[Libreoffice-commits] .: 3 commits - vcl/source

[Michael Stahl]

 vcl/source/gdi/pdfwriter_impl.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 43d7d0684af0df1d5bde69d361365e786bf249bf
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jul 9 11:41:55 2012 +0200

    PDFWriterImpl::createControl: -Werror=maybe-uninitialized
    
    Acutually this one is spurious, gcc 4.7.0 is too dumb here.
    
    Change-Id: I964f0278d19d31bab9859b047dfb8d3661a34958

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index f63a339..7c7db57 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -11735,7 +11735,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
     if( nPageNr < 0 || nPageNr >= (sal_Int32)m_aPages.size() )
         return -1;
 
-    bool sigHidden;
+    bool sigHidden(false);
     sal_Int32 nNewWidget = m_aWidgets.size();
     m_aWidgets.push_back( PDFWidget() );
 
commit 91594e7fd5f8f36fe5c99c8d04b3473e370fa365
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jul 9 11:40:29 2012 +0200

    PDFWriterImpl::finalizeSignature: -Werror=unused-variable
    
    Change-Id: Iaa7a717dad87e092f5b259054d9c79ad3e7ae642

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 116fffa..f63a339 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6185,8 +6185,11 @@ bool PDFWriterImpl::finalizeSignature()
     if (!derEncoded.hasElements())
         return false;
 
+#if 0
+    // FIXME TODO
     sal_Int8* n_derArray = derEncoded.getArray();
     sal_Int32 n_derLength = derEncoded.getLength();
+#endif
 
     // 4- overwrite the PKCS7 content to the m_nSignatureContentOffset
     CHECK_RETURN( (osl_File_E_None == osl_setFilePos( m_aFile, osl_Pos_Absolut, m_nSignatureContentOffset ) ) );
commit 33ca6057e3ad69498f54562f0869e212dddb0c11
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jul 9 11:38:39 2012 +0200

    PDFWriterImpl: -Werror=reorder
    
    Change-Id: Id0f67e2085a7ffa22834375ef8636d603cb34ce1

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 32a0727..116fffa 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1763,10 +1763,10 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
         m_nInheritedPageHeight( 842 ), // default A4
         m_eInheritedOrientation( PDFWriter::Portrait ),
         m_nCurrentPage( -1 ),
-        m_nResourceDict( -1 ),
         m_nSignatureObject( -1 ),
         m_nSignatureContentOffset( 0 ),
         m_nSignatureLastByteRangeNoOffset( 0 ),
+        m_nResourceDict( -1 ),
         m_nFontDictObject( -1 ),
         m_pCodec( NULL ),
         m_aDocDigest( rtl_digest_createMD5() ),