[Libreoffice-commits] core.git: basctl/source include/svx sc/source sd/source svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri May 5 06:51:02 UTC 2017
basctl/source/dlged/dlgedobj.cxx | 4 +-
include/svx/svdedtv.hxx | 4 +-
include/svx/svdedxv.hxx | 4 +-
include/svx/svdglue.hxx | 4 +-
include/svx/svdhdl.hxx | 2 -
include/svx/svdlayer.hxx | 6 +--
include/svx/svdmodel.hxx | 2 -
include/svx/svdmrkv.hxx | 14 +++-----
include/svx/svdobj.hxx | 2 -
include/svx/svdograf.hxx | 2 -
include/svx/svdoole2.hxx | 2 -
include/svx/svdopath.hxx | 2 -
sc/source/core/data/documen9.cxx | 5 +--
sd/source/core/drawdoc2.cxx | 8 ++---
sd/source/core/sdpage.cxx | 2 -
sd/source/filter/ppt/pptin.cxx | 4 +-
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2 -
sd/source/ui/dlg/LayerTabBar.cxx | 8 ++---
sd/source/ui/func/fuconrec.cxx | 4 +-
sd/source/ui/func/fuediglu.cxx | 2 -
sd/source/ui/sidebar/LayoutMenu.cxx | 4 +-
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 4 +-
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 -
sd/source/ui/unoidl/unolayer.cxx | 6 +--
sd/source/ui/unoidl/unomodel.cxx | 8 ++---
sd/source/ui/unoidl/unopage.cxx | 8 ++---
sd/source/ui/view/ViewShellImplementation.cxx | 8 ++---
sd/source/ui/view/drviews2.cxx | 12 +++----
sd/source/ui/view/drviews4.cxx | 2 -
sd/source/ui/view/drviews5.cxx | 2 -
sd/source/ui/view/drviews7.cxx | 4 +-
sd/source/ui/view/drviewsb.cxx | 4 +-
sd/source/ui/view/unmodpg.cxx | 12 +++----
sd/source/ui/view/viewshe3.cxx | 4 +-
svx/source/svdraw/sdrpagewindow.cxx | 4 +-
svx/source/svdraw/svdcrtv.cxx | 6 +--
svx/source/svdraw/svddrgv.cxx | 4 +-
svx/source/svdraw/svdedtv.cxx | 4 +-
svx/source/svdraw/svdedtv1.cxx | 7 +---
svx/source/svdraw/svdedxv.cxx | 22 +++++---------
svx/source/svdraw/svdfmtf.cxx | 21 +------------
svx/source/svdraw/svdfmtf.hxx | 3 -
svx/source/svdraw/svdglue.cxx | 6 +--
svx/source/svdraw/svdhdl.cxx | 12 ++-----
svx/source/svdraw/svdlayer.cxx | 12 +++----
svx/source/svdraw/svdmodel.cxx | 2 -
svx/source/svdraw/svdmrkv1.cxx | 6 +--
svx/source/svdraw/svdobj.cxx | 10 +++---
svx/source/svdraw/svdograf.cxx | 2 -
svx/source/svdraw/svdogrp.cxx | 4 +-
svx/source/svdraw/svdoole2.cxx | 6 +--
svx/source/svdraw/svdopath.cxx | 14 +-------
svx/source/svdraw/svdotxtr.cxx | 4 +-
svx/source/svdraw/svdpagv.cxx | 4 +-
svx/source/svdraw/svdpntv.cxx | 4 +-
svx/source/svdraw/svdview.cxx | 6 +--
svx/source/svdraw/svdxcgv.cxx | 8 ++---
svx/source/unodraw/unoshape.cxx | 2 -
58 files changed, 149 insertions(+), 187 deletions(-)
New commits:
commit ec38966951f28a1e1d4c97f01a550c87f152cbc8
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu May 4 14:29:10 2017 +0200
loplugin:checkunusedparams in svx(part3)
Change-Id: I4b9b749565750acc7f674957fd619870b0e29237
Reviewed-on: https://gerrit.libreoffice.org/37240
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index fcde3f6fc3de..8c9f8a9431c7 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -506,8 +506,8 @@ void DlgEdObj::UpdateStep()
sal_Int32 nStep = GetStep();
SdrLayerAdmin& rLayerAdmin = GetModel()->GetLayerAdmin();
- SdrLayerID nHiddenLayerId = rLayerAdmin.GetLayerID( "HiddenLayer", false );
- SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), false );
+ SdrLayerID nHiddenLayerId = rLayerAdmin.GetLayerID( "HiddenLayer" );
+ SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName() );
if( nCurStep )
{
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 6facb412144a..f849846f720a 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -289,8 +289,8 @@ public:
// EndUndo();
void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, bool bMark=true);
- void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll);
- void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
+ void SetNotPersistAttrToMarked(const SfxItemSet& rAttr);
+ void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr) const;
void MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
SfxItemSet GetAttrFromMarked(bool bOnlyHardAttr) const;
void SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll);
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index d35e398301b6..b1bcbec1d39e 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -104,14 +104,14 @@ protected:
virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const;
void ImpMoveCursorAfterChainingEvent(TextChainCursorManager *pCursorManager);
- TextChainCursorManager *ImpHandleMotionThroughBoxesKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin, bool *bOutHandled);
+ TextChainCursorManager *ImpHandleMotionThroughBoxesKeyInput(const KeyEvent& rKEvt, bool *bOutHandled);
OutlinerView* ImpFindOutlinerView(vcl::Window* pWin) const;
// Create a new OutlinerView at the heap and initialize all required parameters.
// pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized
- OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, bool bNoPaint, OutlinerView* pGivenView, SfxViewShell* pViewShell = nullptr) const;
+ OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, OutlinerView* pGivenView, SfxViewShell* pViewShell = nullptr) const;
void ImpPaintOutlinerView(OutlinerView& rOutlView, const tools::Rectangle& rRect, OutputDevice& rTargetDevice) const;
void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const;
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 3e4e8c89b4da..1db3ca9acce9 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -109,7 +109,7 @@ public:
static SdrEscapeDirection EscAngleToDir(long nAngle);
void Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj);
- void Shear (const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj);
+ void Shear (const Point& rRef, double tn, bool bVShear, const SdrObject* pObj);
};
#define SDRGLUEPOINT_NOTFOUND 0xFFFF
@@ -144,7 +144,7 @@ public:
void Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj);
- void Shear (const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj);
+ void Shear (const Point& rRef, double tn, bool bVShear, const SdrObject* pObj);
};
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 4ce795b4e98a..1c83e09aac5d 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -168,7 +168,7 @@ protected:
sdr::overlay::OverlayObject* CreateOverlayObject(
const basegfx::B2DPoint& rPos,
BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker,
- OutputDevice& rOutDev, Point aMoveOutsideOffset = Point());
+ Point aMoveOutsideOffset = Point());
static BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd);
public:
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index fef2ca52be40..13354503a42c 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -142,9 +142,9 @@ public:
sal_uInt16 GetLayerPos(SdrLayer* pLayer) const;
- SdrLayer* GetLayer(const OUString& rName, bool bInherited);
- const SdrLayer* GetLayer(const OUString& rName, bool bInherited) const;
- SdrLayerID GetLayerID(const OUString& rName, bool bInherited) const;
+ SdrLayer* GetLayer(const OUString& rName);
+ const SdrLayer* GetLayer(const OUString& rName) const;
+ SdrLayerID GetLayerID(const OUString& rName) const;
SdrLayer* GetLayerPerID(sal_uInt16 nID) { return const_cast<SdrLayer*>(const_cast<const SdrLayerAdmin*>(this)->GetLayerPerID(nID)); }
const SdrLayer* GetLayerPerID(sal_uInt16 nID) const;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 996a05c765ba..281c3d3ad8bf 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -555,7 +555,7 @@ public:
// Used as a fallback in *::ReadUserDataSequence() to process common properties
void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue);
- void WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues, bool bBrowse = false);
+ void WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues);
/** returns the numbering type that is used to format page fields in drawing shapes */
virtual SvxNumType GetPageNumType() const;
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 192f26b2b393..d2142ded5040 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -327,9 +327,8 @@ public:
// Selects the first marked point (P1) which is hit by rPnt
// and from there it searches the first non-marked point(P2).
// In case of success the marking of
- // P1 is deleted, a mark is set at P2 and sal_True is returned.
- // With the parameter bPrev=sal_True the scan direction is turned to the other direction.
- bool MarkNextPoint(const Point& rPnt, bool bPrev);
+ // P1 is deleted, a mark is set at P2 and true is returned.
+ bool MarkNextPoint();
// Search for the number of the suitable handle. In case of empty search result,
// SAL_MAX_SIZE is returned.
@@ -367,8 +366,8 @@ public:
// Attention: With each change of the glue point status the handle list is re-calculated.
// All previously saved SdrHdl* became invalid by this, the same with the point IDs!
bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV) const;
- bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, bool bUnmark=false);
- void UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { MarkGluePoint(pObj,nId,pPV,true); }
+ bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, bool bUnmark=false);
+ void UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId) { MarkGluePoint(pObj,nId,true); }
bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const;
// Get the Hdl (handle) of a marked GluePoint. Non-marked
@@ -382,9 +381,8 @@ public:
// Selects the first marked point (P1) which is hit by rPnt
// and from there it searches the first non-marked point(P2).
// In case of success the marking of
- // P1 is deleted, a mark is set at P2 and sal_True is returned.
- // With the parameter bPrev=sal_True the scan direction is turned to the other direction.
- bool MarkNextGluePoint(const Point& rPnt, bool bPrev);
+ // P1 is deleted, a mark is set at P2 and true is returned.
+ bool MarkNextGluePoint();
// Draw a selection frame for glue point marking.
// This routine will just be started in case that HasMarkablePoints() returns sal_True.
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index d5c9149f34bc..9f8ef8f95422 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -656,7 +656,7 @@ public:
void SetGlueReallyAbsolute(bool bOn);
void NbcRotateGluePoints(const Point& rRef, long nAngle, double sn, double cs);
void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2);
- void NbcShearGluePoints (const Point& rRef, long nAngle, double tn, bool bVShear);
+ void NbcShearGluePoints (const Point& rRef, double tn, bool bVShear);
// if bTail1 is true, line start, otherwise line end
// if pObj is null disconnect
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 07532267e8be..a8bc11bb2f94 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -157,7 +157,7 @@ public:
const OUString& GetFileName() const { return aFileName;}
const OUString& GetFilterName() const { return aFilterName;}
- void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize);
+ void StartAnimation();
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
virtual sal_uInt16 GetObjIdentifier() const override;
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 2e71f0b835c2..fc9af9e3651a 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -58,7 +58,7 @@ private:
SVX_DLLPRIVATE void SetGraphic_Impl(const Graphic* pGrf);
// #i118485# helper added
- SVX_DLLPRIVATE SdrObject* createSdrGrafObjReplacement(bool bAddText, bool bUseHCGraphic) const;
+ SVX_DLLPRIVATE SdrObject* createSdrGrafObjReplacement(bool bAddText) const;
SVX_DLLPRIVATE void ImpSetVisAreaSize();
protected:
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index f4ad038f1e22..9b527eb3843e 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -124,7 +124,7 @@ public:
// insert point
sal_uInt32 NbcInsPointOld(const Point& rPos, bool bNewObj);
- sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, bool bNewObj);
+ sal_uInt32 NbcInsPoint(const Point& rPos, bool bNewObj);
// rip at given point
SdrObject* RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index);
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 077691579c3f..3373d16fdf84 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -319,7 +319,7 @@ bool ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* p
return false;
}
-void ScDocument::StartAnimations( SCTAB nTab, vcl::Window* pWin )
+void ScDocument::StartAnimations( SCTAB nTab, vcl::Window* /*pWin*/ )
{
if (!pDrawLayer)
return;
@@ -336,8 +336,7 @@ void ScDocument::StartAnimations( SCTAB nTab, vcl::Window* pWin )
{
if ( pGrafObj->IsAnimated() )
{
- const tools::Rectangle& rRect = pGrafObj->GetCurrentBoundRect();
- pGrafObj->StartAnimation( pWin, rRect.TopLeft(), rRect.GetSize() );
+ pGrafObj->StartAnimation();
}
}
pObject = aIter.Next();
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 87b25fc22bbe..3431ba90b026 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -1346,8 +1346,8 @@ sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum)
// Get background flags
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
return DuplicatePage (
@@ -1490,8 +1490,8 @@ void SdDrawDocument::SetupNewPage (
if (pPreviousPage != nullptr)
{
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
SetOfByte aVisibleLayers = pPreviousPage->TRG_GetMasterPageVisibleLayers();
aVisibleLayers.Set(aBckgrnd, bIsPageBack);
aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index c96a8f122033..1395fe678ae1 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -542,7 +542,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t
// background objects of the master page
pSdrObj->SetLayer( rLayerAdmin.
- GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false) );
+ GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)) );
}
// Subscribe object at the style sheet
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index b11bbd2cb187..8af77d0965f8 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -246,8 +246,8 @@ bool ImplSdPPTImport::Import()
((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- mnBackgroundLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ), false );
- mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ), false );
+ mnBackgroundLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ) );
+ mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) );
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
if ( pDocShell )
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index f126e3c82885..1d6a6fc038bb 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -733,7 +733,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
if( pDoc )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
- SdrLayer* aSdrLayer = rLayerAdmin.GetLayer(sDisplay, false);
+ SdrLayer* aSdrLayer = rLayerAdmin.GetLayer(sDisplay);
if( aSdrLayer )
{
OUString layerAltText = aSdrLayer->GetTitle();
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 7b19236c7857..3d77b676884b 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -131,7 +131,7 @@ sal_Int8 LayerTabBar::AcceptDrop( const AcceptDropEvent& rEvt )
sal_uInt16 nPageId = SDRPAGE_NOTFOUND;
Point aPos( PixelToLogic( rEvt.maPosPixel ) );
sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc().GetLayerAdmin().GetLayerID(
- GetPageText( GetPageId( aPos ) ), false );
+ GetPageText( GetPageId( aPos ) ) );
nRet = pDrViewSh->AcceptDrop( rEvt, *this, nullptr, nPageId, nLayerId );
@@ -148,7 +148,7 @@ sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
sal_uInt16 nPageId = SDRPAGE_NOTFOUND;
sal_uInt16 nLayerId = pDrViewSh->GetView()->GetDoc().GetLayerAdmin().GetLayerID(
- GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ), false );
+ GetPageText( GetPageId( PixelToLogic( rEvt.maPosPixel ) ) ) );
sal_Int8 nRet = pDrViewSh->ExecuteDrop( rEvt, *this, nullptr, nPageId, nLayerId );
EndSwitchPage();
@@ -208,7 +208,7 @@ TabBarAllowRenamingReturnCode LayerTabBar::AllowRenaming()
OUString aNewName( GetEditText() );
if (aNewName.isEmpty() ||
- (rLayerAdmin.GetLayer( aNewName, false ) && aLayerName != aNewName) )
+ (rLayerAdmin.GetLayer( aNewName ) && aLayerName != aNewName) )
{
// Name already exists
ScopedVclPtrInstance<WarningBox> aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ),
@@ -247,7 +247,7 @@ void LayerTabBar::EndRenaming()
SdDrawDocument& rDoc = pView->GetDoc();
OUString aLayerName = pView->GetActiveLayer();
SdrLayerAdmin& rLayerAdmin = rDoc.GetLayerAdmin();
- SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, false);
+ SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName);
if (pLayer)
{
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index c35ea41f4857..5708102dedb8 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -229,7 +229,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES));
- pObj->SetLayer(rAdmin.GetLayerID(aStr, false));
+ pObj->SetLayer(rAdmin.GetLayerID(aStr));
}
// init text position when vertical caption object is created
@@ -489,7 +489,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES));
- pObj->SetLayer(rAdmin.GetLayerID(aStr, false));
+ pObj->SetLayer(rAdmin.GetLayerID(aStr));
}
else if (nSlotId == OBJ_CUSTOMSHAPE )
{
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index bf7a577a7202..bdb72cccccc6 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -107,7 +107,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
if (mpView->IsGluePointMarked(aVEvt.pObj, aVEvt.nGlueId) && rMEvt.IsShift())
{
- mpView->UnmarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, aVEvt.pPV);
+ mpView->UnmarkGluePoint(aVEvt.pObj, aVEvt.nGlueId);
pHdl = nullptr;
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 9bcc3d6f1229..51ec16651ba1 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -468,9 +468,9 @@ SfxRequest LayoutMenu::CreateRequest (
{
SdrLayerAdmin& rLayerAdmin (mrBase.GetDocument()->GetLayerAdmin());
sal_uInt8 aBackground (rLayerAdmin.GetLayerID(
- SD_RESSTR(STR_LAYER_BCKGRND), false));
+ SD_RESSTR(STR_LAYER_BCKGRND)));
sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(
- SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false));
+ SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
ViewShell* pViewShell = mrBase.GetMainViewShell().get();
if (pViewShell == nullptr)
break;
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 031fb61f6913..b4dfa803e5db 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -946,8 +946,8 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
// Undo
SdPage* pUndoPage = pPageToRename;
SdrLayerAdmin & rLayerAdmin = pDocument->GetLayerAdmin();
- sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ), false );
- sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ), false );
+ sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ) );
+ sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) );
SetOfByte aVisibleLayers = pPageToRename->TRG_GetMasterPageVisibleLayers();
// (#67720#)
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 9e831a2f51f4..f78122dca27d 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -109,7 +109,7 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() throw ()
// From the model get the current SdrLayer object via the layer admin.
SdrLayerAdmin& rLayerAdmin = pSdModel->GetLayerAdmin ();
- SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer(), true);
+ SdrLayer* pLayer = rLayerAdmin.GetLayer (mrView.GetActiveLayer());
if (pLayer == nullptr)
break;
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index b9fc3c43014f..3ce581a80ef7 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -486,7 +486,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
OUString aLayerName;
// Test for existing names
- while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName, false) )
+ while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName ) )
{
aLayerName = SD_RESSTR(STR_LAYER);
aLayerName += OUString::number(nLayer);
@@ -613,7 +613,7 @@ uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName )
throw lang::DisposedException();
SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin();
- SdrLayer* pLayer = rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), false );
+ SdrLayer* pLayer = rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ) );
if( pLayer == nullptr )
throw container::NoSuchElementException();
@@ -653,7 +653,7 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName )
SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin();
- return nullptr != rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), false );
+ return nullptr != rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ) );
}
// XElementAccess
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 6fb83a46f59f..b86bb4f8b30e 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -468,8 +468,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
{
sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PageKind::Standard );
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
SdPage* pStandardPage = nullptr;
@@ -530,8 +530,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, true );
}
- aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
aVisibleLayers.Set(aBckgrnd, bIsPageBack);
aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index ce0bf91fa98d..d865abc448e4 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -793,7 +793,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false), bVisible);
+ aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)), bVisible);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -813,7 +813,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false), bVisible);
+ aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)), bVisible);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -1218,7 +1218,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false));
+ aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)));
}
else
{
@@ -1237,7 +1237,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false));
+ aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
}
else
{
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index be79b7387cd9..581c182049e3 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -198,8 +198,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
pCurrentPage->SetAutoLayout(aNewAutoLayout, true);
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
aVisibleLayers.Set(aBckgrnd, bBVisible);
aVisibleLayers.Set(aBckgrndObj, bBObjsVisible);
pCurrentPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
@@ -259,8 +259,8 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP
// Transform the given request into the four argument form that is
// understood by ProcessModifyPageSlot().
SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin());
- sal_uInt8 aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false));
- sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false));
+ sal_uInt8 aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)));
+ sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
SetOfByte aVisibleLayers;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 938cb6c5b842..3e1a597c4e7f 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1409,7 +1409,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
pDlg->GetAttr( aNewAttr );
aLayerName = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_NAME)).GetValue ();
- if( rLayerAdmin.GetLayer( aLayerName, false )
+ if( rLayerAdmin.GetLayer( aLayerName )
|| aLayerName.isEmpty() )
{
// name already exists
@@ -1478,7 +1478,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
mpDrawView->InsertNewLayer(aLayerName, nPrevLayer + 1);
- pLayer = rLayerAdmin.GetLayer(aLayerName, false);
+ pLayer = rLayerAdmin.GetLayer(aLayerName);
if( pLayer )
{
pLayer->SetTitle( aLayerTitle );
@@ -1521,7 +1521,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId();
OUString aLayerName = GetLayerTabControl()->GetPageText(nCurPage);
- SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, false);
+ SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName);
OUString aLayerTitle = pLayer->GetTitle();
OUString aLayerDesc = pLayer->GetDescription();
@@ -1578,7 +1578,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
pDlg->GetAttr( aNewAttr );
aLayerName = static_cast<const SfxStringItem &>( aNewAttr.Get (ATTR_LAYER_NAME)).GetValue ();
- if( (rLayerAdmin.GetLayer( aLayerName, false ) &&
+ if( (rLayerAdmin.GetLayer( aLayerName ) &&
aLayerName != aOldLayerName) || aLayerName.isEmpty() )
{
// name already exists
@@ -2868,9 +2868,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
sal_uInt8 aLayerId;
if (nSId == SID_DISPLAY_MASTER_BACKGROUND)
- aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
+ aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
else
- aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId));
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 825dbf1d2bbd..6bc0613f250a 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -108,7 +108,7 @@ void DrawViewShell::DeleteActualLayer()
if (ScopedVclPtrInstance<QueryBox>(GetActiveWindow(), WB_YES_NO, aString)->Execute() == RET_YES)
{
- const SdrLayer* pLayer = rAdmin.GetLayer(rName, false);
+ const SdrLayer* pLayer = rAdmin.GetLayer(rName);
mpDrawView->DeleteLayer( pLayer->GetName() );
/* in order to redraw TabBar and Window; should be initiated later on by
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 59535abcbe7c..9ba7f6bb4dce 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -454,7 +454,7 @@ void DrawViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::Pro
rSequence[nIndex].Value <<= mbZoomOnPage;
// Common SdrModel processing
- GetDocSh()->GetDoc()->WriteUserDataSequence(rSequence, bBrowse);
+ GetDocSh()->GetDoc()->WriteUserDataSequence(rSequence);
}
void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse )
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 97644b2321ca..c71a0641b227 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1522,8 +1522,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
- sal_uInt8 aBackgroundId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aObjectId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBackgroundId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aObjectId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_BACKGROUND,
aVisibleLayers.IsSet(aBackgroundId)));
rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_OBJECTS,
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 258eaeab56f1..8c6a43d8a8dc 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -81,8 +81,8 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName )
// Undo
SdPage* pUndoPage = pPageToRename;
SdrLayerAdmin & rLayerAdmin = GetDoc()->GetLayerAdmin();
- sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND), false );
- sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false );
+ sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND) );
+ sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ) );
SetOfByte aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers();
::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager();
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index afbb9c07e917..3716eb566b7a 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -58,8 +58,8 @@ ModifyPageUndoAction::ModifyPageUndoAction(
{
maOldName = mpPage->GetName();
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
SetOfByte aVisibleLayers = mpPage->TRG_GetMasterPageVisibleLayers();
mbOldBckgrndVisible = aVisibleLayers.IsSet(aBckgrnd);
@@ -104,8 +104,8 @@ void ModifyPageUndoAction::Undo()
}
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
SetOfByte aVisibleLayers;
aVisibleLayers.Set(aBckgrnd, mbOldBckgrndVisible);
aVisibleLayers.Set(aBckgrndObj, mbOldBckgrndObjsVisible);
@@ -147,8 +147,8 @@ void ModifyPageUndoAction::Redo()
}
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
SetOfByte aVisibleLayers;
aVisibleLayers.Set(aBckgrnd, mbNewBckgrndVisible);
aVisibleLayers.Set(aBckgrndObj, mbNewBckgrndObjsVisible);
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 85df9e38e0f3..aa83468634c6 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -202,8 +202,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
sal_uInt16 nSId = rRequest.GetSlot();
SdDrawDocument* pDocument = GetDoc();
SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
SetOfByte aVisibleLayers;
// Determine the page from which to copy some values, such as layers,
// size, master page, to the new page. This is usually the given page.
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index c5e28ed56e93..76c903c15b92 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -318,7 +318,7 @@ void SdrPageWindow::RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedir
// Draw all layers. do NOT draw form layer from CompleteRedraw, this is done separately
// as a single layer paint
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
- const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), false);
+ const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName());
aProcessLayers.Clear(nControlLayerId);
// still something to paint?
@@ -368,7 +368,7 @@ void SdrPageWindow::RedrawLayer(const SdrLayerID* pId,
{
// find out if we are painting the ControlLayer
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
- const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), false);
+ const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName());
const bool bControlLayerProcessingActive(nControlLayerId == *pId);
// create PaintInfoRec, use Rectangle only temporarily
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 88577c27d3a9..2a2b1e309446 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -395,7 +395,7 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, cons
aLay = maMeasureLayer;
}
- SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,true);
+ SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay);
if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer))
{
@@ -612,11 +612,11 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
if(dynamic_cast<const FmFormObj*>( pObj) != nullptr)
{
// for FormControls, force to form layer
- nLayer = rAd.GetLayerID(rAd.GetControlLayerName(), true);
+ nLayer = rAd.GetLayerID(rAd.GetControlLayerName());
}
else
{
- nLayer = rAd.GetLayerID(maActualLayer, true);
+ nLayer = rAd.GetLayerID(maActualLayer);
}
if(SDRLAYER_NOTFOUND == nLayer)
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 0a3a33f34b5a..7feb11c33959 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -627,7 +627,7 @@ bool SdrDragView::IsInsObjPointPossible() const
return mpMarkedObj!=nullptr && mpMarkedObj->IsPolyObj();
}
-bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut)
+bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 /*nIdx*/, const Point& rPnt, bool bNewObj, OutputDevice* pOut)
{
bool bRet(false);
@@ -651,7 +651,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point
if(bIdxZwang)
{
- mnInsPointNum = pMarkedPath->NbcInsPoint(nIdx, aPt, bNewObj);
+ mnInsPointNum = pMarkedPath->NbcInsPoint(aPt, bNewObj);
}
else
{
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 6cdd8e926f6d..ebbbf88b5aea 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -196,7 +196,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
void SdrEditView::DeleteLayer(const OUString& rName)
{
SdrLayerAdmin& rLA = mpModel->GetLayerAdmin();
- SdrLayer* pLayer = rLA.GetLayer(rName, true);
+ SdrLayer* pLayer = rLA.GetLayer(rName);
sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer));
if(SDRLAYER_NOTFOUND != nLayerNum)
@@ -954,7 +954,7 @@ void SdrEditView::CopyMarkedObj()
bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInsertFlags nOptions)
{
if (nOptions & SdrInsertFlags::SETDEFLAYER) {
- SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(maActualLayer,true);
+ SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(maActualLayer);
if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) {
SdrObject::Free( pObj ); // Layer locked or invisible
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 1819660f982f..67cd2d764c4e 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -690,7 +690,7 @@ void SdrEditView::DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon&
}
-void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bReplaceAll*/)
+void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr)
{
// bReplaceAll has no effect here
tools::Rectangle aAllSnapRect(GetMarkedObjRect());
@@ -776,9 +776,8 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep
}
}
-void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyHardAttr*/) const
+void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr) const
{
- // bOnlyHardAttr has no effect here.
// TODO: Take into account the origin and PvPos.
tools::Rectangle aAllSnapRect(GetMarkedObjRect()); // TODO: change this for PolyPt's and GluePt's!!!
long nAllSnapPosX=aAllSnapRect.Left();
@@ -1168,7 +1167,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll)
// better check before what to do:
// pObj->SetAttr() or SetNotPersistAttr()
// TODO: missing implementation!
- SetNotPersistAttrToMarked(rAttr,bReplaceAll);
+ SetNotPersistAttrToMarked(rAttr);
if( bUndo )
EndUndo();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 4748b1eb018c..ff71c07db5bb 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -154,11 +154,10 @@ SdrPageView* SdrObjEditView::ShowSdrPage(SdrPage* pPage)
// Found one, so create an outliner view, to get invalidations when
// the text edit changes.
- bool bEmpty = pView->GetTextEditObject()->GetOutlinerParaObject() == nullptr;
// Call GetSfxViewShell() to make sure ImpMakeOutlinerView()
// registers the view shell of this draw view, and not the view
// shell of pView.
- OutlinerView* pOutlinerView = pView->ImpMakeOutlinerView(static_cast<vcl::Window*>(pOutDev), !bEmpty, nullptr, GetSfxViewShell());
+ OutlinerView* pOutlinerView = pView->ImpMakeOutlinerView(static_cast<vcl::Window*>(pOutDev), nullptr, GetSfxViewShell());
pOutlinerView->HideCursor();
pView->GetTextEditOutliner()->InsertView(pOutlinerView);
}
@@ -505,7 +504,7 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const
}
}
-OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoPaint*/, OutlinerView* pGivenView, SfxViewShell* pViewShell) const
+OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, OutlinerView* pGivenView, SfxViewShell* pViewShell) const
{
// background
Color aBackground(GetTextEditBackgroundColor(*this));
@@ -794,8 +793,6 @@ bool SdrObjEditView::SdrBeginTextEdit(
pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
}
- bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==nullptr;
-
aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl();
// FieldHdl has to be set by SdrBeginTextEdit, because this call an UpdateFields
pTextEditOutliner->SetCalcFieldValueHdl(LINK(this,SdrObjEditView,ImpOutlinerCalcFieldValueHdl));
@@ -861,7 +858,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
// to call AdjustMarkHdl() always.
AdjustMarkHdl();
- pTextEditOutlinerView=ImpMakeOutlinerView(pWin,!bEmpty,pGivenOutlinerView);
+ pTextEditOutlinerView=ImpMakeOutlinerView(pWin,pGivenOutlinerView);
// check if this view is already inserted
sal_uIntPtr i2,nCount = pTextEditOutliner->GetViewCount();
@@ -887,7 +884,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
if(&rOutDev != pWin && OUTDEV_WINDOW == rOutDev.GetOutDevType())
{
- OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), !bEmpty, nullptr);
+ OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), nullptr);
pTextEditOutliner->InsertView(pOutlView, (sal_uInt16)i);
}
}
@@ -910,7 +907,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
if(&rOutDev != pWin && OUTDEV_WINDOW == rOutDev.GetOutDevType())
{
- OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), !bEmpty, nullptr);
+ OutlinerView* pOutlView = ImpMakeOutlinerView(static_cast<vcl::Window*>(&rOutDev), nullptr);
pOutlView->HideCursor();
pTextEditOutliner->InsertView(pOutlView);
}
@@ -1372,7 +1369,6 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
TextChainCursorManager *SdrObjEditView::ImpHandleMotionThroughBoxesKeyInput(
const KeyEvent& rKEvt,
- vcl::Window*,
bool *bOutHandled)
{
*bOutHandled = false;
@@ -1405,7 +1401,7 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
// We possibly move to another box before any handling
bool bHandled = false;
std::unique_ptr<TextChainCursorManager> xCursorManager(
- ImpHandleMotionThroughBoxesKeyInput(rKEvt, pWin, &bHandled));
+ ImpHandleMotionThroughBoxesKeyInput(rKEvt, &bHandled));
if (bHandled)
return true;
/* End special handling of keys within a chain */
@@ -1688,7 +1684,7 @@ bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) c
if(GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get())
{
- MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr);
+ MergeNotPersistAttrFromMarked(rTargetSet);
}
return true;
@@ -1818,7 +1814,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
if (GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get())
{
- SetNotPersistAttrToMarked(aSet,bReplaceAll);
+ SetNotPersistAttrToMarked(aSet);
}
}
FlushComeBackTimer();
@@ -1895,7 +1891,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pW
if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW)
{
- OutlinerView* pOutlView=ImpMakeOutlinerView(static_cast<vcl::Window*>(pNewWin),false,nullptr);
+ OutlinerView* pOutlView=ImpMakeOutlinerView(static_cast<vcl::Window*>(pNewWin),nullptr);
pTextEditOutliner->InsertView(pOutlView);
}
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 5b53f4ad2d54..d0d6be8d9dd5 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -185,12 +185,12 @@ void ImpSdrGDIMetaFileImport::DoLoopActions(GDIMetaFile& rMtf, SvdProgressInfo*
case MetaActionType::MASKSCALE : DoAction(static_cast<MetaMaskScaleAction&>(*pAct)); break;
case MetaActionType::MASKSCALEPART : DoAction(static_cast<MetaMaskScalePartAction&>(*pAct)); break;
case MetaActionType::GRADIENT : DoAction(static_cast<MetaGradientAction&>(*pAct)); break;
- case MetaActionType::WALLPAPER : DoAction(static_cast<MetaWallpaperAction&>(*pAct)); break;
+ case MetaActionType::WALLPAPER : OSL_ENSURE(false, "Tried to construct SdrObject from MetaWallpaperAction: not supported (!)"); break;
case MetaActionType::Transparent : DoAction(static_cast<MetaTransparentAction&>(*pAct)); break;
- case MetaActionType::EPS : DoAction(static_cast<MetaEPSAction&>(*pAct)); break;
+ case MetaActionType::EPS : OSL_ENSURE(false, "Tried to construct SdrObject from MetaEPSAction: not supported (!)"); break;
case MetaActionType::REFPOINT : DoAction(static_cast<MetaRefPointAction&>(*pAct)); break;
case MetaActionType::TEXTLINECOLOR : DoAction(static_cast<MetaTextLineColorAction&>(*pAct)); break;
- case MetaActionType::TEXTLINE : DoAction(static_cast<MetaTextLineAction&>(*pAct)); break;
+ case MetaActionType::TEXTLINE : OSL_ENSURE(false, "Tried to construct SdrObject from MetaTextLineAction: not supported (!)"); break;
case MetaActionType::FLOATTRANSPARENT : DoAction(static_cast<MetaFloatTransparentAction&>(*pAct)); break;
case MetaActionType::GRADIENTEX : DoAction(static_cast<MetaGradientExAction&>(*pAct)); break;
case MetaActionType::LAYOUTMODE : DoAction(static_cast<MetaLayoutModeAction&>(*pAct)); break;
@@ -1415,11 +1415,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct)
}
}
-void ImpSdrGDIMetaFileImport::DoAction(MetaWallpaperAction&)
-{
- OSL_ENSURE(false, "Tried to construct SdrObject from MetaWallpaperAction: not supported (!)");
-}
-
void ImpSdrGDIMetaFileImport::DoAction(MetaTransparentAction& rAct)
{
basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon());
@@ -1437,16 +1432,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaTransparentAction& rAct)
}
}
-void ImpSdrGDIMetaFileImport::DoAction(MetaEPSAction&)
-{
- OSL_ENSURE(false, "Tried to construct SdrObject from MetaEPSAction: not supported (!)");
-}
-
-void ImpSdrGDIMetaFileImport::DoAction(MetaTextLineAction&)
-{
- OSL_ENSURE(false, "Tried to construct SdrObject from MetaTextLineAction: not supported (!)");
-}
-
void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction& rAct)
{
basegfx::B2DPolyPolygon aSource(rAct.GetPolyPolygon().getB2DPolyPolygon());
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index b6b4b7e0df26..25621d7ac7cf 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -129,12 +129,9 @@ protected:
void DoAction(MetaMaskScaleAction& rAct);
void DoAction(MetaMaskScalePartAction& rAct);
void DoAction(MetaGradientAction& rAct);
- static void DoAction(MetaWallpaperAction& rAct);
void DoAction(MetaTransparentAction& rAct);
- static void DoAction(MetaEPSAction& rAct);
void DoAction(MetaRefPointAction& rAct) { rAct.Execute(mpVD); }
void DoAction(MetaTextLineColorAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; }
- static void DoAction(MetaTextLineAction& rAct);
void DoAction(MetaFloatTransparentAction& rAct);
void DoAction(MetaGradientExAction& rAct);
void DoAction(MetaLayoutModeAction& rAct) { rAct.Execute(mpVD); mbFntDirty = true; }
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 7563fa3bc57c..835adc1c8205 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -243,7 +243,7 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nAngle, c
if (pObj!=nullptr) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
-void SdrGluePoint::Shear(const Point& rRef, long /*nAngle*/, double tn, bool bVShear, const SdrObject* pObj)
+void SdrGluePoint::Shear(const Point& rRef, double tn, bool bVShear, const SdrObject* pObj)
{
Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos());
ShearPoint(aPt,rRef,tn,bVShear);
@@ -396,11 +396,11 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nAngl
}
}
-void SdrGluePointList::Shear(const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj)
+void SdrGluePointList::Shear(const Point& rRef, double tn, bool bVShear, const SdrObject* pObj)
{
sal_uInt16 nCount=GetCount();
for (sal_uInt16 nNum=0; nNum<nCount; nNum++) {
- GetObject(nNum)->Shear(rRef,nAngle,tn,bVShear,pObj);
+ GetObject(nNum)->Shear(rRef,tn,bVShear,pObj);
}
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 1bc9783c7540..5f8212d6b7f7 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -613,7 +613,7 @@ void SdrHdl::CreateB2dIAObject()
{
pNewOverlayObject = CreateOverlayObject(
aPosition, eColIndex, eKindOfMarker,
- rOutDev, aMoveOutsideOffset);
+ aMoveOutsideOffset);
}
// OVERLAYMANAGER
if (pNewOverlayObject)
@@ -784,7 +784,7 @@ BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, BitmapColorIndex eIndex)
sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
const basegfx::B2DPoint& rPos,
- BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, OutputDevice& /*rOutDev*/, Point aMoveOutsideOffset)
+ BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset)
{
sdr::overlay::OverlayObject* pRetval = nullptr;
@@ -1602,12 +1602,10 @@ void ImpEdgeHdl::CreateB2dIAObject()
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
- OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
aPosition,
eColIndex,
- eKindOfMarker,
- rOutDev);
+ eKindOfMarker);
// OVERLAYMANAGER
if (pNewOverlayObject)
@@ -1720,12 +1718,10 @@ void ImpMeasureHdl::CreateB2dIAObject()
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
- OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
aPosition,
eColIndex,
- eKindOfMarker,
- rOutDev);
+ eKindOfMarker);
// OVERLAYMANAGER
if (pNewOverlayObject)
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 33998f37796c..a10c2aa14fcf 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -241,12 +241,12 @@ sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
return sal_uInt16(nRet);
}
-SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool bInherited)
+SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName)
{
- return const_cast<SdrLayer*>(const_cast<const SdrLayerAdmin*>(this)->GetLayer(rName, bInherited));
+ return const_cast<SdrLayer*>(const_cast<const SdrLayerAdmin*>(this)->GetLayer(rName));
}
-const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool /*bInherited*/) const
+const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName) const
{
sal_uInt16 i(0);
const SdrLayer* pLay = nullptr;
@@ -261,16 +261,16 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool /*bInherited
if(!pLay && pParent)
{
- pLay = pParent->GetLayer(rName, true);
+ pLay = pParent->GetLayer(rName);
}
return pLay;
}
-SdrLayerID SdrLayerAdmin::GetLayerID(const OUString& rName, bool bInherited) const
+SdrLayerID SdrLayerAdmin::GetLayerID(const OUString& rName) const
{
SdrLayerID nRet=SDRLAYER_NOTFOUND;
- const SdrLayer* pLay=GetLayer(rName,bInherited);
+ const SdrLayer* pLay=GetLayer(rName);
if (pLay!=nullptr) nRet=pLay->GetID();
return nRet;
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index f8c03fc614de..cbf4db08f645 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1963,7 +1963,7 @@ inline void addPair(std::vector< std::pair< OUString, Any > >& aUserData, const
aUserData.push_back(std::pair< OUString, Any >(name, css::uno::makeAny(val)));
}
-void SdrModel::WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues, bool /*bBrowse*/)
+void SdrModel::WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue >& rValues)
{
std::vector< std::pair< OUString, Any > > aUserData;
addPair(aUserData, "AnchoredTextOverflowLegacy", IsAnchoredTextOverflowLegacy());
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 8f5d5ca41359..59d4196a1ed1 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -250,7 +250,7 @@ bool SdrMarkView::MarkPoints(const tools::Rectangle* pRect, bool bUnmark)
return bChgd;
}
-bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, bool /*bPrev*/)
+bool SdrMarkView::MarkNextPoint()
{
ForceUndirtyMrkPnt();
SortMarkedObjects();
@@ -498,7 +498,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16
return false;
}
-bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, bool bUnmark)
+bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, bool bUnmark)
{
if (!IsGluePointEditMode()) return false;
ForceUndirtyMrkPnt();
@@ -554,7 +554,7 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) cons
return nullptr;
}
-bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, bool /*bPrev*/)
+bool SdrMarkView::MarkNextGluePoint()
{
ForceUndirtyMrkPnt();
SortMarkedObjects();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 82d9ceb7bf99..20edcb48e1fe 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1465,10 +1465,10 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
SetGlueReallyAbsolute(false);
}
-void SdrObject::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
+void SdrObject::NbcShear(const Point& rRef, long /*nAngle*/, double tn, bool bVShear)
{
SetGlueReallyAbsolute(true);
- NbcShearGluePoints(rRef,nAngle,tn,bVShear);
+ NbcShearGluePoints(rRef,tn,bVShear);
SetGlueReallyAbsolute(false);
}
@@ -2106,7 +2106,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
OUString aLayerName=static_cast<const SdrLayerNameItem*>(pPoolItem)->GetValue();
const SdrLayerAdmin* pLayAd=pPage!=nullptr ? &pPage->GetLayerAdmin() : pModel!=nullptr ? &pModel->GetLayerAdmin() : nullptr;
if (pLayAd!=nullptr) {
- const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, true);
+ const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName);
if (pLayer!=nullptr) {
nLayer=pLayer->GetID();
}
@@ -2313,13 +2313,13 @@ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2)
}
}
-void SdrObject::NbcShearGluePoints(const Point& rRef, long nAngle, double tn, bool bVShear)
+void SdrObject::NbcShearGluePoints(const Point& rRef, double tn, bool bVShear)
{
// First a const call to see whether there are any glue points.
// Force const call!
if (GetGluePointList()!=nullptr) {
SdrGluePointList* pGPL=ForceGluePointList();
- pGPL->Shear(rRef,nAngle,tn,bVShear,this);
+ pGPL->Shear(rRef,tn,bVShear,this);
}
}
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 62f73c21d8b9..5076d00b95c9 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1005,7 +1005,7 @@ void SdrGrafObj::SetModel( SdrModel* pNewModel )
ImpLinkAnmeldung();
}
-void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoint*/, const Size& /*rSize*/)
+void SdrGrafObj::StartAnimation()
{
SetGrafAnimationAllowed(true);
}
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 3ba147e89433..7be3f4e94887 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -484,7 +484,7 @@ void SdrObjGroup::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShe
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcShear(rRef,nAngle,tn,bVShear);
}
- NbcShearGluePoints(rRef,nAngle,tn,bVShear);
+ NbcShearGluePoints(rRef,tn,bVShear);
SetGlueReallyAbsolute(false);
}
@@ -674,7 +674,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
SdrObject* pObj=pOL->GetObj(i);
if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nAngle,tn,bVShear);
}
- NbcShearGluePoints(rRef,nAngle,tn,bVShear);
+ NbcShearGluePoints(rRef,tn,bVShear);
SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 85b108357464..b331d5d848d7 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1196,7 +1196,7 @@ void SdrOle2Obj::Disconnect_Impl()
mpImpl->mbConnected = false;
}
-SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHCGraphic */) const
+SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText) const
{
const Graphic* pOLEGraphic = GetGraphic();
@@ -1258,7 +1258,7 @@ SdrObject* SdrOle2Obj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
// #i118485# missing converter added
if(GetModel())
{
- SdrObject* pRetval = createSdrGrafObjReplacement(true, false);
+ SdrObject* pRetval = createSdrGrafObjReplacement(true);
if(pRetval)
{
@@ -1428,7 +1428,7 @@ void SdrOle2Obj::SetClosedObj( bool bIsClosed )
SdrObject* SdrOle2Obj::getFullDragClone() const
{
// #i118485# use central replacement generator
- return createSdrGrafObjReplacement(false, true);
+ return createSdrGrafObjReplacement(false);
}
void SdrOle2Obj::SetPersistName( const OUString& rPersistName )
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index a14a864e2ed9..894d6cbff6c0 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2545,7 +2545,7 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj)
if(bNewObj)
{
- nNewHdl = NbcInsPoint(0L, rPos, true);
+ nNewHdl = NbcInsPoint(rPos, true);
}
else
{
@@ -2556,22 +2556,14 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj)
double fSmallestCut;
basegfx::tools::getSmallestDistancePointToPolyPolygon(GetPathPoly(), aTestPoint, nSmallestPolyIndex, nSmallestEdgeIndex, fSmallestCut);
- // create old polygon index from it
- sal_uInt32 nPolyIndex(nSmallestEdgeIndex);
-
- for(sal_uInt32 a(0L); a < nSmallestPolyIndex; a++)
- {
- nPolyIndex += GetPathPoly().getB2DPolygon(a).count();
- }
-
- nNewHdl = NbcInsPoint(nPolyIndex, rPos, false);
+ nNewHdl = NbcInsPoint(rPos, false);
}
ImpForceKind();
return nNewHdl;
}
-sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bool bNewObj)
+sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj)
{
sal_uInt32 nNewHdl;
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 995e4cd0469f..a64c35ab1034 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -208,7 +208,7 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
SetGlueReallyAbsolute(false);
}
-void SdrTextObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
+void SdrTextObj::NbcShear(const Point& rRef, long /*nAngle*/, double tn, bool bVShear)
{
SetGlueReallyAbsolute(true);
@@ -226,7 +226,7 @@ void SdrTextObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea
}
ImpCheckShear();
SetRectsDirty();
- NbcShearGluePoints(rRef,nAngle,tn,bVShear);
+ NbcShearGluePoints(rRef,tn,bVShear);
SetGlueReallyAbsolute(false);
}
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index c3f35eb16f94..b8fd9863cfde 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -610,7 +610,7 @@ void SdrPageView::SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa)
if(!GetPage())
return;
- SdrLayerID nID = GetPage()->GetLayerAdmin().GetLayerID(rName, true);
+ SdrLayerID nID = GetPage()->GetLayerAdmin().GetLayerID(rName);
if(SDRLAYER_NOTFOUND != nID)
rBS.Set(nID, bJa);
@@ -625,7 +625,7 @@ bool SdrPageView::IsLayer(const OUString& rName, const SetOfByte& rBS) const
if (!rName.isEmpty())
{
- SdrLayerID nId = GetPage()->GetLayerAdmin().GetLayerID(rName, true);
+ SdrLayerID nId = GetPage()->GetLayerAdmin().GetLayerID(rName);
if(SDRLAYER_NOTFOUND != nId)
{
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 37d66e748839..85f5c4648ebf 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -854,7 +854,7 @@ void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow )
{
const SdrModel& rModel = *(GetModel());
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
- const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), false);
+ const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName());
// BUFFERED use GetTargetOutputDevice() now, it may be targeted to VDevs, too
// need to set PreparedPageWindow to make DrawLayer use the correct ObjectContact
@@ -1003,7 +1003,7 @@ void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool /*bOnlyHar
bool bMeasure= dynamic_cast<const SdrView*>(this) != nullptr && static_cast<const SdrView*>(this)->IsMeasureTool();
const OUString& aNam = bMeasure ? maMeasureLayer : maActualLayer;
rAttr.Put(SdrLayerNameItem(aNam));
- SdrLayerID nLayer=mpModel->GetLayerAdmin().GetLayerID(aNam,true);
+ SdrLayerID nLayer=mpModel->GetLayerAdmin().GetLayerID(aNam);
if (nLayer!=SDRLAYER_NOTFOUND) {
rAttr.Put(SdrLayerIdItem(nLayer));
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 5f957e81f37c..634ae5d50c1b 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -854,7 +854,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
case SdrEventKind::MarkPoint: { // + (if applicable) BegDrag
if (!rVEvt.bAddMark) UnmarkAllPoints();
if (rVEvt.bPrevNextMark) {
- bRet=MarkNextPoint(aLogicPos,rVEvt.bMarkPrev);
+ bRet=MarkNextPoint();
} else {
bRet=MarkPoint(*rVEvt.pHdl,rVEvt.bUnmark);
}
@@ -866,9 +866,9 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
case SdrEventKind::MarkGluePoint: { // + (if applicable) BegDrag
if (!rVEvt.bAddMark) UnmarkAllGluePoints();
if (rVEvt.bPrevNextMark) {
- bRet=MarkNextGluePoint(aLogicPos,rVEvt.bMarkPrev);
+ bRet=MarkNextGluePoint();
} else {
- bRet=MarkGluePoint(rVEvt.pObj,rVEvt.nGlueId,rVEvt.pPV,rVEvt.bUnmark);
+ bRet=MarkGluePoint(rVEvt.pObj,rVEvt.nGlueId,rVEvt.bUnmark);
}
if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId);
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 0692f647ff66..b8b7d0d612b4 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -114,7 +114,7 @@ bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& r
if (pObjList!=nullptr) {
const SdrPage* pPg=pObjList->GetPage();
if (pPg!=nullptr) {
- rLayer=pPg->GetLayerAdmin().GetLayerID(maActualLayer,true);
+ rLayer=pPg->GetLayerAdmin().GetLayerID(maActualLayer);
if (rLayer==SDRLAYER_NOTFOUND) rLayer=0;
SdrPageView* pPV = GetSdrPageView();
if (pPV!=nullptr) {
@@ -327,11 +327,11 @@ bool SdrExchangeView::Paste(
if(dynamic_cast<const FmFormObj*>( pNeuObj) != nullptr)
{
// for FormControls, force to form layer
- nLayer = rAd.GetLayerID(rAd.GetControlLayerName(), true);
+ nLayer = rAd.GetLayerID(rAd.GetControlLayerName());
}
else
{
- nLayer = rAd.GetLayerID(maActualLayer, true);
+ nLayer = rAd.GetLayerID(maActualLayer);
}
if(SDRLAYER_NOTFOUND == nLayer)
@@ -672,7 +672,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ];
::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ];
const SdrLayerAdmin& rLayerAdmin = mpModel->GetLayerAdmin();
- const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), false );
+ const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName() );
for( size_t n = 0, nCount = GetMarkedObjectCount(); n < nCount; ++n )
{
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 60753d8d0cd7..591a9cadb391 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2314,7 +2314,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
OUString aLayerName;
if( rValue >>= aLayerName )
{
- const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, true);
+ const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName);
if( pLayer != nullptr )
{
mpObj->SetLayer( pLayer->GetID() );
More information about the Libreoffice-commits
mailing list