[Libreoffice-commits] .: svtools/source

[Caolán McNamara]

 svtools/source/control/ctrlbox.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a86054f697d20a52d882d6307f98b1a7942fc031
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 15 16:11:05 2011 +0100

    psp::getOfficePath is unix only, this should work too

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 1333e7b..2897af6 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 );