[Libreoffice-commits] core.git: include/svx svl/source svtools/source svx/inc svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Oct 20 06:34:04 UTC 2016
include/svx/ctredlin.hxx | 1
include/svx/dlgctrl.hxx | 1
include/svx/galtheme.hxx | 2 -
include/svx/imapdlg.hxx | 3 --
include/svx/sdasitm.hxx | 2 -
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 2 -
include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx | 3 --
include/svx/sdr/overlay/overlayselection.hxx | 1
include/svx/svddrgmt.hxx | 1
include/svx/svdedtv.hxx | 1
include/svx/svdhdl.hxx | 2 -
include/svx/svdmrkv.hxx | 2 -
include/svx/svdobj.hxx | 5 ---
include/svx/svdocapt.hxx | 1
include/svx/svdoedge.hxx | 2 -
include/svx/svdograf.hxx | 2 -
include/svx/svdotext.hxx | 4 --
include/svx/svdpagv.hxx | 2 -
include/svx/svdpntv.hxx | 7 ----
include/svx/svdpoev.hxx | 1
include/svx/unoshape.hxx | 2 -
include/svx/xit.hxx | 1
svl/source/items/stylepool.cxx | 5 +--
svtools/source/contnr/imivctl.hxx | 2 -
svtools/source/contnr/imivctl1.cxx | 4 +-
svtools/source/control/roadmap.cxx | 4 --
svtools/source/inc/unoiface.hxx | 1
svtools/source/misc/transfer.cxx | 5 ---
svtools/source/uno/unoiface.cxx | 7 ----
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 3 --
svx/inc/sdr/overlay/overlayrectangle.hxx | 6 ----
svx/inc/sdr/overlay/overlayrollingrectangle.hxx | 6 ----
svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx | 1
svx/source/dialog/_contdlg.cxx | 2 -
svx/source/dialog/contimp.hxx | 1
svx/source/dialog/ctredlin.cxx | 7 ----
svx/source/dialog/imapdlg.cxx | 9 +-----
svx/source/form/fmexpl.cxx | 7 ----
svx/source/form/fmitems.cxx | 2 -
svx/source/form/fmshimp.cxx | 4 +-
svx/source/gallery2/galtheme.cxx | 6 +---
svx/source/inc/fmexpl.hxx | 1
svx/source/inc/fmitems.hxx | 2 -
svx/source/inc/fmshimp.hxx | 4 --
svx/source/items/customshapeitem.cxx | 2 -
svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 2 -
svx/source/sdr/attribute/sdrformtextattribute.cxx | 3 --
svx/source/sdr/attribute/sdrtextattribute.cxx | 6 +---
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 16 ++---------
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 2 -
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx | 2 -
svx/source/sdr/overlay/overlayrectangle.cxx | 8 ++---
svx/source/sdr/overlay/overlayrollingrectangle.cxx | 6 ++--
svx/source/sdr/overlay/overlayselection.cxx | 2 -
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 2 -
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2 -
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 1
svx/source/svdraw/svddrgmt.cxx | 2 -
svx/source/svdraw/svdedtv2.cxx | 2 -
svx/source/svdraw/svdhdl.cxx | 7 ----
svx/source/svdraw/svdmrkv.cxx | 2 -
svx/source/svdraw/svdobj.cxx | 7 ----
svx/source/svdraw/svdocapt.cxx | 7 ----
svx/source/svdraw/svdoedge.cxx | 2 -
svx/source/svdraw/svdograf.cxx | 7 ----
svx/source/svdraw/svdotext.cxx | 12 --------
svx/source/svdraw/svdotxat.cxx | 2 -
svx/source/svdraw/svdpagv.cxx | 8 -----
svx/source/svdraw/svdpntv.cxx | 16 ++---------
svx/source/svdraw/svdpoev.cxx | 7 ----
svx/source/table/viewcontactoftableobj.cxx | 14 +++------
svx/source/unodraw/unoshap2.cxx | 4 +-
svx/source/unodraw/unoshcol.cxx | 11 -------
svx/source/xoutdev/xattr.cxx | 2 -
74 files changed, 63 insertions(+), 240 deletions(-)
New commits:
commit c2b48a763df113e63e6a27ee05b9a6834e4e49a4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Oct 19 15:06:27 2016 +0200
loplugin:expandablemethodds in svx
Change-Id: I45447b6f5cf7e17d6e81e8c931b07b26d41b9a8c
Reviewed-on: https://gerrit.libreoffice.org/30057
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index de280f3..5954640 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -348,7 +348,6 @@ public:
virtual void dispose() override;
void ShowFilterPage();
- void ShowViewPage();
SvxTPFilter* GetFilterPage() { return pTPFilter;}
SvxTPView* GetViewPage() { return pTPView;}
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index ae7ecfb..2bcdfc1 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -178,7 +178,6 @@ public:
void SetPixelColor( const Color& rCol ) { aPixelColor = rCol; }
void SetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol; }
- void SetLineColor( const Color& rCol ) { aLineColor = rCol; }
sal_uInt16 GetLineCount() const { return nLines; }
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index d1abb8b..f93fd1b 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -129,7 +129,6 @@ public:
SAL_DLLPRIVATE bool ChangeObjectPos( size_t nOldPos, size_t nNewPos );
const OUString& GetName() const;
- SAL_DLLPRIVATE const OUString& GetRealName() const;
// used for building gallery themes during compilation:
SAL_DLLPRIVATE void SetDestDir(const OUString& rDestDir, bool bRelative)
@@ -159,7 +158,6 @@ public:
bool IsReadOnly() const;
bool IsDefault() const;
- SAL_DLLPRIVATE bool IsModified() const;
void Actualize( const Link<const INetURLObject&, void>& rActualizeLink, GalleryProgress* pProgress = nullptr );
SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; }
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 1bc7086..dccdfd6 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -142,9 +142,6 @@ public:
void SetExecState( bool bEnable );
- void SetGraphic( const Graphic& rGraphic );
-
- void SetEditingObject( void* pObj ) { pCheckObj = pObj; }
const void* GetEditingObject() const { return pCheckObj; }
void SetImageMap( const ImageMap& rImageMap );
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 31423f2..43a5f36 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -71,8 +71,6 @@ private:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- const css::uno::Sequence< css::beans::PropertyValue >& GetGeometry() const { return aPropSeq;}
-
css::uno::Any* GetPropertyValueByName( const OUString& rPropName );
const css::uno::Any* GetPropertyValueByName( const OUString& rPropName ) const;
css::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 );
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 83505fe..90f9703 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -46,7 +46,6 @@ namespace drawinglayer
const basegfx::B2DRange& rPaintRange,
const basegfx::B2DRange& rDefineRange);
- protected:
public:
SdrAllFillAttributesHelper(const Color& rColor);
SdrAllFillAttributesHelper(const SfxItemSet& rSet);
@@ -54,7 +53,6 @@ namespace drawinglayer
bool isUsed() const;
bool hasSdrFillAttribute() const { return maFillAttribute.get(); }
- bool hasFillGradientAttribute() const { return maFillGradientAttribute.get(); }
bool isTransparent() const;
const drawinglayer::attribute::SdrFillAttribute& getFillAttribute() const;
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index 2c0207b..8963c6c 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -42,9 +42,6 @@ namespace sdr
explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence);
virtual ~OverlayPrimitive2DSequenceObject() override;
-
- // data read access
- const drawinglayer::primitive2d::Primitive2DContainer& getSequence() const { return maSequence; }
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index fe1c11e..f928743 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -66,7 +66,6 @@ namespace sdr
// data read access
const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; }
- bool getBorder() const { return mbBorder; }
/// override to check conditions for last createOverlayObjectPrimitive2DSequence
virtual drawinglayer::primitive2d::Primitive2DContainer getOverlayObjectPrimitive2DSequence() const override;
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 3eefaa7..3743f27 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -129,7 +129,6 @@ protected:
virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact);
// access for derivated classes to maOverlayObjectList
- void clearOverlayObjectList() { maOverlayObjectList.clear(); }
void addToOverlayObjectList(sdr::overlay::OverlayObject& rNew) { maOverlayObjectList.append(rNew); }
basegfx::B2DRange getB2DRangeFromOverlayObjectList() const { return maOverlayObjectList.getBaseRange(); }
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index bdf7f00..bcec800 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -184,7 +184,6 @@ public:
void EndUndo(); // close undo-grouping (incl. BroadcastEdges)
void AddUndo(SdrUndoAction* pUndo) { mpModel->AddUndo(pUndo); } // add action
// only after first BegUndo or befor last EndUndo:
- void SetUndoComment(const OUString& rComment) { mpModel->SetUndoComment(rComment); }
void SetUndoComment(const OUString& rComment, const OUString& rObjDescr) { mpModel->SetUndoComment(rComment,rObjDescr); }
bool IsUndoEnabled() const;
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index eceb492..035053b 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -242,7 +242,6 @@ public:
class SVX_DLLPUBLIC SdrHdlColor : public SdrHdl
{
-private:
// size of colr markers
Size aMarkerSize;
@@ -261,7 +260,6 @@ private:
// help functions
SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol);
SVX_DLLPRIVATE static Color GetLuminance(const Color& rCol);
- SVX_DLLPRIVATE void CallColorChangeLink();
public:
explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), bool bLum = false);
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index e58ff88..159c099 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -323,8 +323,6 @@ public:
/** should only be used from outside svx for special ui elements */
bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark);
- // Mark all points within this rectangular alle Punkte (View coordinates)
- void MarkPoints(const Rectangle& rRect, bool bUnmark) { MarkPoints(&rRect,bUnmark); }
bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); }
bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return rHdl.IsSelected(); }
bool MarkAllPoints() { return MarkPoints(nullptr,false); }
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 3e10abd..266f289 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -389,10 +389,6 @@ protected:
/// at the same time to avoid recomputation.
public:
virtual void SetRectsDirty(bool bNotMyself = false);
-protected:
-
- // override if the class inherits from SdrObjPlusData:
- static SdrObjPlusData* NewPlusData();
protected:
/// A derived class must override these 3 methods if it has own geometric
@@ -403,7 +399,6 @@ protected:
virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
virtual void RestGeoData(const SdrObjGeoData& rGeo);
-protected:
virtual ~SdrObject() override;
public:
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 5cca473..b4aa64a 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -69,7 +69,6 @@ private:
SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
- SVX_DLLPRIVATE static void ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpRecalcTail();
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 96f5d32..c7e6e4c 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -182,8 +182,6 @@ public:
void SetSuppressDefaultConnect(bool bNew) { mbSuppressDefaultConnect = bNew; }
bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; }
- bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; }
-
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 1d5a9e6..77183c3 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -138,8 +138,6 @@ public:
bool IsEPS() const;
bool IsSwappedOut() const;
- bool IsCropped() const;
-
const MapMode& GetGrafPrefMapMode() const;
const Size& GetGrafPrefSize() const;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 1a4e35e..ec316e9 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -353,7 +353,6 @@ public:
void SetNextLinkInChain(SdrTextObj *);
SdrTextObj *GetPrevLinkInChain() const;
bool IsChainable() const;
- void SetPreventChainable();
bool GetPreventChainable() const;
TextChain *GetTextChain() const;
@@ -362,8 +361,7 @@ public:
// #i121917#
virtual bool HasText() const override;
- bool HasEditText() const;
- bool IsTextEditActive() const { return (pEdtOutl != nullptr); }
+ bool IsTextEditActive() const { return pEdtOutl != nullptr; }
/** returns the currently active text. */
virtual SdrText* getActiveText() const;
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 98bd49e..5d7e27a 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -93,9 +93,7 @@ private:
SdrPageWindow* mpPreparedPageWindow;
// interface to SdrPageWindow
-private:
void ClearPageWindows();
- void AppendPageWindow(SdrPageWindow& rNew);
SdrPageWindow* RemovePageWindow(SdrPageWindow& rOld);
public:
sal_uInt32 PageWindowCount() const { return maPageWindows.size(); }
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index cde8018..659bf57 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -209,8 +209,6 @@ protected:
Color maGridColor;
// Interface to SdrPaintWindow
-protected:
- void AppendPaintWindow(SdrPaintWindow& rNew);
void RemovePaintWindow(SdrPaintWindow& rOld);
void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ) override;
@@ -238,8 +236,8 @@ protected:
public:
bool ImpIsGlueVisible() { return mbGlueVisible || mbGlueVisible2 || mbGlueVisible3 || mbGlueVisible4; }
-protected:
+protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
void GlueInvalidate() const;
@@ -248,7 +246,6 @@ protected:
// Any sub-class override this method, MUST call the base class' ModelHasChanged() method
virtual void ModelHasChanged();
-protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
SdrPaintView(SdrModel* pModel1, OutputDevice* pOut = nullptr);
virtual ~SdrPaintView() override;
@@ -386,7 +383,6 @@ public:
void SetHlplVisible(bool bOn = true) { mbHlplVisible=bOn; InvalidateAllWin(); }
void SetHlplFront(bool bOn) { mbHlplFront =bOn; InvalidateAllWin(); }
void SetGlueVisible(bool bOn = true) { if (mbGlueVisible!=bOn) { mbGlueVisible=bOn; if (!mbGlueVisible2 && !mbGlueVisible3 && !mbGlueVisible4) GlueInvalidate(); } }
- void SetGridColor( Color aColor );
bool IsPreviewRenderer() const { return mbPreviewRenderer; }
void SetPreviewRenderer(bool bOn) { mbPreviewRenderer=bOn; }
@@ -435,7 +431,6 @@ public:
void SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
const SfxItemSet& GetDefaultAttr() const { return maDefaultAttr; }
void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
- SfxStyleSheet* GetDefaultStyleSheet() const { return mpDefaultStyleSheet; }
void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index a4c2d94..b76d740 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -37,7 +37,6 @@ protected:
SdrPathSegmentKind eMarkedSegmentsKind;
private:
- SVX_DLLPRIVATE void ImpClearVars();
SVX_DLLPRIVATE void ImpResetPolyPossibilityFlags();
SVX_DLLPRIVATE void ImpCheckPolyPossibilities();
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 9161daa..c900e46 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -591,7 +591,6 @@ public:
virtual ~SvxShapePolyPolygon() throw() override;
// Local support functions
- css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;}
void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(css::uno::RuntimeException);
basegfx::B2DPolyPolygon GetPolygon() const throw();
};
@@ -618,7 +617,6 @@ public:
virtual ~SvxShapePolyPolygonBezier() throw() override;
// Local support functions
- css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;}
void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(css::uno::RuntimeException);
basegfx::B2DPolyPolygon GetPolygon() const throw();
};
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index e4df901..7d08775 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -58,7 +58,6 @@ public:
OUString GetName() const { return GetValue(); }
void SetName(const OUString& rName) { SetValue(rName); }
- sal_Int32 GetIndex() const { return nPalIndex; }
bool IsIndex() const { return (nPalIndex >= 0); }
/** this static checks if the given NameOrIndex item has a unique name for its value.
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index eb615eb..0028b35 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -73,7 +73,6 @@ namespace {
Node* nextItemSet( Node* pLast,
const bool bSkipUnusedItemSet,
const bool bSkipIgnorable );
- const SfxPoolItem& getPoolItem() const { return *mpItem; }
// #i86923#
bool hasIgnorableChildren( const bool bCheckUsage ) const;
const std::shared_ptr<SfxItemSet> getItemSetOfIgnorableChild(
@@ -132,8 +131,8 @@ namespace {
std::vector<Node*>::const_iterator aIter = mChildren.begin();
while( aIter != mChildren.end() )
{
- if( rItem.Which() == (*aIter)->getPoolItem().Which() &&
- rItem == (*aIter)->getPoolItem() )
+ if( rItem.Which() == (*aIter)->mpItem->Which() &&
+ rItem == *(*aIter)->mpItem )
return *aIter;
++aIter;
}
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 2434281..4bac273 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -450,7 +450,6 @@ public:
SvxIconChoiceCtrlEntry* pEntry
);
#endif
- bool IsEntryEditingEnabled() const { return bEntryEditingEnabled; }
bool IsEntryEditing() const { return (pCurEditedEntry!=nullptr); }
void EditEntry( SvxIconChoiceCtrlEntry* pEntry );
void StopEntryEditing();
@@ -480,7 +479,6 @@ public:
const SvxIconChoiceCtrlColumnInfo* GetColumn( sal_uInt16 nIndex ) const;
Rectangle GetDocumentRect() const { return Rectangle( Point(), aVirtOutputSize ); }
- Rectangle GetVisibleRect() const { return GetOutputRect(); }
void SetEntryHighlightFrame(
SvxIconChoiceCtrlEntry* pEntry,
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 62d7d7f..82b8af5 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -790,7 +790,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
}
}
bool bSelected = pEntry->IsSelected();
- bool bEditingEnabled = IsEntryEditingEnabled();
+ bool bEditingEnabled = bEntryEditingEnabled;
if( rMEvt.GetClicks() == 2 )
{
@@ -2034,7 +2034,7 @@ void SvxIconChoiceCtrl_Impl::ImpHideDDIcon()
bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
{
Rectangle aDocRect( GetDocumentRect() );
- Rectangle aVisRect( GetVisibleRect() );
+ Rectangle aVisRect( GetOutputRect() );
if( aVisRect.IsInside( aDocRect ))
return false;
Size aDocSize( aDocRect.GetSize() );
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index cd9b9a0e9..db44584 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -75,8 +75,6 @@ public:
bool Contains( const vcl::Window* _pWindow ) const;
- HyperLabel* GetDescriptionHyperLabel() const { return mpDescription; }
-
private:
void ImplUpdateIndex( const ItemIndex _nIndex );
void ImplUpdatePosSize();
@@ -748,7 +746,7 @@ void RoadmapItem::SetPosition(RoadmapItem* _pOldItem)
}
else
{
- Size aOldSize = _pOldItem->GetDescriptionHyperLabel()->GetSizePixel();
+ Size aOldSize = _pOldItem->mpDescription->GetSizePixel();
aIDPos = _pOldItem->mpID->GetPosPixel();
aIDPos.Y() += aOldSize.Height();
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index d99f46e..adb0485 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -184,7 +184,6 @@ public:
css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
protected:
- css::uno::Reference< css::util::XNumberFormatsSupplier > getFormatsSupplier() const;
void setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier);
sal_Int32 getFormatKey() const;
void setFormatKey(sal_Int32 nKey);
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index c271ecb..d673104 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1054,10 +1054,7 @@ public:
TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex );
/// determines whether we're currently listening
- inline bool isListening() const { return !isDisposed(); }
-
- /// determines whether the instance is disposed
- inline bool isDisposed() const { return mpListener == nullptr; }
+ inline bool isListening() const { return mpListener != nullptr; }
/// makes the instance non-functional
void dispose();
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index d250fa1..f1df7df 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1000,7 +1000,7 @@ css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) th
{
if (!bIsStandardSupplier)
{ // ansonsten void
- css::uno::Reference< css::util::XNumberFormatsSupplier > xSupplier = getFormatsSupplier();
+ css::uno::Reference< css::util::XNumberFormatsSupplier > xSupplier = m_xCurrentSupplier.get();
aReturn <<= xSupplier;
}
}
@@ -1020,11 +1020,6 @@ css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) th
return aReturn;
}
-css::uno::Reference< css::util::XNumberFormatsSupplier > SVTXFormattedField::getFormatsSupplier() const
-{
- return m_xCurrentSupplier.get();
-}
-
css::uno::Any SVTXFormattedField::convertEffectiveValue(const css::uno::Any& rValue)
{
css::uno::Any aReturn;
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 6712e49..97d402a 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -80,9 +80,6 @@ namespace sdr
// invalidate the given range at local OutputDevice
virtual void invalidateRange(const basegfx::B2DRange& rRange) override;
-
- // access to RefreshWithPreRendering Flag
- bool DoRefreshWithPreRendering() const { return mbRefreshWithPreRendering; }
};
} // end of namespace overlay
} // end of namespace sdr
diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index 640a1f9..f9de117 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -57,12 +57,6 @@ namespace sdr
double fRotation,
bool bAnimate);
- // data read access
- double getTransparence() const { return mfTransparence; }
- double getDiscreteGrow() const { return mfDiscreteGrow; }
- double getDiscreteShrink() const { return mfDiscreteShrink; }
- double getRotation() const { return mfRotation; }
-
// execute event from base class sdr::animation::Event. Default
// implementation does nothing and does not create a new event.
virtual void Trigger(sal_uInt32 nTime) override;
diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
index 7b00d90..d00598f 100644
--- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx
@@ -54,12 +54,6 @@ namespace sdr
const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
void setSecondPosition(const basegfx::B2DPoint& rNew);
- // change extended lines
- bool getExtendedLines() const { return mbExtendedLines; }
-
- // change show bounds
- bool getShowBounds() const { return mbShowBounds; }
-
// react on stripe definition change
virtual void stripeDefinitionHasChanged() override;
};
diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 25bcfb5..e599998 100644
--- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -64,7 +64,6 @@ namespace drawinglayer
// data access
const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
- sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; }
// provide unique ID
DeclPrimitive2DIDBlock()
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 2f316de..3f62c8d 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -580,7 +580,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl, Idle *, void)
SetGraphic( aUpdateGraphic );
SetPolyPolygon( aUpdatePolyPoly );
- SetEditingObject( pUpdateEditingObject );
+ pCheckObj = pUpdateEditingObject;
bGraphicLinked = bUpdateGraphicLinked;
aUpdateGraphic = Graphic();
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 75c53ec..c6eae9a 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -110,7 +110,6 @@ public:
void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly );
tools::PolyPolygon GetPolyPolygon();
- void SetEditingObject( void* pObj ) { pCheckObj = pObj; }
const void* GetEditingObject() const { return pCheckObj; }
bool IsUndoPossible() const;
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 7d85606..86bf1a9 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -1073,7 +1073,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTop
pTPFilter->SetRedlinTable(GetViewTable());
- ShowViewPage();
+ SetCurPageId(m_nViewPageId);
Show();
}
@@ -1096,11 +1096,6 @@ void SvxAcceptChgCtr::ShowFilterPage()
SetCurPageId(m_nFilterPageId);
}
-void SvxAcceptChgCtr::ShowViewPage()
-{
- SetCurPageId(m_nViewPageId);
-}
-
SvxRedlinTable* SvxAcceptChgCtr::GetViewTable()
{
return pTPView ? pTPView->GetTableControl() : nullptr;
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index fb09fe6..ebc66b0 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -278,11 +278,6 @@ void SvxIMapDlg::SetExecState( bool bEnable )
pOwnData->bExecState = bEnable;
}
-void SvxIMapDlg::SetGraphic( const Graphic& rGraphic )
-{
- pIMapWnd->SetGraphic( rGraphic );
-}
-
void SvxIMapDlg::SetImageMap( const ImageMap& rImageMap )
{
pIMapWnd->SetImageMap( rImageMap );
@@ -737,10 +732,10 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Idle *, void)
DoSave();
}
- SetGraphic( pOwnData->aUpdateGraphic );
+ pIMapWnd->SetGraphic( pOwnData->aUpdateGraphic );
SetImageMap( pOwnData->aUpdateImageMap );
SetTargetList( pOwnData->aUpdateTargetList );
- SetEditingObject( pOwnData->pUpdateEditingObject );
+ pCheckObj = pOwnData->pUpdateEditingObject;
// After changes => default selection
m_pTbxIMapDlg1->CheckItem( mnSelectId );
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 7554033..cbc6f2b 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -185,7 +185,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface
FmEntryData::~FmEntryData()
{
- Clear();
+ GetChildList()->clear();
delete pChildList;
}
@@ -221,11 +221,6 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
}
-void FmEntryData::Clear()
-{
- GetChildList()->clear();
-}
-
bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index aed2077..7e50a3d 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -29,7 +29,7 @@
bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
- return( xInterface == static_cast<const FmInterfaceItem&>(rAttr).GetInterface() );
+ return xInterface == static_cast<const FmInterfaceItem&>(rAttr).xInterface;
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 1ad1630..c1e0b16 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3650,10 +3650,10 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, bool _bSyncAction /
UpdateForms( true );
- if ( !hasEverBeenActivated() )
+ if ( m_bFirstActivation )
{
m_nActivationEvent = Application::PostUserEvent( LINK( this, FmXFormShell, OnFirstTimeActivation ) );
- setHasBeenActivated();
+ m_bFirstActivation = false;
}
// find a default "current form", if there is none, yet
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 57f6f54..64d1c8f 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -190,7 +190,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
void GalleryTheme::ImplWrite()
{
- if( IsModified() )
+ if( pThm->IsModified() )
{
INetURLObject aPathURL( GetThmURL() );
@@ -1286,7 +1286,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
bool bRel;
rOStm.WriteUInt16( 0x0004 );
- write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8);
+ write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, pThm->GetThemeName(), RTL_TEXTENCODING_UTF8);
rOStm.WriteUInt32( nCount ).WriteUInt16( osl_getThreadTextEncoding() );
for( sal_uInt32 i = 0; i < nCount; i++ )
@@ -1514,7 +1514,6 @@ void GalleryTheme::ImplSetModified( bool bModified )
pThm->SetModified(bModified);
}
-const OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); }
const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); }
const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); }
const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); }
@@ -1523,7 +1522,6 @@ void GalleryTheme::SetId( sal_uInt32 nNewId, bool bResetThemeName ) { pThm->SetI
bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
-bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
const tools::SvRef<SotStorage>& GalleryTheme::GetSvDrawStorage() const
{
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 29cfa3a..d62995f 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -157,7 +157,6 @@ public:
FmEntryData( const FmEntryData& rEntryData );
virtual ~FmEntryData();
- void Clear();
void SetText( const OUString& rText ){ aText = rText; }
void SetParent( FmEntryData* pParentData ){ pParent = pParentData; }
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index c04445f..c017605 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -43,8 +43,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override;
-
- const css::uno::Reference< css::uno::XInterface >& GetInterface() const { return xInterface; }
};
inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy )
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 300650e..48c518b 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -319,10 +319,6 @@ public:
SAL_DLLPRIVATE void SetY2KState(sal_uInt16 n);
protected:
- // activation handling
- SAL_DLLPRIVATE inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; }
- SAL_DLLPRIVATE inline void setHasBeenActivated( ) { m_bFirstActivation = false; }
-
// form handling
/// load or unload the forms on a page
SAL_DLLPRIVATE void loadForms( FmFormPage* _pPage, const LoadFormsFlags _nBehaviour );
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index dd04f24..1615e64 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -290,7 +290,7 @@ SvStream& SdrCustomShapeGeometryItem::Store( SvStream& rOut, sal_uInt16 nItemVer
SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const
{
- return new SdrCustomShapeGeometryItem( GetGeometry() );
+ return new SdrCustomShapeGeometryItem( aPropSeq );
}
sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
index f98f1d7..f908782b 100644
--- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
+++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
@@ -100,7 +100,7 @@ namespace drawinglayer
return true;
}
- if(hasFillGradientAttribute() && !maFillGradientAttribute->isDefault())
+ if(maFillGradientAttribute.get() && !maFillGradientAttribute->isDefault())
{
return true;
}
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 5325ca0..ebce022 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -228,7 +228,6 @@ namespace drawinglayer
sal_Int32 getFormTextStart() const { return mnFormTextStart; }
sal_Int32 getFormTextShdwXVal() const { return mnFormTextShdwXVal; }
sal_Int32 getFormTextShdwYVal() const { return mnFormTextShdwYVal; }
- sal_uInt16 getFormTextShdwTransp() const { return mnFormTextShdwTransp; }
XFormTextStyle getFormTextStyle() const { return meFormTextStyle; }
XFormTextAdjust getFormTextAdjust() const { return meFormTextAdjust; }
XFormTextShadow getFormTextShadow() const { return meFormTextShadow; }
@@ -245,7 +244,7 @@ namespace drawinglayer
&& getFormTextStart() == rCandidate.getFormTextStart()
&& getFormTextShdwXVal() == rCandidate.getFormTextShdwXVal()
&& getFormTextShdwYVal() == rCandidate.getFormTextShdwYVal()
- && getFormTextShdwTransp() == rCandidate.getFormTextShdwTransp()
+ && mnFormTextShdwTransp == rCandidate.mnFormTextShdwTransp
&& getFormTextStyle() == rCandidate.getFormTextStyle()
&& getFormTextAdjust() == rCandidate.getFormTextAdjust()
&& getFormTextShadow() == rCandidate.getFormTextShadow()
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index b0d347f..d7460cb 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -171,14 +171,12 @@ namespace drawinglayer
bool isScroll() const { return mbScroll; }
bool isInEditMode() const { return mbInEditMode; }
bool isFixedCellHeight() const { return mbFixedCellHeight; }
- bool isWrongSpell() const { return mbWrongSpell; }
bool isChainable() const { return mbChainable; }
const SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; }
sal_Int32 getTextLeftDistance() const { return maTextLeftDistance; }
sal_Int32 getTextUpperDistance() const { return maTextUpperDistance; }
sal_Int32 getTextRightDistance() const { return maTextRightDistance; }
sal_Int32 getTextLowerDistance() const { return maTextLowerDistance; }
- sal_uInt32 getPropertiesVersion() const { return maPropertiesVersion; }
SdrTextHorzAdjust getSdrTextHorzAdjust() const { return maSdrTextHorzAdjust; }
SdrTextVertAdjust getSdrTextVertAdjust() const { return maSdrTextVertAdjust; }
@@ -218,7 +216,7 @@ namespace drawinglayer
&& getTextUpperDistance() == rCandidate.getTextUpperDistance()
&& getTextRightDistance() == rCandidate.getTextRightDistance()
&& getTextLowerDistance() == rCandidate.getTextLowerDistance()
- && getPropertiesVersion() == rCandidate.getPropertiesVersion()
+ && maPropertiesVersion == rCandidate.maPropertiesVersion
&& getSdrTextHorzAdjust() == rCandidate.getSdrTextHorzAdjust()
&& getSdrTextVertAdjust() == rCandidate.getSdrTextVertAdjust()
@@ -231,7 +229,7 @@ namespace drawinglayer
&& isScroll() == rCandidate.isScroll()
&& isInEditMode() == rCandidate.isInEditMode()
&& isFixedCellHeight() == rCandidate.isFixedCellHeight()
- && isWrongSpell() == rCandidate.isWrongSpell() );
+ && mbWrongSpell == rCandidate.mbWrongSpell );
}
};
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 081284c..6e6b055 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -597,7 +597,7 @@ namespace sdr { namespace contact {
/** determines whether our control is currently visible
@nofail
*/
- bool isControlVisible() const { return impl_isControlVisible_nofail(); }
+ bool isControlVisible() const { return m_bControlIsVisible; }
/// creates an XControl for the given device and SdrUnoObj
static bool
@@ -749,16 +749,6 @@ namespace sdr { namespace contact {
*/
bool impl_isDisposed_nofail() const { return m_pAntiImpl == nullptr; }
- /** determines whether our control is currently visible
- @nofail
- */
- bool impl_isControlVisible_nofail() const { return m_bControlIsVisible; }
-
- /** determines whether we are currently a listener at the control for design-mode relevant facets
- @nofail
- */
- bool impl_isDesignModeListening_nofail() const { return m_bIsDesignModeListening; }
-
/** determines whether the control currently is in design mode
@precond
@@ -1181,7 +1171,7 @@ namespace sdr { namespace contact {
return;
SdrPageViewAccess aPVAccess( *pPageView );
- impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, impl_isControlVisible_nofail(), false/*_bForce*/ );
+ impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, m_bControlIsVisible, false/*_bForce*/ );
}
@@ -1259,7 +1249,7 @@ namespace sdr { namespace contact {
void ViewObjectContactOfUnoControl_Impl::impl_switchDesignModeListening_nothrow( bool _bStart )
{
- if ( impl_isDesignModeListening_nofail() != _bStart )
+ if ( m_bIsDesignModeListening != _bStart )
{
m_bIsDesignModeListening = _bStart;
impl_switchPropertyListening_nothrow( _bStart );
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 8642740..d0f1d19 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -238,7 +238,7 @@ namespace sdr
}
}
- if(DoRefreshWithPreRendering())
+ if(mbRefreshWithPreRendering)
{
// #i73602# ensure valid and sized mpOutputBufferDevice
const Size aDestinationSizePixel(mpBufferDevice->GetOutputSizePixel());
diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
index f8e44ce..5ca6da5 100644
--- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
+++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
@@ -29,7 +29,7 @@ namespace sdr
{
drawinglayer::primitive2d::Primitive2DContainer OverlayPrimitive2DSequenceObject::createOverlayObjectPrimitive2DSequence()
{
- return getSequence();
+ return maSequence;
}
OverlayPrimitive2DSequenceObject::OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence)
diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx
index 0163434..7c72884 100644
--- a/svx/source/sdr/overlay/overlayrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrectangle.cxx
@@ -54,10 +54,10 @@ namespace sdr
new drawinglayer::primitive2d::OverlayRectanglePrimitive(
aHatchRange,
aColor,
- getTransparence(),
- getDiscreteGrow(),
- getDiscreteShrink(),
- getRotation()));
+ mfTransparence,
+ mfDiscreteGrow,
+ mfDiscreteShrink,
+ mfRotation));
return drawinglayer::primitive2d::Primitive2DContainer { aReference };
}
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index 8439c29..1f75c8f 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -35,14 +35,14 @@ namespace sdr
{
drawinglayer::primitive2d::Primitive2DContainer aRetval;
- if(getOverlayManager() && (getShowBounds() || getExtendedLines()))
+ if(getOverlayManager() && (mbShowBounds || mbExtendedLines))
{
const basegfx::BColor aRGBColorA(getOverlayManager()->getStripeColorA().getBColor());
const basegfx::BColor aRGBColorB(getOverlayManager()->getStripeColorB().getBColor());
const double fStripeLengthPixel(getOverlayManager()->getStripeLengthPixel());
const basegfx::B2DRange aRollingRectangle(getBasePosition(), getSecondPosition());
- if(getShowBounds())
+ if(mbShowBounds)
{
// view-independent part, create directly
const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aRollingRectangle));
@@ -66,7 +66,7 @@ namespace sdr
false);
}
- if(getExtendedLines())
+ if(mbExtendedLines)
{
// view-dependent part, use helper primitive
const drawinglayer::primitive2d::Primitive2DReference aReference(
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index 4c25318..0eb66b0 100644
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
@@ -135,7 +135,7 @@ namespace sdr
aRetval,
fTransparence));
- if(getBorder())
+ if(mbBorder)
{
const basegfx::B2DPolyPolygon aPolyPolygon(impCombineRangesToPolyPolygon(getRanges()));
const drawinglayer::primitive2d::Primitive2DReference aSelectionOutline(
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index a4fa9e4..83ced58 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -160,7 +160,7 @@ namespace drawinglayer
// #i104867# to find out if the Graphic content of the
// OLE has changed, use GraphicVersion number
- && getGraphicVersion() == rCompare.getGraphicVersion()
+ && mnGraphicVersion == rCompare.mnGraphicVersion
);
}
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 46e37e6..eb13510 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -74,7 +74,7 @@ TextCharacterSpacingControl::~TextCharacterSpacingControl()
void TextCharacterSpacingControl::dispose()
{
- if (GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT)
+ if (mnLastCus == SPACING_CLOSE_BY_CUS_EDIT)
{
SvtViewOptions aWinOpt(E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE);
css::uno::Sequence<css::beans::NamedValue> aSeq
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index 7d30ab9..9035c71 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -38,7 +38,6 @@ public:
virtual ~TextCharacterSpacingControl() override;
virtual void dispose() override;
- short GetLastCustomState() { return mnLastCus;}
long GetLastCustomValue() { return mnCustomKern;}
private:
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 5c23581..9d119f3 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -828,7 +828,7 @@ void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay
void SdrDragMethod::destroyOverlayGeometry()
{
- clearOverlayObjectList();
+ maOverlayObjectList.clear();
}
bool SdrDragMethod::DoAddConnectorOverlays()
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index b4469e7..1131127 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -979,7 +979,7 @@ void SdrEditView::DistributeMarkedObjects()
}
// UNDO-Comment and end of UNDO
- SetUndoComment(ImpGetResStr(STR_DistributeMarkedObjects));
+ mpModel->SetUndoComment(ImpGetResStr(STR_DistributeMarkedObjects));
if( bUndo )
EndUndo();
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 3e7b947..eb90259 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1088,11 +1088,6 @@ Color SdrHdlColor::GetLuminance(const Color& rCol)
return aRetval;
}
-void SdrHdlColor::CallColorChangeLink()
-{
- aColorChangeHdl.Call(this);
-}
-
void SdrHdlColor::SetColor(Color aNew, bool bCallLink)
{
if(IsUseLuminance())
@@ -1108,7 +1103,7 @@ void SdrHdlColor::SetColor(Color aNew, bool bCallLink)
// tell about change
if(bCallLink)
- CallColorChangeLink();
+ aColorChangeHdl.Call(this);
}
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index bc32fe6..78f1d04 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -433,7 +433,7 @@ bool SdrMarkView::EndMarkPoints()
{
Rectangle aRect(maDragStat.GetStart(), maDragStat.GetNow());
aRect.Justify();
- MarkPoints(aRect, mpMarkPointsOverlay->IsUnmarking());
+ MarkPoints(&aRect, mpMarkPointsOverlay->IsUnmarking());
bRetval = true;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f440b12..39dd1b3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -394,11 +394,6 @@ void SdrObject::Free( SdrObject*& _rpObject )
delete pObject;
}
-SdrObjPlusData* SdrObject::NewPlusData()
-{
- return new SdrObjPlusData;
-}
-
void SdrObject::SetRectsDirty(bool bNotMyself)
{
if (!bNotMyself) {
@@ -1035,7 +1030,7 @@ void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) co
void SdrObject::ImpForcePlusData()
{
if (!pPlusData)
- pPlusData = NewPlusData();
+ pPlusData = new SdrObjPlusData;
}
OUString SdrObject::GetAngleStr(long nAngle) const
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 0a032ed..6582273 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -525,18 +525,13 @@ void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPo
rPoly=aPol;
}
-void SdrCaptionObj::ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
-{
- ImpCalcTail3(rPara,rPoly,rRect);
-}
-
void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect)
{
switch (rPara.eType) {
case SdrCaptionType::Type1: ImpCalcTail1(rPara,rPoly,rRect); break;
case SdrCaptionType::Type2: ImpCalcTail2(rPara,rPoly,rRect); break;
case SdrCaptionType::Type3: ImpCalcTail3(rPara,rPoly,rRect); break;
- case SdrCaptionType::Type4: ImpCalcTail4(rPara,rPoly,rRect); break;
+ case SdrCaptionType::Type4: ImpCalcTail3(rPara,rPoly,rRect); break;
}
}
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 7b5ce56..69c1dd2 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -548,7 +548,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
}
// #i110649#
- if(IsBoundRectCalculationRunning())
+ if(mbBoundRectCalculationRunning)
{
// This object is involved into another ImpRecalcEdgeTrack() call
// from another SdrEdgeObj. Do not calculate again to avoid loop.
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 6fdb099..4ca13f6 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -534,11 +534,6 @@ bool SdrGrafObj::IsSwappedOut() const
return mbIsPreview || pGraphic->IsSwappedOut();
}
-bool SdrGrafObj::IsCropped() const
-{
- return aGrafInfo.IsCropped();
-}
-
const MapMode& SdrGrafObj::GetGrafPrefMapMode() const
{
return pGraphic->GetPrefMapMode();
@@ -571,7 +566,7 @@ Size SdrGrafObj::getOriginalSize() const
{
Size aSize = GetGrafPrefSize();
- if (IsCropped())
+ if (aGrafInfo.IsCropped())
{
long aCroppedTop = OutputDevice::LogicToLogic( aGrafInfo.GetTopCrop(), GetModel()->GetScaleUnit(), GetGrafPrefMapMode().GetMapUnit());
long aCroppedBottom = OutputDevice::LogicToLogic( aGrafInfo.GetBottomCrop(), GetModel()->GetScaleUnit(), GetGrafPrefMapMode().GetMapUnit());
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2b77740..d799110 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -468,11 +468,6 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
return bRet;
}
-bool SdrTextObj::HasEditText() const
-{
- return HasTextImpl( pEdtOutl );
-}
-
void SdrTextObj::SetPage(SdrPage* pNewPage)
{
bool bRemove=pNewPage==nullptr && pPage!=nullptr;
@@ -2099,11 +2094,6 @@ SdrTextObj* SdrTextObj::GetPrevLinkInChain() const
return mpPrevInChain;
}
-void SdrTextObj::SetPreventChainable()
-{
- mbIsUnchainableClone = true;
-}
-
bool SdrTextObj::GetPreventChainable() const
{
// Prevent chaining it 1) during dragging && 2) when we are editing next link
@@ -2116,7 +2106,7 @@ bool SdrTextObj::GetPreventChainable() const
SdrTextObj *pTextObjClone = dynamic_cast<SdrTextObj *>(pClone);
if (pTextObjClone != nullptr) {
// Avoid transferring of text for chainable object during dragging
- pTextObjClone->SetPreventChainable();
+ pTextObjClone->mbIsUnchainableClone = true;
}
return pClone;
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index f4e3909..21ef7b9 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -419,7 +419,7 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
bool SdrTextObj::HasText() const
{
if( pEdtOutl )
- return HasEditText();
+ return HasTextImpl(pEdtOutl);
OutlinerParaObject* pOPO = GetOutlinerParaObject();
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 0fafd16..c520ac7 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -114,11 +114,6 @@ void SdrPageView::ClearPageWindows()
maPageWindows.clear();
}
-void SdrPageView::AppendPageWindow(SdrPageWindow& rNew)
-{
- maPageWindows.push_back(&rNew);
-}
-
SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld)
{
const SdrPageWindowVector::iterator aFindResult = ::std::find(maPageWindows.begin(), maPageWindows.end(), &rOld);
@@ -173,8 +168,7 @@ SdrPageView::~SdrPageView()
void SdrPageView::CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow)
{
- SdrPageWindow& rWindow = *(new SdrPageWindow(*this, rPaintWindow));
- AppendPageWindow(rWindow);
+ maPageWindows.push_back(new SdrPageWindow(*this, rPaintWindow));
}
void SdrPageView::AddPaintWindowToPageView(SdrPaintWindow& rPaintWindow)
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index b100976..c374c75 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -89,11 +89,6 @@ SdrPaintWindow* SdrPaintView::GetPaintWindow(sal_uInt32 nIndex) const
return nullptr;
}
-void SdrPaintView::AppendPaintWindow(SdrPaintWindow& rNew)
-{
- maPaintWindows.push_back(&rNew);
-}
-
void SdrPaintView::RemovePaintWindow(SdrPaintWindow& rOld)
{
const SdrPaintWindowVector::iterator aFindResult = ::std::find(maPaintWindows.begin(), maPaintWindows.end(), &rOld);
@@ -440,7 +435,7 @@ void SdrPaintView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWin
{
DBG_ASSERT(pNewWin, "SdrPaintView::AddWindowToPaintView: No OutputDevice(!)");
SdrPaintWindow* pNewPaintWindow = new SdrPaintWindow(*this, *pNewWin, pWindow);
- AppendPaintWindow(*pNewPaintWindow);
+ maPaintWindows.push_back(pNewPaintWindow);
if(mpPageView)
{
@@ -1093,7 +1088,7 @@ bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
SfxStyleSheet* SdrPaintView::GetStyleSheet() const
{
- return GetDefaultStyleSheet();
+ return mpDefaultStyleSheet;
}
bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
@@ -1246,12 +1241,7 @@ void SdrPaintView::VisAreaChanged(const SdrPageWindow& /*rWindow*/)
void SdrPaintView::onChangeColorConfig()
{
- SetGridColor( Color( maColorConfig.GetColorValue( svtools::DRAWGRID ).nColor ) );
-}
-
-void SdrPaintView::SetGridColor( Color aColor )
-{
- maGridColor = aColor;
+ maGridColor = Color( maColorConfig.GetColorValue( svtools::DRAWGRID ).nColor );
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 8a1644a..b61d285 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -44,15 +44,10 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags()
bSetMarkedSegmentsKindPossible=false;
}
-void SdrPolyEditView::ImpClearVars()
-{
- ImpResetPolyPossibilityFlags();
-}
-
SdrPolyEditView::SdrPolyEditView(SdrModel* pModel1, OutputDevice* pOut):
SdrEditView(pModel1,pOut)
{
- ImpClearVars();
+ ImpResetPolyPossibilityFlags();
}
SdrPolyEditView::~SdrPolyEditView()
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index c97192b..0b8ee3c 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -224,10 +224,6 @@ namespace drawinglayer
const SvxBorderLine& getBottomLine() const { return maBottomLine; }
const SvxBorderLine& getRightLine() const { return maRightLine; }
const SvxBorderLine& getTopLine() const { return maTopLine; }
- bool getLeftIsOutside() const { return mbLeftIsOutside; }
- bool getBottomIsOutside() const { return mbBottomIsOutside; }
- bool getRightIsOutside() const { return mbRightIsOutside; }
- bool getTopIsOutside() const { return mbTopIsOutside; }
// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
@@ -325,7 +321,7 @@ namespace drawinglayer
}
}
- if(!getBottomLine().isEmpty() && getBottomIsOutside())
+ if(!getBottomLine().isEmpty() && mbBottomIsOutside)
{
// create bottom line from left to right
const basegfx::B2DPoint aStart(getTransform() * basegfx::B2DPoint(0.0, 1.0));
@@ -446,10 +442,10 @@ namespace drawinglayer
&& maTopFromRLine == rCompare.maTopFromRLine
&& maBottomFromLLine == rCompare.maBottomFromLLine
&& maBottomFromRLine == rCompare.maBottomFromRLine
- && getLeftIsOutside() == rCompare.getLeftIsOutside()
- && getBottomIsOutside() == rCompare.getBottomIsOutside()
- && getRightIsOutside() == rCompare.getRightIsOutside()
- && getTopIsOutside() == rCompare.getTopIsOutside());
+ && mbLeftIsOutside == rCompare.mbLeftIsOutside
+ && mbBottomIsOutside == rCompare.mbBottomIsOutside
+ && mbRightIsOutside == rCompare.mbRightIsOutside
+ && mbTopIsOutside == rCompare.mbTopIsOutside);
}
return false;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index e70f94b..994eb2d 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1188,7 +1188,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
}
case OWN_ATTR_VALUE_POLYGONKIND:
{
- rValue <<= GetPolygonKind();
+ rValue <<= mePolygonKind;
break;
}
default:
@@ -1306,7 +1306,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
}
case OWN_ATTR_VALUE_POLYGONKIND:
{
- rValue <<= GetPolygonKind();
+ rValue <<= mePolygonKind;
break;
}
default:
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 6de5b89..d284912 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -51,8 +51,6 @@ private:
cppu::OBroadcastHelper mrBHelper;
- void disposing() throw();
-
public:
SvxShapeCollection() throw();
virtual ~SvxShapeCollection() throw() override;
@@ -127,12 +125,6 @@ void SvxShapeCollection::release() throw()
}
// XComponent
-void SvxShapeCollection::disposing() throw()
-{
- maShapeContainer.clear();
-}
-
-// XComponent
void SvxShapeCollection::dispose()
throw(css::uno::RuntimeException, std::exception)
{
@@ -166,8 +158,7 @@ void SvxShapeCollection::dispose()
// inform all listeners to release this object
// The listener container are automatically cleared
mrBHelper.aLC.disposeAndClear( aEvt );
- // notify subclasses to do their dispose
- disposing();
+ maShapeContainer.clear();
}
catch(const css::uno::Exception&)
{
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index d378a28..5aeb630 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -264,7 +264,7 @@ void NameOrIndex::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("isIndex"), BAD_CAST(OString::boolean(IsIndex()).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"), BAD_CAST(OString::number(GetIndex()).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"), BAD_CAST(OString::number(nPalIndex).getStr()));
xmlTextWriterEndElement(pWriter);
}
More information about the Libreoffice-commits
mailing list