Modified: openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx (original) +++ openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx Thu Apr 18 10:58:02 2013 @@ -540,7 +540,8 @@ static std::queue< std::_tstring > getPr extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle ) { std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); - std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\"); +// std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\"); + std::_tstring sProgramDir = sInstDir + TEXT("program\\"); std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt"); std::queue< std::_tstring > aSectionNames;
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx (original) +++ openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx Thu Apr 18 10:58:02 2013 @@ -184,8 +184,8 @@ extern "C" UINT __stdcall IsOfficeRunnin // Property empty -> no office installed if ( sInstDir.length() == 0 ) return ERROR_SUCCESS; - - std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\"); +// std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\"); + std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\"); std::_tstring sPattern = sResourceDir + TEXT("vcl*.res"); // std::_tstring mystr; Modified: openoffice/trunk/main/sfx2/source/appl/shutdownicon.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/appl/shutdownicon.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/appl/shutdownicon.cxx (original) +++ openoffice/trunk/main/sfx2/source/appl/shutdownicon.cxx Thu Apr 18 10:58:02 2013 @@ -894,7 +894,7 @@ void ShutdownIcon::SetAutostart( bool bA #else // UNX getDotAutostart( true ); - OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ) ); + OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/share/xdg/qstart.desktop" ) ); Bootstrap::expandMacros( aPath ); OUString aDesktopFile; Modified: openoffice/trunk/main/sfx2/source/doc/objmisc.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/doc/objmisc.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/doc/objmisc.cxx (original) +++ openoffice/trunk/main/sfx2/source/doc/objmisc.cxx Thu Apr 18 10:58:02 2013 @@ -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() ) Modified: openoffice/trunk/main/solenv/bin/macosx-change-install-names.pl URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/macosx-change-install-names.pl?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/bin/macosx-change-install-names.pl (original) +++ openoffice/trunk/main/solenv/bin/macosx-change-install-names.pl Thu Apr 18 10:58:02 2013 @@ -27,25 +27,46 @@ use macosxotoolhelper; sub action($$$) { my %action = - ('app/UREBIN/URELIB' => '@executable_path/../lib', - 'app/OOO/URELIB' => '@executable_path/../ure-link/lib', + ('app/UREBIN/URELIB' => '@executable_path', + 'app/OOO/URELIB' => '@executable_path/', 'app/OOO/OOO' => '@executable_path', - 'app/SDK/URELIB' => '@executable_path/../../ure-link/lib', - 'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib', - 'app/BRAND/OOO' => '@executable_path/../basis-link/program', + 'app/SDK/URELIB' => '@executable_path', + 'app/BRAND/URELIB' => '@executable_path', + 'app/BRAND/OOO' => '@executable_path', 'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__', 'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__', 'shl/URELIB/URELIB' => '@loader_path', - 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', + 'shl/OOO/URELIB' => '@loader_path', 'shl/OOO/OOO' => '@loader_path', 'shl/LOADER/LOADER' => '@loader_path', - 'shl/OXT/URELIB' => '@executable_path/urelibs', - 'shl/BOXT/URELIB' => '@executable_path/urelibs', - 'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program', + 'shl/OXT/URELIB' => '@executable_path', + 'shl/BOXT/URELIB' => '@executable_path', + 'shl/BOXT/OOO' => '@loader_path', 'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__', 'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__'); + +# ('app/UREBIN/URELIB' => '@executable_path/../lib', +# 'app/OOO/URELIB' => '@executable_path/../ure-link/lib', +# 'app/OOO/OOO' => '@executable_path', +# 'app/SDK/URELIB' => '@executable_path/../../ure-link/lib', +# 'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib', +# 'app/BRAND/OOO' => '@executable_path/../basis-link/program', +# 'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', +# 'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__', +# 'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__', +# 'shl/URELIB/URELIB' => '@loader_path', +# 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', +# 'shl/OOO/OOO' => '@loader_path', +# 'shl/LOADER/LOADER' => '@loader_path', +# 'shl/OXT/URELIB' => '@executable_path/urelibs', +# 'shl/BOXT/URELIB' => '@executable_path/urelibs', +# 'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program', +# 'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', +# 'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__', +# 'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__'); + my ($type, $loc1, $loc2) = @_; my $act = $action{"$type/$loc1/$loc2"}; die "illegal combination $type/$loc1/$loc2" unless defined $act; Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Thu Apr 18 10:58:02 2013 @@ -657,7 +657,7 @@ endif gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" gb_Library_COMPONENTPREFIXES := \ - OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \ + OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Thu Apr 18 10:58:02 2013 @@ -749,7 +749,7 @@ endif gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" gb_Library_COMPONENTPREFIXES := \ - OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \ + OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Thu Apr 18 10:58:02 2013 @@ -692,7 +692,7 @@ endif gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" gb_Library_COMPONENTPREFIXES := \ - OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \ + OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ # vim: set noet sw=4 ts=4: Modified: openoffice/trunk/main/solenv/inc/settings.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/settings.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/settings.mk (original) +++ openoffice/trunk/main/solenv/inc/settings.mk Thu Apr 18 10:58:02 2013 @@ -1359,11 +1359,11 @@ CPPUNIT_CFLAGS = COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ -.IF "$(OS)" == "WNT" || "$(OS)" == "OS2" -COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/ -.ELSE +#.IF "$(OS)" == "WNT" || "$(OS)" == "OS2" +#COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/ +#.ELSE COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/ -.END +#.END COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: COMPONENTPREFIX_INBUILD_NATIVE = \ Modified: openoffice/trunk/main/solenv/inc/unxfbsd.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxfbsd.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/unxfbsd.mk (original) +++ openoffice/trunk/main/solenv/inc/unxfbsd.mk Thu Apr 18 10:58:02 2013 @@ -137,13 +137,18 @@ LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBA .ENDIF # "$(SYSBASE)"!="" LINKFLAGSDEFS*=-Wl,-z,defs LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' +LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' +LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' +LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +#LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' +#LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' +LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) Modified: openoffice/trunk/main/solenv/inc/unxlng.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxlng.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/unxlng.mk (original) +++ openoffice/trunk/main/solenv/inc/unxlng.mk Thu Apr 18 10:58:02 2013 @@ -144,13 +144,18 @@ LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBA .ENDIF # "$(SYSBASE)"!="" LINKFLAGSDEFS*=-Wl,-z,defs LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' +LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN'\' +LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN'\' +LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +#LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' +#LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-lin LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' +LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" Modified: openoffice/trunk/main/solenv/inc/unxsoli4.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxsoli4.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/unxsoli4.mk (original) +++ openoffice/trunk/main/solenv/inc/unxsoli4.mk Thu Apr 18 10:58:02 2013 @@ -127,13 +127,18 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS) # -z combreloc combines multiple relocation sections. Reduces overhead on startup # -norunpath prevents the compiler from recording his own libs in the runpath LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' +LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN'\' +LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN'\' +LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +#LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' +#LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\' +LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd LINKCFLAGS=-w -mt -z combreloc -norunpath Modified: openoffice/trunk/main/solenv/inc/unxsols4.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxsols4.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/unxsols4.mk (original) +++ openoffice/trunk/main/solenv/inc/unxsols4.mk Thu Apr 18 10:58:02 2013 @@ -133,13 +133,18 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS) # -z combreloc combines multiple relocation sections. Reduces overhead on startup # -norunpath prevents the compiler from recording his own libs in the runpath LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' +LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN'\' +LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN'\' +LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +#LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' +#LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\' +LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd LINKCFLAGS=-w -mt -z combreloc -norunpath Modified: openoffice/trunk/main/solenv/inc/unxsolu4.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxsolu4.mk?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/unxsolu4.mk (original) +++ openoffice/trunk/main/solenv/inc/unxsolu4.mk Thu Apr 18 10:58:02 2013 @@ -128,12 +128,16 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS) # -z combreloc combines multiple relocation sections. Reduces overhead on startup # -norunpath prevents the compiler from recording his own libs in the runpath LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' +LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN'\' +LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +#LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\' +LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN'\' +#LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4 LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath Modified: openoffice/trunk/main/svtools/source/filter/filter.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/filter/filter.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/svtools/source/filter/filter.cxx (original) +++ openoffice/trunk/main/svtools/source/filter/filter.cxx Thu Apr 18 10:58:02 2013 @@ -1158,11 +1158,7 @@ void GraphicFilter::ImplInit() if( bUseConfig ) { -#if defined WNT || defined OS2 - rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")); -#else rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program")); -#endif rtl::Bootstrap::expandMacros(url); //TODO: detect failure utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath); } Modified: openoffice/trunk/main/svx/source/dialog/docrecovery.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/docrecovery.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/svx/source/dialog/docrecovery.cxx (original) +++ openoffice/trunk/main/svx/source/dialog/docrecovery.cxx Thu Apr 18 10:58:02 2013 @@ -2032,7 +2032,7 @@ void BrokenRecoveryDialog::impl_askForSa { #if defined(WNT) || defined(OS2) - OUString ustrValue = OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue = OUString::createFromAscii("${$OOO_BASE_DIR/program/bootstrap.ini:UserInstallation}"); #elif defined( MACOSX ) OUString ustrValue = OUString::createFromAscii("~"); #else Modified: openoffice/trunk/main/svx/source/dialog/sendreportunx.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/sendreportunx.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/svx/source/dialog/sendreportunx.cxx (original) +++ openoffice/trunk/main/svx/source/dialog/sendreportunx.cxx Thu Apr 18 10:58:02 2013 @@ -239,7 +239,7 @@ namespace svx{ int ret = -1; rtl::OUString path1( RTL_CONSTASCII_USTRINGPARAM( - "$BRAND_BASE_DIR/program/crashrep")); + "$OOO_BASE_DIR/program/crashrep")); rtl::Bootstrap::expandMacros(path1); rtl::OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == Modified: openoffice/trunk/main/svx/source/unodraw/recoveryui.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/unodraw/recoveryui.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/svx/source/unodraw/recoveryui.cxx (original) +++ openoffice/trunk/main/svx/source/unodraw/recoveryui.cxx Thu Apr 18 10:58:02 2013 @@ -186,7 +186,7 @@ static OUString GetCrashConfigDir() { #if defined(WNT) || defined(OS2) - OUString ustrValue = OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue = OUString::createFromAscii("${$OOO_BASE_DIR/program/bootstrap.ini:UserInstallation}"); #elif defined(MACOSX) OUString ustrValue = OUString::createFromAscii("~"); #else Modified: openoffice/trunk/main/tools/source/rc/resmgr.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/source/rc/resmgr.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/tools/source/rc/resmgr.cxx (original) +++ openoffice/trunk/main/tools/source/rc/resmgr.cxx Thu Apr 18 10:58:02 2013 @@ -200,10 +200,6 @@ void ResMgrContainer::init() // 1. fixed locations rtl::OUString uri( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/resource")); - rtl::Bootstrap::expandMacros(uri); - aDirs.push_back(uri); - uri = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/resource")); rtl::Bootstrap::expandMacros(uri); aDirs.push_back(uri); Modified: openoffice/trunk/main/unotools/source/config/bootstrap.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/source/config/bootstrap.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/unotools/source/config/bootstrap.cxx (original) +++ openoffice/trunk/main/unotools/source/config/bootstrap.cxx Thu Apr 18 10:58:02 2013 @@ -148,7 +148,7 @@ namespace utl // s_pData = &s_theData; rtl::OUString uri; rtl::Bootstrap::get( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OOO_BASE_DIR")), uri); s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" BOOTSTRAP_DATA_NAME))); } return *s_pData; @@ -908,7 +908,7 @@ sal_Bool Bootstrap::Impl::getVersionValu // try to open version.ini (versionrc) rtl::OUString uri; rtl::Bootstrap::get( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OOO_BASE_DIR")), uri); rtl::Bootstrap aData( uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) ); if ( aData.getHandle() == NULL ) Modified: openoffice/trunk/main/unotools/source/config/configmgr.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/source/config/configmgr.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/unotools/source/config/configmgr.cxx (original) +++ openoffice/trunk/main/unotools/source/config/configmgr.cxx Thu Apr 18 10:58:02 2013 @@ -487,7 +487,7 @@ Any ConfigManager::GetDirectConfigProper rtl::OUString name( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "${BRAND_BASE_DIR}/program/edition/edition.ini"))); + "${OOO_BASE_DIR}/program/edition/edition.ini"))); rtl::Bootstrap::expandMacros(name); if (rtl::Bootstrap(name).getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EDITIONNAME")), Modified: openoffice/trunk/main/ure/source/jvmfwk3.ini URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/jvmfwk3.ini?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/ure/source/jvmfwk3.ini (original) +++ openoffice/trunk/main/ure/source/jvmfwk3.ini Thu Apr 18 10:58:02 2013 @@ -19,7 +19,7 @@ # # ************************************************************* [Bootstrap] -UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../misc/javavendors.xml +UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/javavendors.xml UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA} ${SYSUSERCONFIG}/URE/javasettings_${_OS}_${_ARCH}.xml UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA} ${SYSUSERCONFIG}/URE/javasettings_${_OS}_${_ARCH}.xml UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS} Modified: openoffice/trunk/main/ure/source/jvmfwk3rc URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/jvmfwk3rc?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/ure/source/jvmfwk3rc (original) +++ openoffice/trunk/main/ure/source/jvmfwk3rc Thu Apr 18 10:58:02 2013 @@ -19,7 +19,7 @@ # # ************************************************************* [Bootstrap] -UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/javavendors.xml +UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/javavendors.xml UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA} file:///etc/opt/ure/javasettings_${_OS}_${_ARCH}.xml UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA} ${SYSUSERHOME}/.ure/javasettings_${_OS}_${_ARCH}.xml UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS} Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx (original) +++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx Thu Apr 18 10:58:02 2013 @@ -1718,17 +1718,17 @@ static bool AddLocalTempFontDirs( void ) return false; bFirst = false; - // add private font files found in brand and base layer + // add private font files found in office base dir - rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ); - rtl_bootstrap_expandMacros( &aBrandStr.pData ); - rtl::OUString aBrandSysPath; - OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None ); + // rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) ); + // rtl_bootstrap_expandMacros( &aBrandStr.pData ); + // rtl::OUString aBrandSysPath; + // OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None ); - rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); - aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); - aBrandFontDir.append( "/share/fonts/truetype/" ); - bool bBrandSuccess = AddTempFontDir( aBrandFontDir.getStr() ); + // rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); + // aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); + // aBrandFontDir.append( "/share/fonts/truetype/" ); + // bool bBrandSuccess = AddTempFontDir( aBrandFontDir.getStr() ); rtl::OUString aBaseStr( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) ); rtl_bootstrap_expandMacros( &aBaseStr.pData ); @@ -1740,7 +1740,8 @@ static bool AddLocalTempFontDirs( void ) aBaseFontDir.append( "/share/fonts/truetype/" ); bool bBaseSuccess = AddTempFontDir( aBaseFontDir.getStr() ); - return bBrandSuccess && bBaseSuccess; +// return bBrandSuccess && bBaseSuccess; + return bBaseSuccess; } void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) Modified: openoffice/trunk/main/vcl/source/gdi/imagerepository.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/imagerepository.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/vcl/source/gdi/imagerepository.cxx (original) +++ openoffice/trunk/main/vcl/source/gdi/imagerepository.cxx Thu Apr 18 10:58:02 2013 @@ -81,7 +81,7 @@ namespace vcl { rtl::OUString sImages; rtl::OUStringBuffer aBuff( rName ); - rtl::OUString aBasePath( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR/program" ) ); + rtl::OUString aBasePath( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR/program" ) ); rtl::Bootstrap::expandMacros( aBasePath ); bool bLoaded = false; Modified: openoffice/trunk/main/vcl/source/gdi/impimagetree.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/impimagetree.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/vcl/source/gdi/impimagetree.cxx (original) +++ openoffice/trunk/main/vcl/source/gdi/impimagetree.cxx Thu Apr 18 10:58:02 2013 @@ -215,7 +215,7 @@ void ImplImageTree::resetZips() { m_zips.clear(); { rtl::OUString url( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition/images.zip")); + RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/edition/images.zip")); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); @@ -226,7 +226,7 @@ void ImplImageTree::resetZips() { } { rtl::OUString url( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config")); + RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config")); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); @@ -244,7 +244,7 @@ void ImplImageTree::resetZips() { { rtl::OUString url( RTL_CONSTASCII_USTRINGPARAM( - "$BRAND_BASE_DIR/share/config/images_brand.zip")); + "$OOO_BASE_DIR/share/config/images_brand.zip")); rtl::Bootstrap::expandMacros(url); m_zips.push_back( std::make_pair( Modified: openoffice/trunk/main/vcl/unx/generic/app/saldata.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/app/saldata.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/vcl/unx/generic/app/saldata.cxx (original) +++ openoffice/trunk/main/vcl/unx/generic/app/saldata.cxx Thu Apr 18 10:58:02 2013 @@ -831,7 +831,7 @@ const char* X11SalData::getFrameClassNam if( !aClassName.getLength() ) { rtl::OUString aIni, aProduct; - rtl::Bootstrap::get( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aIni ); + rtl::Bootstrap::get( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OOO_BASE_DIR" ) ), aIni ); aIni += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ProductKey" ) ), aProduct ); Modified: openoffice/trunk/main/vcl/unx/generic/fontmanager/helper.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/fontmanager/helper.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/vcl/unx/generic/fontmanager/helper.cxx (original) +++ openoffice/trunk/main/vcl/unx/generic/fontmanager/helper.cxx Thu Apr 18 10:58:02 2013 @@ -53,7 +53,7 @@ OUString getOfficePath( enum whichOffice { bOnce = true; OUString aIni; - Bootstrap::get( OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aIni ); + Bootstrap::get( OUString( RTL_CONSTASCII_USTRINGPARAM( "OOO_BASE_DIR" ) ), aIni ); aIni += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomDataUrl" ) ), aConfigPath ); Modified: openoffice/trunk/main/vcl/win/source/gdi/salgdi3.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/gdi/salgdi3.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff ============================================================================== --- openoffice/trunk/main/vcl/win/source/gdi/salgdi3.cxx (original) +++ openoffice/trunk/main/vcl/win/source/gdi/salgdi3.cxx Thu Apr 18 10:58:02 2013 @@ -2340,7 +2340,7 @@ void WinSalGraphics::GetDevFontList( Imp ::rtl::OUString aExecutableFile( aPath ); aPath = aPath.copy( 0, aPath.lastIndexOf('/') ); String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') ); - aFontDirUrl += String( RTL_CONSTASCII_USTRINGPARAM("/Basis/share/fonts/truetype") ); + aFontDirUrl += String( RTL_CONSTASCII_USTRINGPARAM("/share/fonts/truetype") ); // collect fonts in font path that could not be registered osl::Directory aFontDir( aFontDirUrl ); @@ -2351,7 +2351,7 @@ void WinSalGraphics::GetDevFontList( Imp String aEmptyString; ::rtl::OUString aBootStrap; - rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aBootStrap ); + rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "OOO_BASE_DIR" ) ), aBootStrap ); aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aBootStrap ); ::rtl::OUString aUserPath;
