[Libreoffice-commits] .: 2 commits - sc/qa vcl/unx

[Michael Stahl]

 sc/qa/unit/macros-test.cxx                  |    6 +++---
 vcl/unx/generic/fontmanager/fontmanager.cxx |    4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 1a76bb7161d0a892b6998f404d3922421a89db9b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 24 21:23:23 2011 +0200

    macros-test.cxx: fix syntax error

diff --git a/sc/qa/unit/macros-test.cxx b/sc/qa/unit/macros-test.cxx
index e97156f..28f5d49 100644
--- a/sc/qa/unit/macros-test.cxx
+++ b/sc/qa/unit/macros-test.cxx
@@ -269,8 +269,8 @@ struct TestMacroInfo
 };
 void ScMacrosTest::testVba()
 {
-    TestMacroInfo testInfo[] { 
-        { 
+    TestMacroInfo testInfo[] = {
+        {
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestAddress.")),
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Sheet1.test?language=Basic&location=document"))
         },
@@ -282,7 +282,7 @@ void ScMacrosTest::testVba()
         }
 */
     };
-       
+
     rtl::OUString aFileExtension(aFileFormats[1].pName, strlen(aFileFormats[1].pName), RTL_TEXTENCODING_UTF8 );
     rtl::OUString aFilterName(aFileFormats[1].pFilterName, strlen(aFileFormats[1].pFilterName), RTL_TEXTENCODING_UTF8) ;
     rtl::OUString aFilterType(aFileFormats[1].pTypeName, strlen(aFileFormats[1].pTypeName), RTL_TEXTENCODING_UTF8);
commit 95550e469b5b0fa90401235be8398ecd73dec11d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 24 21:22:17 2011 +0200

    PrintFontManager: don't look at empty path entires

diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 0028f04..80cddee 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -2190,6 +2190,10 @@ void PrintFontManager::initialize()
         {
             OString aToken = aPath.getToken( 0, ';', nIndex );
             normPath( aToken );
+            if (!aToken.getLength())
+            {
+                continue;
+            }
             // if registering an app-specific fontdir with fontconfig fails
             // and fontconfig-based substitutions are enabled
             // then trying to use these app-specific fonts doesn't make sense