diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 /sw | |
| parent | 18041138d3169d565755565bdbabd8de596b5ac7 (diff) | |
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.
Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/envelp/labelcfg.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 81f49f3922b8..d7b9f8a0d4a6 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <swtypes.hxx> #include <labelcfg.hxx> #include <labimp.hxx> @@ -72,7 +74,7 @@ static Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix) SwLabelConfig::SwLabelConfig() : ConfigItem("Office.Labels/Manufacturer") { - OUString uri("$BRAND_BASE_DIR/share/labels/labels.xml"); + OUString uri("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/labels/labels.xml"); rtl::Bootstrap::expandMacros(uri); xmlreader::XmlReader reader(uri); int nsId; |