[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cppuhelper/source

Michael Meeks michael at kemper.freedesktop.org
Wed Apr 18 04:06:49 PDT 2012


 cppuhelper/source/bootstrap.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ed7df6ba854a799e8e9fb92c68650cc5e6e5695
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Apr 18 11:04:08 2012 +0100

    avoid using the new rdb reading logic for empty/non-existent directories
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 7ead585..cd0313e 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -322,7 +322,7 @@ Reference< registry::XSimpleRegistry > readRdbDirectory(
         }
         nXML++;
     }
-    if (nXML == aURLs.size())
+    if (nXML > 0 && nXML == aURLs.size())
     {
         OSL_TRACE (OSL_LOG_PREFIX "no legacy rdbs in directory '%s'\n",
                    rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8 ).getStr());


More information about the Libreoffice-commits mailing list