CWS-TOOLING: integrate CWS cmcfixes52

2009-01-05 10:49:04 +0100 cmc  r265860 : #i97763# remove low-hanging warnings

4 files changed, 14 insertions, 12 deletions

diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 9c76533c7758..98e09de655ad 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -706,7 +706,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                     aKeyString += sal_Unicode(1);   // mask it
                                     // extra for '>' which is coded as <SHIFT GREATER>
                                     if ( pKeyEvent->GetCharCode() == '>' )
-                                        aKeyString += sal_Unicode( KEY_GREATER | aKeyCode.GetAllModifier() & ~KEY_SHIFT );
+                                        aKeyString += sal_Unicode( KEY_GREATER | (aKeyCode.GetAllModifier() & ~KEY_SHIFT) );
                                     else
                                         aKeyString += sal_Unicode( aKeyCode.GetCode() | aKeyCode.GetAllModifier() );
                                 }
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 755063f757d9..d5db8b47023c 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1600,8 +1600,8 @@ void OStorage_Impl::RemoveElement( SotElement_Impl* pElement )
     if ( !pElement )
         return;
 
-    if ( pElement->m_pStorage && ( pElement->m_pStorage->m_pAntiImpl || !pElement->m_pStorage->m_aReadOnlyWrapList.empty() )
-      || pElement->m_pStream && ( pElement->m_pStream->m_pAntiImpl || !pElement->m_pStream->m_aInputStreamsList.empty() ) )
+    if ( (pElement->m_pStorage && ( pElement->m_pStorage->m_pAntiImpl || !pElement->m_pStorage->m_aReadOnlyWrapList.empty() ))
+      || (pElement->m_pStream && ( pElement->m_pStream->m_pAntiImpl || !pElement->m_pStream->m_aInputStreamsList.empty() )) )
         throw io::IOException(); // TODO: Access denied
 
     if ( pElement->m_bIsInserted )
@@ -3751,11 +3751,13 @@ void SAL_CALL OStorage::revert()
 
     for ( SotElementList_Impl::iterator pElementIter = m_pImpl->m_aChildrenList.begin();
           pElementIter != m_pImpl->m_aChildrenList.end(); pElementIter++ )
-        if ( (*pElementIter)->m_pStorage
-                && ( (*pElementIter)->m_pStorage->m_pAntiImpl || !(*pElementIter)->m_pStorage->m_aReadOnlyWrapList.empty() )
-          || (*pElementIter)->m_pStream
-                  && ( (*pElementIter)->m_pStream->m_pAntiImpl || !(*pElementIter)->m_pStream->m_aInputStreamsList.empty() ) )
+    {
+        if ( ((*pElementIter)->m_pStorage
+                && ( (*pElementIter)->m_pStorage->m_pAntiImpl || !(*pElementIter)->m_pStorage->m_aReadOnlyWrapList.empty() ))
+          || ((*pElementIter)->m_pStream
+                  && ( (*pElementIter)->m_pStream->m_pAntiImpl || !(*pElementIter)->m_pStream->m_aInputStreamsList.empty()) ) )
             throw io::IOException(); // TODO: access denied
+    }
 
     if ( m_pData->m_bReadOnlyWrap || !m_pImpl->m_bListCreated )
         return; // nothing to do
diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx
index 2a5cc9ad44c0..fb88774ea27f 100644
--- a/package/source/zipapi/ByteGrabber.cxx
+++ b/package/source/zipapi/ByteGrabber.cxx
@@ -114,7 +114,7 @@ ByteGrabber& ByteGrabber::operator >> (sal_Int16& rInt16)
     {
         pSequence = aSequence.getConstArray();
         rInt16 = static_cast <sal_Int16>
-               ( pSequence[0] & 0xFF
+               ( (pSequence[0] & 0xFF)
               | (pSequence[1] & 0xFF) << 8);
     }
     return *this;
@@ -127,7 +127,7 @@ ByteGrabber& ByteGrabber::operator >> (sal_Int32& rInt32)
     {
         pSequence = aSequence.getConstArray();
         rInt32 = static_cast < sal_Int32 >
-                ( pSequence[0] & 0xFF
+                ( (pSequence[0] & 0xFF)
               | ( pSequence[1] & 0xFF ) << 8
               | ( pSequence[2] & 0xFF ) << 16
               | ( pSequence[3] & 0xFF ) << 24 );
@@ -151,7 +151,7 @@ ByteGrabber& ByteGrabber::operator >> (sal_uInt16& rInt16)
     {
         pSequence = aSequence.getConstArray();
         rInt16 = static_cast <sal_uInt16>
-               ( pSequence[0] & 0xFF
+               ( (pSequence[0] & 0xFF)
               | (pSequence[1] & 0xFF) << 8);
     }
     return *this;
@@ -164,7 +164,7 @@ ByteGrabber& ByteGrabber::operator >> (sal_uInt32& ruInt32)
     {
         pSequence = aSequence.getConstArray();
         ruInt32 = static_cast < sal_uInt32 >
-                ( pSequence[0] & 0xFF
+                ( (pSequence[0] & 0xFF)
               | ( pSequence[1] & 0xFF ) << 8
               | ( pSequence[2] & 0xFF ) << 16
               | ( pSequence[3] & 0xFF ) << 24 );
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 570b9ea9f98c..ef1fae055b06 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -192,7 +192,7 @@ uno::Reference< io::XInputStream > ZipPackageStream::GetRawEncrStreamNoHeaderCop
 //--------------------------------------------------------------------------
 Reference< io::XInputStream > ZipPackageStream::TryToGetRawFromDataStream( sal_Bool bAddHeaderForEncr )
 {
-    if ( m_nStreamMode != PACKAGE_STREAM_DATA || !GetOwnSeekStream().is() || bAddHeaderForEncr && !bToBeEncrypted )
+    if ( m_nStreamMode != PACKAGE_STREAM_DATA || !GetOwnSeekStream().is() || (bAddHeaderForEncr && !bToBeEncrypted) )
         throw packages::NoEncryptionException(); // TODO
 
     Sequence< sal_Int8 > aKey;