diff options
50 files changed, 139 insertions, 368 deletions
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index 006a050b6f86..a6edd3005d88 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -59,8 +59,6 @@ public: * If pNewPage is 0 then removes all occurrences of pOldPage. */ void ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ); - /** Removes all occurrences of pPage. */ - void RemovePage( const SdPage* pPage ); void SetName(const OUString& rName); const OUString& GetName() const { return aName;} diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index c1a8bcb72191..b016db6c489c 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -121,7 +121,6 @@ public: virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; protected: - void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets ); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix ); diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index 1f3e6b7b4939..8f67ca963bc4 100644 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.cxx @@ -89,7 +89,7 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ) { if( !pNewPage ) { - RemovePage(pOldPage); + maPages.erase(::std::remove(maPages.begin(), maPages.end(), pOldPage), maPages.end()); } else { @@ -97,12 +97,7 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ) } } -void SdCustomShow::RemovePage( const SdPage* pPage ) -{ - maPages.erase(::std::remove(maPages.begin(), maPages.end(), pPage), maPages.end()); -} - -void SdCustomShow::SetName(const OUString& rName) +void SdCustomShow::SetName(const OUString& rName) { aName = rName; } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index f8d5a3a5767b..84b2db9865f1 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -595,7 +595,7 @@ void SdStyleSheetPool::CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleShee void SdStyleSheetPool::RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix) { - RenameAndCopySheets( rSourcePool, SD_STYLE_FAMILY_GRAPHICS, rCreatedSheets, rRenameSuffix ); + CopySheets( rSourcePool, SD_STYLE_FAMILY_GRAPHICS, rCreatedSheets, rRenameSuffix ); } void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ) @@ -604,11 +604,6 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily CopySheets(rSourcePool, eFamily, aTmpSheets); } -void SdStyleSheetPool::RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix) -{ - CopySheets( rSourcePool, eFamily, rCreatedSheets, rRenameSuffix ); -} - void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets) { OUString emptyName; diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index bbcc709084d9..2c3574f93d52 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -178,7 +178,8 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec nNodes = importAnimationContainer( pAtom.get(), xParent ); } - processAfterEffectNodes(); + std::for_each( maAfterEffectNodes.begin(), maAfterEffectNodes.end(), + sd::stl_process_after_effect_node_func ); } } @@ -189,11 +190,6 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec return nNodes; } -void AnimationImporter::processAfterEffectNodes() -{ - std::for_each( maAfterEffectNodes.begin(), maAfterEffectNodes.end(), sd::stl_process_after_effect_node_func ); -} - Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, const AnimationNode& rNode ) { const char* pServiceName = nullptr; diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 843415fac79a..49b9012ec54d 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -81,8 +81,6 @@ private: bool convertAnimationNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xParent ); static bool convertAnimationValue( oox::ppt::MS_AttributeNames eAttribute, css::uno::Any& rValue ); - void processAfterEffectNodes(); - css::uno::Any implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); static sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 49bb5e5fb43e..c76e60f79a8a 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -562,11 +562,6 @@ PropRead::PropRead( SotStorage& rStorage, const OUString& rName ) : } } -void PropRead::AddSection( Section& rSection ) -{ - maSections.push_back( o3tl::make_unique<Section>( rSection ) ); -} - const Section* PropRead::GetSection( const sal_uInt8* pFMTID ) { std::vector<std::unique_ptr<Section> >::iterator it; @@ -605,7 +600,7 @@ void PropRead::Read() mpSvStream->Seek( nSectionOfs ); Section aSection( pSectCLSID ); aSection.Read( mpSvStream.get() ); - AddSection( aSection ); + maSections.push_back( o3tl::make_unique<Section>( aSection ) ); mpSvStream->Seek( nCurrent ); } delete[] pSectCLSID; diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index 6f57574ab043..682076d6e4ed 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -147,14 +147,12 @@ class PropRead sal_uInt8 mApplicationCLSID[ 16 ]; std::vector<std::unique_ptr<Section> > maSections; - void AddSection( Section& rSection ); - public: PropRead( SotStorage& rSvStorage, const OUString& rName ); PropRead& operator=( const PropRead& rPropRead ); const Section* GetSection( const sal_uInt8* pFMTID ); - bool IsValid() const { return mbStatus; }; + bool IsValid() const { return mbStatus; }; void Read(); }; diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 6e64e3f2d664..63436bec0352 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -336,7 +336,7 @@ void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( { const osl::MutexGuard aGuard(maMutex); - if (IsDisposed()) + if (rBHelper.bDisposed || rBHelper.bInDispose) { uno::Reference<uno::XInterface> x (static_cast<lang::XComponent *>(this), uno::UNO_QUERY); rxListener->disposing (lang::EventObject (x)); @@ -654,11 +654,6 @@ void AccessibleSlideSorterView::ThrowIfDisposed() } } -bool AccessibleSlideSorterView::IsDisposed() -{ - return (rBHelper.bDisposed || rBHelper.bInDispose); -} - //===== AccessibleSlideSorterView::Implementation ============================= AccessibleSlideSorterView::Implementation::Implementation ( diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index ef3db270b6f3..237bdd198a7a 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1740,37 +1740,6 @@ bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std:: return false; } -void CustomAnimationPane::animationChange() -{ - if( maListSelection.size() == 1 ) - { - CustomAnimationPresetPtr* pPreset = static_cast< CustomAnimationPresetPtr* >(mpLBAnimation->GetSelectEntryData()); - // tdf#99137, the selected entry may also be a subcategory title, so not an effect - // just leave in this case - if (!pPreset) - return; - const double fDuration = (*pPreset)->getDuration(); - CustomAnimationPresetPtr pDescriptor(*pPreset); - MainSequenceRebuildGuard aGuard( mpMainSequence ); - - // get selected effect - EffectSequence::iterator aIter( maListSelection.begin() ); - const EffectSequence::iterator aEnd( maListSelection.end() ); - while( aIter != aEnd ) - { - CustomAnimationEffectPtr pEffect = (*aIter++); - - EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); - if( !pEffectSequence ) - pEffectSequence = mpMainSequence.get(); - - pEffectSequence->replace( pEffect, pDescriptor, fDuration ); - } - onPreview(false); - } - -} - void CustomAnimationPane::onAdd() { bool bHasText = true; @@ -1976,40 +1945,6 @@ void CustomAnimationPane::onChangeStart( sal_Int16 nNodeType ) } } -void CustomAnimationPane::onChangeProperty() -{ - if( mpLBProperty->getSubControl() ) - { - addUndo(); - - MainSequenceRebuildGuard aGuard( mpMainSequence ); - - const Any aValue( mpLBProperty->getSubControl()->getValue() ); - - bool bNeedUpdate = false; - - // change selected effect - EffectSequence::iterator aIter( maListSelection.begin() ); - const EffectSequence::iterator aEnd( maListSelection.end() ); - while( aIter != aEnd ) - { - CustomAnimationEffectPtr pEffect = (*aIter++); - - if( setProperty1Value( mnPropertyType, pEffect, aValue ) ) - bNeedUpdate = true; - } - - if( bNeedUpdate ) - { - mpMainSequence->rebuild(); - updateControls(); - mrBase.GetDocShell()->SetModified(); - } - - onPreview( false ); - } -} - void CustomAnimationPane::onChangeSpeed() { double fDuration = getDuration(); @@ -2051,12 +1986,66 @@ double CustomAnimationPane::getDuration() /// this link is called when the property box is modified by the user IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void) { - onChangeProperty(); + if( mpLBProperty->getSubControl() ) + { + addUndo(); + + MainSequenceRebuildGuard aGuard( mpMainSequence ); + + const Any aValue( mpLBProperty->getSubControl()->getValue() ); + + bool bNeedUpdate = false; + + // change selected effect + EffectSequence::iterator aIter( maListSelection.begin() ); + const EffectSequence::iterator aEnd( maListSelection.end() ); + while( aIter != aEnd ) + { + CustomAnimationEffectPtr pEffect = (*aIter++); + + if( setProperty1Value( mnPropertyType, pEffect, aValue ) ) + bNeedUpdate = true; + } + + if( bNeedUpdate ) + { + mpMainSequence->rebuild(); + updateControls(); + mrBase.GetDocShell()->SetModified(); + } + + onPreview( false ); + } } IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) { - animationChange(); + if( maListSelection.size() == 1 ) + { + CustomAnimationPresetPtr* pPreset = static_cast< CustomAnimationPresetPtr* >(mpLBAnimation->GetSelectEntryData()); + // tdf#99137, the selected entry may also be a subcategory title, so not an effect + // just leave in this case + if (!pPreset) + return; + const double fDuration = (*pPreset)->getDuration(); + CustomAnimationPresetPtr pDescriptor(*pPreset); + MainSequenceRebuildGuard aGuard( mpMainSequence ); + + // get selected effect + EffectSequence::iterator aIter( maListSelection.begin() ); + const EffectSequence::iterator aEnd( maListSelection.end() ); + while( aIter != aEnd ) + { + CustomAnimationEffectPtr pEffect = (*aIter++); + + EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); + if( !pEffectSequence ) + pEffectSequence = mpMainSequence.get(); + + pEffectSequence->replace( pEffect, pDescriptor, fDuration ); + } + onPreview(false); + } } IMPL_LINK_NOARG(CustomAnimationPane, UpdateAnimationLB, ListBox&, void) @@ -2327,14 +2316,6 @@ void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimation SlideShow::StartPreview( mrBase, mxCurrentPage, xRoot ); } -// ICustomAnimationListController -void CustomAnimationPane::onSelect() -{ - maListSelection = mpCustomAnimationList->getSelection(); - updateControls(); - markShapesFromSelectedEffects(); -} - const CustomAnimationPresets& CustomAnimationPane::getPresets() { if (mpCustomAnimationPresets == nullptr) @@ -2342,8 +2323,13 @@ const CustomAnimationPresets& CustomAnimationPane::getPresets() return *mpCustomAnimationPresets; } -void CustomAnimationPane::markShapesFromSelectedEffects() +// ICustomAnimationListController +void CustomAnimationPane::onSelect() { + maListSelection = mpCustomAnimationList->getSelection(); + updateControls(); + + // mark shapes from selected effects if( !maSelectionLock.isLocked() ) { ScopeLockGuard aGuard( maSelectionLock ); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index aabe68c2ffbb..636fff1edcb0 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -74,11 +74,9 @@ public: void onSelectionChanged(); void onChangeCurrentPage(); void onAdd(); - void animationChange(); void onRemove(); void onChangeStart(); void onChangeStart( sal_Int16 nNodeType ); - void onChangeProperty(); void onChangeSpeed(); // methods @@ -108,7 +106,6 @@ private: void removeListener(); void updateControls(); void updateMotionPathTags(); - void markShapesFromSelectedEffects(); void showOptions(const OString& sPage = OString()); void moveSelection( bool bUp ); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index b80be66e0fca..dc65fdde43da 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -925,8 +925,8 @@ void SlideTransitionPane::applyToSelectedPages(bool bPreview = true) { if (aEffect.mnType) // mnType = 0 denotes no transition playCurrentEffect(); - else - stopEffects(); + else if( mxView.is() ) + SlideShow::Stop( mrBase ); } if (pFocusWindow) @@ -944,14 +944,6 @@ void SlideTransitionPane::playCurrentEffect() } } -void SlideTransitionPane::stopEffects() -{ - if( mxView.is() ) - { - SlideShow::Stop( mrBase ); - } -} - void SlideTransitionPane::addListener() { Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,SlideTransitionPane,EventMultiplexerListener) ); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 76703f876a2e..1eda7533e41f 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -1092,17 +1092,22 @@ Color AnnotationManagerImpl::GetColorDark(sal_uInt16 aAuthorIndex) return Color(COL_WHITE); } -SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) +SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForward ) { if( pPage == nullptr ) - return bForeward ? GetFirstPage() : GetLastPage(); + { + if (bForward) + return mpDoc->GetSdPage(0, PageKind::Standard ); // first page + else + return mpDoc->GetMasterSdPage( mpDoc->GetMasterSdPageCount(PageKind::Standard) - 1, PageKind::Standard ); // last page + } sal_uInt16 nPageNum = (pPage->GetPageNum() - 1) >> 1; // first all non master pages if( !pPage->IsMasterPage() ) { - if( bForeward ) + if( bForward ) { if( nPageNum >= mpDoc->GetSdPageCount(PageKind::Standard)-1 ) { @@ -1122,7 +1127,7 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) } else { - if( bForeward ) + if( bForward ) { if( nPageNum >= mpDoc->GetMasterSdPageCount(PageKind::Standard)-1 ) { @@ -1144,17 +1149,6 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward ) } } -SdPage* AnnotationManagerImpl::GetFirstPage() -{ - // return first drawing page - return mpDoc->GetSdPage(0, PageKind::Standard ); -} - -SdPage* AnnotationManagerImpl::GetLastPage() -{ - return mpDoc->GetMasterSdPage( mpDoc->GetMasterSdPageCount(PageKind::Standard) - 1, PageKind::Standard ); -} - SdPage* AnnotationManagerImpl::GetCurrentPage() { if (mrBase.GetMainViewShell().get()) diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 920111e38fb5..04ceb976e5c0 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -103,8 +103,6 @@ public: void DisposeTags(); SdPage* GetNextPage( SdPage* pPage, bool bForeward ); - SdPage* GetFirstPage(); - SdPage* GetLastPage(); SdPage* GetCurrentPage(); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 5666ff46af84..4e7dfc1fa6f1 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -353,7 +353,7 @@ void AnnotationWindow::InitControls() Invalidate(); - SetLanguage(GetLanguage()); + SetLanguage(SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE )); mpMeta->Show(); mpVScrollbar->Show(); @@ -494,11 +494,6 @@ IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll, void) getView()->Scroll( 0, nDiff ); } -SvxLanguageItem AnnotationWindow::GetLanguage() -{ - return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE ); -} - TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation ) { if( xAnnotation.is() ) diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index f99a6f02cedf..3643a070b36b 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -100,8 +100,6 @@ class AnnotationWindow : public FloatingWindow void StartEdit(); - SvxLanguageItem GetLanguage(); - void setAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); void ExecuteSlot( sal_uInt16 nSID ); diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index ecfee501b282..32f2143997f9 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -78,7 +78,7 @@ ConfigurationUpdater::ConfigurationUpdater ( // updates until the two configurations are the same. maUpdateTimer.SetTimeout(snNormalTimeout); maUpdateTimer.SetTimeoutHdl(LINK(this,ConfigurationUpdater,TimeoutHandler)); - SetControllerManager(rxControllerManager); + mxControllerManager = rxControllerManager; } ConfigurationUpdater::~ConfigurationUpdater() @@ -86,12 +86,6 @@ ConfigurationUpdater::~ConfigurationUpdater() maUpdateTimer.Stop(); } -void ConfigurationUpdater::SetControllerManager( - const Reference<XControllerManager>& rxControllerManager) -{ - mxControllerManager = rxControllerManager; -} - void ConfigurationUpdater::RequestUpdate ( const Reference<XConfiguration>& rxRequestedConfiguration) { diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 308d00b33ff5..928b15954cf1 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -55,13 +55,6 @@ public: css::drawing::framework::XControllerManager>& rxControllerManager); ~ConfigurationUpdater(); - /** This method is typically called once, when the controller manager is - accessible to the caller. - */ - void SetControllerManager( - const css::uno::Reference< - css::drawing::framework::XControllerManager>& rxControllerManager); - /** Request an update of the current configuration so that it looks like the given requested configuration. It checks whether an update of the current configuration can be done. Calls UpdateConfiguration() diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index c8c520aa764e..6a01191c6d68 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -71,24 +71,11 @@ ModuleController::ModuleController (const Reference<XComponentContext>& rxContex mpResourceToFactoryMap(new ResourceToFactoryMap()), mpLoadedFactories(new LoadedFactoryContainer()) { - (void)rxContext; - LoadFactories(rxContext); -} - -ModuleController::~ModuleController() throw() -{ -} - -void SAL_CALL ModuleController::disposing() -{ - // Break the cyclic reference back to DrawController object - mpLoadedFactories.reset(); - mpResourceToFactoryMap.reset(); - mxController.clear(); -} - -void ModuleController::LoadFactories (const Reference<XComponentContext>& rxContext) -{ + /** Load a list of URL to service mappings from the + /org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories + configuration entry. The mappings are stored in the + mpResourceToFactoryMap member. + */ try { ConfigurationAccess aConfiguration ( @@ -114,6 +101,18 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont } } +ModuleController::~ModuleController() throw() +{ +} + +void SAL_CALL ModuleController::disposing() +{ + // Break the cyclic reference back to DrawController object + mpLoadedFactories.reset(); + mpResourceToFactoryMap.reset(); + mxController.clear(); +} + void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) { OSL_ASSERT(rValues.size() == snFactoryPropertyCount); diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index b3cb41442d4a..7b007c4fdcfc 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -165,8 +165,16 @@ void SAL_CALL ResourceManager::notifyConfigurationChange ( } } -void ResourceManager::UpdateForMainViewShell() +void ResourceManager::HandleMainViewSwitch ( + const OUString& rsViewURL, + const Reference<XConfiguration>& /*rxConfiguration*/, + const bool bIsActivated) { + if (bIsActivated) + msCurrentMainViewURL = rsViewURL; + else + msCurrentMainViewURL.clear(); + if (mxConfigurationController.is()) { ConfigurationController::Lock aLock (mxConfigurationController); @@ -189,19 +197,6 @@ void ResourceManager::UpdateForMainViewShell() } } -void ResourceManager::HandleMainViewSwitch ( - const OUString& rsViewURL, - const Reference<XConfiguration>& rxConfiguration, - const bool bIsActivated) -{ - (void)rxConfiguration; - if (bIsActivated) - msCurrentMainViewURL = rsViewURL; - else - msCurrentMainViewURL.clear(); - UpdateForMainViewShell(); -} - void ResourceManager::HandleResourceRequest( bool bActivation, const Reference<XConfiguration>& rxConfiguration) diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 6e40983ba50a..10bf23b4d9dd 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -97,7 +97,6 @@ private: void HandleResourceRequest( bool bActivation, const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration); - void UpdateForMainViewShell(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 27be093fdc7c..ee98373408d6 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -290,14 +290,6 @@ private: */ void ThrowIfDisposed() throw (css::lang::DisposedException); - - /** Check whether or not the object has been disposed (or is in the - state of being disposed). - - @return sal_True, if the object is disposed or in the course - of being disposed. Otherwise, sal_False is returned. - */ - bool IsDisposed(); }; } // end of namespace ::accessibility diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 1068edb8bae9..a0de364f6e6b 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -402,7 +402,6 @@ protected: void GetMenuStateSel(SfxItemSet& rSet); private: - void ShowSlideShow(SfxRequest& rReq); /** This flag controls whether the layer mode is active, i.e. the layer dialog is visible. */ diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index ae641df7f8ce..5f46db658ee6 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -149,7 +149,6 @@ public: void UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ); private: - void ShowSlideShow(SfxRequest& rReq); OutlineView* pOlView; SdPage* pLastPage; // For efficient processing of the preview rtl::Reference<TransferableClipboardListener> mxClipEvtLstnr; diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 88f4abf8bc96..6f85c3f01f6e 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -202,12 +202,6 @@ protected: */ model::SlideSorterModel* CreateModel(); - /** Create the view for the view shell. When called from the default - implementation of CreateModelViewController() then the model but not - the controller does exist. Test their pointers when in doubt. - */ - view::SlideSorterView* CreateView(); - /** Create the controller for the view shell. When called from the default implementation of CreateModelViewController() then both the view and the controller do exist. Test their pointers when in doubt. diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index 221eade120ca..5834969a44df 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -85,7 +85,6 @@ private: void applyToSelectedPages(bool bPreview); void playCurrentEffect(); - void stopEffects(); void addListener(); void removeListener(); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 06d7f1760b00..d076b8ba942f 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -54,8 +54,6 @@ public: virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin) override; virtual void HideSdrPage() override; // SdrPageView* pPV); - void PresPaint(const vcl::Region& rRegion); - virtual void DeleteMarked() override; // from SdrView protected: virtual void ModelHasChanged() override; diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index 54e872f477d1..f29450f38c74 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -100,13 +100,6 @@ private: ModuleController (const ModuleController&) = delete; virtual ~ModuleController() throw() override; - /** Load a list of URL to service mappings from the - /org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories - configuration entry. The mappings are stored in the - mpResourceToFactoryMap member. - */ - void LoadFactories (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - /** Called for every entry in the ResourceFactories configuration entry. */ void ProcessFactory (const ::std::vector<css::uno::Any>& rValues); diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 2a10e3470e81..49ac3448a7e4 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -159,7 +159,6 @@ public: // settings bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen() - bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop(); OutputDevice* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow() int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode() sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage() diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 26207772b40b..75bf1cebaf49 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -78,7 +78,6 @@ private: sal_uInt32 nMillisecondsBetweenSteps, sal_uInt32 nMaxTimePerStep); ~TimerBasedTaskExecution(); - void SetSelf (const std::shared_ptr<TimerBasedTaskExecution>& rpSelf); class Deleter; friend class Deleter; diff --git a/sd/source/ui/inc/uiobject.hxx b/sd/source/ui/inc/uiobject.hxx index 66ca0273e575..b969356a6493 100644 --- a/sd/source/ui/inc/uiobject.hxx +++ b/sd/source/ui/inc/uiobject.hxx @@ -43,8 +43,6 @@ protected: private: VclPtr<sd::Window> mxWindow; - - SdrPageView* getPageView(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 62cb7141cdb4..74ab94f7e667 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -92,7 +92,6 @@ private: sal_Int32 mnTop; sal_Int32 mnTotalHeight; - void GetEditEngine(); EditEngine* CreateEditEngine(); void CheckTop(); }; @@ -254,7 +253,7 @@ PresenterTextView::Implementation::Implementation() { mpOutputDevice->SetMapMode(MapUnit::MapPixel); - GetEditEngine(); + mpEditEngine = CreateEditEngine (); } PresenterTextView::Implementation::~Implementation() @@ -264,12 +263,6 @@ PresenterTextView::Implementation::~Implementation() mpOutputDevice.disposeAndClear(); } -void PresenterTextView::Implementation::GetEditEngine() -{ - if (mpEditEngine == nullptr) - mpEditEngine = CreateEditEngine (); -} - EditEngine* PresenterTextView::Implementation::CreateEditEngine() { EditEngine* pEditEngine = mpEditEngine; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 4adc45b7e45e..9ef3276d35f4 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -455,13 +455,6 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC } } -MasterPagesSelector::UserData* MasterPagesSelector::CreateUserData ( - int nIndex, - MasterPageContainer::Token aToken) -{ - return new UserData(nIndex,aToken); -} - MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) const { const ::osl::MutexGuard aGuard (maMutex); @@ -519,7 +512,7 @@ void MasterPagesSelector::SetItem ( mpContainer->GetPageNameForToken(aToken), nIndex); } - SetUserData(nIndex, CreateUserData(nIndex,aToken)); + SetUserData(nIndex, new UserData(nIndex,aToken)); AddTokenToIndexEntry(nIndex,aToken); } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index f8aa0822a7a7..d7271c63c72a 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -139,7 +139,6 @@ protected: virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent); typedef ::std::pair<int, MasterPageContainer::Token> UserData; - static UserData* CreateUserData (int nIndex, MasterPageContainer::Token aToken); UserData* GetUserData (int nIndex) const; void SetUserData (int nIndex, UserData* pData); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 1a927542f1f0..9f18403b9d1e 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -671,7 +671,8 @@ void SAL_CALL SlideShow::end() WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent()); if( pWorkWindow ) { - pWorkWindow->StartPresentationMode( isAlwaysOnTop() ? PresentationFlags::HideAllApps : PresentationFlags::NONE ); + pWorkWindow->StartPresentationMode( (mxController.is() && mxController->maPresSettings.mbAlwaysOnTop) + ? PresentationFlags::HideAllApps : PresentationFlags::NONE ); } } } @@ -994,11 +995,6 @@ void SlideShow::paint( const Rectangle& rRect ) mxController->paint( rRect ); } -bool SlideShow::isAlwaysOnTop() -{ - return mxController.is() && mxController->maPresSettings.mbAlwaysOnTop; -} - void SlideShow::pause( bool bPause ) { if( mxController.is() ) diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index ca8144484356..6c026415b04f 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -94,16 +94,12 @@ void CurrentSlideManager::ReleaseCurrentSlide() mnCurrentSlideIndex = -1; } -bool CurrentSlideManager::IsCurrentSlideIsValid() -{ - return mnCurrentSlideIndex >= 0 && mnCurrentSlideIndex<mrSlideSorter.GetModel().GetPageCount(); -} - void CurrentSlideManager::AcquireCurrentSlide (const sal_Int32 nSlideIndex) { mnCurrentSlideIndex = nSlideIndex; - if (IsCurrentSlideIsValid()) + // if current slide valid + if (mnCurrentSlideIndex >= 0 && mnCurrentSlideIndex<mrSlideSorter.GetModel().GetPageCount()) { // Get a descriptor for the XDrawPage reference. Note that the // given XDrawPage may or may not be member of the slide sorter diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 5203b879407a..cbcd84241338 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -445,7 +445,11 @@ void SAL_CALL Listener::propertyChange ( const PropertyChangeEvent& rEvent) throw (RuntimeException, std::exception) { - ThrowIfDisposed(); + if (rBHelper.bDisposed || rBHelper.bInDispose) + { + throw lang::DisposedException ("SlideSorterController object has already been disposed", + static_cast<uno::XWeak*>(this)); + } static const char sCurrentPagePropertyName[] = "CurrentPage"; static const char sEditModePropertyName[] = "IsMasterPageMode"; @@ -624,16 +628,6 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } } -void Listener::ThrowIfDisposed() - throw (css::lang::DisposedException) -{ - if (rBHelper.bDisposed || rBHelper.bInDispose) - { - throw lang::DisposedException ("SlideSorterController object has already been disposed", - static_cast<uno::XWeak*>(this)); - } -} - } } } // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index c57b6336a79a..429ff75162d4 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -170,12 +170,6 @@ private: */ void HandleShapeModification (const SdrPage* pPage); - /** This method throws a DisposedException when the object has already been - disposed. - */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); - DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void); }; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 9232980b9695..26336fb033a9 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -132,7 +132,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) case SID_PRESENTATION: case SID_PRESENTATION_CURRENT_SLIDE: case SID_REHEARSE_TIMINGS: - ShowSlideShow (rRequest); + slideshowhelp::ShowSlideShow(rRequest, *mrSlideSorter.GetModel().GetDocument()); pShell->Cancel(); rRequest.Done(); break; @@ -856,11 +856,6 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) } } -void SlotManager::ShowSlideShow( SfxRequest& rReq) -{ - slideshowhelp::ShowSlideShow(rReq, *mrSlideSorter.GetModel().GetDocument()); -} - void SlotManager::RenameSlide() { View* pDrView = &mrSlideSorter.GetView(); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 571374d98d93..2ee4ecfa84cd 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -92,7 +92,6 @@ private: */ Timer maSwitchPageDelayTimer; - bool IsCurrentSlideIsValid(); void SetCurrentSlideAtViewShellBase (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtTabControl (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtXController (const model::SharedPageDescriptor& rpSlide); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 0f74f23fed20..41bb97e56c2f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -78,10 +78,6 @@ private: /// The controller for which we manage the slot calls. SlideSorter& mrSlideSorter; - /** Called by FuTemporary to show the slide show. - */ - void ShowSlideShow (SfxRequest& rRequest); - /** The implementation is a copy of the code for SID_RENAMEPAGE in drviews2.cxx. */ diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index d49481a679db..c0cd5c3ed5bd 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -60,12 +60,6 @@ private: Timer maShowTimer; Timer maHiddenTimer; - /** Request to show the tool tip. - @param bForce - When <TRUE/> then the tool tip is show right away. Otherwise it - is shown after a short delay. - */ - void Show (const bool bForce); void DoShow(); DECL_LINK(DelayTrigger, Timer*, void); diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index edc3750ee697..78dd6be59b5e 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -305,7 +305,7 @@ void SlideSorter::CreateModelViewController() DBG_ASSERT (mpSlideSorterModel.get()!=nullptr, "Can not create model for slide browser"); - mpSlideSorterView.reset(CreateView()); + mpSlideSorterView.reset(new view::SlideSorterView (*this)); DBG_ASSERT (mpSlideSorterView.get()!=nullptr, "Can not create view for slide browser"); @@ -333,11 +333,6 @@ model::SlideSorterModel* SlideSorter::CreateModel() return nullptr; } -view::SlideSorterView* SlideSorter::CreateView() -{ - return new view::SlideSorterView (*this); -} - controller::SlideSorterController* SlideSorter::CreateController() { controller::SlideSorterController* pController diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 1c86c933bde4..33e08c10d1e4 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -83,7 +83,10 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor) msCurrentHelpText = sHelpText; // show new tooltip immediately, if last one was recently hidden - Show(maHiddenTimer.IsActive()); + if(maHiddenTimer.IsActive()) + DoShow(); + else + maShowTimer.Start(); } else { @@ -92,14 +95,6 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor) } } -void ToolTip::Show (const bool bNoDelay) -{ - if (bNoDelay) - DoShow(); - else - maShowTimer.Start(); -} - void ToolTip::DoShow() { if (maShowTimer.IsActive()) diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index fc5aae457e25..8a38ebdf59bf 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -142,12 +142,6 @@ private: EventMultiplexerEventId eId, void* pUserData = nullptr); - /** This method throws a DisposedException when the object has already been - disposed. - */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); - DECL_LINK(SlideSorterSelectionChangeListener, LinkParamNone*, void); }; @@ -484,7 +478,12 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( const beans::PropertyChangeEvent& rEvent) throw (RuntimeException, std::exception) { - ThrowIfDisposed(); + if (rBHelper.bDisposed || rBHelper.bInDispose) + { + throw lang::DisposedException ( + "SlideSorterController object has already been disposed", + static_cast<uno::XWeak*>(this)); + } if ( rEvent.PropertyName == aCurrentPagePropertyName ) { @@ -618,17 +617,6 @@ void SAL_CALL EventMultiplexer::Implementation::disposing() ReleaseListeners(); } -void EventMultiplexer::Implementation::ThrowIfDisposed() - throw (css::lang::DisposedException) -{ - if (rBHelper.bDisposed || rBHelper.bInDispose) - { - throw lang::DisposedException ( - "SlideSorterController object has already been disposed", - static_cast<uno::XWeak*>(this)); - } -} - void EventMultiplexer::Implementation::Notify ( SfxBroadcaster&, const SfxHint& rHint) diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 8d99a259a7e3..f61823b31d6a 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -48,7 +48,8 @@ std::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create ( // Let the new object have a shared_ptr to itself, so that it can // release itself when the AsynchronousTask has been executed // completely. - pExecution->SetSelf(pExecution); + if (pExecution->mpTask.get() != nullptr) + pExecution->mpSelf = pExecution; return pExecution; } @@ -99,13 +100,6 @@ TimerBasedTaskExecution::~TimerBasedTaskExecution() maTimer.Stop(); } -void TimerBasedTaskExecution::SetSelf ( - const std::shared_ptr<TimerBasedTaskExecution>& rpSelf) -{ - if (mpTask.get() != nullptr) - mpSelf = rpSelf; -} - IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback, Timer *, void) { if (mpTask.get() != nullptr) diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx index b665abc82fd6..f47e1311b3d7 100644 --- a/sd/source/ui/uitest/uiobject.cxx +++ b/sd/source/ui/uitest/uiobject.cxx @@ -124,7 +124,7 @@ void ImpressWindowUIObject::execute(const OUString& rAction, auto itr = rParameters.find("OBJECT"); OUString aName = itr->second; SdrObject* pObj = getObject(mxWindow, aName); - SdrPageView* pPageView = getPageView(); + SdrPageView* pPageView = getViewShell(mxWindow)->GetView()->GetSdrPageView(); getViewShell(mxWindow)->GetView()->MarkObj(pObj, pPageView); } } @@ -171,9 +171,4 @@ std::unique_ptr<UIObject> ImpressWindowUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new ImpressWindowUIObject(pWin)); } -SdrPageView* ImpressWindowUIObject::getPageView() -{ - return getViewShell(mxWindow)->GetView()->GetSdrPageView(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index e800f6957705..497ae7585ba8 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -472,8 +472,8 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sd OutputDevice* pShowWindow = xSlideshow->getShowWindow(); if( (pShowWindow == pOutDev) || (xSlideshow->getAnimationMode() == ANIMATIONMODE_PREVIEW) ) { - if( pShowWindow == pOutDev ) - PresPaint(rReg); + if( pShowWindow == pOutDev && mpViewSh ) + xSlideshow->paint( rReg.GetBoundRect() ); bStandardPaint = false; } } @@ -486,20 +486,6 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sd } /** - * Paint-Event during running slide show - */ - -void DrawView::PresPaint(const vcl::Region& rRegion) -{ - if(mpViewSh) - { - rtl::Reference< SlideShow > xSlideshow( SlideShow::GetSlideShow( GetDoc() ) ); - if( xSlideshow.is() && xSlideshow->isRunning() ) - xSlideshow->paint( rRegion.GetBoundRect() ); - } -} - -/** * Make passed region visible (scrolling if necessary) */ diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 5199a7188286..690990118e3a 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -722,7 +722,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_PRESENTATION_CURRENT_SLIDE: case SID_REHEARSE_TIMINGS: { - ShowSlideShow(rReq); + slideshowhelp::ShowSlideShow(rReq, *GetDoc()); rReq.Ignore (); } break; @@ -1614,11 +1614,6 @@ namespace slideshowhelp } } -void DrawViewShell::ShowSlideShow(SfxRequest& rReq) -{ - slideshowhelp::ShowSlideShow(rReq, *GetDoc()); -} - void DrawViewShell::StopSlideShow (bool /*bCloseFrame*/) { Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() ); diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 45d7565ae82d..c8135930073f 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -241,7 +241,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) case SID_REHEARSE_TIMINGS: { pOlView->PrepareClose(); - ShowSlideShow(rReq); + slideshowhelp::ShowSlideShow(rReq, *GetDoc()); Cancel(); rReq.Done(); } @@ -348,11 +348,6 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) Invalidate(SID_PASTE_UNFORMATTED); } -void OutlineViewShell::ShowSlideShow(SfxRequest& rReq) -{ - slideshowhelp::ShowSlideShow(rReq, *GetDoc()); -} - void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) { sal_uInt16 nSId = rReq.GetSlot(); |