diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
| commit | 6173f8b29e2979da7e579e361e748a06262df87c (patch) | |
| tree | 54bfacb302a4b703998038824991f68d7cc8e72a /framework/source | |
| parent | 532d47b610e1a73297c01ac0dc5d90b10065838d (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
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/classes/actiontriggerseparatorpropertyset.cxx | 2 | ||||
| -rw-r--r-- | framework/source/helper/titlehelper.cxx | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/classes/actiontriggerseparatorpropertyset.cxx index 3dfd08f3ec..49936d55ee 100644 --- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/classes/actiontriggerseparatorpropertyset.cxx @@ -324,7 +324,7 @@ throw( IllegalArgumentException ) sal_Bool bReturn = sal_False; // Get new value from any. // IllegalArgumentException() can be thrown! - sal_Int16 aValue ; + sal_Int16 aValue = 0; convertPropertyValue( aValue, aNewValue ); // If value change ... diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx index 1f043e3a19..4c83be7f6c 100644 --- a/framework/source/helper/titlehelper.cxx +++ b/framework/source/helper/titlehelper.cxx @@ -220,9 +220,13 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) aLock.clear (); // <- SYNCHRONIZED - if (aEvent.Source != xOwner - || aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is()) + if ( + aEvent.Source != xOwner || + (aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is()) + ) + { return; + } impl_updateTitle (); } |