diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2013-04-18 09:58:02 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2013-04-18 09:58:02 +0000 |
| commit | 2af65172af2cfc768e4f44507a02e1b17a9806ba (patch) | |
| tree | fd4c4c673a8a83bee9427170d8963559017474cf /sfx2/source/doc/objmisc.cxx | |
| parent | 581c83c696bd850066d425427c10374b6587b45d (diff) | |
#121996# integrate first part to remove 3layer office
Notes
Notes:
prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068
Diffstat (limited to 'sfx2/source/doc/objmisc.cxx')
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index dd0703fc5348..e7ee3cc1b508 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -2366,20 +2366,20 @@ void SfxObjectShell::StoreLog() if ( pImp->m_xLogRing.is() ) { -#ifdef WNT - ::rtl::OUString aFileURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ) ); -#else - ::rtl::OUString aFileURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}" ) ); -#endif - + ::rtl::OUString aFileURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ) ); +//#ifdef WNT +// ::rtl::OUString aFileURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ) ); +//#else +// ::rtl::OUString aFileURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/bootstraprc:UserInstallation}" ) ); +//#endif ::rtl::Bootstrap::expandMacros( aFileURL ); -#ifdef WNT - ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ) ); -#else - ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/setuprc:buildid}" ) ); -#endif - +//#ifdef WNT +// ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/setup.ini:buildid}" ) ); +//#else +// ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/setuprc:buildid}" ) ); +//#endif + ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("setup") ":buildid}" ) ); ::rtl::Bootstrap::expandMacros( aBuildID ); if ( aFileURL.getLength() ) |