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 /sdext | |
| 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 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/wrapper/wrapper.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 98c39e2e62bd..f2c97388ace7 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "contentsink.hxx" #include "pdfparse.hxx" @@ -1043,11 +1044,11 @@ bool xpdf_ImportFromFile( const OUString& rURL, } // Determine xpdfimport executable URL: - OUString converterURL("$BRAND_BASE_DIR/program/xpdfimport"); + OUString converterURL("$BRAND_BASE_DIR/" LIBO_BIN_FOLDER "/xpdfimport"); rtl::Bootstrap::expandMacros(converterURL); //TODO: detect failure // Determine pathname of xpdfimport_err.pdf: - OUString errPathname("$BRAND_BASE_DIR/share/xpdfimport/xpdfimport_err.pdf"); + OUString errPathname("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/xpdfimport/xpdfimport_err.pdf"); rtl::Bootstrap::expandMacros(errPathname); //TODO: detect failure if (osl::FileBase::getSystemPathFromFileURL(errPathname, errPathname) != osl::FileBase::E_None) |