diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-04-15 16:11:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-15 16:11:05 +0100 |
| commit | 9be31e132e6314879cf495052a5e11120e15ede0 (patch) | |
| tree | 1613d8bb975abc67a94cdf377b6e9ff9af56f50c /svtools | |
| parent | e601c32661735e9fd78def7ee11bfe21279cca71 (diff) | |
psp::getOfficePath is unix only, this should work too
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index eddc8d3eb35a..a094ed4f3ff3 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -50,6 +50,8 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <rtl/bootstrap.hxx> + #if OSL_DEBUG_LEVEL > 1 #include <cstdio> #endif @@ -65,7 +67,6 @@ #define FONTNAMEBOXMRUENTRIESFILE "/user/config/fontnameboxmruentries" using namespace ::com::sun::star; -using namespace psp; // ======================================================================== // ColorListBox @@ -1078,7 +1079,10 @@ void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode void FontNameBox::InitFontMRUEntriesFile() { - maFontMRUEntriesFile = getOfficePath( UserPath ); + rtl::OUString sUserConfigDir(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}")); + rtl::Bootstrap::expandMacros(sUserConfigDir); + + maFontMRUEntriesFile = sUserConfigDir; if( maFontMRUEntriesFile.Len() ) { maFontMRUEntriesFile.AppendAscii( FONTNAMEBOXMRUENTRIESFILE ); |