[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/unx vcl/win

[Noel Grandin]

 vcl/inc/win/salprn.h          |    2 +-
 vcl/unx/kde/UnxFilePicker.cxx |    2 +-
 vcl/win/gdi/salprn.cxx        |    9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 36ec485c70cfd952426bc072e40fb07a7ee1172a
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jan 18 11:20:18 2016 +0200

    fix windows build
    
        ...after c88165dfb46c771eba6324ec061bf4455732194e "loplugin: unused return
        values in vcl/"
    
    Change-Id: I8fb8e719861448142fd0c8b90081b85267cb8472

diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 1eed33a..90c7077 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -99,7 +99,7 @@ public:
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData ) override;
-    virtual bool                    EndJob() override;
+    virtual void                    EndJob() override;
     virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) override;
     virtual bool                    EndPage() override;
     virtual sal_uIntPtr             GetErrorCode() override;
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index b0aca3c..e7bdbb2 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -1650,7 +1650,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobDat
     return mpGraphics;
 }
 
-bool WinSalPrinter::EndPage()
+void WinSalPrinter::EndPage()
 {
     HDC hDC = mhDC;
     if ( hDC && mpGraphics )
@@ -1661,20 +1661,17 @@ bool WinSalPrinter::EndPage()
     }
 
     if( ! isValid() )
-        return FALSE;
+        return;
 
     volatile int nRet = 0;
     CATCH_DRIVER_EX_BEGIN;
     nRet = ::EndPage( hDC );
     CATCH_DRIVER_EX_END( "exception in EndPage", this );
 
-    if ( nRet > 0 )
-        return TRUE;
-    else
+    if ( nRet <= 0 )
     {
         GetLastError();
         mnError = SAL_PRINTER_ERROR_GENERALERROR;
-        return FALSE;
     }
 }
 
commit 8ff02f0615bfde9b7a062543025b0a47f379d6b2
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jan 18 11:07:00 2016 +0200

    -Wunused-result
    
    Change-Id: I6e8c4ac497bc1ca33ae81c5fea4898b1886bb8fe

diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 047741b..509fd4a 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -881,7 +881,7 @@ void UnxFilePicker::sendCommand( const OUString &rCommand )
     ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl;
 #endif
 
-    write( m_nFilePickerWrite, aUtfString.getStr(), aUtfString.getLength() );
+    (void)write( m_nFilePickerWrite, aUtfString.getStr(), aUtfString.getLength() );
 }
 
 void UnxFilePicker::sendCommand( const OUString &rCommand, ::osl::Condition &rCondition )