[Libreoffice-commits] core.git: sfx2/source
David Tardon
dtardon at redhat.com
Sun Apr 28 07:29:09 PDT 2013
sfx2/source/doc/objmisc.cxx | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit f7cea8fb5b5d92ff6b8ac09b38d02badaaf7db04
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 28 11:18:35 2013 +0200
use SAL_CONFIGFILE macro
Change-Id: I958a961993aaf920c52b5d7b8eea6666656b4ddd
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 7ce3d1d..1bde2ae 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -2076,19 +2076,11 @@ void SfxObjectShell::StoreLog()
if ( pImp->m_xLogRing.is() )
{
-#ifdef WNT
- OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" );
-#else
- OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}" );
-#endif
+ OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" );
::rtl::Bootstrap::expandMacros( aFileURL );
-#ifdef WNT
- OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" );
-#else
- OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/setuprc:buildid}" );
-#endif
+ OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("setup") ":buildid}" );
::rtl::Bootstrap::expandMacros( aBuildID );
More information about the Libreoffice-commits
mailing list