diff options
Diffstat (limited to 'sd')
23 files changed, 44 insertions, 45 deletions
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index d2519a7b0b6d..45fb8fd6a6ac 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -37,7 +37,7 @@ public: /** Set or reset the undo manager linked with the called undo manager. */ - void SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager); + void SetLinkedUndoManager (SfxUndoManager* pLinkedUndoManager); private: using SdrUndoManager::Undo; @@ -46,7 +46,7 @@ private: /** Used when the outline view is visible as a last resort to synchronize the undo managers. */ - ::svl::IUndoManager* mpLinkedUndoManager; + SfxUndoManager* mpLinkedUndoManager; /** Call ClearRedo() at the linked undo manager, when present. diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 51c56bc886f5..5cd4c61cd185 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -478,7 +478,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( // Get the necessary presentation stylesheets and transfer them before // the pages, else, the text objects won't reference their styles anymore. - ::svl::IUndoManager* pUndoMgr = nullptr; + SfxUndoManager* pUndoMgr = nullptr; if( mpDocSh ) { pUndoMgr = mpDocSh->GetUndoManager(); @@ -1183,7 +1183,7 @@ SdCustomShowList* SdDrawDocument::GetCustomShowList(bool bCreate) void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnlyDuplicatePages, bool bUndo) { ::sd::View* pView = nullptr; - ::svl::IUndoManager* pUndoMgr = nullptr; + SfxUndoManager* pUndoMgr = nullptr; if( bUndo && !IsUndoEnabled() ) bUndo = false; @@ -1397,7 +1397,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, bool bMaster, bool bCheckMasters) { - ::svl::IUndoManager* pUndoMgr = nullptr; + SfxUndoManager* pUndoMgr = nullptr; if( mpDocSh ) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 1746ea72cbd8..96742679c100 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -271,7 +271,7 @@ void SdPage::EnsureMasterPageDefaultBackground() */ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::tools::Rectangle& rRect ) { - ::svl::IUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); + SfxUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted(); SdrObject* pSdrObj = nullptr; @@ -733,7 +733,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const ::tools { if( pObj->GetUserCall() ) { - ::svl::IUndoManager* pUndoManager = static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager(); + SfxUndoManager* pUndoManager = static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager(); const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted(); if( bUndo ) @@ -781,7 +781,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const ::tools void SdPage::CreateTitleAndLayout(bool bInit, bool bCreate ) { - ::svl::IUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); + SfxUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted(); SdPage* pMasterPage = this; @@ -1601,7 +1601,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, bool bInit, bool bCreate ) const bool bSwitchLayout = eLayout != GetAutoLayout(); - ::svl::IUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); + SfxUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted(); meAutoLayout = eLayout; @@ -2080,7 +2080,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P if( !pSourceObj ) return pSourceObj; - ::svl::IUndoManager* pUndoManager = rModel.GetUndoManager(); + SfxUndoManager* pUndoManager = rModel.GetUndoManager(); const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && rPage.IsInserted(); SdrObject* pNewObj = pSourceObj; @@ -2218,7 +2218,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P */ SdrObject* SdPage::InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, const ::tools::Rectangle& rRect, bool bInit) { - ::svl::IUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); + SfxUndoManager* pUndoManager(static_cast< SdDrawDocument& >(getSdrModelFromSdrPage()).GetUndoManager()); const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted(); if (!pObj && bInit) diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index 57bc43880e63..950747bc8d20 100644 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -49,7 +49,7 @@ void UndoManager::AddUndoAction( SfxUndoAction *pAction, bool bTryMerg /* = sal_ } } -void UndoManager::SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager) +void UndoManager::SetLinkedUndoManager (SfxUndoManager* pLinkedUndoManager) { mpLinkedUndoManager = pLinkedUndoManager; } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index a3a3d5d44dc3..eea562a53d7f 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -291,7 +291,7 @@ void CustomAnimationPane::dispose() void CustomAnimationPane::addUndo() { - ::svl::IUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager(); + SfxUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager(); if( pManager ) { SdPage* pPage = SdPage::getImplementation( mxCurrentPage ); @@ -2511,7 +2511,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot CustomAnimationEffectPtr pEffect = xTag->getEffect(); if( (pPathObj != nullptr) && pEffect.get() != nullptr ) { - ::svl::IUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager(); + SfxUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager(); if( pManager ) { SdPage* pPage = SdPage::getImplementation( mxCurrentPage ); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index fe555039409e..161141ddc5bf 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -239,7 +239,7 @@ void lcl_CreateUndoForPages( ::sd::DrawDocShell* pDocSh = rBase.GetDocShell(); if (!pDocSh) return; - ::svl::IUndoManager* pManager = pDocSh->GetUndoManager(); + SfxUndoManager* pManager = pDocSh->GetUndoManager(); if (!pManager) return; SdDrawDocument* pDoc = pDocSh->GetDoc(); diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index bdfc7855897f..56de16045ab8 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -139,7 +139,7 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt) assert (pDrView && "Change layer attribute undo action is only working with a SdDrawView"); if(pDrView) { - ::svl::IUndoManager* pManager = rDoc.GetDocSh()->GetUndoManager(); + SfxUndoManager* pManager = rDoc.GetDocSh()->GetUndoManager(); SdLayerModifyUndoAction* pAction = new SdLayerModifyUndoAction( &rDoc, pLayer, @@ -320,7 +320,7 @@ void LayerTabBar::EndRenaming() assert (pDrView && "Rename layer undo action is only working with a SdDrawView"); if( pDrView ) { - ::svl::IUndoManager* pManager = rDoc.GetDocSh()->GetUndoManager(); + SfxUndoManager* pManager = rDoc.GetDocSh()->GetUndoManager(); SdLayerModifyUndoAction* pAction = new SdLayerModifyUndoAction( &rDoc, pLayer, diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 18ae520fbbf7..09f460c994f2 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -405,7 +405,7 @@ void DrawDocShell::Deactivate( bool ) { } -::svl::IUndoManager* DrawDocShell::GetUndoManager() +SfxUndoManager* DrawDocShell::GetUndoManager() { return mpUndoManager.get(); } @@ -521,7 +521,7 @@ void DrawDocShell::ClearUndoBuffer() pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false); } - ::svl::IUndoManager* pUndoManager = GetUndoManager(); + SfxUndoManager* pUndoManager = GetUndoManager(); if(pUndoManager && pUndoManager->GetUndoActionCount()) pUndoManager->Clear(); } diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 523578bad564..1574d2d6b7ba 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -126,7 +126,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) pOV->InsertText( "" ); // prepare undo - ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); + SfxUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR), "", 0, mpViewShell->GetViewShellBase().GetViewShellId() ); @@ -237,7 +237,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq ) SfxItemSet aOldSet( mpDoc->GetPool(), svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO>{} ); aOldSet.Put( pOV->GetAttribs() ); - ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); + SfxUndoManager& rUndoMgr = pOL->GetUndoManager(); ViewShellId nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1); rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR), "", 0, nViewShellId ); diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 1d1854d4906b..7915a1b8c783 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -75,7 +75,7 @@ rtl::Reference<FuPoor> FuObjectAnimationParameters::Create( ViewShell* pViewSh, void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) { - ::svl::IUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); + SfxUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4c6bc4528cc1..b11af639a4a4 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -91,8 +91,7 @@ public: virtual ::tools::Rectangle GetVisArea(sal_uInt16 nAspect) const override; virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect) override; - virtual ::svl::IUndoManager* - GetUndoManager() override; + virtual SfxUndoManager* GetUndoManager() override; virtual Printer* GetDocumentPrinter() override; virtual void OnDocumentPrinterChanged(Printer* pNewPrinter) override; virtual SfxStyleSheetBasePool* GetStyleSheetPool() override; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 621ba4c7820a..29baec79a8e7 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -199,7 +199,7 @@ protected: /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ - virtual ::svl::IUndoManager* ImpGetUndoManager() const override; + virtual SfxUndoManager* ImpGetUndoManager() const override; private: std::shared_ptr<SlideSorter> mpSlideSorter; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 1e002a59958e..a78834330ed3 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -492,7 +492,7 @@ protected: std::unique_ptr<Implementation, o3tl::default_delete<Implementation>> mpImpl; // Support methods for centralized UNDO/REDO - virtual ::svl::IUndoManager* ImpGetUndoManager() const; + virtual SfxUndoManager* ImpGetUndoManager() const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; void ImpSidUndo(SfxRequest& rReq); diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 63d41e996140..15930344209e 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -268,7 +268,7 @@ void DocumentHelper::ProvideStyles ( // Add an undo action for the copied style sheets. if( !aCreatedStyles.empty() ) { - ::svl::IUndoManager* pUndoManager = rTargetDocument.GetDocSh()->GetUndoManager(); + SfxUndoManager* pUndoManager = rTargetDocument.GetDocSh()->GetUndoManager(); if (pUndoManager != nullptr) { SdMoveStyleSheetsUndoAction* pMovStyles = @@ -315,7 +315,7 @@ void DocumentHelper::AssignMasterPageToPageList ( if (aCleanedList.empty() ) return; - ::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager(); + SfxUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager(); if( pUndoMgr ) pUndoMgr->EnterListAction(SdResId(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, rTargetDocument.GetDocSh()->GetViewShell()->GetViewShellBase().GetViewShellId()); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index d380d2e55bef..b95af6f2b617 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -926,7 +926,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri SdPage* pPageToRename = nullptr; - ::svl::IUndoManager* pManager = pDocument->GetDocSh()->GetUndoManager(); + SfxUndoManager* pManager = pDocument->GetDocSh()->GetUndoManager(); if( mrSlideSorter.GetModel().GetEditMode() == EditMode::Page ) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index ca3be2f90439..2344a7371a8f 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -294,7 +294,7 @@ bool SlideSorterViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) return bSuccess; } -::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager() const +SfxUndoManager* SlideSorterViewShell::ImpGetUndoManager() const { SfxShell* pObjectBar = GetViewShellBase().GetViewShellManager()->GetTopShell(); if (pObjectBar != nullptr) diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index e34f97ef6aad..b93db139d119 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -162,7 +162,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( SdPage* pUndoPage = bHandoutMode ? pHandoutMPage : pCurrentPage; - ::svl::IUndoManager* pUndoManager = mrViewShell.GetDocSh()->GetUndoManager(); + SfxUndoManager* pUndoManager = mrViewShell.GetDocSh()->GetUndoManager(); DBG_ASSERT(pUndoManager, "No UNDO MANAGER ?!?"); if( pUndoManager ) diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 463487eee215..e54b5d505bd0 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -707,7 +707,7 @@ void ViewShellManager::Implementation::UpdateShellStack() // Remember the undo manager from the top-most shell on the stack. SfxShell* pTopMostShell = mrBase.GetSubShell(0); - ::svl::IUndoManager* pUndoManager = (pTopMostShell!=nullptr) + SfxUndoManager* pUndoManager = (pTopMostShell!=nullptr) ? pTopMostShell->GetUndoManager() : nullptr; @@ -800,7 +800,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe // Remember the undo manager from the top-most shell on the stack. SfxShell* pTopMostShell = mrBase.GetSubShell(0); - ::svl::IUndoManager* pUndoManager = (pTopMostShell!=nullptr) + SfxUndoManager* pUndoManager = (pTopMostShell!=nullptr) ? pTopMostShell->GetUndoManager() : nullptr; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index af5b57298246..3891ecb24486 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -566,7 +566,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { case SID_OUTLINE_TEXT_AUTOFIT: { - ::svl::IUndoManager* pUndoManager = GetDocSh()->GetUndoManager(); + SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager(); const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 ) { @@ -2027,7 +2027,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) break; } - ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); + SfxUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); SdLayerModifyUndoAction* pAction = new SdLayerModifyUndoAction( GetDoc(), pLayer, diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 49e98b7d721e..9fd8f21f5cd7 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -82,7 +82,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SdResId(STR_LAYER_BCKGRNDOBJ) ); SdrLayerIDSet aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers(); - ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); + SfxUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); ModifyPageUndoAction* pAction = new ModifyPageUndoAction( GetDoc(), pUndoPage, rName, pUndoPage->GetAutoLayout(), aVisibleLayers.IsSet( nBackground ), diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 534a484ce810..527f32378289 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1428,7 +1428,7 @@ void OutlineView::EndModelChange() { UpdateDocument(); - ::svl::IUndoManager* pDocUndoMgr = mpDocSh->GetUndoManager(); + SfxUndoManager* pDocUndoMgr = mpDocSh->GetUndoManager(); bool bHasUndoActions = pDocUndoMgr->GetUndoActionCount() != 0; @@ -1482,7 +1482,7 @@ void OutlineView::UpdateDocument() /** merge edit engine undo actions if possible */ void OutlineView::TryToMergeUndoActions() { - ::svl::IUndoManager& rOutlineUndo = mrOutliner.GetUndoManager(); + SfxUndoManager& rOutlineUndo = mrOutliner.GetUndoManager(); if( rOutlineUndo.GetUndoActionCount() > 1 ) { SfxListUndoAction* pListAction = dynamic_cast< SfxListUndoAction* >( rOutlineUndo.GetUndoAction() ); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 507724c68ce2..4a45f8912a8e 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -122,7 +122,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SfxItemState::DEFAULT == rSet.GetItemState(SID_UNDO)) { - ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + SfxUndoManager* pUndoManager = ImpGetUndoManager(); if(pUndoManager) { if(pUndoManager->GetUndoActionCount() != 0) @@ -151,7 +151,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SfxItemState::DEFAULT == rSet.GetItemState(SID_REDO)) { - ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + SfxUndoManager* pUndoManager = ImpGetUndoManager(); if(pUndoManager) { if(pUndoManager->GetRedoActionCount() != 0) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 93f3fcc85684..1ec9cdec1a21 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1123,7 +1123,7 @@ void ViewShell::UpdatePreview (SdPage*, bool ) // useful is still done. } -::svl::IUndoManager* ViewShell::ImpGetUndoManager() const +SfxUndoManager* ViewShell::ImpGetUndoManager() const { const ViewShell* pMainViewShell = GetViewShellBase().GetMainViewShell().get(); @@ -1160,7 +1160,7 @@ void ViewShell::UpdatePreview (SdPage*, bool ) void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const { - ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + SfxUndoManager* pUndoManager = ImpGetUndoManager(); if(pUndoManager) { sal_uInt16 nCount(pUndoManager->GetUndoActionCount()); @@ -1187,7 +1187,7 @@ void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const { - ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + SfxUndoManager* pUndoManager = ImpGetUndoManager(); if(pUndoManager) { sal_uInt16 nCount(pUndoManager->GetRedoActionCount()); @@ -1237,7 +1237,7 @@ void ViewShell::ImpSidUndo(SfxRequest& rReq) if (pSlideSorterViewShell) xWatcher.reset(new KeepSlideSorterInSyncWithPageChanges(pSlideSorterViewShell->GetSlideSorter())); - ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + SfxUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); const SfxItemSet* pReqArgs = rReq.GetArgs(); bool bRepair = false; @@ -1306,7 +1306,7 @@ void ViewShell::ImpSidRedo(SfxRequest& rReq) if (pSlideSorterViewShell) xWatcher.reset(new KeepSlideSorterInSyncWithPageChanges(pSlideSorterViewShell->GetSlideSorter())); - ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); + SfxUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); const SfxItemSet* pReqArgs = rReq.GetArgs(); bool bRepair = false; |