diff options
author | Noel Grandin <noel@peralex.com> | 2013-06-04 17:16:58 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-06-05 08:13:23 +0200 |
commit | 95c0d568fdcd0da939c891d861bb470b28079170 (patch) | |
tree | ca4e4108178ec1176fd1a976df6f31a08d590210 /sd | |
parent | a1afcae81ca3c4b6bb240263b3259090d48c7715 (diff) |
use uno::Reference#clear() method...
...instead of assigning an empty value. Reduces code noise.
Change-Id: Ic95b081a41fb740a738c92b3407a9514ccb8b06e
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/framework/factories/BasicPaneFactory.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index ea26cc318264..6da8a8219c3e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -363,7 +363,7 @@ IMPL_LINK(CustomAnimationPane,EventMultiplexerListener, break; case tools::EventMultiplexerEvent::EID_DISPOSING: - mxView = Reference<XDrawView>(); + mxView.clear(); onSelectionChanged(); onChangeCurrentPage(); break; @@ -1737,9 +1737,9 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper []bHasAnimateForm means the UI has changed, bAnimateForm is it value So if create a new textgroup animation, the following animation will never be run! - Since the Animate attached shape is default checked. + Since the \A1\B0Animate attached shape\A1\B1 is default checked. And the bHasAnimateForm default is false, and if user uncheck it the value bAnimateForm will be false, - it same as the TextGroups default value, also could not be run setAnimateForm. + it same as the TextGroup\A1\AFs default value, also could not be run setAnimateForm. if( bHasAnimateForm ) { if( pTextGroup->getAnimateForm() != bAnimateForm ) @@ -1752,7 +1752,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper In setTextGrouping, there are three case: 1. Create new text effects for empty TextGroup 2. Remove all text effects of TextGroup (nTextGrouping == -1) - 3. Change all the text effects start type + 3. Change all the text effects\A1\AF start type So here is the right logic: If set the animation from text to shape and remove text animation, diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 20233f2c9038..f0b3d388c7bc 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -942,7 +942,7 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, break; case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: - mxView = Reference<XDrawView>(); + mxView.clear(); onSelectionChanged(); break; diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index c91265f3446f..d74a69715329 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -143,7 +143,7 @@ void SAL_CALL BasicPaneFactory::disposing (void) { xCC->removeResourceFactoryForReference(this); xCC->removeConfigurationChangeListener(this); - mxConfigurationControllerWeak = Reference<XConfigurationController>(); + mxConfigurationControllerWeak.clear(); } for (PaneContainer::const_iterator iDescriptor = mpPaneContainer->begin(); @@ -398,7 +398,7 @@ void SAL_CALL BasicPaneFactory::disposing ( { if (mxConfigurationControllerWeak == rEventObject.Source) { - mxConfigurationControllerWeak = Reference<XConfigurationController>(); + mxConfigurationControllerWeak.clear(); } else { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 29b278c67b21..484b4677362d 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -609,7 +609,7 @@ IMPL_LINK(TableDesignPane,EventMultiplexerListener, break; case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: - mxView = Reference<XDrawView>(); + mxView.clear(); onSelectionChanged(); break; diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 284c452bc64f..e9550bcfbcf2 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -530,7 +530,7 @@ void SAL_CALL EventMultiplexer::Implementation::disposing ( if (xConfigurationController.is() && rEventObject.Source == xConfigurationController) { - mxConfigurationControllerWeak = Reference<XConfigurationController>(); + mxConfigurationControllerWeak.clear(); } } |