CWS-TOOLING: integrate CWS cmcfixes58

2009-05-04 13:51:10 +0200 cmc  r271450 : #i101533# latest sw warnings
2009-05-04 00:02:46 +0200 cmc  r271436 : #i101517# silence new warnings
2009-05-03 23:13:53 +0200 cmc  r271435 : #i101305# add that one back in
2009-05-02 16:30:42 +0200 cmc  r271431 : #i101493# get it to build, and remove some warnings
2009-05-02 16:12:37 +0200 cmc  r271430 : CWS-TOOLING: rebase CWS cmcfixes58 to trunk@271427 (milestone: DEV300:m47)
2009-04-23 13:19:33 +0200 cmc  r271163 : #i101305# remove annoying import foo is unused warnings
2009-04-21 17:10:34 +0200 cmc  r271048 : #i101246# remove AVMEDIA_MANAGER_SERVICE_NAME defines again
2009-04-21 17:07:41 +0200 cmc  r271047 : #i86323# remove xml2cmp unused methods

3 files changed, 13 insertions, 1 deletions

diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 55929333c079..ee3bf30f8388 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -544,10 +544,12 @@ void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxCon
         Reference< XContainer > xSimpleContainer( _rxContainer, UNO_QUERY );
         // OSL_ENSURE( xSimpleContainer.is(), "OXUndoEnvironment::switchListening: how are we expected to be notified of changes in the container?" );
         if ( xSimpleContainer.is() )
+        {
             if ( _bStartListening )
                 xSimpleContainer->addContainerListener( this );
             else
                 xSimpleContainer->removeContainerListener( this );
+        }
     }
     catch( const Exception& )
     {
@@ -566,18 +568,22 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec
         {
             Reference< XPropertySet > xProps( _rxObject, UNO_QUERY );
             if ( xProps.is() )
+            {
                 if ( _bStartListening )
                     xProps->addPropertyChangeListener( ::rtl::OUString(), this );
                 else
                     xProps->removePropertyChangeListener( ::rtl::OUString(), this );
+            }
         }
 
         Reference< XModifyBroadcaster > xBroadcaster( _rxObject, UNO_QUERY );
         if ( xBroadcaster.is() )
+        {
             if ( _bStartListening )
                 xBroadcaster->addModifyListener( this );
             else
                 xBroadcaster->removeModifyListener( this );
+        }
     }
     catch( const Exception& )
     {
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index bb4ed5efae07..89939759abbd 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3968,7 +3968,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert
         const beans::PropertyValue* pEnd  = pIter + _aArgs.getLength();
         const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter,pEnd,::std::bind2nd(PropertyValueCompare(),boost::cref(sKeyModifier)));
         sal_Int16 nKeyModifier = 0;
-        if ( pKeyModifier == pEnd || (pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1 )
+        if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) )
         {
             Sequence< PropertyValue > aCreateArgs;
             m_pMyOwnView->unmarkAllObjects(NULL);
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 32332b195cb4..45b48f123658 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -344,10 +344,12 @@ void OXReportControllerObserver::switchListening( const uno::Reference< containe
         uno::Reference< container::XContainer > xSimpleContainer( _rxContainer, uno::UNO_QUERY );
         // OSL_ENSURE( xSimpleContainer.is(), "OXReportControllerObserver::switchListening: how are we expected to be notified of changes in the container?" );
         if ( xSimpleContainer.is() )
+        {
             if ( _bStartListening )
                 xSimpleContainer->addContainerListener( this );
             else
                 xSimpleContainer->removeContainerListener( this );
+        }
     }
     catch( const uno::Exception& )
     {
@@ -366,18 +368,22 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn
         {
             uno::Reference< beans::XPropertySet > xProps( _rxObject, uno::UNO_QUERY );
             if ( xProps.is() )
+            {
                 if ( _bStartListening )
                     xProps->addPropertyChangeListener( ::rtl::OUString(), this );
                 else
                     xProps->removePropertyChangeListener( ::rtl::OUString(), this );
+            }
         }
 
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( _rxObject, uno::UNO_QUERY );
         if ( xBroadcaster.is() )
+        {
             if ( _bStartListening )
                 xBroadcaster->addModifyListener( this );
             else
                 xBroadcaster->removeModifyListener( this );
+        }
     }
     catch( const uno::Exception& )
     {