summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
commita62d903fe64f3079ccf5e27a45ae69b48b411f13 (patch)
treef81379e215f605f97f1d33bcb53799158b64ea06
parente1c6c6d470bd33c708b97cb6d79b1043d98f7909 (diff)
CWS-TOOLING: integrate CWS cmcfixes56
2009-03-26 14:46:13 +0100 cmc r270080 : #i100517# merge changes of locales32 to match 2009-03-26 14:31:32 +0100 cmc r270079 : #i100517# add some brackets and remove stray ; 2009-03-25 13:30:36 +0100 cmc r270021 : #i100503# make tralay work again 2009-03-25 10:13:35 +0100 cmc r269999 : #i100536# remove last unused method 2009-03-24 15:13:50 +0100 cmc r269955 : #i100517# fix straight-forward warnings 2009-03-24 14:36:37 +0100 cmc r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working 2009-03-24 14:02:27 +0100 cmc r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings 2009-03-24 13:58:15 +0100 cmc r269942 : #i100504# drawinglayer is warning free on ix86 linux 2009-03-24 13:56:15 +0100 cmc r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 0a02cf1d2..a22e8c447 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -911,10 +911,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& )
{
@@ -933,18 +935,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& )
{