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/DocumentRenderer.cxx4
-rw-r--r--sd/source/ui/view/OutlinerIterator.cxx8
-rw-r--r--sd/source/ui/view/drawview.cxx2
-rw-r--r--sd/source/ui/view/drviews4.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx8
-rw-r--r--sd/source/ui/view/sdview.cxx32
-rw-r--r--sd/source/ui/view/sdview2.cxx8
-rw-r--r--sd/source/ui/view/sdview3.cxx12
-rw-r--r--sd/source/ui/view/sdview4.cxx6
9 files changed, 41 insertions, 41 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index b94f0713046a..ecb42f830904 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -952,7 +952,7 @@ namespace {
// Collect the page objects of the handout master.
std::vector<SdrPageObj*> aHandoutPageObjects;
- SdrObjListIter aShapeIter (rHandoutPage);
+ SdrObjListIter aShapeIter (&rHandoutPage);
while (aShapeIter.IsMore())
{
SdrPageObj* pPageObj = dynamic_cast<SdrPageObj*>(aShapeIter.Next());
@@ -1803,7 +1803,7 @@ private:
// Count page shapes.
sal_uInt32 nShapeCount (0);
- SdrObjListIter aShapeIter (rHandoutPage);
+ SdrObjListIter aShapeIter (&rHandoutPage);
while (aShapeIter.IsMore())
{
SdrPageObj* pPageObj = dynamic_cast<SdrPageObj*>(aShapeIter.Next());
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index c9cc081b7e3a..434f488b463c 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -553,7 +553,7 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const
if (mpObjectIterator != nullptr)
{
- pIterator->mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward);
+ pIterator->mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward);
// No direct way to set the object iterator to the current object.
pIterator->maPosition.mxObject.reset(nullptr);
@@ -598,7 +598,7 @@ void ViewIteratorImpl::GotoNextText()
SetPage (maPosition.mnPageIndex-1);
if (mpPage != nullptr)
- mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward);
+ mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, !mbDirectionIsForward);
if (mpObjectIterator!=nullptr && mpObjectIterator->IsMore())
maPosition.mxObject.reset(mpObjectIterator->Next());
else
@@ -650,7 +650,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex)
// Set up object list iterator.
if (mpPage != nullptr)
- mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward);
+ mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward);
else
mpObjectIterator = nullptr;
@@ -677,7 +677,7 @@ void ViewIteratorImpl::Reverse()
// Create reversed object list iterator.
delete mpObjectIterator;
if (mpPage != nullptr)
- mpObjectIterator = new SdrObjListIter(*mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward);
+ mpObjectIterator = new SdrObjListIter(mpPage, SdrIterMode::DeepNoGroups, ! mbDirectionIsForward);
else
mpObjectIterator = nullptr;
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 95a4807e43c3..cdb8b2d85112 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -540,7 +540,7 @@ void DrawView::DeleteMarked()
SdrObject* pObj = aList.GetMark(nMark)->GetMarkedSdrObj();
if( pObj && !pObj->IsEmptyPresObj() && pObj->GetUserCall() )
{
- pPage = static_cast< SdPage* >( pObj->GetPage() );
+ pPage = static_cast< SdPage* >( pObj->getSdrPageFromSdrObject() );
if (pPage)
{
PresObjKind ePresObjKind(pPage->GetPresObjKind(pObj));
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index a8e2621a1834..9356034fa8b1 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -148,7 +148,7 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
GetView()->SdrEndTextEdit();
// look for a new candidate, a successor of pOldObj
- SdrObjListIter aIter(*pActualPage, SdrIterMode::DeepNoGroups);
+ SdrObjListIter aIter(pActualPage, SdrIterMode::DeepNoGroups);
bool bDidVisitOldObject(false);
while(aIter.IsMore() && !pCandidate)
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 8b69d3616037..0792f0cc281a 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -655,7 +655,7 @@ void DrawViewShell::FuDeleteSelectedObjects()
for (size_t i=0; i < rMarkList.GetMarkCount(); ++i)
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
- SdPage* pPage = static_cast<SdPage*>(pObj->GetPage());
+ SdPage* pPage = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject());
PresObjKind eKind = pPage->GetPresObjKind(pObj);
if (eKind == PRESOBJ_FOOTER || eKind == PRESOBJ_HEADER ||
eKind == PRESOBJ_DATETIME || eKind == PRESOBJ_SLIDENUMBER)
@@ -668,7 +668,7 @@ void DrawViewShell::FuDeleteSelectedObjects()
{
//Unmark object
mpDrawView->MarkObj(pObj, mpDrawView->GetSdrPageView(), true);
- SdPage* pPage = static_cast<SdPage*>(pObj->GetPage());
+ SdPage* pPage = static_cast<SdPage*>(pObj->getSdrPageFromSdrObject());
//remove placeholder from master page
pPage->DestroyDefaultPresObj(pPage->GetPresObjKind(pObj));
}
@@ -1540,8 +1540,8 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText,
SdrObjFactory::MakeNewObject(
GetView()->getSdrModelFromSdrView(),
SdrInventor::FmForm,
- OBJ_FM_BUTTON,
- mpDrawView->GetSdrPageView()->GetPage()));
+ OBJ_FM_BUTTON)); //,
+ //mpDrawView->GetSdrPageView()->GetPage()));
Reference< awt::XControlModel > xControlModel( pUnoCtrl->GetUnoControlModel(), uno::UNO_QUERY_THROW );
Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY_THROW );
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 3409123b788b..5684e8068fcd 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -195,20 +195,20 @@ drawinglayer::primitive2d::Primitive2DContainer ViewRedirector::createRedirected
SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject();
drawinglayer::primitive2d::Primitive2DContainer xRetval;
- if(pObject && pObject->GetPage())
+ if(pObject && pObject->getSdrPageFromSdrObject())
{
- const bool bDoCreateGeometry(pObject->GetPage()->checkVisibility( rOriginal, rDisplayInfo, true ));
+ const bool bDoCreateGeometry(pObject->getSdrPageFromSdrObject()->checkVisibility( rOriginal, rDisplayInfo, true ));
if(!bDoCreateGeometry && !(( pObject->GetObjInventor() == SdrInventor::Default ) && ( pObject->GetObjIdentifier() == OBJ_PAGE )) )
return xRetval;
PresObjKind eKind(PRESOBJ_NONE);
const bool bSubContentProcessing(rDisplayInfo.GetSubContentActive());
- const bool bIsMasterPageObject(pObject->GetPage()->IsMasterPage());
+ const bool bIsMasterPageObject(pObject->getSdrPageFromSdrObject()->IsMasterPage());
const bool bIsPrinting(rOriginal.GetObjectContact().isOutputToPrinter());
const SdrPageView* pPageView = rOriginal.GetObjectContact().TryToGetSdrPageView();
const SdrPage* pVisualizedPage = GetSdrPageFromXDrawPage(rOriginal.GetObjectContact().getViewInformation2D().getVisualizedPage());
- const SdPage* pObjectsSdPage = dynamic_cast< SdPage* >(pObject->GetPage());
+ const SdPage* pObjectsSdPage = dynamic_cast< SdPage* >(pObject->getSdrPageFromSdrObject());
const bool bIsInsidePageObj(pPageView && pPageView->GetPage() != pVisualizedPage);
// check if we need to draw a placeholder border. Never do it for
@@ -554,7 +554,7 @@ bool View::IsPresObjSelected(bool bOnPage, bool bOnMasterPage, bool bCheckPresOb
if ( pObj && ( bCheckPresObjListOnly || pObj->IsEmptyPresObj() || pObj->GetUserCall() ) )
{
- pPage = static_cast<SdPage*>( pObj->GetPage() );
+ pPage = static_cast<SdPage*>( pObj->getSdrPageFromSdrObject() );
bMasterPage = pPage && pPage->IsMasterPage();
if ( (bMasterPage && bOnMasterPage) || (!bMasterPage && bOnPage) )
@@ -652,7 +652,7 @@ bool View::SdrBeginTextEdit(
SdrOutliner* pOutl, OutlinerView* pGivenOutlinerView,
bool bDontDeleteOutliner, bool bOnlyOneView, bool bGrabFocus )
{
- SdrPage* pPage = pObj ? pObj->GetPage() : nullptr;
+ SdrPage* pPage = pObj ? pObj->getSdrPageFromSdrObject() : nullptr;
bool bMasterPage = pPage && pPage->IsMasterPage();
GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent(
@@ -716,7 +716,7 @@ bool View::SdrBeginTextEdit(
{
::Outliner* pOL = GetTextEditOutliner();
- if( pObj && pObj->GetPage() )
+ if( pObj && pObj->getSdrPageFromSdrObject() )
{
Color aBackground;
if( pObj->GetObjInventor() == SdrInventor::Default && pObj->GetObjIdentifier() == OBJ_TABLE )
@@ -725,7 +725,7 @@ bool View::SdrBeginTextEdit(
}
else
{
- aBackground = pObj->GetPage()->GetPageBackgroundColor(pPV);
+ aBackground = pObj->getSdrPageFromSdrObject()->GetPageBackgroundColor(pPV);
}
if (pOL != nullptr)
pOL->SetBackgroundColor( aBackground );
@@ -741,7 +741,7 @@ bool View::SdrBeginTextEdit(
if (bMasterPage && bReturn && pOutl)
{
const SdrTextObj* pTextObj = pOutl->GetTextObj();
- const SdPage* pSdPage = pTextObj ? static_cast<const SdPage*>(pTextObj->GetPage()) : nullptr;
+ const SdPage* pSdPage = pTextObj ? static_cast<const SdPage*>(pTextObj->getSdrPageFromSdrObject()) : nullptr;
const PresObjKind eKind = pSdPage ? pSdPage->GetPresObjKind(const_cast<SdrTextObj*>(pTextObj)) : PRESOBJ_NONE;
switch (eKind)
{
@@ -785,7 +785,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally)
SdrTextObj* pObj = xObj.get();
if( pObj && pObj->HasText() )
{
- SdrPage* pPage = pObj->GetPage();
+ SdrPage* pPage = pObj->getSdrPageFromSdrObject();
if( !pPage || !pPage->IsMasterPage() )
pObj->SetEmptyPresObj( false );
}
@@ -806,7 +806,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally)
}
- SdPage* pPage = dynamic_cast< SdPage* >( xObj->GetPage() );
+ SdPage* pPage = dynamic_cast< SdPage* >( xObj->getSdrPageFromSdrObject() );
if( pPage )
pPage->onEndTextEdit( xObj.get() );
}
@@ -824,7 +824,7 @@ bool View::RestoreDefaultText( SdrTextObj* pTextObj )
{
if( !pTextObj->HasText() )
{
- SdPage* pPage = dynamic_cast< SdPage* >( pTextObj->GetPage() );
+ SdPage* pPage = dynamic_cast< SdPage* >( pTextObj->getSdrPageFromSdrObject() );
if(pPage)
{
@@ -1074,7 +1074,7 @@ IMPL_LINK( View, OnParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, aParam,
if( aParam.pPara && pObj )
{
- SdPage* pPage = dynamic_cast< SdPage* >( pObj->GetPage() );
+ SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() );
if( pPage )
pPage->onParagraphInserted( aParam.pOutliner, aParam.pPara, pObj );
}
@@ -1089,7 +1089,7 @@ IMPL_LINK( View, OnParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, aParam,
if( aParam.pPara && pObj )
{
- SdPage* pPage = dynamic_cast< SdPage* >( pObj->GetPage() );
+ SdPage* pPage = dynamic_cast< SdPage* >( pObj->getSdrPageFromSdrObject() );
if( pPage )
pPage->onParagraphRemoving( aParam.pOutliner, aParam.pPara, pObj );
}
@@ -1207,10 +1207,10 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfo )
/* Style Sheet handling */
SdrTextObj* pTextObj = GetTextEditObject();
SdrOutliner* pOutliner = GetTextEditOutliner();
- if( !pOutliner || !pTextObj || !pTextObj->GetPage() )
+ if( !pOutliner || !pTextObj || !pTextObj->getSdrPageFromSdrObject() )
return;
- SdPage* pPage = static_cast< SdPage* >( pTextObj->GetPage() );
+ SdPage* pPage = static_cast< SdPage* >( pTextObj->getSdrPageFromSdrObject() );
const PresObjKind eKind = pPage->GetPresObjKind(pTextObj);
// outline kinds are taken care of in Outliner::ImplSetLevelDependentStyleSheet
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 29c3c2bc24a8..45905d242cf9 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -275,7 +275,7 @@ void View::DoPaste (::sd::Window* pWindow)
const_cast< OutlinerView* >(pOLV)->PasteSpecial();
SdrObject* pObj = GetTextEditObject();
- SdPage* pPage = static_cast<SdPage*>( pObj ? pObj->GetPage() : nullptr );
+ SdPage* pPage = static_cast<SdPage*>( pObj ? pObj->getSdrPageFromSdrObject() : nullptr );
::Outliner* pOutliner = pOLV->GetOutliner();
if( pOutliner)
@@ -405,10 +405,10 @@ void View::DragFinished( sal_Int8 nDropAction )
SdrMark* pM=mpDragSrcMarkList->GetMark(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
- if( pObj && pObj->GetPage() )
+ if( pObj && pObj->getSdrPageFromSdrObject() )
{
const size_t nOrdNum = pObj->GetOrdNumDirect();
- SdrObject* pChkObj = pObj->GetPage()->RemoveObject(nOrdNum);
+ SdrObject* pChkObj = pObj->getSdrPageFromSdrObject()->RemoveObject(nOrdNum);
DBG_ASSERT(pChkObj==pObj,"pChkObj!=pObj in RemoveObject()");
}
}
@@ -538,7 +538,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
if (pPickObj && (pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall()))
{
- SdPage* pPage = static_cast<SdPage*>( pPickObj->GetPage() );
+ SdPage* pPage = static_cast<SdPage*>( pPickObj->getSdrPageFromSdrObject() );
if( pPage && pPage->IsMasterPage() )
bIsPresTarget = pPage->IsPresObj( pPickObj );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 4100fe9dfacc..634e59e7ce93 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -646,7 +646,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
SdDrawDocument* pWorkModel = const_cast<SdDrawDocument*>(pOwnData->GetWorkDocument());
SdPage* pWorkPage = pWorkModel->GetSdPage( 0, PageKind::Standard );
- pWorkPage->SetRectsDirty();
+ pWorkPage->SetSdrObjListRectsDirty();
// #i120393# Clipboard data uses full object geometry range
const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
@@ -816,7 +816,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
{
SdrPage* pWorkPage = pModel->GetSdPage( 0, PageKind::Standard );
- pWorkPage->SetRectsDirty();
+ pWorkPage->SetSdrObjListRectsDirty();
if( pOwnData )
{
@@ -890,7 +890,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
SdDrawDocument* pModel = xDocShRef->GetDoc();
SdPage* pWorkPage = pModel->GetSdPage( 0, PageKind::Standard );
- pWorkPage->SetRectsDirty();
+ pWorkPage->SetSdrObjListRectsDirty();
if( pOwnData )
{
@@ -1228,7 +1228,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkModel->GetSdPage( 0, PageKind::Standard ) :
pWorkModel->GetPage( 0 ) );
- pWorkPage->SetRectsDirty();
+ pWorkPage->SetSdrObjListRectsDirty();
// #i120393# Clipboard data uses full object geometry range
const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
@@ -1260,7 +1260,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkModel->GetSdPage( 0, PageKind::Standard ) :
pWorkModel->GetPage( 0 ) );
- pWorkPage->SetRectsDirty();
+ pWorkPage->SetSdrObjListRectsDirty();
// #i120393# Clipboard data uses full object geometry range
const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
@@ -1309,7 +1309,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkModel->GetSdPage( 0, PageKind::Standard ) :
pWorkModel->GetPage( 0 ) );
- pWorkPage->SetRectsDirty();
+ pWorkPage->SetSdrObjListRectsDirty();
// #i120393# Clipboard data uses full object geometry range
const Size aSize( pWorkPage->GetAllObjBoundRect().GetSize() );
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 9d1cb05ed000..fa9a48ea1a2c 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -106,7 +106,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
if( IsUndoEnabled() )
BegUndo(SdResId(STR_INSERTGRAPHIC));
- SdPage* pPage = static_cast<SdPage*>( pPickObj->GetPage() );
+ SdPage* pPage = static_cast<SdPage*>( pPickObj->getSdrPageFromSdrObject() );
if( bIsGraphic )
{
@@ -214,7 +214,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
if( ( mnAction & DND_ACTION_MOVE ) && pPickObj && (pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall()) )
{
- SdPage* pP = static_cast< SdPage* >( pPickObj->GetPage() );
+ SdPage* pP = static_cast< SdPage* >( pPickObj->getSdrPageFromSdrObject() );
if ( pP && pP->IsMasterPage() )
bIsPresTarget = pP->IsPresObj(pPickObj);
@@ -342,7 +342,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
bool bIsPres = false;
if( pPickObj )
{
- SdPage* pPage = static_cast< SdPage* >(pPickObj->GetPage());
+ SdPage* pPage = static_cast< SdPage* >(pPickObj->getSdrPageFromSdrObject());
bIsPres = pPage && pPage->IsPresObj(pPickObj);
if( bIsPres )
{
generated by cgit (git 2.34.1) at 2024-07-10 13:13:09 +0000