[Libreoffice-commits] .: 3 commits - sal/inc sc/source solenv/bin

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 11 02:04:00 PDT 2012


 sal/inc/rtl/oustringostreaminserter.hxx |    4 ++--
 sc/source/ui/view/gridwin.cxx           |    2 +-
 solenv/bin/modules/installer/files.pm   |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3b333819a335a6c734eba26a7ff4ff87c3cffbd9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 11 11:03:24 2012 +0200

    warning C4805: '!=': unsafe mix of type 'bool' and type 'sal_Bool'
    
    Change-Id: Ie05299fb67d90a7df332626d361697cb32bb205c

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 873b08b..3392623 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1168,7 +1168,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec
     sal_uInt16 i;
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
     long nSizeX  = 0;
     long nSizeY  = 0;
commit 8e136c360ddaa78816ba264dba3b8a9b7289d8ec
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 11 10:11:39 2012 +0200

    Missing "include"
    
    Change-Id: I93baa875c15ea2186f7e738bfa48457e7fa09f88

diff --git a/sal/inc/rtl/oustringostreaminserter.hxx b/sal/inc/rtl/oustringostreaminserter.hxx
index 28d7c17..c25998a 100644
--- a/sal/inc/rtl/oustringostreaminserter.hxx
+++ b/sal/inc/rtl/oustringostreaminserter.hxx
@@ -57,8 +57,8 @@ namespace rtl {
 
     @since LibreOffice 3.5.
 */
-template< typename charT, typename traits > std::basic_ostream<charT, traits> &
-operator <<(
+template< typename charT, typename traits >
+inline std::basic_ostream<charT, traits> & operator <<(
     std::basic_ostream<charT, traits> & stream, rtl::OUString const & string)
 {
     return stream <<
commit 7e3db5c46453115c4168e663f2b1df8f67fc6dc0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 11 10:09:26 2012 +0200

    Better error reporting
    
    Change-Id: Id5fa59ebd8d656158c22552e6f06e61897df2fb5

diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index 26715ed..610ba4f 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -32,6 +32,7 @@ use warnings;
 
 use installer::exiter;
 use installer::logger;
+use Carp;
 
 ############################################
 # File Operations
@@ -86,7 +87,7 @@ sub save_file
         if ( $savefile =~ /\.log/ )
         {
             print "\n*************************************************\n";
-            print "ERROR: Cannot write log file: $savefile";
+            print "ERROR: Cannot write log file $savefile, $!";
             print "\n*************************************************\n";
             exit(-1);   # exiting the program to avoid endless loops
         }


More information about the Libreoffice-commits mailing list