diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 12:22:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 12:23:01 +0200 |
| commit | 0a158b7800221ce8b79dac430015c6a02ad33e31 (patch) | |
| tree | 3bd224bdeb065dbfb5899903175db80605ae1157 /tools/source | |
| parent | ad9c1ffdd02caad147d9386f96942bd1c9eb6657 (diff) | |
Undo basis/brand split: merge basis program/resource/ into brand program/resource/.
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 1973419530a0..1733e6e1d1ae 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -207,10 +207,6 @@ void ResMgrContainer::init() 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); // 2. in STAR_RESOURCEPATH const sal_Char* pEnv = getenv( "STAR_RESOURCEPATH" ); |