[Libreoffice-commits] .: 2 commits - package/source UnoControls/source

[Caolán McNamara]

 UnoControls/source/controls/progressmonitor.cxx |   11 -----------
 package/source/xstor/ohierarchyholder.cxx       |    2 --
 package/source/zipapi/ZipFile.cxx               |    1 +
 package/source/zipapi/ZipOutputStream.cxx       |    3 +++
 4 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 57530bd4b407d1dfc1ba258996f4fff14a6e3cea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 24 14:46:48 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 997c62a..9aab0b8 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -732,11 +732,6 @@ void ProgressMonitor::impl_recalcLayout ()
     sal_Int32	nWidth_ProgressBar		;
     sal_Int32	nHeight_ProgressBar		;
 
-    sal_Int32	nX_3DLine				;
-    sal_Int32	nY_3DLine				;
-    sal_Int32	nWidth_3DLine			;
-    sal_Int32	nHeight_3DLine			;
-
     sal_Int32	nX_Text_Top				;
     sal_Int32	nY_Text_Top				;
     sal_Int32	nWidth_Text_Top			;
@@ -820,12 +815,6 @@ void ProgressMonitor::impl_recalcLayout ()
     nHeight_Text_Bottom		=	nHeight_Topic_Bottom											;
 
     // Oriented by progressbar.
-    nX_3DLine				=	nX_Topic_Top													;
-    nY_3DLine				=	nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2)				;
-    nWidth_3DLine			=	nWidth_ProgressBar												;
-    nHeight_3DLine			=	1																;	// Height for ONE line ! (But we paint two lines!)
-
-    // Oriented by progressbar.
     nX_Button				=	nX_ProgressBar+nWidth_ProgressBar-nWidth_Button					;
     nY_Button				=	nY_Topic_Bottom+nHeight_Topic_Bottom+PROGRESSMONITOR_FREEBORDER	;
 
commit 97cfbe46e6e8e553106b008435df31640145a4a7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 24 11:15:15 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index 6f0b3c5..ab0d9a6 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -192,7 +192,6 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList
     }
     else
     {
-        sal_Bool bNewElement = sal_False;
         ::rtl::Reference< OHierarchyElement_Impl > aElement;
         OHierarchyElementList_Impl::iterator aIter = m_aChildren.find( aNextName );
         if ( aIter != m_aChildren.end() )
@@ -200,7 +199,6 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList
 
         if ( !aElement.is() )
         {
-            bNewElement = sal_True;
             uno::Reference< embed::XStorage > xChildStorage = xOwnStor->openStorageElement( aNextName,
                                                                                             embed::ElementModes::READWRITE );
             if ( !xChildStorage.is() )
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index b1fb366..3f3314d 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -358,6 +358,7 @@ sal_Bool ZipFile::StaticHasValidPassword( const Sequence< sal_Int8 > &aReadBuffe
 
     aDigestResult = rtl_digest_getSHA1 ( aDigest, aDigestSeq.getArray(), RTL_DIGEST_LENGTH_SHA1 );
     OSL_ASSERT ( aDigestResult == rtl_Digest_E_None );
+    (void)aDigestResult;
 
     // If we don't have a digest, then we have to assume that the password is correct
     if (  rData->aDigest.getLength() != 0  &&
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index d4778a8..729726f 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -174,6 +174,7 @@ void SAL_CALL ZipOutputStream::closeEntry(  )
                                                  reinterpret_cast < sal_uInt8 * > ( pCurrentEncryptData->aDigest.getArray() ),
                                                  RTL_DIGEST_LENGTH_SHA1 );
             OSL_ASSERT( aDigestResult == rtl_Digest_E_None );
+            (void)aDigestResult;
             rtl_digest_destroySHA1 ( aDigest );
         }
         pCurrentEntry = NULL;
@@ -260,6 +261,7 @@ void ZipOutputStream::doDeflate()
                 mnDigested = mnDigested + nEat;
             }
             OSL_ASSERT( aDigestResult == rtl_Digest_E_None );
+            (void)aDigestResult;
 
             aEncryptionBuffer.realloc ( nLength );
 
@@ -267,6 +269,7 @@ void ZipOutputStream::doDeflate()
             aCipherResult = rtl_cipher_encode ( aCipher, pTmpBuffer,
                                             nLength, reinterpret_cast < sal_uInt8 * > (aEncryptionBuffer.getArray()),  nLength );
             OSL_ASSERT( aCipherResult == rtl_Cipher_E_None );
+            (void)aCipherResult;
 
             aChucker.WriteBytes( aEncryptionBuffer );
             aCRC.update ( aEncryptionBuffer );