summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/NotesPanelView.cxx2
-rw-r--r--sd/source/ui/view/NotesPanelViewShell.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx6
-rw-r--r--sd/source/ui/view/ViewClipboard.cxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx4
-rw-r--r--sd/source/ui/view/drviews4.cxx2
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx2
-rw-r--r--sd/source/ui/view/drviewsa.cxx7
-rw-r--r--sd/source/ui/view/drviewse.cxx2
-rw-r--r--sd/source/ui/view/drviewsf.cxx2
-rw-r--r--sd/source/ui/view/drviewsg.cxx2
-rw-r--r--sd/source/ui/view/drviewsk.cxx2
-rw-r--r--sd/source/ui/view/frmview.cxx2
-rw-r--r--sd/source/ui/view/outlview.cxx2
-rw-r--r--sd/source/ui/view/sdview.cxx2
-rw-r--r--sd/source/ui/view/sdview2.cxx15
-rw-r--r--sd/source/ui/view/sdview3.cxx15
-rw-r--r--sd/source/ui/view/viewshel.cxx2
20 files changed, 41 insertions, 38 deletions
diff --git a/sd/source/ui/view/NotesPanelView.cxx b/sd/source/ui/view/NotesPanelView.cxx
index 037fb0809cf5..42562275b70f 100644
--- a/sd/source/ui/view/NotesPanelView.cxx
+++ b/sd/source/ui/view/NotesPanelView.cxx
@@ -41,7 +41,7 @@ NotesPanelView::NotesPanelView(DrawDocShell& rDocSh, vcl::Window* pWindow,
aModifyIdle.SetPriority(TaskPriority::LOWEST);
maOutliner.Init(OutlinerMode::OutlineView);
- maOutliner.SetRefDevice(SD_MOD()->GetVirtualRefDevice());
+ maOutliner.SetRefDevice(SdModule::get()->GetVirtualRefDevice());
maOutliner.SetPaperSize(mrNotesPanelViewShell.GetActiveWindow()->GetViewSize());
maOutlinerView.SetOutputArea(
diff --git a/sd/source/ui/view/NotesPanelViewShell.cxx b/sd/source/ui/view/NotesPanelViewShell.cxx
index 5a5c9ec1407b..e2fadf2a2c5c 100644
--- a/sd/source/ui/view/NotesPanelViewShell.cxx
+++ b/sd/source/ui/view/NotesPanelViewShell.cxx
@@ -1362,7 +1362,7 @@ void NotesPanelViewShell::Execute(SfxRequest& rReq)
{
const SvxSearchItem& rSearchItem = pReqArgs->Get(SID_SEARCH_ITEM);
- SD_MOD()->SetSearchItem(
+ SdModule::get()->SetSearchItem(
std::unique_ptr<SvxSearchItem>(rSearchItem.Clone()));
xFuSearch->SearchAndReplace(&rSearchItem);
}
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 9ebadaca1026..d25744a4926e 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -185,7 +185,7 @@ SdOutliner::SdOutliner( SdDrawDocument* pDoc, OutlinerMode nMode )
{
SetStyleSheetPool(static_cast<SfxStyleSheetPool*>( mpDrawDocument->GetStyleSheetPool() ));
SetEditTextObjectPool( &pDoc->GetItemPool() );
- SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
+ SetCalcFieldValueHdl(LINK(SdModule::get(), SdModule, CalcFieldValueHdl));
SetForbiddenCharsTable( pDoc->GetForbiddenCharsTable() );
EEControlBits nCntrl = GetControlWord();
@@ -272,7 +272,7 @@ void SdOutliner::PrepareSpelling()
sd::ViewShellBase* pBase = getViewShellBase();
if (pBase != nullptr)
SetViewShell (pBase->GetMainViewShell());
- SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
+ SetRefDevice(SdModule::get()->GetVirtualRefDevice());
std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell)
@@ -1970,7 +1970,7 @@ void SdOutliner::PrepareConversion()
void SdOutliner::BeginConversion()
{
- SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
+ SetRefDevice(SdModule::get()->GetVirtualRefDevice());
sd::ViewShellBase* pBase = getViewShellBase();
if (pBase != nullptr)
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index c17bf7de1f01..89cf897eaae9 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -222,7 +222,7 @@ sal_uInt16 ViewClipboard::InsertSlides (
false,
false,
nInsertPosition,
- (&rTransferable == SD_MOD()->pTransferDrag),
+ (&rTransferable == SdModule::get()->pTransferDrag),
pDataDocSh,
true,
bMergeMasterPages,
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 15f1a51f1e8b..37d32df82f0f 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -368,7 +368,7 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
pFrameView->SetViewShellTypeOnLoad(pViewShell->GetShellType());
}
// Show/Hide the TabBar
- SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDocument()->GetDocumentType());
+ SdOptions* pOptions = SdModule::get()->GetSdOptions(GetDocument()->GetDocumentType());
bool bIsTabBarVisible = pOptions->IsTabBarVisible();
mpImpl->SetUserWantsTabBar( bIsTabBarVisible );
}
@@ -648,7 +648,7 @@ void ViewShellBase::Execute (SfxRequest& rRequest)
case SID_TOGGLE_TABBAR_VISIBILITY:
{
- SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDocument()->GetDocumentType());
+ SdOptions* pOptions = SdModule::get()->GetSdOptions(GetDocument()->GetDocumentType());
bool bIsTabBarVisible = pOptions->IsTabBarVisible();
pOptions->SetTabBarVisible( !bIsTabBarVisible );
mpImpl->SetUserWantsTabBar( !bIsTabBarVisible );
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 4faf8b632be7..d67963b2a823 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1914,7 +1914,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
vcl::Window* pWin = GetActiveWindow();
ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg( pFact->CreateSdInsertLayerDlg(pWin ? pWin->GetFrameWeld() : nullptr, aNewAttr, true, SdResId(STR_INSERTLAYER)) );
- pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
+ pDlg->SetHelpId( SdModule::get()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
// test for already existing names
bool bLoop = true;
@@ -2067,7 +2067,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
vcl::Window* pWin = GetActiveWindow();
ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg( pFact->CreateSdInsertLayerDlg(pWin ? pWin->GetFrameWeld() : nullptr, aNewAttr, bDelete, SdResId(STR_MODIFYLAYER)) );
- pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
+ pDlg->SetHelpId( SdModule::get()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
// test for already existing names
bool bLoop = true;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 3611af691081..6652f8d64e9c 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -558,7 +558,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
}
else if( rCEvt.GetCommand() == CommandEventId::ContextMenu && !bNativeShow &&
- pWin != nullptr && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() )
+ pWin != nullptr && !mpDrawView->IsAction() && !SdModule::get()->GetWaterCan() )
{
OUString aPopupId; // Resource name for popup menu
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 3488bc9bc6ff..118c8971d917 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -136,7 +136,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
// this option has to be adjust at the model
GetDoc()->SetPickThroughTransparentTextFrames(
- SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType())->IsPickThrough());
+ SdModule::get()->GetSdOptions(GetDoc()->GetDocumentType())->IsPickThrough());
// initialization of the Character-(Screen-) attribute
if (HasRuler() != pView->HasRuler())
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 753c34b01e4e..8bb8748e2e36 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1064,7 +1064,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if ( ( !aActiveLayer.isEmpty() && pPV && ( pPV->IsLayerLocked(aActiveLayer) ||
!pPV->IsLayerVisible(aActiveLayer) ) ) ||
- SD_MOD()->GetWaterCan() )
+ SdModule::get()->GetWaterCan() )
{
rSet.DisableItem( SID_PASTE );
rSet.DisableItem( SID_PASTE_SPECIAL );
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 2779e27f7adc..78e86ff87e8a 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -132,8 +132,9 @@ DrawViewShell::DrawViewShell( ViewShellBase& rViewShellBase, vcl::Window* pParen
doShow();
ConfigureAppBackgroundColor();
- SD_MOD()->GetColorConfig().AddListener(this);
- maViewOptions.mnDocBackgroundColor = SD_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
+ SdModule* mod = SdModule::get();
+ mod->GetColorConfig().AddListener(this);
+ maViewOptions.mnDocBackgroundColor = mod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
if (comphelper::LibreOfficeKit::isActive())
{
@@ -162,7 +163,7 @@ void DrawViewShell::ImplDestroy()
{
destroyXSlideShowInstance();
- SD_MOD()->GetColorConfig().RemoveListener(this);
+ SdModule::get()->GetColorConfig().RemoveListener(this);
mpSelectionChangeHandler->Disconnect();
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index a096b31da543..b68d3e09cfdf 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -618,7 +618,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
return;
// get SdOptions
- SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType());
+ SdOptions* pOptions = SdModule::get()->GetSdOptions(GetDoc()->GetDocumentType());
sal_uInt32 nDefaultObjectSizeWidth(pOptions->GetDefaultObjectSizeWidth());
sal_uInt32 nDefaultObjectSizeHeight(pOptions->GetDefaultObjectSizeHeight());
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 037207137c75..0d9286ffcc62 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -545,7 +545,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
rSet.Put(SfxBoolItem(nWhich,false));
else
{
- SfxBoolItem aItem(nWhich, SD_MOD()->GetWaterCan());
+ SfxBoolItem aItem(nWhich, SdModule::get()->GetWaterCan());
aAllSet.Put( aItem );
}
}
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 1e156f3df0fa..c0e71e05ad7e 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -105,7 +105,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
bool bDefault = false;
sal_uInt16 nSlot = rReq.GetSlot();
- SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType());
+ SdOptions* pOptions = SdModule::get()->GetSdOptions(GetDoc()->GetDocumentType());
std::shared_ptr<comphelper::ConfigurationChanges> batch(
comphelper::ConfigurationChanges::create());
diff --git a/sd/source/ui/view/drviewsk.cxx b/sd/source/ui/view/drviewsk.cxx
index 1aaa2039ffd6..54cb0ac55aca 100644
--- a/sd/source/ui/view/drviewsk.cxx
+++ b/sd/source/ui/view/drviewsk.cxx
@@ -53,7 +53,7 @@ void DrawViewShell::ConfigurationChanged( utl::ConfigurationBroadcaster* pCb, Co
void DrawViewShell::ConfigureAppBackgroundColor( svtools::ColorConfig *pColorConfig )
{
if (!pColorConfig)
- pColorConfig = &SD_MOD()->GetColorConfig();
+ pColorConfig = &SdModule::get()->GetColorConfig();
Color aFillColor( pColorConfig->GetColorValue( svtools::APPBACKGROUND ).nColor );
if (comphelper::LibreOfficeKit::isActive())
aFillColor = COL_TRANSPARENT;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 3fc4c4089085..54b84a5f550f 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -246,7 +246,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULL *
bInitDesignMode = false;
SetDesignMode( bInitDesignMode );
- Update( SD_MOD()->GetSdOptions(pDrawDoc->GetDocumentType()) );
+ Update(SdModule::get()->GetSdOptions(pDrawDoc->GetDocumentType()));
}
}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 0fa6402f1a04..15fad231a696 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -87,7 +87,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
// initialize Outliner: set Reference Device
bInitOutliner = true;
mrOutliner.Init( OutlinerMode::OutlineView );
- mrOutliner.SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
+ mrOutliner.SetRefDevice(SdModule::get()->GetVirtualRefDevice());
//viewsize without the width of the image and number in front
mnPaperWidth = (mrOutlineViewShell.GetActiveWindow()->GetViewSize().Width() - 4000);
mrOutliner.SetPaperSize(Size(mnPaperWidth, 400000000));
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 189d3050bbf8..5a6be3034fb8 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -675,7 +675,7 @@ bool View::SdrBeginTextEdit(
if( pOutl )
{
pOutl->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>( mrDoc.GetStyleSheetPool() ));
- pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
+ pOutl->SetCalcFieldValueHdl(LINK(SdModule::get(), SdModule, CalcFieldValueHdl));
EEControlBits nCntrl = pOutl->GetControlWord();
nCntrl |= EEControlBits::ALLOWBIGOBJS;
nCntrl |= EEControlBits::MARKFIELDS;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index b2f58cfcfffd..fd4abde21279 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -83,7 +83,7 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateClipboardDat
// dynamically created object is destroyed automatically
rtl::Reference<SdTransferable> pTransferable = new SdTransferable( &mrDoc, nullptr, false );
- SD_MOD()->pTransferClip = pTransferable.get();
+ SdModule::get()->pTransferClip = pTransferable.get();
mrDoc.CreatingDataObj( pTransferable.get() );
pTransferable->SetWorkDocument( static_cast<SdDrawDocument*>(CreateMarkedObjModel().release()) );
@@ -145,7 +145,7 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateDragDataObje
{
rtl::Reference<SdTransferable> pTransferable = new SdTransferable( &mrDoc, pWorkView, false );
- SD_MOD()->pTransferDrag = pTransferable.get();
+ SdModule::get()->pTransferDrag = pTransferable.get();
std::unique_ptr<TransferableObjectDescriptor> pObjDesc(new TransferableObjectDescriptor);
OUString aDisplayName;
@@ -196,7 +196,7 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateSelectionDat
std::unique_ptr<TransferableObjectDescriptor> pObjDesc(new TransferableObjectDescriptor);
const ::tools::Rectangle aMarkRect( GetAllMarkedRect() );
- SD_MOD()->pTransferSelection = pTransferable.get();
+ SdModule::get()->pTransferSelection = pTransferable.get();
if( mpDocSh )
{
@@ -232,10 +232,11 @@ void View::ClearSelectionClipboard() // true case
return;
if (!mpViewSh->GetActiveWindow())
return;
- if (SD_MOD()->pTransferSelection && SD_MOD()->pTransferSelection->GetView() == this)
+ SdModule* mod = SdModule::get();
+ if (mod->pTransferSelection && mod->pTransferSelection->GetView() == this)
{
TransferableHelper::ClearPrimarySelection();
- SD_MOD()->pTransferSelection = nullptr;
+ mod->pTransferSelection = nullptr;
}
}
@@ -378,7 +379,7 @@ void View::DragFinished( sal_Int8 nDropAction )
BegUndo(aStr + " " + mpDragSrcMarkList->GetMarkDescription());
}
- SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
+ SdTransferable* pDragTransferable = SdModule::get()->pTransferDrag;
if( pDragTransferable )
pDragTransferable->SetView( nullptr );
@@ -473,7 +474,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
if( !bIsInsideOutlinerView )
{
- SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
+ SdTransferable* pDragTransferable = SdModule::get()->pTransferDrag;
if(pDragTransferable && (nDropAction & DND_ACTION_LINK))
{
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 4f7a52b0a9c3..c16f92b7349c 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -300,15 +300,16 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
// try to get own transfer data
if( pImplementation )
{
- if( SD_MOD()->pTransferClip == pImplementation )
- pOwnData = SD_MOD()->pTransferClip;
- else if( SD_MOD()->pTransferDrag == pImplementation )
+ SdModule* mod = SdModule::get();
+ if (mod->pTransferClip == pImplementation)
+ pOwnData = mod->pTransferClip;
+ else if (mod->pTransferDrag == pImplementation)
{
- pOwnData = SD_MOD()->pTransferDrag;
+ pOwnData = mod->pTransferDrag;
bSelfDND = true;
}
- else if( SD_MOD()->pTransferSelection == pImplementation )
- pOwnData = SD_MOD()->pTransferSelection;
+ else if (mod->pTransferSelection == pImplementation)
+ pOwnData = mod->pTransferSelection;
}
const bool bGroupUndoFromDragWithDrop = bSelfDND && mpDragSrcMarkList && IsUndoEnabled();
@@ -467,7 +468,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
// calculate real position of current
// source objects, if necessary (#103207)
- if( pOwnData == SD_MOD()->pTransferSelection )
+ if (pOwnData == SdModule::get()->pTransferSelection)
{
::tools::Rectangle aCurBoundRect;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 261c6aaf7701..6c139827182e 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -383,7 +383,7 @@ void ViewShell::UIDeactivated( SfxInPlaceClient* )
void ViewShell::Deactivate(bool bIsMDIActivate)
{
// remove view from a still active drag'n'drop session
- SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
+ SdTransferable* pDragTransferable = SdModule::get()->pTransferDrag;
if (IsMainViewShell())
GetDocSh()->Disconnect(this);
generated by cgit (git 2.34.1) at 2024-12-23 23:21:33 +0000