avmedia/source/vlc/wrapper/SymbolLoader.hxx | 4 ++-- basctl/source/basicide/baside2.cxx | 5 +++++ basctl/source/basicide/baside3.cxx | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-)
New commits: commit 81f94edc6341b4c898d8109ed50260de9ed06504 Author: Tor Lillqvist <[email protected]> Date: Sat Oct 12 09:34:51 2013 +0300 What (who?) are OW and MTF? Change-Id: I47b9b91d72e423c0ef37eaa9f081e755adfc36d6 diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 667bae5..7080371 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -72,6 +72,11 @@ namespace Print short const ValidWindow = 0x1234; +// What (who) are OW and MTF? Compare to baside3.cxx where an +// identically named variable, used in the same way, has the value +// "*.*" on Windows, "*" otherwise. Is that what should be done here, +// too? + #if defined(OW) || defined(MTF) char const FilterMask_All[] = "*"; #else commit 5705102c02fefa715426424f0536d675c3faee68 Author: Tor Lillqvist <[email protected]> Date: Sat Oct 12 09:30:34 2013 +0300 Test WNT instead of the vague UNX Change-Id: I99aa82d29d056afde92d258fd5cdf13359f9b74c diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index a6c73d1..b22db95 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -64,10 +64,10 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::resource; using namespace ::com::sun::star::ui::dialogs; -#if defined(UNX) -char const FilterMask_All[] = "*"; -#else +#ifdef WNT char const FilterMask_All[] = "*.*"; +#else +char const FilterMask_All[] = "*"; #endif DBG_NAME( DialogWindow ) commit f1b956f5aaa83b53b1217d85be24d71d6379e97e Author: Tor Lillqvist <[email protected]> Date: Sat Oct 12 09:26:17 2013 +0300 s/UNX/LINUX/, as that is what is meant here Change-Id: I6b58f6f62bc304b29c336fc46f87bce8d2ce22fe diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 7061faf..e7db7a7 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -34,7 +34,7 @@ struct ApiMap namespace { -#if defined( UNX ) +#if defined( LINUX ) const char LibName[] = "libvlc.so.5"; #elif defined( MACOSX ) const char LibName[] = "/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib"; @@ -92,7 +92,7 @@ namespace template<size_t N> bool InitApiMap( const ApiMap ( &pMap )[N] ) { -#if defined( UNX ) || defined( MACOSX ) +#if defined( LINUX ) || defined( MACOSX ) const OUString& fullPath = OUString::createFromAscii(LibName); #elif defined( WNT ) const OUString& fullPath = GetVLCPath() + OUString::createFromAscii(LibName); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
