diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-20 11:12:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-20 23:04:11 +0200 |
| commit | b1eae75f53ad2ee88192241776ffa7d29725301a (patch) | |
| tree | b130ed008e3670cc81152b6f653c8347e7f80e4a /desktop | |
| parent | d9604fa1b4123da145fc9b52901b42888d25ca3b (diff) | |
Undo basis/brand split: moved ini files from basis program/ to brand program/.
Moved uno ini, folded fundamentalbasis ini into fundamental ini, merged
version inis.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index fbc5136518c3..37b1bfe41b22 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -375,7 +375,7 @@ static bool impl_needsCompatCheck() { bool bNeedsCheck = false; rtl::OUString aLastCheckBuildID; - rtl::OUString aCurrentBuildID( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) ); + rtl::OUString aCurrentBuildID( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) ); rtl::Bootstrap::expandMacros( aCurrentBuildID ); try { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 33306839a72f..f0b3f41d9e09 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1281,7 +1281,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG) sal_Int32 nPos = m_noDependencyCurVer.indexOf( sVersion ); if ( nPos >= 0 ) { - ::rtl::OUString sCurVersion( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}")); + ::rtl::OUString sCurVersion( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}")); ::rtl::Bootstrap::expandMacros(sCurVersion); m_noDependencyCurVer = m_noDependencyCurVer.replaceAt( nPos, sVersion.getLength(), sCurVersion ); } diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 6b937547ae93..9bbaa1f4c5b7 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -62,7 +62,7 @@ lcl_versionIsNot(dp_misc::Order i_eOrder, ::rtl::OUString const& i_rVersion) { ::rtl::OUString aVersion( RTL_CONSTASCII_USTRINGPARAM( - "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}")); ::rtl::Bootstrap::expandMacros(aVersion); return ::dp_misc::compareVersions(aVersion, i_rVersion) != i_eOrder; diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 2bd02540a8d3..8e47e8fb0ea8 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -82,7 +82,7 @@ struct UnoRc : public rtl::StaticWithInit< boost::shared_ptr<rtl::Bootstrap>, UnoRc> { const boost::shared_ptr<rtl::Bootstrap> operator () () { OUString unorc( RTL_CONSTASCII_USTRINGPARAM( - "$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")) ); + "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")) ); ::rtl::Bootstrap::expandMacros( unorc ); ::boost::shared_ptr< ::rtl::Bootstrap > ret( new ::rtl::Bootstrap( unorc ) ); |