[Libreoffice-commits] .: 3 commits - connectivity/source extensions/source Repository.mk

[Libreoffice Gerrit user]

 Repository.mk                                     |    8 +++---
 connectivity/source/drivers/mork/MNSINIParser.cxx |   27 ++++++++++------------
 extensions/source/ole/unoobjw.cxx                 |    2 -
 3 files changed, 18 insertions(+), 19 deletions(-)

New commits:
commit 8aae567dc66c271fe3211f2847b48afbf02473b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 19 15:47:49 2012 +0200

    Wrong include
    
    Change-Id: I3a6b2218cec77eabf05bc422258e672269440c7b

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index b796260..df9675c 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -54,7 +54,7 @@
 #include <com/sun/star/reflection/XIdlReflection.hpp>
 #include <osl/interlck.h>
 #include <com/sun/star/uno/genfunc.h>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 #include "comifaces.hxx"
commit 4f18490ca6cc84727e953bd2f99d9a92a4cc3710
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 19 14:52:04 2012 +0200

    Clean up warning/info reporting
    
    Change-Id: Ib2a8da9f837b0b91f980aacda9df1c6c5c691eef

diff --git a/connectivity/source/drivers/mork/MNSINIParser.cxx b/connectivity/source/drivers/mork/MNSINIParser.cxx
index c601213..bd7ac6e 100644
--- a/connectivity/source/drivers/mork/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mork/MNSINIParser.cxx
@@ -23,21 +23,20 @@
 IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException )
 {
     OUString iniUrl;
-    if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData))
+    oslFileError fileError = osl_getFileURLFromSystemPath(
+        rIniName.pData, &iniUrl.pData);
+    if (fileError != osl_File_E_None)
+    {
+        SAL_WARN(
+            "connectivity.mork",
+            "InitParser, getFileURLFromSystemPath(" << rIniName << "): "
+                << +fileError);
         return;
+    }
 
     SAL_INFO("connectivity.mork", "IniParser: " << iniUrl);
     oslFileHandle handle=NULL;
-    oslFileError fileError = osl_File_E_INVAL;
-    try{
-        if (!iniUrl.isEmpty())
-            fileError = osl_openFile(iniUrl.pData, &handle, osl_File_OpenFlag_Read);
-    }
-    catch(const ::com::sun::star::io::IOException&)
-    {
-        SAL_WARN("connectivity.mork", "IniParser -- couldn't open file: " << iniUrl);
-        return;
-    }
+    fileError = osl_openFile(iniUrl.pData, &handle, osl_File_OpenFlag_Read);
 
     if (osl_File_E_None == fileError)
     {
@@ -85,12 +84,12 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce
         }
         osl_closeFile(handle);
     }
-#if OSL_DEBUG_LEVEL > 0
     else
     {
-        SAL_WARN("connectivity.mork", "IniParser -- couldn't open file: " << iniUrl);
+        SAL_INFO(
+            "connectivity.mork",
+            "IniParser couldn't open file " << iniUrl << ": " << +fileError);
     }
-#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6435ef9a592e6bfc510bca5a9e061e3dab7fdf58
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 19 14:51:05 2012 +0200

    Lexicographical sorting
    
    Change-Id: If6dd2af2f71c467a8c69305433eb465457b38714

diff --git a/Repository.mk b/Repository.mk
index d5fdb49..d2ed49f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     bestreversemap \
     bmp \
     bmpsum \
-    checksingleton \
     cfgex \
+    checksingleton \
     cppunit/cppunittester \
     g2g \
     gencoll_rule \
@@ -45,8 +45,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     idxdict \
     lngconvex \
     localize \
-    mork_helper \
     mkunroll \
+    mork_helper \
     osl_process_child \
     pdf2xml \
     pdfunzip \
@@ -62,12 +62,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     svidl \
     transex3 \
     typesconfig \
-	ucpp \
+    ucpp \
     ulfconv \
     ulfex \
     xml2cmp \
-    xrmex \
     xpdfimport \
+    xrmex \
 ))
 
 $(eval $(call gb_Helper_register_executables,SDK, \