ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

FuPoor: pass SdDrawDocument by ref

Browse Source 
Change-Id: I75701740a24ad64f7a491937991eacf0c733d37e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185906
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Xisco Fauli
2025-05-27 16:01:15 +02:00
parent 72292a7e87
commit d573d3c70f
121 changed files with 648 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sd/inc/Outliner.hxx
+4 -4
View File
@@ -125,7 +125,7 @@ public:
friend class ::sd::outliner::OutlinerContainer;
/** Create a new sd outliner object.
@param pDoc
@param rDoc
The draw document from which to take the content.
@param nMode
The valid values <const>OutlinerMode::DontKnow</const>,
@@ -135,7 +135,7 @@ public:
<const>OutlinerMode::OutlineView</const> are defined in
editeng/outliner.hxx.
*/
SdOutliner(SdDrawDocument* pDoc, OutlinerMode nMode);
SdOutliner(SdDrawDocument& rDoc, OutlinerMode nMode);
virtual ~SdOutliner() override;
/// Forbid copy construction and copy assignment
SdOutliner(const Outliner&) = delete;
@@ -193,7 +193,7 @@ public:
int GetIgnoreCurrentPageChangesLevel() const { return mnIgnoreCurrentPageChangesLevel; };
void IncreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel++; };
void DecreIgnoreCurrentPageChangesLevel() { mnIgnoreCurrentPageChangesLevel--; };
SdDrawDocument* GetDoc() const { return mpDrawDocument; }
SdDrawDocument& GetDoc() const { return mrDrawDocument; }
private:
class Implementation;
@@ -221,7 +221,7 @@ private:
/// This window contains the view.
VclPtr<::sd::Window> mpWindow;
/// The document on whose objects and pages this class operates.
SdDrawDocument* mpDrawDocument;
SdDrawDocument& mrDrawDocument;
/** this is the language that is used for current text conversion.
Only valid if meMode is TEXT_CONVERSION.
sd/source/core/ThemeColorChanger.cxx
+1 -1
View File
@@ -109,7 +109,7 @@ bool changeStyle(sd::DrawDocShell* pDocShell, SdStyleSheet* pStyle,
if (bChanged)
{
pDocShell->GetUndoManager()->AddUndoAction(
std::make_unique<StyleSheetUndoAction>(pDocShell->GetDoc(), *pStyle, &aItemSet));
std::make_unique<StyleSheetUndoAction>(*pDocShell->GetDoc(), *pStyle, &aItemSet));
pStyle->GetItemSet().Put(aItemSet);
pStyle->Broadcast(SfxHint(SfxHintId::DataChanged));
}
sd/source/core/drawdoc.cxx
+2 -2
View File
@@ -932,7 +932,7 @@ SdOutliner* SdDrawDocument::GetOutliner(bool bCreateOutliner)
{
if (!mpOutliner && bCreateOutliner)
{
mpOutliner.reset(new SdOutliner( this, OutlinerMode::TextObject ));
mpOutliner.reset(new SdOutliner( *this, OutlinerMode::TextObject ));
if (mpDocSh)
mpOutliner->SetRefDevice(SdModule::get()->GetVirtualRefDevice());
@@ -950,7 +950,7 @@ SdOutliner* SdDrawDocument::GetInternalOutliner(bool bCreateOutliner)
{
if ( !mpInternalOutliner && bCreateOutliner )
{
mpInternalOutliner.reset( new SdOutliner( this, OutlinerMode::TextObject ) );
mpInternalOutliner.reset( new SdOutliner( *this, OutlinerMode::TextObject ) );
// This outliner is only used to create special text objects. As no
// information about portions is saved in this outliner, the update mode
sd/source/core/drawdoc3.cxx
+1 -1
View File
@@ -1707,7 +1707,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if (bUndo)
{
pUndoMgr->AddUndoAction(std::make_unique<StyleSheetUndoAction>(this,
pUndoMgr->AddUndoAction(std::make_unique<StyleSheetUndoAction>(*this,
*pMySheet, &pHisSheet->GetItemSet()));
}
pMySheet->GetItemSet().Put(pHisSheet->GetItemSet());
sd/source/ui/dlg/SpellDialogChildWindow.cxx
+2 -2
View File
@@ -100,7 +100,7 @@ void SpellDialogChildWindow::EndSpellingAndClearOutliner()
{
if (!mpSdOutliner)
return;
EndListening(*mpSdOutliner->GetDoc());
EndListening(mpSdOutliner->GetDoc());
mpSdOutliner->EndSpelling();
if (mbOwnOutliner)
delete mpSdOutliner;
@@ -146,7 +146,7 @@ void SpellDialogChildWindow::ProvideOutliner()
// to create one.
mbOwnOutliner = true;
SdDrawDocument *pDoc = pViewShell->GetDoc();
mpSdOutliner = new SdOutliner(pDoc, OutlinerMode::TextObject);
mpSdOutliner = new SdOutliner(*pDoc, OutlinerMode::TextObject);
StartListening(*pDoc);
}
else if( dynamic_cast< const OutlineViewShell *>( pViewShell ) != nullptr)
sd/source/ui/dlg/unchss.cxx
+4 -4
View File
@@ -33,19 +33,19 @@
#include <stlsheet.hxx>
#include <strings.hxx>
StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument& rTheDoc,
SfxStyleSheet& rTheStyleSheet,
const SfxItemSet* pTheNewItemSet)
: SdUndoAction(pTheDoc),
: SdUndoAction(&rTheDoc),
mrStyleSheet(rTheStyleSheet)
{
// Create ItemSets; Attention, it is possible that the new one is from a,
// different pool. Therefore we clone it with its items.
mpNewSet = std::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), pTheNewItemSet->GetRanges());
SdrModel::MigrateItemSet( pTheNewItemSet, mpNewSet.get(), *pTheDoc );
SdrModel::MigrateItemSet( pTheNewItemSet, mpNewSet.get(), rTheDoc );
mpOldSet = std::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mrStyleSheet.GetItemSet().GetRanges());
SdrModel::MigrateItemSet( &mrStyleSheet.GetItemSet(), mpOldSet.get(), *pTheDoc );
SdrModel::MigrateItemSet( &mrStyleSheet.GetItemSet(), mpOldSet.get(), rTheDoc );
OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
OUString aName(mrStyleSheet.GetName());
sd/source/ui/docshell/docshel3.cxx
+3 -3
View File
@@ -211,7 +211,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
xFuSearch = rtl::Reference<FuSearch>(
FuSearch::createPtr(*mpViewShell,
mpViewShell->GetActiveWindow(),
pView, mpDoc, rReq));
pView, *mpDoc, rReq));
pView->getSearchContext().setSearchFunction(xFuSearch);
}
@@ -270,7 +270,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
{
if( mpViewShell )
{
rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create(*mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), mpDoc, rReq ) );
rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create(*mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), *mpDoc, rReq ) );
static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, nullptr, i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true );
}
}
@@ -280,7 +280,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
{
if( mpViewShell )
{
rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create(*mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), mpDoc, rReq ) );
rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create(*mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), *mpDoc, rReq ) );
static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartChineseConversion();
}
}
sd/source/ui/func/fuarea.cxx
+6 -6
View File
@@ -31,14 +31,14 @@
namespace sd {
FuArea::FuArea( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* _pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, _pView, pDoc, rReq)
FuArea::FuArea( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* _pView, SdDrawDocument& rDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, _pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuArea::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* _pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuArea::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* _pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuArea( rViewSh, pWin, _pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuArea( rViewSh, pWin, _pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -51,13 +51,13 @@ void FuArea::DoExecute( SfxRequest& rReq )
if (pArgs)
return;
SfxItemSet aNewAttr( mpDoc->GetPool() );
SfxItemSet aNewAttr( mrDoc.GetPool() );
mpView->GetAttributes( aNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
bool bHasSlideBackground = mrViewShell.GetDoc()->GetDocumentType() == DocumentType::Impress;
VclPtr<AbstractSvxAreaTabDialog> pDlg(
pFact->CreateSvxAreaTabDialog(mrViewShell.GetFrameWeld(), &aNewAttr, mpDoc, true, bHasSlideBackground));
pFact->CreateSvxAreaTabDialog(mrViewShell.GetFrameWeld(), &aNewAttr, &mrDoc, true, bHasSlideBackground));
pDlg->StartExecuteAsync([pDlg, pView = this->mpView, pViewShell = &this->mrViewShell](sal_Int32 nResult){
if (nResult == RET_OK)
sd/source/ui/func/fubullet.cxx
+8 -8
View File
@@ -58,15 +58,15 @@ FuBullet::FuBullet (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* _pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, _pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, _pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuBullet::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuBullet::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuBullet( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuBullet( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -168,7 +168,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq )
}
else
{
SfxItemSet aFontAttr( mpDoc->GetPool() );
SfxItemSet aFontAttr( mrDoc.GetPool() );
mpView->GetAttributes( aFontAttr );
const SvxFontItem* pFItem = aFontAttr.GetItem( SID_ATTR_CHAR_FONT );
if( pFItem )
@@ -178,10 +178,10 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq )
if (aChars.isEmpty())
{
SfxAllItemSet aSet( mpDoc->GetPool() );
SfxAllItemSet aSet( mrDoc.GetPool() );
aSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
SfxItemSet aFontAttr( mpDoc->GetPool() );
SfxItemSet aFontAttr( mrDoc.GetPool() );
mpView->GetAttributes( aFontAttr );
const SvxFontItem* pFontItem = aFontAttr.GetItem( SID_ATTR_CHAR_FONT );
if( pFontItem )
@@ -243,7 +243,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq )
empty string). */
pOV->InsertText( u""_ustr );
SfxItemSetFixed<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO> aOldSet( mpDoc->GetPool() );
SfxItemSetFixed<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO> aOldSet( mrDoc.GetPool() );
aOldSet.Put( pOV->GetAttribs() );
EditUndoManager& rUndoMgr = pOL->GetUndoManager();
sd/source/ui/func/fuchar.cxx
+9 -9
View File
@@ -40,15 +40,15 @@ FuChar::FuChar (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuChar::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuChar::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuChar( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuChar( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -59,14 +59,14 @@ void FuChar::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SfxItemSet aEditAttr( mpDoc->GetPool() );
SfxItemSet aEditAttr( mrDoc.GetPool() );
mpView->GetAttributes( aEditAttr );
SfxItemSetFixed<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END> aNewAttr(mrViewShell.GetPool());
aNewAttr.Put( aEditAttr, false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSdTabCharDialog(mrViewShell.GetFrameWeld(), &aNewAttr, mpDoc->GetDocSh() ) );
ScopedVclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSdTabCharDialog(mrViewShell.GetFrameWeld(), &aNewAttr, mrDoc.GetDocSh() ) );
if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
{
pDlg->SetCurPageId(u"RID_SVXPAGE_CHAR_EFFECTS"_ustr);
@@ -114,14 +114,14 @@ void FuChar::DoExecute( SfxRequest& rReq )
mrViewShell.GetViewFrame()->GetBindings().Invalidate( SidArray );
if( mpDoc->GetOnlineSpell() )
if( mrDoc.GetOnlineSpell() )
{
if( SfxItemState::SET == pArgs->GetItemState(EE_CHAR_LANGUAGE, false ) ||
SfxItemState::SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CJK, false ) ||
SfxItemState::SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CTL, false ) )
{
mpDoc->StopOnlineSpelling();
mpDoc->StartOnlineSpelling();
mrDoc.StopOnlineSpelling();
mrDoc.StartOnlineSpelling();
}
}
}
sd/source/ui/func/fucon3d.cxx
+7 -7
View File
@@ -54,16 +54,16 @@ FuConstruct3dObject::FuConstruct3dObject (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuConstruct(rViewSh, pWin, pView, pDoc, rReq)
: FuConstruct(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuConstruct3dObject::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
rtl::Reference<FuPoor> FuConstruct3dObject::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent )
{
FuConstruct3dObject* pFunc;
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstruct3dObject( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstruct3dObject( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
pFunc->SetPermanent(bPermanent);
return xFunc;
@@ -334,7 +334,7 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
if (pObj)
{
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet(aAttr, pObj);
// extract LineStyle
@@ -408,7 +408,7 @@ rtl::Reference<SdrObject> FuConstruct3dObject::CreateDefaultObject(const sal_uIn
double fW(aVolume.getWidth());
double fH(aVolume.getHeight());
::tools::Rectangle a3DRect(0, 0, static_cast<::tools::Long>(fW), static_cast<::tools::Long>(fH));
rtl::Reference< E3dScene > pScene(new E3dScene(*mpDoc));
rtl::Reference< E3dScene > pScene(new E3dScene(mrDoc));
// copied code from E3dView::InitScene
double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0));
@@ -424,7 +424,7 @@ rtl::Reference<SdrObject> FuConstruct3dObject::CreateDefaultObject(const sal_uIn
pScene->InsertObject(p3DObj.get());
pScene->NbcSetSnapRect(a3DRect);
ImpPrepareBasic3DShape(p3DObj.get(), pScene.get());
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet(aAttr, p3DObj.get());
aAttr.Put(XLineStyleItem (drawing::LineStyle_NONE));
p3DObj->SetMergedItemSet(aAttr);
sd/source/ui/func/fuconarc.cxx
+6 -6
View File
@@ -49,16 +49,16 @@ FuConstructArc::FuConstructArc (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq )
: FuConstruct( rViewSh, pWin, pView, pDoc, rReq )
: FuConstruct( rViewSh, pWin, pView, rDoc, rReq )
{
}
rtl::Reference<FuPoor> FuConstructArc::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
rtl::Reference<FuPoor> FuConstructArc::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent )
{
FuConstructArc* pFunc;
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructArc( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructArc( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
pFunc->SetPermanent(bPermanent);
return xFunc;
@@ -117,7 +117,7 @@ bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
if (pObj)
{
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet(aAttr, pObj);
pObj->SetMergedItemSet(aAttr);
@@ -229,7 +229,7 @@ rtl::Reference<SdrObject> FuConstructArc::CreateDefaultObject(const sal_uInt16 n
pObj->SetLogicRect(aRect);
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
aAttr.Put(makeSdrCircStartAngleItem(9000_deg100));
aAttr.Put(makeSdrCircEndAngleItem(0_deg100));
sd/source/ui/func/fuconbez.cxx
+5 -5
View File
@@ -62,9 +62,9 @@ FuConstructBezierPolygon::FuConstructBezierPolygon (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuConstruct(rViewSh, pWin, pView, pDoc, rReq),
: FuConstruct(rViewSh, pWin, pView, rDoc, rReq),
nEditMode(SID_BEZIER_MOVE),
mnTransparence(0),
mnWidth(0)
@@ -90,10 +90,10 @@ bool isSticky(const SfxRequest& rReq)
}
rtl::Reference<FuPoor> FuConstructBezierPolygon::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
rtl::Reference<FuPoor> FuConstructBezierPolygon::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent )
{
FuConstructBezierPolygon* pFunc;
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructBezierPolygon( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructBezierPolygon( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
pFunc->SetPermanent(bPermanent || isSticky(rReq));
return xFunc;
@@ -178,7 +178,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
if (pObj)
{
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet(aAttr, pObj);
SetAttributes(aAttr, pObj);
pObj->SetMergedItemSet(aAttr);
sd/source/ui/func/fuconcs.cxx
+6 -6
View File
@@ -49,16 +49,16 @@ FuConstructCustomShape::FuConstructCustomShape (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq ) :
FuConstruct(rViewSh, pWin, pView, pDoc, rReq)
FuConstruct(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuConstructCustomShape::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
rtl::Reference<FuPoor> FuConstructCustomShape::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent )
{
FuConstructCustomShape* pFunc;
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructCustomShape( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructCustomShape( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
pFunc->SetPermanent( bPermanent );
return xFunc;
@@ -104,7 +104,7 @@ bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
bForceFillStyle = false;
bForceNoFillStyle = true;
}
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet( aAttr, pObj, bForceFillStyle, bForceNoFillStyle );
pObj->SetMergedItemSet(aAttr);
}
@@ -240,7 +240,7 @@ rtl::Reference<SdrObject> FuConstructCustomShape::CreateDefaultObject(const sal_
ImpForceQuadratic( aRect );
pObj->SetLogicRect( aRect );
SetAttributes( pObj.get() );
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet(aAttr, pObj.get());
pObj->SetMergedItemSet(aAttr);
}
sd/source/ui/func/fuconnct.cxx
+5 -5
View File
@@ -31,22 +31,22 @@ FuConnectionDlg::FuConnectionDlg (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuConnectionDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuConnectionDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuConnectionDlg( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuConnectionDlg( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
void FuConnectionDlg::DoExecute( SfxRequest& rReq )
{
SfxItemSet aNewAttr( mpDoc->GetPool() );
SfxItemSet aNewAttr( mrDoc.GetPool() );
mpView->GetAttributes( aNewAttr );
const SfxItemSet* pArgs = rReq.GetArgs();
sd/source/ui/func/fuconrec.cxx
+9 -9
View File
@@ -81,9 +81,9 @@ FuConstructRectangle::FuConstructRectangle (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuConstruct(rViewSh, pWin, pView, pDoc, rReq)
: FuConstruct(rViewSh, pWin, pView, rDoc, rReq)
, mnFillTransparence(0)
, mnLineStyle(SAL_MAX_UINT16)
{
@@ -108,10 +108,10 @@ bool isSticky(const SfxRequest& rReq)
}
rtl::Reference<FuPoor> FuConstructRectangle::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
rtl::Reference<FuPoor> FuConstructRectangle::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent )
{
FuConstructRectangle* pFunc;
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructRectangle( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructRectangle( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
pFunc->SetPermanent(bPermanent || isSticky(rReq));
return xFunc;
@@ -267,7 +267,7 @@ bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
if (pObj)
{
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet(aAttr, pObj);
SetAttributes(aAttr, pObj);
SetLineEnds(aAttr, *pObj);
@@ -295,7 +295,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
if(SID_DRAW_MEASURELINE == nSlotId)
{
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
SdrLayerAdmin& rAdmin = mrDoc.GetLayerAdmin();
pObj->SetLayer(rAdmin.GetLayerID(sUNO_LayerName_measurelines));
}
@@ -631,7 +631,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
pObj->SetStyleSheet(pSheet, false);
}
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
SdrLayerAdmin& rAdmin = mrDoc.GetLayerAdmin();
pObj->SetLayer(rAdmin.GetLayerID(sUNO_LayerName_measurelines));
}
else if (nSlotId == SID_DRAW_RECT)
@@ -723,7 +723,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject const & rObj
aSquare.append(aNewSquare);
}
SfxItemSet aSet( mpDoc->GetPool() );
SfxItemSet aSet( mrDoc.GetPool() );
mpView->GetAttributes( aSet );
// #i3908# Here, the default Line Start/End width for arrow construction is
@@ -1061,7 +1061,7 @@ rtl::Reference<SdrObject> FuConstructRectangle::CreateDefaultObject(const sal_uI
}
}
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
SetStyleSheet(aAttr, pObj.get());
SetAttributes(aAttr, pObj.get());
SetLineEnds(aAttr, *pObj);
sd/source/ui/func/fuconstr.cxx
+3 -3
View File
@@ -54,9 +54,9 @@ FuConstruct::FuConstruct (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuDraw(rViewSh, pWin, pView, pDoc, rReq),
: FuDraw(rViewSh, pWin, pView, rDoc, rReq),
bSelectionChanged(false)
{
}
@@ -330,7 +330,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
{
SdPage* pPage = static_cast<SdPage*>(mpView->GetSdrPageView()->GetPage());
if ( pPage->IsMasterPage() && pPage->GetPageKind() == PageKind::Standard &&
mpDoc->GetDocumentType() == DocumentType::Impress )
mrDoc.GetDocumentType() == DocumentType::Impress )
{
/**********************************************
* Objects was created on the slide master page
sd/source/ui/func/fuconuno.cxx
+4 -4
View File
@@ -41,18 +41,18 @@ FuConstructUnoControl::FuConstructUnoControl (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuConstruct(rViewSh, pWin, pView, pDoc, rReq)
: FuConstruct(rViewSh, pWin, pView, rDoc, rReq)
, nInventor(SdrInventor::Unknown)
, nIdentifier(SdrObjKind::NONE)
{
}
rtl::Reference<FuPoor> FuConstructUnoControl::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
rtl::Reference<FuPoor> FuConstructUnoControl::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent )
{
FuConstructUnoControl* pFunc;
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructUnoControl( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( pFunc = new FuConstructUnoControl( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
pFunc->SetPermanent(bPermanent);
return xFunc;
sd/source/ui/func/fucopy.cxx
+5 -5
View File
@@ -47,15 +47,15 @@ FuCopy::FuCopy (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuCopy::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuCopy::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuCopy( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuCopy( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -78,7 +78,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
SfxItemSetFixed<ATTR_COPY_START, ATTR_COPY_END> aSet( mrViewShell.GetPool() );
// indicate color attribute
SfxItemSet aAttr( mpDoc->GetPool() );
SfxItemSet aAttr( mrDoc.GetPool() );
mpView->GetAttributes( aAttr );
if( const XFillStyleItem* pFillStyleItem = aAttr.GetItemIfSet( XATTR_FILLSTYLE ) )
sd/source/ui/func/fucushow.cxx
+8 -8
View File
@@ -36,15 +36,15 @@ FuCustomShowDlg::FuCustomShowDlg (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor( rViewSh, pWin, pView, pDoc, rReq )
: FuPoor( rViewSh, pWin, pView, rDoc, rReq )
{
}
rtl::Reference<FuPoor> FuCustomShowDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuCustomShowDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuCustomShowDlg( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuCustomShowDlg( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -53,10 +53,10 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
vcl::Window* pWin = mrViewShell.GetActiveWindow();
ScopedVclPtr<AbstractSdCustomShowDlg> pDlg( pFact->CreateSdCustomShowDlg(pWin ? pWin->GetFrameWeld() : nullptr, *mpDoc) );
ScopedVclPtr<AbstractSdCustomShowDlg> pDlg( pFact->CreateSdCustomShowDlg(pWin ? pWin->GetFrameWeld() : nullptr, mrDoc) );
sal_uInt16 nRet = pDlg->Execute();
mpDoc->SetChanged();
sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings();
mrDoc.SetChanged();
sd::PresentationSettings& rSettings = mrDoc.getPresentationSettings();
if( nRet == RET_YES )
{
@@ -74,7 +74,7 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
}
if (nRet == RET_OK)
{
if (mpDoc->GetCustomShowList())
if (mrDoc.GetCustomShowList())
{
if (!pDlg->IsCustomShow())
{
sd/source/ui/func/fudraw.cxx
+2 -2
View File
@@ -63,8 +63,8 @@ namespace sd {
* Base-class for all drawmodul-specific functions
*/
FuDraw::FuDraw(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
SdDrawDocument& rDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
, aNewPointer(PointerStyle::Arrow)
, aOldPointer(PointerStyle::Arrow)
, bMBDown(false)
sd/source/ui/func/fudspord.cxx
+4 -4
View File
@@ -30,8 +30,8 @@
namespace sd {
FuDisplayOrder::FuDisplayOrder( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
FuDisplayOrder::FuDisplayOrder( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
, maPtr(PointerStyle::Arrow)
, mpRefObj(nullptr)
{
@@ -46,9 +46,9 @@ void FuDisplayOrder::implClearOverlay()
mpOverlay.reset();
}
rtl::Reference<FuPoor> FuDisplayOrder::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuDisplayOrder::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuDisplayOrder( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuDisplayOrder( rViewSh, pWin, pView, rDoc, rReq ) );
return xFunc;
}
sd/source/ui/func/fuediglu.cxx
+4 -4
View File
@@ -37,9 +37,9 @@ FuEditGluePoints::FuEditGluePoints (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuDraw(rViewSh, pWin, pView, pDoc, rReq)
: FuDraw(rViewSh, pWin, pView, rDoc, rReq)
//Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
//and SHIFT+ENTER key to decide the position and draw the new insert point
,bBeginInsertPoint(false),
@@ -47,10 +47,10 @@ FuEditGluePoints::FuEditGluePoints (
{
}
rtl::Reference<FuPoor> FuEditGluePoints::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent )
rtl::Reference<FuPoor> FuEditGluePoints::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent )
{
FuEditGluePoints* pFunc;
rtl::Reference<FuPoor> xFunc( pFunc = new FuEditGluePoints( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( pFunc = new FuEditGluePoints( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
pFunc->SetPermanent( bPermanent );
return xFunc;
sd/source/ui/func/fuexecuteinteraction.cxx
+4 -4
View File
@@ -50,17 +50,17 @@ using namespace css;
namespace sd
{
FuExecuteInteraction::FuExecuteInteraction(ViewShell& rViewSh, ::sd::Window* pWin,
::sd::View* pView, SdDrawDocument* pDoc,
::sd::View* pView, SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuExecuteInteraction::Create(ViewShell& rViewSh, ::sd::Window* pWin,
::sd::View* pView, SdDrawDocument* pDoc,
::sd::View* pView, SdDrawDocument& rDoc,
SfxRequest& rReq)
{
rtl::Reference<FuPoor> xFunc(new FuExecuteInteraction(rViewSh, pWin, pView, pDoc, rReq));
rtl::Reference<FuPoor> xFunc(new FuExecuteInteraction(rViewSh, pWin, pView, rDoc, rReq));
xFunc->DoExecute(rReq);
return xFunc;
}
sd/source/ui/func/fuexpand.cxx
+21 -21
View File
@@ -51,15 +51,15 @@ FuExpandPage::FuExpandPage (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuExpandPage::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuExpandPage::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuExpandPage( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuExpandPage( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -72,13 +72,13 @@ void FuExpandPage::DoExecute( SfxRequest& )
// find selected page (only standard pages)
SdPage* pActualPage = nullptr;
sal_uInt16 i = 0;
sal_uInt16 nCount = mpDoc->GetSdPageCount(PageKind::Standard);
sal_uInt16 nCount = mrDoc.GetSdPageCount(PageKind::Standard);
while (!pActualPage && i < nCount)
{
if (mpDoc->GetSdPage(i, PageKind::Standard)->IsSelected())
if (mrDoc.GetSdPage(i, PageKind::Standard)->IsSelected())
{
pActualPage = mpDoc->GetSdPage(i, PageKind::Standard);
pActualPage = mrDoc.GetSdPage(i, PageKind::Standard);
}
i++;
@@ -87,19 +87,19 @@ void FuExpandPage::DoExecute( SfxRequest& )
if (!pActualPage)
return;
SdOutliner aOutliner( mpDoc, OutlinerMode::OutlineObject );
SdOutliner aOutliner( mrDoc, OutlinerMode::OutlineObject );
aOutliner.SetUpdateLayout(false);
aOutliner.EnableUndo(false);
if (mpDocSh)
aOutliner.SetRefDevice(SdModule::get()->GetVirtualRefDevice());
aOutliner.SetDefTab( mpDoc->GetDefaultTabulator() );
aOutliner.SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
aOutliner.SetDefTab( mrDoc.GetDefaultTabulator() );
aOutliner.SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mrDoc.GetStyleSheetPool()));
SdrLayerIDSet aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
sal_uInt16 nActualPageNum = pActualPage->GetPageNum();
SdPage* pActualNotesPage = static_cast<SdPage*>(mpDoc->GetPage(nActualPageNum + 1));
SdPage* pActualNotesPage = static_cast<SdPage*>(mrDoc.GetPage(nActualPageNum + 1));
SdrTextObj* pActualOutline = static_cast<SdrTextObj*>(pActualPage->GetPresObj(PresObjKind::Outline));
if (pActualOutline)
@@ -114,7 +114,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
aOutliner.SetText(*pParaObj);
// remove hard paragraph- and character attributes
SfxItemSetFixed<EE_ITEMS_START, EE_ITEMS_END> aEmptyEEAttr(mpDoc->GetPool());
SfxItemSetFixed<EE_ITEMS_START, EE_ITEMS_END> aEmptyEEAttr(mrDoc.GetPool());
sal_Int32 nParaCount1 = aOutliner.GetParagraphCount();
for (sal_Int32 nPara = 0; nPara < nParaCount1; nPara++)
@@ -133,7 +133,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
if ( nDepth == 0 )
{
// page with title & structuring!
rtl::Reference<SdPage> pPage = mpDoc->AllocSdPage(false);
rtl::Reference<SdPage> pPage = mrDoc.AllocSdPage(false);
pPage->SetSize(pActualPage->GetSize() );
pPage->SetBorder(pActualPage->GetLeftBorder(),
pActualPage->GetUpperBorder(),
@@ -142,11 +142,11 @@ void FuExpandPage::DoExecute( SfxRequest& )
pPage->SetName(OUString());
// insert page after current page
mpDoc->InsertPage(pPage.get(), nActualPageNum + nPos);
mrDoc.InsertPage(pPage.get(), nActualPageNum + nPos);
nPos++;
if( bUndo )
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pPage));
mpView->AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoNewPage(*pPage));
// use MasterPage of the current page
pPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage());
@@ -155,7 +155,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
// notes-page
rtl::Reference<SdPage> pNotesPage = mpDoc->AllocSdPage(false);
rtl::Reference<SdPage> pNotesPage = mrDoc.AllocSdPage(false);
pNotesPage->SetSize(pActualNotesPage->GetSize());
pNotesPage->SetBorder(pActualNotesPage->GetLeftBorder(),
pActualNotesPage->GetUpperBorder(),
@@ -165,11 +165,11 @@ void FuExpandPage::DoExecute( SfxRequest& )
pNotesPage->SetName(OUString());
// insert page after current page
mpDoc->InsertPage(pNotesPage.get(), nActualPageNum + nPos);
mrDoc.InsertPage(pNotesPage.get(), nActualPageNum + nPos);
nPos++;
if( bUndo )
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage));
mpView->AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage));
// use MasterPage of the current page
pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage());
@@ -188,7 +188,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
if( pOutlinerParaObject->GetDepth(0) != -1 )
{
std::unique_ptr<SdrOutliner> pTempOutl = SdrMakeOutliner(OutlinerMode::TitleObject, *mpDoc);
std::unique_ptr<SdrOutliner> pTempOutl = SdrMakeOutliner(OutlinerMode::TitleObject, mrDoc);
pTempOutl->SetText( *pOutlinerParaObject );
@@ -215,7 +215,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
// create structuring text objects
std::optional<OutlinerParaObject> pOPO = aOutliner.CreateParaObject(++nParaPos, nChildCount);
std::unique_ptr<SdrOutliner> pTempOutl = SdrMakeOutliner(OutlinerMode::OutlineObject, *mpDoc);
std::unique_ptr<SdrOutliner> pTempOutl = SdrMakeOutliner(OutlinerMode::OutlineObject, mrDoc);
pTempOutl->SetText( *pOPO );
sal_Int32 nParaCount2 = pTempOutl->GetParagraphCount();
@@ -234,7 +234,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
pOutlineObj->SetEmptyPresObj(false);
// remove hard attributes (Flag to sal_True)
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
aAttr.Put(XLineStyleItem(drawing::LineStyle_NONE));
aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
pOutlineObj->SetMergedItemSet(aAttr);
sd/source/ui/func/fuformatpaintbrush.cxx
+8 -8
View File
@@ -58,17 +58,17 @@ bool ShouldPasteParaFormatPerSelection(const OutlinerView* pOLV)
namespace sd {
FuFormatPaintBrush::FuFormatPaintBrush( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
: FuText(rViewSh, pWin, pView, pDoc, rReq)
FuFormatPaintBrush::FuFormatPaintBrush( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
: FuText(rViewSh, pWin, pView, rDoc, rReq)
, mnDepth(-1)
, mbPermanent( false )
, mbOldIsQuickTextEditMode(true)
{
}
rtl::Reference<FuPoor> FuFormatPaintBrush::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuFormatPaintBrush::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuFormatPaintBrush( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuFormatPaintBrush( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute( rReq );
return xFunc;
}
@@ -259,7 +259,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
return;
SdrObject* pObj( nullptr );
bool bUndo = mpDoc->IsUndoEnabled();
bool bUndo = mrDoc.IsUndoEnabled();
if( bUndo && !mpView->GetTextEditOutlinerView() )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -269,16 +269,16 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
if( pObj )
{
OUString sLabel( mrViewShell.GetViewShellBase().RetrieveLabelFromCommand(u".uno:FormatPaintbrush"_ustr ) );
mpDoc->BegUndo( sLabel );
mrDoc.BegUndo( sLabel );
if (dynamic_cast< sdr::table::SdrTableObj* >( pObj ) == nullptr)
mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) );
mrDoc.AddUndo( mrDoc.GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) );
}
mpView->ApplyFormatPaintBrush( *mxItemSet, mnDepth, bNoCharacterFormats, bNoParagraphFormats );
if( pObj )
{
mpDoc->EndUndo();
mrDoc.EndUndo();
}
}
sd/source/ui/func/fuhhconv.cxx
+10 -13
View File
@@ -55,21 +55,21 @@ FuHangulHanjaConversion::FuHangulHanjaConversion (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDocument,
SdDrawDocument& rDocument,
SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, pDocument, rReq),
: FuPoor(rViewSh, pWin, pView, rDocument, rReq),
pSdOutliner(nullptr),
bOwnOutliner(false)
{
if ( dynamic_cast< const DrawViewShell *>( &mrViewShell ) != nullptr )
{
bOwnOutliner = true;
pSdOutliner = new SdOutliner( mpDoc, OutlinerMode::TextObject );
pSdOutliner = new SdOutliner( mrDoc, OutlinerMode::TextObject );
}
else if ( dynamic_cast< const OutlineViewShell *>( &mrViewShell ) != nullptr )
{
bOwnOutliner = false;
pSdOutliner = mpDoc->GetOutliner();
pSdOutliner = mrDoc.GetOutliner();
}
if (pSdOutliner)
@@ -85,9 +85,9 @@ FuHangulHanjaConversion::~FuHangulHanjaConversion()
delete pSdOutliner;
}
rtl::Reference<FuPoor> FuHangulHanjaConversion::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuHangulHanjaConversion::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuHangulHanjaConversion( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuHangulHanjaConversion( rViewSh, pWin, pView, rDoc, rReq ) );
return xFunc;
}
@@ -110,7 +110,7 @@ void FuHangulHanjaConversion::StartConversion( LanguageType nSourceLanguage, Lan
pSdOutliner->EndConversion();
bOwnOutliner = true;
pSdOutliner = new SdOutliner( mpDoc, OutlinerMode::TextObject );
pSdOutliner = new SdOutliner( mrDoc, OutlinerMode::TextObject );
pSdOutliner->BeginConversion();
}
else if ( pSdOutliner && dynamic_cast< const OutlineViewShell *>( pViewShell ) != nullptr && bOwnOutliner )
@@ -119,7 +119,7 @@ void FuHangulHanjaConversion::StartConversion( LanguageType nSourceLanguage, Lan
delete pSdOutliner;
bOwnOutliner = false;
pSdOutliner = mpDoc->GetOutliner();
pSdOutliner = mrDoc.GetOutliner();
pSdOutliner->BeginConversion();
}
@@ -147,10 +147,7 @@ void FuHangulHanjaConversion::StartConversion( LanguageType nSourceLanguage, Lan
void FuHangulHanjaConversion::ConvertStyles( LanguageType nTargetLanguage, const vcl::Font *pTargetFont )
{
if( !mpDoc )
return;
SfxStyleSheetBasePool* pStyleSheetPool = mpDoc->GetStyleSheetPool();
SfxStyleSheetBasePool* pStyleSheetPool = mrDoc.GetStyleSheetPool();
if( !pStyleSheetPool )
return;
@@ -180,7 +177,7 @@ void FuHangulHanjaConversion::ConvertStyles( LanguageType nTargetLanguage, const
pStyle = pStyleSheetPool->Next();
}
mpDoc->SetLanguage( nTargetLanguage, EE_CHAR_LANGUAGE_CJK );
mrDoc.SetLanguage( nTargetLanguage, EE_CHAR_LANGUAGE_CJK );
}
void FuHangulHanjaConversion::StartChineseConversion()
sd/source/ui/func/fuinsert.cxx
+17 -17
View File
@@ -94,18 +94,18 @@ FuInsertGraphic::FuInsertGraphic (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq,
bool replaceExistingImage)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq),
: FuPoor(rViewSh, pWin, pView, rDoc, rReq),
mbReplaceExistingImage(replaceExistingImage)
{
}
rtl::Reference<FuPoor> FuInsertGraphic::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq, bool replaceExistingImage )
SdDrawDocument& rDoc, SfxRequest& rReq, bool replaceExistingImage )
{
rtl::Reference<FuPoor> xFunc( new FuInsertGraphic( rViewSh, pWin, pView, pDoc, rReq, replaceExistingImage ) );
rtl::Reference<FuPoor> xFunc( new FuInsertGraphic( rViewSh, pWin, pView, rDoc, rReq, replaceExistingImage ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -210,15 +210,15 @@ FuInsertClipboard::FuInsertClipboard (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuInsertClipboard::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuInsertClipboard::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuInsertClipboard( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuInsertClipboard( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -279,15 +279,15 @@ FuInsertOLE::FuInsertOLE (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuInsertOLE::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuInsertOLE::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuInsertOLE( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuInsertOLE( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -477,7 +477,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
break;
}
aServerLst.FillInsertObjects();
if (mpDoc->GetDocumentType() == DocumentType::Draw)
if (mrDoc.GetDocumentType() == DocumentType::Draw)
{
aServerLst.Remove( GraphicDocShell::Factory().GetClassId() );
}
@@ -672,15 +672,15 @@ FuInsertAVMedia::FuInsertAVMedia(
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuInsertAVMedia::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuInsertAVMedia::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuInsertAVMedia( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuInsertAVMedia( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
sd/source/ui/func/fuinsfil.cxx
+18 -18
View File
@@ -107,15 +107,15 @@ FuInsertFile::FuInsertFile (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuInsertFile::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuInsertFile::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuInsertFile( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuInsertFile( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -142,7 +142,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
aFileDialog.SetTitle( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE) );
if( mpDoc->GetDocumentType() == DocumentType::Impress )
if( mrDoc.GetDocumentType() == DocumentType::Impress )
{
aOwnCont = "simpress";
aOtherCont = "sdraw";
@@ -165,7 +165,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
lcl_AddFilter( aFilterVector, pFilter );
// get template filter
if( mpDoc->GetDocumentType() == DocumentType::Impress )
if( mrDoc.GetDocumentType() == DocumentType::Impress )
pFilter = DrawDocShell::Factory().GetTemplateFilter();
else
pFilter = GraphicDocShell::Factory().GetTemplateFilter();
@@ -317,7 +317,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
weld::Window* pParent = mrViewShell.GetFrameWeld();
ScopedVclPtr<AbstractSdInsertPagesObjsDlg> pDlg( pFact->CreateSdInsertPagesObjsDlg(pParent, mpDoc, pMedium, aFile) );
ScopedVclPtr<AbstractSdInsertPagesObjsDlg> pDlg( pFact->CreateSdInsertPagesObjsDlg(pParent, &mrDoc, pMedium, aFile) );
sal_uInt16 nRet = pDlg->Execute();
@@ -373,7 +373,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
bNameOK = mpView->GetExchangeList( aExchangeList, aBookmarkList, 0 );
if( bNameOK )
bOK = mpDoc->InsertFileAsPage( aBookmarkList, &aExchangeList,
bOK = mrDoc.InsertFileAsPage( aBookmarkList, &aExchangeList,
bLink, nPos, nullptr );
aBookmarkList.clear();
@@ -384,11 +384,11 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
bNameOK = mpView->GetExchangeList( aExchangeList, aObjectBookmarkList, 1 );
if( bNameOK )
bOK = mpDoc->InsertBookmarkAsObject( aObjectBookmarkList, aExchangeList,
bOK = mrDoc.InsertBookmarkAsObject( aObjectBookmarkList, aExchangeList,
nullptr, nullptr, false );
if( pDlg->IsRemoveUnnecessaryMasterPages() )
mpDoc->RemoveUnnecessaryMasterPages();
mrDoc.RemoveUnnecessaryMasterPages();
}
return bOK;
@@ -397,7 +397,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
ScopedVclPtr<AbstractSdInsertPagesObjsDlg> pDlg( pFact->CreateSdInsertPagesObjsDlg(mrViewShell.GetFrameWeld(), mpDoc, nullptr, aFile) );
ScopedVclPtr<AbstractSdInsertPagesObjsDlg> pDlg( pFact->CreateSdInsertPagesObjsDlg(mrViewShell.GetFrameWeld(), &mrDoc, nullptr, aFile) );
mpDocSh->SetWaitCursor( false );
@@ -421,7 +421,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
SdOutliner aOutliner( mpDoc, OutlinerMode::TextObject );
SdOutliner aOutliner( mrDoc, OutlinerMode::TextObject );
// set reference device
aOutliner.SetRefDevice(SdModule::get()->GetVirtualRefDevice());
@@ -498,7 +498,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
/* can be bigger as the maximal allowed size:
limit object size if necessary */
Size aSize(aOutliner.CalcTextSize());
Size aMaxSize = mpDoc->GetMaxObjSize();
Size aMaxSize = mrDoc.GetMaxObjSize();
aSize.setHeight( std::min(aSize.Height(), aMaxSize.Height()) );
aSize.setWidth( std::min(aSize.Width(), aMaxSize.Width()) );
aSize = mpWindow->LogicToPixel(aSize);
@@ -519,7 +519,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
if( bUndo )
{
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoInsertObject(*pTO));
mpView->AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoInsertObject(*pTO));
mpView->EndUndo();
}
}
@@ -559,7 +559,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
nPage++;
pPara = rDocliner.GetParagraph( nPos - 1 );
}
SdPage* pPage = mpDoc->GetSdPage(nPage, PageKind::Standard);
SdPage* pPage = mrDoc.GetSdPage(nPage, PageKind::Standard);
aLayoutName = pPage->GetLayoutName();
sal_Int32 nIndex = aLayoutName.indexOf(SD_LT_SEPARATOR);
if( nIndex != -1 )
@@ -571,8 +571,8 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
::Outliner aOutliner( &mpDoc->GetItemPool(), OutlinerMode::OutlineObject );
aOutliner.SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
::Outliner aOutliner( &mrDoc.GetItemPool(), OutlinerMode::OutlineObject );
aOutliner.SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mrDoc.GetStyleSheetPool()));
// set reference device
aOutliner.SetRefDevice(SdModule::get()->GetVirtualRefDevice());
@@ -632,7 +632,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
OUString aStyleSheetName( pStyleSheet->GetName() );
aStyleSheetName = aStyleSheetName.subView( 0, aStyleSheetName.getLength()-1 ) +
OUString::number( nDepth <= 0 ? 1 : nDepth+1 );
SfxStyleSheetBasePool* pStylePool = mpDoc->GetStyleSheetPool();
SfxStyleSheetBasePool* pStylePool = mrDoc.GetStyleSheetPool();
SfxStyleSheet* pOutlStyle = static_cast<SfxStyleSheet*>( pStylePool->Find( aStyleSheetName, pStyleSheet->GetFamily() ) );
rDocliner.SetStyleSheet( nTargetPos, pOutlStyle );
}
sd/source/ui/func/fuline.cxx
+6 -6
View File
@@ -35,15 +35,15 @@ FuLine::FuLine (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuLine::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuLine::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuLine( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuLine( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -61,12 +61,12 @@ void FuLine::DoExecute( SfxRequest& rReq )
if( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
SfxItemSet aNewAttr( mpDoc->GetPool() );
SfxItemSet aNewAttr( mrDoc.GetPool() );
mpView->GetAttributes( aNewAttr );
bool bHasMarked = rMarkList.GetMarkCount() != 0;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
VclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSvxLineTabDialog(mrViewShell.GetFrameWeld(), &aNewAttr, mpDoc, pObj, bHasMarked) );
VclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSvxLineTabDialog(mrViewShell.GetFrameWeld(), &aNewAttr, &mrDoc, pObj, bHasMarked) );
pDlg->StartExecuteAsync([pDlg, this](sal_Int32 nResult){
if (nResult == RET_OK)
sd/source/ui/func/fulinend.cxx
+5 -5
View File
@@ -37,14 +37,14 @@ namespace sd {
FuLineEnd::FuLineEnd(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
SdDrawDocument& rDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuLineEnd::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuLineEnd::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuLineEnd( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuLineEnd( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -91,7 +91,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
// Delete the created poly-object
pConvPolyObj.clear();
XLineEndListRef pLineEndList = mpDoc->GetLineEndList();
XLineEndListRef pLineEndList = mrDoc.GetLineEndList();
OUString aNewName( SdResId( STR_LINEEND ) );
OUString aDesc( SdResId( STR_DESC_LINEEND ) );
sd/source/ui/func/fulink.cxx
+5 -5
View File
@@ -41,15 +41,15 @@ FuLink::FuLink (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuLink::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuLink::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuLink( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuLink( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -65,7 +65,7 @@ void FuLink::DoExecute( SfxRequest& )
return;
}
sfx2::LinkManager* pLinkManager = mpDoc->GetLinkManager();
sfx2::LinkManager* pLinkManager = mrDoc.GetLinkManager();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
VclPtr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog(mrViewShell.GetFrameWeld(), pLinkManager));
sd/source/ui/func/fumeasur.cxx
+5 -5
View File
@@ -31,22 +31,22 @@ FuMeasureDlg::FuMeasureDlg (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuMeasureDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuMeasureDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuMeasureDlg( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuMeasureDlg( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
void FuMeasureDlg::DoExecute( SfxRequest& rReq )
{
SfxItemSet aNewAttr( mpDoc->GetPool() );
SfxItemSet aNewAttr( mrDoc.GetPool() );
mpView->GetAttributes( aNewAttr );
const SfxItemSet* pArgs = rReq.GetArgs();
sd/source/ui/func/fumorph.cxx
+4 -4
View File
@@ -52,9 +52,9 @@ FuMorph::FuMorph (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
@@ -62,11 +62,11 @@ rtl::Reference<FuPoor> FuMorph::Create(
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq
)
{
rtl::Reference<FuPoor> xFunc( new FuMorph( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuMorph( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
sd/source/ui/func/funavig.cxx
+8 -8
View File
@@ -41,15 +41,15 @@ FuNavigation::FuNavigation (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuNavigation::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuNavigation::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuNavigation( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuNavigation( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -116,7 +116,7 @@ void FuNavigation::DoExecute( SfxRequest& rReq )
SdPage* pPage = pDrawViewShell->GetActualPage();
sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2;
if (nSdPage < mpDoc->GetSdPageCount(pPage->GetPageKind()) - 1)
if (nSdPage < mrDoc.GetSdPageCount(pPage->GetPageKind()) - 1)
{
// Switch the page and send events regarding
// deactivation the old page and activating the new
@@ -140,7 +140,7 @@ void FuNavigation::DoExecute( SfxRequest& rReq )
{
// jump to last page
SdPage* pPage = pDrawViewShell->GetActualPage();
pDrawViewShell->SwitchPage(mpDoc->GetSdPageCount(
pDrawViewShell->SwitchPage(mrDoc.GetSdPageCount(
pPage->GetPageKind()) - 1);
}
}
@@ -154,14 +154,14 @@ void FuNavigation::DoExecute( SfxRequest& rReq )
OUString sTitle = SdResId(STR_GOTO_PAGE_DLG_TITLE);
OUString sLabel = SdResId(STR_PAGE_NAME) + ":";
if (mpDoc->GetDocumentType() == DocumentType::Impress)
if (mrDoc.GetDocumentType() == DocumentType::Impress)
{
sTitle = SdResId(STR_GOTO_SLIDE_DLG_TITLE);
sLabel = SdResId(STR_SLIDE_NAME) + ":";
}
svx::GotoPageDlg aDlg(pDrawViewShell->GetFrameWeld(), sTitle, sLabel,
pDrawViewShell->GetCurPagePos() + 1,
mpDoc->GetSdPageCount(PageKind::Standard));
mrDoc.GetSdPageCount(PageKind::Standard));
if (aDlg.run() == RET_OK)
pDrawViewShell->SwitchPage(aDlg.GetPageSelection() - 1);
}
sd/source/ui/func/fuoaprms.cxx
+10 -10
View File
@@ -59,15 +59,15 @@ FuObjectAnimationParameters::FuObjectAnimationParameters (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuObjectAnimationParameters::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuObjectAnimationParameters::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuObjectAnimationParameters( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuObjectAnimationParameters( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -335,7 +335,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
if(!pArgs)
{
// fill ItemSet for dialog
std::shared_ptr<SfxItemSet> aSet = std::make_shared<SfxItemSetFixed<ATTR_ANIMATION_START, ATTR_ACTION_END>>(mpDoc->GetPool());
std::shared_ptr<SfxItemSet> aSet = std::make_shared<SfxItemSetFixed<ATTR_ANIMATION_START, ATTR_ACTION_END>>(mrDoc.GetPool());
// fill the set
if (nAnimationSet == ATTR_SET)
@@ -667,7 +667,7 @@ void FuObjectAnimationParameters::Finish( const std::shared_ptr<SfxRequest>& xRe
pUndoMgr->EnterListAction(aComment, aComment, 0, mrViewShell.GetViewShellBase().GetViewShellId());
// create undo group
std::unique_ptr<SdUndoGroup> pUndoGroup(new SdUndoGroup(mpDoc));
std::unique_ptr<SdUndoGroup> pUndoGroup(new SdUndoGroup(&mrDoc));
pUndoGroup->SetComment(aComment);
// for the path effect, remember some stuff
@@ -716,7 +716,7 @@ void FuObjectAnimationParameters::Finish( const std::shared_ptr<SfxRequest>& xRe
Size aDistance(aNewCenter.X() - aCurCenter.X(), aNewCenter.Y() - aCurCenter.Y());
pRunningObj->Move(aDistance);
pUndoMgr->AddUndoAction(mpDoc->GetSdrUndoFactory().CreateUndoMoveObject( *pRunningObj, aDistance));
pUndoMgr->AddUndoAction(mrDoc.GetSdrUndoFactory().CreateUndoMoveObject( *pRunningObj, aDistance));
}
}
@@ -737,7 +737,7 @@ void FuObjectAnimationParameters::Finish( const std::shared_ptr<SfxRequest>& xRe
if (eEffect == presentation::AnimationEffect_PATH && pObject == pPath)
{
SdAnimationPrmsUndoAction* pAction = new SdAnimationPrmsUndoAction
(mpDoc, pObject, bCreated);
(&mrDoc, pObject, bCreated);
pAction->SetActive(pInfo->mbActive, pInfo->mbActive);
pAction->SetEffect(pInfo->meEffect, pInfo->meEffect);
pAction->SetTextEffect(pInfo->meTextEffect, pInfo->meTextEffect);
@@ -763,7 +763,7 @@ void FuObjectAnimationParameters::Finish( const std::shared_ptr<SfxRequest>& xRe
// create undo action with old and new sizes
SdAnimationPrmsUndoAction* pAction = new SdAnimationPrmsUndoAction
(mpDoc, pObject, bCreated);
(&mrDoc, pObject, bCreated);
pAction->SetActive(pInfo->mbActive, bActive);
pAction->SetEffect(pInfo->meEffect, eEffect);
pAction->SetTextEffect(pInfo->meTextEffect, eTextEffect);
@@ -841,7 +841,7 @@ void FuObjectAnimationParameters::Finish( const std::shared_ptr<SfxRequest>& xRe
pUndoMgr->LeaveListAction();
// Model changed
mpDoc->SetChanged();
mrDoc.SetChanged();
// not seen, therefore we do not need to invalidate at the bindings
}
sd/source/ui/func/fuolbull.cxx
+7 -7
View File
@@ -42,15 +42,15 @@ using namespace svx::sidebar;
namespace sd {
FuBulletAndPosition::FuBulletAndPosition(ViewShell& rViewShell, ::sd::Window* pWindow,
::sd::View* pView, SdDrawDocument* pDoc,
::sd::View* pView, SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewShell, pWindow, pView, pDoc, rReq)
: FuPoor(rViewShell, pWindow, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuBulletAndPosition::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuBulletAndPosition::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuBulletAndPosition( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuBulletAndPosition( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -76,7 +76,7 @@ void FuBulletAndPosition::DoExecute( SfxRequest& rReq )
}
// fill ItemSet for Dialog
SfxItemSet aEditAttr( mpDoc->GetPool() );
SfxItemSet aEditAttr( mrDoc.GetPool() );
mpView->GetAttributes( aEditAttr );
SfxItemSetFixed<EE_PARA_NUMBULLET, EE_PARA_BULLET> aNewAttr( mrViewShell.GetPool() );
@@ -113,7 +113,7 @@ void FuBulletAndPosition::DoExecute( SfxRequest& rReq )
void FuBulletAndPosition::SetCurrentBulletsNumbering(SfxRequest& rReq)
{
if (!mpDoc || !mpView)
if (!mpView)
return;
const sal_uInt16 nSId = rReq.GetSlot();
@@ -134,7 +134,7 @@ void FuBulletAndPosition::SetCurrentBulletsNumbering(SfxRequest& rReq)
SfxItemSetFixed<EE_ITEMS_START, EE_ITEMS_END> aNewAttr( mrViewShell.GetPool() );
{
SfxItemSet aEditAttr( mpDoc->GetPool() );
SfxItemSet aEditAttr( mrDoc.GetPool() );
mpView->GetAttributes( aEditAttr );
aNewAttr.Put( aEditAttr, false );
}
sd/source/ui/func/fuoltext.cxx
+6 -6
View File
@@ -107,23 +107,23 @@ bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
return false;
}
rtl::Reference<FuPoor> FuOutlineText::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::SimpleOutlinerView* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuOutlineText::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::SimpleOutlinerView* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuOutlineText( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuOutlineText( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute( rReq );
return xFunc;
}
FuOutlineText::FuOutlineText(ViewShell& rViewShell, ::sd::Window* pWindow,
::sd::SimpleOutlinerView* pView, SdDrawDocument* pDoc,
::sd::SimpleOutlinerView* pView, SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuSimpleOutlinerText(rViewShell, pWindow, pView, pDoc, rReq)
: FuSimpleOutlinerText(rViewShell, pWindow, pView, rDoc, rReq)
{}
FuSimpleOutlinerText::FuSimpleOutlinerText(ViewShell& rViewShell, ::sd::Window* pWindow,
::sd::SimpleOutlinerView* pView, SdDrawDocument* pDoc,
::sd::SimpleOutlinerView* pView, SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewShell, pWindow, pView, pDoc, rReq),
: FuPoor(rViewShell, pWindow, pView, rDoc, rReq),
mpSimpleOutlinerView (pView)
{
}
sd/source/ui/func/fupage.cxx
+31 -31
View File
@@ -100,8 +100,8 @@ static void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource )
}
FuPage::FuPage( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, pDoc, rReq),
SdDrawDocument& rDoc, SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, rDoc, rReq),
mbPageBckgrdDeleted( false ),
mbMasterPage( false ),
mbDisplayBackgroundTabPage( true ),
@@ -110,9 +110,9 @@ FuPage::FuPage( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
{
}
rtl::Reference<FuPoor> FuPage::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuPage::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuPage( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuPage( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -203,10 +203,10 @@ void FuPage::ExecuteAsyncDialog(weld::Window* pParent, const SfxRequest& rReq)
XATTR_FILL_FIRST, XATTR_FILL_LAST, EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_SHADOW,
SID_ATTR_BORDER_SHADOW, SID_ATTR_PAGE, SID_ATTR_PAGE_SHARED, SID_ATTR_CHAR_GRABBAG,
SID_ATTR_CHAR_GRABBAG, SID_ATTR_PAGE_COLOR, SID_ATTR_PAGE_FILLSTYLE>(mpDoc->GetPool()));
SID_ATTR_CHAR_GRABBAG, SID_ATTR_PAGE_COLOR, SID_ATTR_PAGE_FILLSTYLE>(mrDoc.GetPool()));
// Keep it sorted
aNewAttr->MergeRange(mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_LRSPACE),
mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_ULSPACE));
aNewAttr->MergeRange(mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_LRSPACE),
mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_ULSPACE));
// Retrieve additional data for dialog
@@ -216,7 +216,7 @@ void FuPage::ExecuteAsyncDialog(weld::Window* pParent, const SfxRequest& rReq)
aNewAttr->Put( aBoxItem );
aNewAttr->Put( SvxFrameDirectionItem(
mpDoc->GetDefaultWritingMode() == css::text::WritingMode_RL_TB ? SvxFrameDirection::Horizontal_RL_TB : SvxFrameDirection::Horizontal_LR_TB,
mrDoc.GetDefaultWritingMode() == css::text::WritingMode_RL_TB ? SvxFrameDirection::Horizontal_RL_TB : SvxFrameDirection::Horizontal_LR_TB,
EE_PARA_WRITINGDIR ) );
// Retrieve page-data for dialog
@@ -225,7 +225,7 @@ void FuPage::ExecuteAsyncDialog(weld::Window* pParent, const SfxRequest& rReq)
aPageItem.SetDescName( mpPage->GetName() );
aPageItem.SetPageUsage( SvxPageUsage::All );
aPageItem.SetLandscape( mpPage->GetOrientation() == Orientation::Landscape );
aPageItem.SetNumType( mpDoc->GetPageNumType() );
aPageItem.SetNumType( mrDoc.GetPageNumType() );
aNewAttr->Put( aPageItem );
// size
@@ -244,14 +244,14 @@ void FuPage::ExecuteAsyncDialog(weld::Window* pParent, const SfxRequest& rReq)
SvxLRSpaceItem aLRSpaceItem(SvxIndentValue::twips(mpPage->GetLeftBorder()),
SvxIndentValue::twips(mpPage->GetRightBorder()),
SvxIndentValue::zero(),
mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_LRSPACE));
mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_LRSPACE));
aNewAttr->Put( aLRSpaceItem );
SvxULSpaceItem aULSpaceItem( static_cast<sal_uInt16>(mpPage->GetUpperBorder()), static_cast<sal_uInt16>(mpPage->GetLowerBorder()), mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_ULSPACE));
SvxULSpaceItem aULSpaceItem( static_cast<sal_uInt16>(mpPage->GetUpperBorder()), static_cast<sal_uInt16>(mpPage->GetLowerBorder()), mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_ULSPACE));
aNewAttr->Put( aULSpaceItem );
// Application
bool bScale = mpDoc->GetDocumentType() != DocumentType::Draw;
bool bScale = mrDoc.GetDocumentType() != DocumentType::Draw;
aNewAttr->Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ) );
bool bFullSize = mpPage->IsMasterPage() ?
@@ -327,14 +327,14 @@ void FuPage::ExecuteAsyncDialog(weld::Window* pParent, const SfxRequest& rReq)
if (nError == ERRCODE_NONE)
{
SfxItemSet tempSet( mpDoc->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST> );
SfxItemSet tempSet( mrDoc.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST> );
tempSet.Put( XFillStyleItem( drawing::FillStyle_BITMAP ) );
// MigrateItemSet makes sure the XFillBitmapItem will have a unique name
SfxItemSet aMigrateSet(SfxItemSet::makeFixedSfxItemSet<XATTR_FILLBITMAP, XATTR_FILLBITMAP>(mpDoc->GetPool()));
SfxItemSet aMigrateSet(SfxItemSet::makeFixedSfxItemSet<XATTR_FILLBITMAP, XATTR_FILLBITMAP>(mrDoc.GetPool()));
aMigrateSet.Put(XFillBitmapItem(u"background"_ustr, std::move(aGraphic)));
SdrModel::MigrateItemSet( &aMigrateSet, &tempSet, *mpDoc );
SdrModel::MigrateItemSet( &aMigrateSet, &tempSet, mrDoc );
tempSet.Put( XFillBmpStretchItem( true ));
tempSet.Put( XFillBmpTileItem( false ));
@@ -405,24 +405,24 @@ void FuPage::ApplyItemSet(SdStyleSheet& styleSheet, const std::shared_ptr<SfxIte
if (pTempGradItem && pTempGradItem->GetName().isEmpty())
{
// MigrateItemSet guarantees unique gradient names
SfxItemSet aMigrateSet(SfxItemSet::makeFixedSfxItemSet<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT>(mpDoc->GetPool()));
SfxItemSet aMigrateSet(SfxItemSet::makeFixedSfxItemSet<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT>(mrDoc.GetPool()));
aMigrateSet.Put( XFillGradientItem(u"gradient"_ustr, pTempGradItem->GetGradientValue()) );
SdrModel::MigrateItemSet( &aMigrateSet, &tempSet, *mpDoc);
SdrModel::MigrateItemSet( &aMigrateSet, &tempSet, mrDoc);
}
const XFillHatchItem* pTempHatchItem = tempSet.GetItem<XFillHatchItem>(XATTR_FILLHATCH);
if (pTempHatchItem && pTempHatchItem->GetName().isEmpty())
{
// MigrateItemSet guarantees unique hatch names
SfxItemSet aMigrateSet(SfxItemSet::makeFixedSfxItemSet<XATTR_FILLHATCH, XATTR_FILLHATCH>(mpDoc->GetPool()));
SfxItemSet aMigrateSet(SfxItemSet::makeFixedSfxItemSet<XATTR_FILLHATCH, XATTR_FILLHATCH>(mrDoc.GetPool()));
aMigrateSet.Put( XFillHatchItem(u"hatch"_ustr, pTempHatchItem->GetHatchValue()) );
SdrModel::MigrateItemSet( &aMigrateSet, &tempSet, *mpDoc);
SdrModel::MigrateItemSet( &aMigrateSet, &tempSet, mrDoc);
}
if( !mbMasterPage && bChanges && mbPageBckgrdDeleted )
{
mpBackgroundObjUndoAction.reset( new SdBackgroundObjUndoAction(
*mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()) );
mrDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()) );
if(!mpPage->IsMasterPage())
{
@@ -445,7 +445,7 @@ void FuPage::ApplyItemSet(SdStyleSheet& styleSheet, const std::shared_ptr<SfxIte
if( mbMasterPage )
{
mpDocSh->GetUndoManager()->AddUndoAction(std::make_unique<StyleSheetUndoAction>(
mpDoc, *static_cast<SfxStyleSheet*>(&styleSheet), &tempSet));
mrDoc, *static_cast<SfxStyleSheet*>(&styleSheet), &tempSet));
styleSheet.GetItemSet().Put( tempSet );
sdr::properties::CleanupFillProperties( styleSheet.GetItemSet() );
styleSheet.Broadcast(SfxHint(SfxHintId::DataChanged));
@@ -464,10 +464,10 @@ void FuPage::ApplyItemSet(SdStyleSheet& styleSheet, const std::shared_ptr<SfxIte
if( const SvxFrameDirectionItem* pItem = tempSet.GetItemIfSet( EE_PARA_WRITINGDIR, false ) )
{
SvxFrameDirection nVal = pItem->GetValue();
mpDoc->SetDefaultWritingMode( nVal == SvxFrameDirection::Horizontal_RL_TB ? css::text::WritingMode_RL_TB : css::text::WritingMode_LR_TB );
mrDoc.SetDefaultWritingMode( nVal == SvxFrameDirection::Horizontal_RL_TB ? css::text::WritingMode_RL_TB : css::text::WritingMode_LR_TB );
}
mpDoc->SetChanged();
mrDoc.SetChanged();
// BackgroundFill of Masterpage: no hard attributes allowed
SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage();
@@ -501,7 +501,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
if( pArgs->GetItemState(SID_ATTR_PAGE, true, &pPoolItem) == SfxItemState::SET )
{
mpDoc->SetPageNumType(static_cast<const SvxPageItem*>(pPoolItem)->GetNumType());
mrDoc.SetPageNumType(static_cast<const SvxPageItem*>(pPoolItem)->GetNumType());
eOrientation = static_cast<const SvxPageItem*>(pPoolItem)->IsLandscape() ?
Orientation::Landscape : Orientation::Portrait;
@@ -520,7 +520,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
bSetPageSizeAndBorder = true;
}
if( pArgs->GetItemState(mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_LRSPACE),
if( pArgs->GetItemState(mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_LRSPACE),
true, &pPoolItem) == SfxItemState::SET )
{
nLeft = static_cast<const SvxLRSpaceItem*>(pPoolItem)->ResolveLeft({});
@@ -531,7 +531,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
}
if( pArgs->GetItemState(mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_ULSPACE),
if( pArgs->GetItemState(mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_ULSPACE),
true, &pPoolItem) == SfxItemState::SET )
{
nUpper = static_cast<const SvxULSpaceItem*>(pPoolItem)->GetUpper();
@@ -541,7 +541,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
bSetPageSizeAndBorder = true;
}
if( pArgs->GetItemState(mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_PAGE_EXT1), true, &pPoolItem) == SfxItemState::SET )
if( pArgs->GetItemState(mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_PAGE_EXT1), true, &pPoolItem) == SfxItemState::SET )
{
bScaleAll = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
}
@@ -562,7 +562,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
}
// Paper Bin
if( pArgs->GetItemState(mpDoc->GetPool().GetWhichIDFromSlotID(SID_ATTR_PAGE_PAPERBIN), true, &pPoolItem) == SfxItemState::SET )
if( pArgs->GetItemState(mrDoc.GetPool().GetWhichIDFromSlotID(SID_ATTR_PAGE_PAPERBIN), true, &pPoolItem) == SfxItemState::SET )
{
nPaperBin = static_cast<const SvxPaperBinItem*>(pPoolItem)->GetValue();
@@ -597,7 +597,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
{
// Only this page
mpBackgroundObjUndoAction.reset( new SdBackgroundObjUndoAction(
*mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()) );
mrDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()) );
SfxItemSet aSet( *pArgs );
sdr::properties::CleanupFillProperties(aSet);
mpPage->getSdrPageProperties().ClearItem();
@@ -613,9 +613,9 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
}
// Objects can not be bigger than ViewSize
Size aPageSize = mpDoc->GetSdPage(0, ePageKind)->GetSize();
Size aPageSize = mrDoc.GetSdPage(0, ePageKind)->GetSize();
Size aViewSize(aPageSize.Width() * 3, aPageSize.Height() * 2);
mpDoc->SetMaxObjSize(aViewSize);
mrDoc.SetMaxObjSize(aViewSize);
// if necessary, we tell Preview the new context
mpDrawViewShell->UpdatePreview( mpDrawViewShell->GetActualPage() );
sd/source/ui/func/fuparagr.cxx
+5 -5
View File
@@ -42,15 +42,15 @@ FuParagraph::FuParagraph (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuParagraph::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuParagraph::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuParagraph( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuParagraph( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -64,7 +64,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SfxItemSet aEditAttr( mpDoc->GetPool() );
SfxItemSet aEditAttr( mrDoc.GetPool() );
mpView->GetAttributes( aEditAttr );
SfxItemPool *pPool = aEditAttr.GetPool();
SfxItemSet aNewAttr(SfxItemSet::makeFixedSfxItemSet<
sd/source/ui/func/fupoor.cxx
+5 -5
View File
@@ -57,13 +57,13 @@ FuPoor::FuPoor (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDrDoc,
SdDrawDocument& rDrDoc,
SfxRequest& rReq)
: mpView(pView),
mrViewShell(rViewSh),
mpWindow(pWin),
mpDocSh( pDrDoc->GetDocSh() ),
mpDoc(pDrDoc),
mpDocSh( rDrDoc.GetDocSh() ),
mrDoc(rDrDoc),
nSlotId( rReq.GetSlot() ),
aScrollTimer("sd FuPoor aScrollTimer"),
aDragTimer("sd FuPoor aDragTimer"),
@@ -395,7 +395,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
{
// jump to last page
SdPage* pPage = pDrawViewShell->GetActualPage();
pDrawViewShell->SwitchPage(mpDoc->GetSdPageCount(
pDrawViewShell->SwitchPage(mrDoc.GetSdPageCount(
pPage->GetPageKind()) - 1);
bReturn = true;
}
@@ -469,7 +469,7 @@ bool FuPoor::KeyInput(const KeyEvent& rKEvt)
SdPage* pPage = static_cast<DrawViewShell*>(&mrViewShell)->GetActualPage();
sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2;
if (nSdPage < mpDoc->GetSdPageCount(pPage->GetPageKind()) - 1)
if (nSdPage < mrDoc.GetSdPageCount(pPage->GetPageKind()) - 1)
{
// Switch the page and send events regarding
// deactivation the old page and activating the new
sd/source/ui/func/fuprlout.cxx
+13 -13
View File
@@ -49,15 +49,15 @@ FuPresentationLayout::FuPresentationLayout (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuPresentationLayout::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuPresentationLayout::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuPresentationLayout( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuPresentationLayout( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -101,7 +101,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
{
if (pPage->IsSelected() || pPage->GetPageKind() != PageKind::Standard)
continue;
mpDoc->SetSelected(pPage, true);
mrDoc.SetSelected(pPage, true);
aUnselect.push_back(pPage);
}
}
@@ -111,9 +111,9 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
std::vector<SdPage*> aSelectedPages;
std::vector<sal_uInt16> aSelectedPageNums;
// determine the active pages
for (sal_uInt16 nPage = 0; nPage < mpDoc->GetSdPageCount(PageKind::Standard); nPage++)
for (sal_uInt16 nPage = 0; nPage < mrDoc.GetSdPageCount(PageKind::Standard); nPage++)
{
SdPage* pPage = mpDoc->GetSdPage(nPage, PageKind::Standard);
SdPage* pPage = mrDoc.GetSdPage(nPage, PageKind::Standard);
if (pPage->IsSelected())
{
aSelectedPages.push_back(pPage);
@@ -128,7 +128,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
bool bLoad = false; // appear the new master pages?
OUString aFile;
SfxItemSetFixed<ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END> aSet(mpDoc->GetPool() );
SfxItemSetFixed<ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END> aSet(mrDoc.GetPool() );
aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad));
aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_MASTER_PAGE, bMasterPage ) );
@@ -202,7 +202,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
{
sal_Int32 nIdx{ 0 };
OUString aFileName = aFile.getToken(0, DOCUMENT_TOKEN, nIdx);
SdDrawDocument* pTempDoc = mpDoc->OpenBookmarkDoc( aFileName );
SdDrawDocument* pTempDoc = mrDoc.OpenBookmarkDoc( aFileName );
// #69581: If I chose the standard-template I got no filename and so I get no
// SdDrawDocument-Pointer. But the method SetMasterPage is able to handle
@@ -211,14 +211,14 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
if( pTempDoc )
aLayoutName = aFile.getToken(0, DOCUMENT_TOKEN, nIdx);
for (auto nSelectedPage : aSelectedPageNums)
mpDoc->SetMasterPage(nSelectedPage, aLayoutName, pTempDoc, bMasterPage, bCheckMasters);
mpDoc->CloseBookmarkDoc();
mrDoc.SetMasterPage(nSelectedPage, aLayoutName, pTempDoc, bMasterPage, bCheckMasters);
mrDoc.CloseBookmarkDoc();
}
else
{
// use master page with the layout name aFile from current Doc
for (auto nSelectedPage : aSelectedPageNums)
mpDoc->SetMasterPage(nSelectedPage, aFile, mpDoc, bMasterPage, bCheckMasters);
mrDoc.SetMasterPage(nSelectedPage, aFile, &mrDoc, bMasterPage, bCheckMasters);
}
// remove blocking
@@ -257,7 +257,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
//Undo transfer to document selection
for (auto pPage : aUnselect)
mpDoc->SetSelected(pPage, false);
mrDoc.SetSelected(pPage, false);
// fake a mode change to repaint the page tab bar
sd/source/ui/func/fuprobjs.cxx
+6 -6
View File
@@ -49,15 +49,15 @@ FuPresentationObjects::FuPresentationObjects (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuPresentationObjects::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuPresentationObjects::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuPresentationObjects( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuPresentationObjects( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -71,7 +71,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
/* does the selections end in a unique presentation layout?
if not, it is not allowed to edit the templates */
SfxItemSetFixed<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT> aSet(mpDoc->GetItemPool() );
SfxItemSetFixed<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT> aSet(mrDoc.GetItemPool() );
pOutlineViewShell->GetStatusBarState( aSet );
OUString aLayoutName = aSet.Get(SID_STATUS_LAYOUT).GetValue();
DBG_ASSERT(!aLayoutName.isEmpty(), "Layout not defined");
@@ -142,7 +142,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
// Undo-Action
mpDocSh->GetUndoManager()->AddUndoAction(
std::make_unique<StyleSheetUndoAction>(mpDoc, static_cast<SfxStyleSheet&>(rStyleSheet), pOutSet));
std::make_unique<StyleSheetUndoAction>(mrDoc, static_cast<SfxStyleSheet&>(rStyleSheet), pOutSet));
rStyleSheet.GetItemSet().Put( *pOutSet );
static_cast<SfxStyleSheet&>( rStyleSheet ).Broadcast( SfxHint( SfxHintId::DataChanged ) );
sd/source/ui/func/fuscale.cxx
+5 -5
View File
@@ -45,15 +45,15 @@ FuScale::FuScale (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuScale::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuScale::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuScale( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuScale( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -66,7 +66,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SfxItemSetFixed<SID_ATTR_ZOOM, SID_ATTR_ZOOM> aNewAttr( mpDoc->GetPool() );
SfxItemSetFixed<SID_ATTR_ZOOM, SID_ATTR_ZOOM> aNewAttr( mrDoc.GetPool() );
std::unique_ptr<SvxZoomItem> pZoomItem;
SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL;
sd/source/ui/func/fusearch.cxx
+10 -10
View File
@@ -50,17 +50,17 @@ FuSearch::FuSearch (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, pDoc, rReq),
: FuPoor(rViewSh, pWin, pView, rDoc, rReq),
m_pSdOutliner(nullptr),
m_bOwnOutliner(false)
{
}
FuSearch* FuSearch::createPtr(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq)
FuSearch* FuSearch::createPtr(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq)
{
FuSearch* xFunc( new FuSearch( rViewSh, pWin, pView, pDoc, rReq ) );
FuSearch* xFunc( new FuSearch( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -72,12 +72,12 @@ void FuSearch::DoExecute( SfxRequest& )
if ( dynamic_cast< const DrawViewShell *>( &mrViewShell ) != nullptr )
{
m_bOwnOutliner = true;
m_pSdOutliner = new SdOutliner( mpDoc, OutlinerMode::TextObject );
m_pSdOutliner = new SdOutliner( mrDoc, OutlinerMode::TextObject );
}
else if ( dynamic_cast< const OutlineViewShell *>( &mrViewShell ) != nullptr )
{
m_bOwnOutliner = false;
m_pSdOutliner = mpDoc->GetOutliner();
m_pSdOutliner = mrDoc.GetOutliner();
}
else if ( dynamic_cast< const NotesPanelViewShell *>( &mrViewShell ) != nullptr )
{
@@ -85,12 +85,12 @@ void FuSearch::DoExecute( SfxRequest& )
if( nShellType == ViewShell::ST_OUTLINE )
{
m_bOwnOutliner = false;
m_pSdOutliner = mpDoc->GetOutliner();
m_pSdOutliner = mrDoc.GetOutliner();
}
if( nShellType == ViewShell::ST_IMPRESS )
{
m_bOwnOutliner = true;
m_pSdOutliner = new SdOutliner( mpDoc, OutlinerMode::TextObject );
m_pSdOutliner = new SdOutliner( mrDoc, OutlinerMode::TextObject );
}
}
@@ -125,7 +125,7 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem )
m_pSdOutliner->EndSpelling();
m_bOwnOutliner = true;
m_pSdOutliner = new SdOutliner(mpDoc, OutlinerMode::TextObject);
m_pSdOutliner = new SdOutliner(mrDoc, OutlinerMode::TextObject);
m_pSdOutliner->PrepareSpelling();
}
else if (m_pSdOutliner && dynamic_cast<const OutlineViewShell*>(pViewShell) && m_bOwnOutliner)
@@ -134,7 +134,7 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem )
delete m_pSdOutliner;
m_bOwnOutliner = false;
m_pSdOutliner = mpDoc->GetOutliner();
m_pSdOutliner = mrDoc.GetOutliner();
m_pSdOutliner->PrepareSpelling();
}
sd/source/ui/func/fusel.cxx
+7 -7
View File
@@ -71,9 +71,9 @@ FuSelection::FuSelection (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuDraw(rViewSh, pWin, pView, pDoc, rReq),
: FuDraw(rViewSh, pWin, pView, rDoc, rReq),
bTempRotation(false),
bSelectionChanged(false),
pHdl(nullptr),
@@ -89,9 +89,9 @@ FuSelection::FuSelection (
{
}
rtl::Reference<FuPoor> FuSelection::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuSelection::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuSelection( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuSelection( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -825,9 +825,9 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
// Added UNDOs for the WaterCan mode. This was never done in
// the past, thus it was missing all the time.
std::unique_ptr<SdrUndoAction> pUndoAttr = mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pWaterCanCandidate, true, true);
std::unique_ptr<SdrUndoAction> pUndoAttr = mrDoc.GetSdrUndoFactory().CreateUndoAttrObject(*pWaterCanCandidate, true, true);
mpView->BegUndo(pUndoAttr->GetComment());
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoGeoObject(*pWaterCanCandidate));
mpView->AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoGeoObject(*pWaterCanCandidate));
mpView->AddUndo(std::move(pUndoAttr));
pWaterCanCandidate->SetStyleSheet (pStyleSheet, false);
@@ -1250,7 +1250,7 @@ bool FuSelection::HandleImageMapClick(const SdrObject* pObj, const Point& rPos)
if (bClosed)
{
SfxItemSet aSet(mpDoc->GetPool());
SfxItemSet aSet(mrDoc.GetPool());
aSet.Put(pObj->GetMergedItemSet());
sd/source/ui/func/fusldlg.cxx
+11 -11
View File
@@ -47,33 +47,33 @@ FuSlideShowDlg::FuSlideShowDlg (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor( rViewSh, pWin, pView, pDoc, rReq )
: FuPoor( rViewSh, pWin, pView, rDoc, rReq )
{
}
rtl::Reference<FuPoor> FuSlideShowDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuSlideShowDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuSlideShowDlg( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuSlideShowDlg( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
void FuSlideShowDlg::DoExecute( SfxRequest& )
{
PresentationSettings& rPresentationSettings = mpDoc->getPresentationSettings();
PresentationSettings& rPresentationSettings = mrDoc.getPresentationSettings();
SfxItemSetFixed<ATTR_PRESENT_START, ATTR_PRESENT_END> aDlgSet( mpDoc->GetPool() );
std::vector<OUString> aPageNameList(mpDoc->GetSdPageCount( PageKind::Standard ));
SfxItemSetFixed<ATTR_PRESENT_START, ATTR_PRESENT_END> aDlgSet( mrDoc.GetPool() );
std::vector<OUString> aPageNameList(mrDoc.GetSdPageCount( PageKind::Standard ));
const OUString& rPresPage = rPresentationSettings.maPresPage;
OUString aFirstPage;
SdPage* pPage = nullptr;
::tools::Long nPage;
for( nPage = mpDoc->GetSdPageCount( PageKind::Standard ) - 1; nPage >= 0; nPage-- )
for( nPage = mrDoc.GetSdPageCount( PageKind::Standard ) - 1; nPage >= 0; nPage-- )
{
pPage = mpDoc->GetSdPage( static_cast<sal_uInt16>(nPage), PageKind::Standard );
pPage = mrDoc.GetSdPage( static_cast<sal_uInt16>(nPage), PageKind::Standard );
OUString aStr( pPage->GetName() );
if ( aStr.isEmpty() )
@@ -89,7 +89,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
else if ( pPage->IsSelected() && aFirstPage.isEmpty() )
aFirstPage = aStr;
}
SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(); // No Create
SdCustomShowList* pCustomShowList = mrDoc.GetCustomShowList(); // No Create
if( aFirstPage.isEmpty() && pPage )
aFirstPage = pPage->GetName();
@@ -238,7 +238,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
// is something has changed, we set the modified flag
if ( bValuesChanged )
mpDoc->SetChanged();
mrDoc.SetChanged();
}
} // end of namespace sd
sd/source/ui/func/fusnapln.cxx
+4 -4
View File
@@ -38,14 +38,14 @@ namespace sd {
FuSnapLine::FuSnapLine(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq) :
FuPoor(rViewSh, pWin, pView, pDoc, rReq)
SdDrawDocument& rDoc, SfxRequest& rReq) :
FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuSnapLine::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuSnapLine::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuSnapLine( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuSnapLine( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
sd/source/ui/func/fusumry.cxx
+19 -19
View File
@@ -47,15 +47,15 @@ FuSummaryPage::FuSummaryPage (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuSummaryPage::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuSummaryPage::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuSummaryPage( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuSummaryPage( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -67,14 +67,14 @@ void FuSummaryPage::DoExecute( SfxRequest& )
sal_uInt16 i = 0;
sal_uInt16 nFirstPage = SDRPAGE_NOTFOUND;
sal_uInt16 nSelectedPages = 0;
sal_uInt16 nCount = mpDoc->GetSdPageCount(PageKind::Standard);
sal_uInt16 nCount = mrDoc.GetSdPageCount(PageKind::Standard);
while (i < nCount && nSelectedPages <= 1)
{
/* How many pages are selected?
exactly one: pool everything from this page
otherwise: only pool the selected pages */
SdPage* pActualPage = mpDoc->GetSdPage(i, PageKind::Standard);
SdPage* pActualPage = mrDoc.GetSdPage(i, PageKind::Standard);
if (pActualPage->IsSelected())
{
@@ -95,11 +95,11 @@ void FuSummaryPage::DoExecute( SfxRequest& )
for (i = nFirstPage; i < nCount; i++)
{
SdPage* pActualPage = mpDoc->GetSdPage(i, PageKind::Standard);
SdPage* pActualPage = mrDoc.GetSdPage(i, PageKind::Standard);
if (nSelectedPages <= 1 || pActualPage->IsSelected())
{
SdPage* pActualNotesPage = mpDoc->GetSdPage(i, PageKind::Notes);
SdPage* pActualNotesPage = mrDoc.GetSdPage(i, PageKind::Notes);
SdrTextObj* pTextObj = static_cast<SdrTextObj*>( pActualPage->GetPresObj(PresObjKind::Title) );
if (pTextObj && !pTextObj->IsEmptyPresObj())
@@ -118,7 +118,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
SdrLayerIDSet aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
// page with title & structuring!
pSummaryPage = mpDoc->AllocSdPage(false);
pSummaryPage = mrDoc.AllocSdPage(false);
pSummaryPage->SetSize(pActualPage->GetSize() );
pSummaryPage->SetBorder(pActualPage->GetLeftBorder(),
pActualPage->GetUpperBorder(),
@@ -126,9 +126,9 @@ void FuSummaryPage::DoExecute( SfxRequest& )
pActualPage->GetLowerBorder() );
// insert page at the back
mpDoc->InsertPage(pSummaryPage.get(), nCount * 2 + 1);
mrDoc.InsertPage(pSummaryPage.get(), nCount * 2 + 1);
if( bUndo )
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pSummaryPage));
mpView->AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoNewPage(*pSummaryPage));
// use MasterPage of the current page
pSummaryPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage());
@@ -138,7 +138,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings());
// notes-page
rtl::Reference<SdPage> pNotesPage = mpDoc->AllocSdPage(false);
rtl::Reference<SdPage> pNotesPage = mrDoc.AllocSdPage(false);
pNotesPage->SetSize(pActualNotesPage->GetSize());
pNotesPage->SetBorder(pActualNotesPage->GetLeftBorder(),
pActualNotesPage->GetUpperBorder(),
@@ -147,10 +147,10 @@ void FuSummaryPage::DoExecute( SfxRequest& )
pNotesPage->SetPageKind(PageKind::Notes);
// insert page at the back
mpDoc->InsertPage(pNotesPage.get(), nCount * 2 + 2);
mrDoc.InsertPage(pNotesPage.get(), nCount * 2 + 2);
if( bUndo )
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage));
mpView->AddUndo(mrDoc.GetSdrUndoFactory().CreateUndoNewPage(*pNotesPage));
// use MasterPage of the current page
pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage());
@@ -159,15 +159,15 @@ void FuSummaryPage::DoExecute( SfxRequest& )
pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
pNotesPage->setHeaderFooterSettings(pActualNotesPage->getHeaderFooterSettings());
pOutl.reset(new SdOutliner( mpDoc, OutlinerMode::OutlineObject ));
pOutl.reset(new SdOutliner( mrDoc, OutlinerMode::OutlineObject ));
pOutl->SetUpdateLayout(false);
pOutl->EnableUndo(false);
if (mpDocSh)
pOutl->SetRefDevice(SdModule::get()->GetVirtualRefDevice());
pOutl->SetDefTab( mpDoc->GetDefaultTabulator() );
pOutl->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
pOutl->SetDefTab( mrDoc.GetDefaultTabulator() );
pOutl->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mrDoc.GetStyleSheetPool()));
pStyle = pSummaryPage->GetStyleSheetForPresObj( PresObjKind::Outline );
pOutl->SetStyleSheet( 0, pStyle );
}
@@ -193,7 +193,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
return;
// remove hard break- and character attributes
SfxItemSetFixed<EE_ITEMS_START, EE_ITEMS_END> aEmptyEEAttr(mpDoc->GetPool());
SfxItemSetFixed<EE_ITEMS_START, EE_ITEMS_END> aEmptyEEAttr(mrDoc.GetPool());
sal_Int32 nParaCount = pOutl->GetParagraphCount();
for (sal_Int32 nPara = 0; nPara < nParaCount; nPara++)
@@ -208,7 +208,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
pTextObj->SetEmptyPresObj(false);
// remove hard attributes (Flag to sal_True)
SfxItemSet aAttr(mpDoc->GetPool());
SfxItemSet aAttr(mrDoc.GetPool());
aAttr.Put(XLineStyleItem(drawing::LineStyle_NONE));
aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
pTextObj->SetMergedItemSet(aAttr);
sd/source/ui/func/futempl.cxx
+25 -25
View File
@@ -78,15 +78,15 @@ FuTemplate::FuTemplate (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq )
: FuPoor( rViewSh, pWin, pView, pDoc, rReq )
: FuPoor( rViewSh, pWin, pView, rDoc, rReq )
{
}
rtl::Reference<FuPoor> FuTemplate::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuTemplate::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuTemplate( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuTemplate( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -97,7 +97,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
sal_uInt16 nSId = rReq.GetSlot();
// get StyleSheet parameter
SfxStyleSheetBasePool* pSSPool = mpDoc->GetDocSh()->GetStyleSheetPool();
SfxStyleSheetBasePool* pSSPool = mrDoc.GetDocSh()->GetStyleSheetPool();
SfxStyleSheetBase* pStyleSheet = nullptr;
const SfxPoolItem* pItem;
@@ -136,7 +136,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
try
{
Reference< XStyleFamiliesSupplier > xModel(mpDoc->GetDocSh()->GetModel(), UNO_QUERY_THROW );
Reference< XStyleFamiliesSupplier > xModel(mrDoc.GetDocSh()->GetModel(), UNO_QUERY_THROW );
Reference< XNameAccess > xCont( xModel->getStyleFamilies() );
Reference< XNameAccess > xStyles( xCont->getByName(pFamilyItem->GetValue()), UNO_QUERY_THROW );
Reference< XPropertySet > xInfo( xStyles->getByName( pNameItem->GetValue() ), UNO_QUERY_THROW );
@@ -204,7 +204,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
pSSPool->Remove( pStyleSheet );
nRetMask = sal_uInt16(true);
mpDoc->SetChanged();
mrDoc.SetChanged();
}
else
{
@@ -239,10 +239,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
(pStyleSheet->GetFamily() == SfxStyleFamily::Para && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) ||
// allow if old was presentation and we are a drawing document
(pOldStyleSheet->GetFamily() == SfxStyleFamily::Page && mpDoc->GetDocumentType() == DocumentType::Draw) )
(pOldStyleSheet->GetFamily() == SfxStyleFamily::Page && mrDoc.GetDocumentType() == DocumentType::Draw) )
{
mpView->SetStyleSheet( static_cast<SfxStyleSheet*>(pStyleSheet));
mpDoc->SetChanged();
mrDoc.SetChanged();
mrViewShell.GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
@@ -301,7 +301,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if (eFamily == SfxStyleFamily::Para)
{
pStdDlg.disposeAndReset(pFact ? pFact->CreateSdTabTemplateDlg(mrViewShell.GetFrameWeld(), mpDoc->GetDocSh(), *pStyleSheet, mpDoc, mpView) : nullptr);
pStdDlg.disposeAndReset(pFact ? pFact->CreateSdTabTemplateDlg(mrViewShell.GetFrameWeld(), mrDoc.GetDocSh(), *pStyleSheet, &mrDoc, mpView) : nullptr);
}
else if (eFamily == SfxStyleFamily::Pseudo)
{
@@ -437,7 +437,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
const SfxPoolItem* pOldItem = nullptr;
if( rAttr.GetItemState( XATTR_FILLBITMAP, true, &pOldItem ) == SfxItemState::SET )
{
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillBitmapItem*>(pOldItem)->checkForUniqueItem( *mpDoc );
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillBitmapItem*>(pOldItem)->checkForUniqueItem( mrDoc );
if( pNewItem )
{
rAttr.Put( std::move(pNewItem) );
@@ -445,7 +445,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
if( rAttr.GetItemState( XATTR_LINEDASH, true, &pOldItem ) == SfxItemState::SET )
{
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XLineDashItem*>(pOldItem)->checkForUniqueItem( *mpDoc );
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XLineDashItem*>(pOldItem)->checkForUniqueItem( mrDoc );
if( pNewItem )
{
rAttr.Put( std::move(pNewItem) );
@@ -453,7 +453,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
if( rAttr.GetItemState( XATTR_LINESTART, true, &pOldItem ) == SfxItemState::SET )
{
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XLineStartItem*>(pOldItem)->checkForUniqueItem( *mpDoc );
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XLineStartItem*>(pOldItem)->checkForUniqueItem( mrDoc );
if( pNewItem )
{
rAttr.Put( std::move(pNewItem) );
@@ -461,7 +461,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
if( rAttr.GetItemState( XATTR_LINEEND, true, &pOldItem ) == SfxItemState::SET )
{
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XLineEndItem*>(pOldItem)->checkForUniqueItem( *mpDoc );
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XLineEndItem*>(pOldItem)->checkForUniqueItem( mrDoc );
if( pNewItem )
{
rAttr.Put( std::move(pNewItem) );
@@ -469,7 +469,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
if( rAttr.GetItemState( XATTR_FILLGRADIENT, true, &pOldItem ) == SfxItemState::SET )
{
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillGradientItem*>(pOldItem)->checkForUniqueItem( *mpDoc );
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillGradientItem*>(pOldItem)->checkForUniqueItem( mrDoc );
if( pNewItem )
{
rAttr.Put( std::move(pNewItem) );
@@ -477,7 +477,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
if( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE, true, &pOldItem ) == SfxItemState::SET )
{
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillFloatTransparenceItem*>(pOldItem)->checkForUniqueItem( *mpDoc );
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillFloatTransparenceItem*>(pOldItem)->checkForUniqueItem( mrDoc );
if( pNewItem )
{
rAttr.Put( std::move(pNewItem) );
@@ -485,7 +485,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
if( rAttr.GetItemState( XATTR_FILLHATCH, true, &pOldItem ) == SfxItemState::SET )
{
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillHatchItem*>(pOldItem)->checkForUniqueItem( *mpDoc );
std::unique_ptr<SfxPoolItem> pNewItem = static_cast<const XFillHatchItem*>(pOldItem)->checkForUniqueItem( mrDoc );
if( pNewItem )
{
rAttr.Put( std::move(pNewItem) );
@@ -524,18 +524,18 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
}
if( mpDoc->GetOnlineSpell() )
if( mrDoc.GetOnlineSpell() )
{
if( SfxItemState::SET == rAttr.GetItemState(EE_CHAR_LANGUAGE, false ) ||
SfxItemState::SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CJK, false ) ||
SfxItemState::SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CTL, false ) )
{
mpDoc->StopOnlineSpelling();
mpDoc->StartOnlineSpelling();
mrDoc.StopOnlineSpelling();
mrDoc.StartOnlineSpelling();
}
}
mpDoc->SetChanged();
mrDoc.SetChanged();
}
break;
@@ -555,7 +555,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( pStyleSheet )
{
nRetMask = static_cast<sal_uInt16>(pStyleSheet->GetMask());
SfxItemSet aCoreSet( mpDoc->GetPool() );
SfxItemSet aCoreSet( mrDoc.GetPool() );
mpView->GetAttributes( aCoreSet, true );
// if the object had a template, this becomes parent of the new template
@@ -581,7 +581,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SfxHintId::DataChanged ) );
mpDoc->SetChanged();
mrDoc.SetChanged();
mrViewShell.GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
@@ -600,7 +600,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( pStyleSheet )
{
nRetMask = static_cast<sal_uInt16>(pStyleSheet->GetMask());
SfxItemSet aCoreSet( mpDoc->GetPool() );
SfxItemSet aCoreSet( mrDoc.GetPool() );
mpView->GetAttributes( aCoreSet );
SfxItemSet* pStyleSet = &pStyleSheet->GetItemSet();
@@ -609,7 +609,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
mpView->SetStyleSheet( static_cast<SfxStyleSheet*>(pStyleSheet));
static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SfxHintId::DataChanged ) );
mpDoc->SetChanged();
mrDoc.SetChanged();
mrViewShell.GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
sd/source/ui/func/futext.cxx
+6 -6
View File
@@ -132,17 +132,17 @@ const sal_uInt16 SidArray[] = {
/**
* base class for text functions
*/
FuText::FuText( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
: FuConstruct(rViewSh, pWin, pView, pDoc, rReq)
FuText::FuText( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
: FuConstruct(rViewSh, pWin, pView, rDoc, rReq)
, bFirstObjCreated(false)
, bJustEndedEdit(false)
, rRequest (rReq)
{
}
rtl::Reference<FuPoor> FuText::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuText::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuText( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuText( rViewSh, pWin, pView, rDoc, rReq ) );
return xFunc;
}
@@ -157,7 +157,7 @@ void FuText::disposing()
::Outliner* pOutliner = mpView->GetTextEditOutliner();
if (pOutliner)
pOutliner->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
pOutliner->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mrDoc.GetStyleSheetPool()));
}
}
@@ -1026,7 +1026,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag)
nSdrObjKind == SdrObjKind::OutlineText || !pTextObj->IsEmptyPresObj() ) )
{
// create new outliner (owned by SdrObjEditView)
std::unique_ptr<SdrOutliner> pOutl = SdrMakeOutliner(OutlinerMode::OutlineObject, *mpDoc);
std::unique_ptr<SdrOutliner> pOutl = SdrMakeOutliner(OutlinerMode::OutlineObject, mrDoc);
if (bEmptyOutliner)
mpView->SdrEndTextEdit(true);
sd/source/ui/func/futhes.cxx
+7 -7
View File
@@ -49,14 +49,14 @@ namespace sd {
FuThesaurus::FuThesaurus( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
SdDrawDocument& rDoc, SfxRequest& rReq )
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuThesaurus::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuThesaurus::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuThesaurus( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuThesaurus( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -96,7 +96,7 @@ void FuThesaurus::DoExecute(SfxRequest& rReq)
if( xHyphenator.is() )
pOutliner->SetHyphenator( xHyphenator );
pOutliner->SetDefaultLanguage( mpDoc->GetLanguage( EE_CHAR_LANGUAGE ) );
pOutliner->SetDefaultLanguage( mrDoc.GetLanguage( EE_CHAR_LANGUAGE ) );
}
EESpellState eState = const_cast<OutlinerView*>(pOutlView)->StartThesaurus(rReq.GetFrameWeld());
@@ -105,7 +105,7 @@ void FuThesaurus::DoExecute(SfxRequest& rReq)
}
else if (dynamic_cast< OutlineViewShell *>( &mrViewShell ))
{
Outliner* pOutliner = mpDoc->GetOutliner();
Outliner* pOutliner = mrDoc.GetOutliner();
OutlinerView* pOutlView = pOutliner->GetView(0);
if ( !pOutliner->GetSpeller().is() )
@@ -118,7 +118,7 @@ void FuThesaurus::DoExecute(SfxRequest& rReq)
if( xHyphenator.is() )
pOutliner->SetHyphenator( xHyphenator );
pOutliner->SetDefaultLanguage( mpDoc->GetLanguage( EE_CHAR_LANGUAGE ) );
pOutliner->SetDefaultLanguage( mrDoc.GetLanguage( EE_CHAR_LANGUAGE ) );
}
EESpellState eState = pOutlView->StartThesaurus(rReq.GetFrameWeld());
sd/source/ui/func/futransf.cxx
+5 -5
View File
@@ -35,14 +35,14 @@
using namespace sd;
FuTransform::FuTransform(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
SdDrawDocument& rDoc, SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuTransform::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuTransform::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuTransform( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuTransform( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
@@ -90,7 +90,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
pObj->GetObjIdentifier() == SdrObjKind::Caption )
{
// --------- itemset for caption --------
SfxItemSet aNewAttr( mpDoc->GetPool() );
SfxItemSet aNewAttr( mrDoc.GetPool() );
mpView->GetAttributes( aNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
sd/source/ui/func/futxtatt.cxx
+5 -5
View File
@@ -31,22 +31,22 @@ FuTextAttrDlg::FuTextAttrDlg (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq)
: FuPoor(rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuTextAttrDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuTextAttrDlg::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuTextAttrDlg( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuTextAttrDlg( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
void FuTextAttrDlg::DoExecute( SfxRequest& rReq )
{
SfxItemSet aNewAttr( mpDoc->GetPool() );
SfxItemSet aNewAttr( mrDoc.GetPool() );
mpView->GetAttributes( aNewAttr );
const SfxItemSet* pArgs = rReq.GetArgs();
sd/source/ui/func/fuvect.cxx
+4 -4
View File
@@ -34,15 +34,15 @@ FuVectorize::FuVectorize (
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor (rViewSh, pWin, pView, pDoc, rReq)
: FuPoor (rViewSh, pWin, pView, rDoc, rReq)
{
}
rtl::Reference<FuPoor> FuVectorize::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuVectorize::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuVectorize( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuVectorize( rViewSh, pWin, pView, rDoc, rReq ) );
xFunc->DoExecute(rReq);
return xFunc;
}
sd/source/ui/func/fuzoom.cxx
+4 -4
View File
@@ -44,9 +44,9 @@ FuZoom::FuZoom(
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pView, pDoc, rReq),
: FuPoor(rViewSh, pWin, pView, rDoc, rReq),
bVisible(false),
bStartDrag(false),
aPtr(PointerStyle::Arrow)
@@ -65,9 +65,9 @@ FuZoom::~FuZoom()
}
}
rtl::Reference<FuPoor> FuZoom::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
rtl::Reference<FuPoor> FuZoom::Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq )
{
rtl::Reference<FuPoor> xFunc( new FuZoom( rViewSh, pWin, pView, pDoc, rReq ) );
rtl::Reference<FuPoor> xFunc( new FuZoom( rViewSh, pWin, pView, rDoc, rReq ) );
return xFunc;
}
sd/source/ui/inc/NotesPanelViewShell.hxx
+2 -2
View File
@@ -101,14 +101,14 @@ class FuNotesPane : public FuSimpleOutlinerText
{
public:
static rtl::Reference<FuPoor> Create(ViewShell& rViewSh, ::sd::Window* pWin,
::sd::SimpleOutlinerView* pView, SdDrawDocument* pDoc,
::sd::SimpleOutlinerView* pView, SdDrawDocument& rDoc,
SfxRequest& rReq);
virtual bool KeyInput(const KeyEvent& rKEvt) override;
protected:
FuNotesPane(ViewShell& rViewShell, ::sd::Window* pWin, ::sd::SimpleOutlinerView* pView,
SdDrawDocument* pDoc, SfxRequest& rReq);
SdDrawDocument& rDoc, SfxRequest& rReq);
};
} // end of namespace sd
sd/source/ui/inc/fuarea.hxx
+2 -2
View File
@@ -27,7 +27,7 @@ class FuArea final : public FuPoor
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void Activate() override;
virtual void Deactivate() override;
@@ -37,7 +37,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
virtual void DoExecute( SfxRequest& rReq ) override;
sd/source/ui/inc/fubullet.hxx
+2 -2
View File
@@ -32,7 +32,7 @@ class FuBullet final : public FuPoor
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
static void GetSlotState( SfxItemSet& rSet, ViewShell const * pViewShell, SfxViewFrame* pViewFrame );
@@ -42,7 +42,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
void InsertSpecialCharacter( SfxRequest const & rReq );
sd/source/ui/inc/fuchar.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuChar final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -40,7 +40,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fucon3d.hxx
+2 -2
View File
@@ -33,7 +33,7 @@ class FuConstruct3dObject final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -49,7 +49,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
void ImpPrepareBasic3DShape(E3dCompoundObject const * p3DObj, E3dScene *pScene);
sd/source/ui/inc/fuconarc.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuConstructArc final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -44,7 +44,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuconbez.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ class FuConstructBezierPolygon final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent );
void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -58,7 +58,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
sal_uInt16 nEditMode;
sd/source/ui/inc/fuconcs.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ class FuConstructCustomShape final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -53,7 +53,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
OUString aCustomShape;
sd/source/ui/inc/fuconnct.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuConnectionDlg
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -37,7 +37,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuconrec.hxx
+2 -2
View File
@@ -41,7 +41,7 @@ private:
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -61,7 +61,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuconstr.hxx
+1 -1
View File
@@ -56,7 +56,7 @@ protected:
FuConstruct (ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
private:
bool bSelectionChanged;
sd/source/ui/inc/fuconuno.hxx
+2 -2
View File
@@ -34,7 +34,7 @@ class FuConstructUnoControl final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -51,7 +51,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
OUString aOldLayer;
sd/source/ui/inc/fucopy.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuCopy final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -37,7 +37,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fucushow.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuCustomShowDlg
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -36,7 +36,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fudraw.hxx
+1 -1
View File
@@ -63,7 +63,7 @@ protected:
FuDraw (ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
virtual ~FuDraw() override;
sd/source/ui/inc/fudspord.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ class FuDisplayOrder final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
// Mouse- & Key-Events
virtual bool MouseMove(const MouseEvent& rMEvt) override;
@@ -53,7 +53,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuediglu.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuEditGluePoints final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq, bool bPermanent );
virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -54,7 +54,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
virtual ~FuEditGluePoints() override;
};
sd/source/ui/inc/fuexecuteinteraction.hxx
+2 -2
View File
@@ -29,12 +29,12 @@ class FuExecuteInteraction final : public FuPoor
{
public:
static rtl::Reference<FuPoor> Create(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq);
SdDrawDocument& rDoc, SfxRequest& rReq);
virtual void DoExecute(SfxRequest& rReq) override;
private:
FuExecuteInteraction(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView,
SdDrawDocument* pDoc, SfxRequest& rReq);
SdDrawDocument& rDoc, SfxRequest& rReq);
css::uno::Reference<css::media::XPlayer> mxPlayer;
};
sd/source/ui/inc/fuexpand.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuExpandPage final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -36,7 +36,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuformatpaintbrush.hxx
+2 -2
View File
@@ -29,7 +29,7 @@ class FuFormatPaintBrush final : public FuText
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual bool MouseMove(const MouseEvent& rMEvt) override;
virtual bool MouseButtonUp(const MouseEvent& rMEvt) override;
@@ -42,7 +42,7 @@ public:
static void GetMenuState( DrawViewShell const & rDrawViewShell, SfxItemSet &rSet );
private:
FuFormatPaintBrush ( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq);
FuFormatPaintBrush ( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq);
void DoExecute( SfxRequest& rReq ) override;
sd/source/ui/inc/fuhhconv.hxx
+2 -2
View File
@@ -29,7 +29,7 @@ class FuHangulHanjaConversion final : public FuPoor
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
void StartConversion( LanguageType nSourceLanguage, LanguageType nTargetLanguage,
const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
@@ -48,7 +48,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq );
};
sd/source/ui/inc/fuinsert.hxx
+8 -8
View File
@@ -30,7 +30,7 @@ class FuInsertGraphic final
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin,
::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq,
::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq,
bool replaceExistingImage);
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -40,7 +40,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq,
bool replaceExistingImage);
@@ -54,7 +54,7 @@ class FuInsertClipboard final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -62,7 +62,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
@@ -73,7 +73,7 @@ class FuInsertOLE final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -81,7 +81,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
@@ -92,7 +92,7 @@ class FuInsertAVMedia final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -100,7 +100,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
#if HAVE_FEATURE_AVMEDIA
sd/source/ui/inc/fuinsfil.hxx
+2 -2
View File
@@ -32,7 +32,7 @@ class FuInsertFile final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
static void GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector );
@@ -42,7 +42,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
OUString aLayoutName; ///< layout name of the currently inserted page
sd/source/ui/inc/fuline.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ public:
virtual void Activate() override;
virtual void Deactivate() override;
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -40,7 +40,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fulinend.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ public:
virtual void Activate() override;
virtual void Deactivate() override;
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -40,7 +40,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fulink.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuLink final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -37,7 +37,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq );
};
sd/source/ui/inc/fumeasur.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuMeasureDlg final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -37,7 +37,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fumorph.hxx
+2 -2
View File
@@ -36,7 +36,7 @@ class FuMorph final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -46,7 +46,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
void ImpInsertPolygons(
sd/source/ui/inc/funavig.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuNavigation final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -37,7 +37,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuoaprms.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ class FuObjectAnimationParameters final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
void Finish( const std::shared_ptr<SfxRequest>& rReq, const VclPtr<SfxAbstractDialog>& pDlg );
@@ -41,7 +41,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuolbull.hxx
+2 -2
View File
@@ -40,7 +40,7 @@ class FuBulletAndPosition final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -48,7 +48,7 @@ private:
ViewShell& rViewShell,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
void SetCurrentBulletsNumbering(SfxRequest& rReq);
sd/source/ui/inc/fuoltext.hxx
+3 -3
View File
@@ -58,7 +58,7 @@ protected:
ViewShell& rViewShell,
::sd::Window* pWin,
::sd::SimpleOutlinerView* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
SimpleOutlinerView* mpSimpleOutlinerView;
@@ -67,7 +67,7 @@ protected:
class FuOutlineText final : public FuSimpleOutlinerText
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::SimpleOutlinerView* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::SimpleOutlinerView* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual bool KeyInput(const KeyEvent& rKEvt) override;
/** Call this method when the text in the outliner (may) have changed.
@@ -81,7 +81,7 @@ private:
ViewShell& rViewShell,
::sd::Window* pWin,
::sd::SimpleOutlinerView* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fupage.hxx
+2 -2
View File
@@ -36,7 +36,7 @@ class FuPage final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
virtual void Activate() override;
@@ -52,7 +52,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq );
void ApplyItemSet(SdStyleSheet& styleSheet, const std::shared_ptr<SfxItemSet>& newAttr,
sd/source/ui/inc/fuparagr.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ public:
virtual void Activate() override;
virtual void Deactivate() override;
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -39,7 +39,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fupoor.hxx
+2 -2
View File
@@ -111,7 +111,7 @@ protected:
FuPoor (ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
virtual ~FuPoor() override;
@@ -141,7 +141,7 @@ protected:
ViewShell& mrViewShell;
VclPtr< ::sd::Window> mpWindow;
DrawDocShell* mpDocSh;
SdDrawDocument* mpDoc;
SdDrawDocument& mrDoc;
sal_uInt16 nSlotId;
sd/source/ui/inc/fuprlout.hxx
+2 -2
View File
@@ -34,7 +34,7 @@ class FuPresentationLayout final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -42,7 +42,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuprobjs.hxx
+2 -2
View File
@@ -34,7 +34,7 @@ class FuPresentationObjects final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -42,7 +42,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fuscale.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuScale final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -36,7 +36,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fusearch.hxx
+2 -2
View File
@@ -30,7 +30,7 @@ class FuSearch final : public FuPoor
{
public:
static FuSearch* createPtr(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq);
static FuSearch* createPtr(ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq);
virtual void DoExecute( SfxRequest& rReq ) override;
@@ -46,7 +46,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fusel.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ class FuSelection final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
// Mouse- & Key-Events
@@ -64,7 +64,7 @@ private:
FuSelection (ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
virtual ~FuSelection() override;
sd/source/ui/inc/fusldlg.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuSlideShowDlg final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -36,7 +36,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fusnapln.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ public:
virtual void Activate() override;
virtual void Deactivate() override;
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -39,7 +39,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/fusumry.hxx
+2 -2
View File
@@ -28,7 +28,7 @@ class FuSummaryPage final
{
public:
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -36,7 +36,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};
sd/source/ui/inc/futempl.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ public:
virtual void Activate() override;
virtual void Deactivate() override;
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
static rtl::Reference<FuPoor> Create( ViewShell& rViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument& rDoc, SfxRequest& rReq );
virtual void DoExecute( SfxRequest& rReq ) override;
private:
@@ -39,7 +39,7 @@ private:
ViewShell& rViewSh,
::sd::Window* pWin,
::sd::View* pView,
SdDrawDocument* pDoc,
SdDrawDocument& rDoc,
SfxRequest& rReq);
};

Some files were not shown because too many files have changed in this diff Show More