[Libreoffice-commits] core.git: include/svx svx/inc svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Oct 27 06:09:56 UTC 2016
include/svx/AccessibleControlShape.hxx | 3
include/svx/AccessibleShape.hxx | 2
include/svx/SmartTagMgr.hxx | 2
include/svx/algitem.hxx | 2
include/svx/chrtitem.hxx | 1
include/svx/ctredlin.hxx | 2
include/svx/fmshell.hxx | 2
include/svx/fmsrcimp.hxx | 2
include/svx/hdft.hxx | 4
include/svx/imapdlg.hxx | 1
include/svx/nbdtmg.hxx | 4
include/svx/numfmtsh.hxx | 1
include/svx/rulritem.hxx | 1
include/svx/sdr/animation/scheduler.hxx | 3
include/svx/sdr/contact/objectcontact.hxx | 6
include/svx/sdrmasterpagedescriptor.hxx | 3
include/svx/sidebar/PanelLayout.hxx | 1
include/svx/svddrgmt.hxx | 1
include/svx/svdhdl.hxx | 2
include/svx/svdmrkv.hxx | 3
include/svx/svdoedge.hxx | 1
include/svx/svdomedia.hxx | 2
include/svx/svdpagv.hxx | 2
include/svx/svdtrans.hxx | 1
include/svx/textchainflow.hxx | 3
include/svx/viewpt3d.hxx | 2
include/svx/xmleohlp.hxx | 2
svx/inc/GalleryControl.hxx | 1
svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx | 7
svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx | 3
svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx | 2
svx/source/accessibility/AccessibleControlShape.cxx | 7
svx/source/accessibility/AccessibleFrameSelector.cxx | 12 -
svx/source/accessibility/AccessibleShape.cxx | 22 --
svx/source/accessibility/AccessibleTextHelper.cxx | 3
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 7
svx/source/accessibility/charmapacc.cxx | 12 -
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 31 ---
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 25 +--
svx/source/dialog/_contdlg.cxx | 14 -
svx/source/dialog/contimp.hxx | 3
svx/source/dialog/ctredlin.cxx | 79 ++++-----
svx/source/dialog/frmsel.cxx | 9 -
svx/source/dialog/hdft.cxx | 2
svx/source/dialog/imapdlg.cxx | 7
svx/source/dialog/rulritem.cxx | 7
svx/source/engine3d/viewpt3d2.cxx | 11 -
svx/source/form/databaselocationinput.cxx | 8 -
svx/source/form/fmshell.cxx | 11 -
svx/source/form/fmsrcimp.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 16 --
svx/source/form/fmvwimp.cxx | 23 +-
svx/source/form/navigatortree.cxx | 8 -
svx/source/gallery2/GalleryControl.cxx | 10 -
svx/source/inc/AccessibleFrameSelector.hxx | 2
svx/source/inc/GraphCtlAccessibleContext.hxx | 1
svx/source/inc/charmapacc.hxx | 1
svx/source/inc/eventhandler.hxx | 3
svx/source/inc/fmexpl.hxx | 1
svx/source/inc/fmtextcontrolshell.hxx | 4
svx/source/inc/fmvwimp.hxx | 2
svx/source/inc/frmselimpl.hxx | 2
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 12 -
svx/source/inc/svxrectctaccessiblecontext.hxx | 21 --
svx/source/items/algitem.cxx | 25 +--
svx/source/items/chrtitem.cxx | 8 -
svx/source/items/numfmtsh.cxx | 7
svx/source/sdr/animation/scheduler.cxx | 17 --
svx/source/sdr/contact/objectcontact.cxx | 29 ---
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx | 2
svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx | 7
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 7
svx/source/sdr/event/eventhandler.cxx | 23 +-
svx/source/sidebar/PanelLayout.cxx | 7
svx/source/sidebar/line/LinePropertyPanel.cxx | 7
svx/source/sidebar/line/LinePropertyPanel.hxx | 2
svx/source/sidebar/nbdtmg.cxx | 46 ++---
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 80 ++++------
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 2
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 9 -
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 1
svx/source/smarttags/SmartTagMgr.cxx | 14 -
svx/source/svdraw/sdrmasterpagedescriptor.cxx | 8 -
svx/source/svdraw/svddrgmt.cxx | 2
svx/source/svdraw/svdhdl.cxx | 8 -
svx/source/svdraw/svdmrkv.cxx | 6
svx/source/svdraw/svdoedge.cxx | 8 -
svx/source/svdraw/svdomedia.cxx | 9 -
svx/source/svdraw/svdpagv.cxx | 7
svx/source/svdraw/svdtrans.cxx | 3
svx/source/svdraw/textchainflow.cxx | 8 -
svx/source/table/viewcontactoftableobj.cxx | 2
svx/source/table/viewcontactoftableobj.hxx | 6
svx/source/unogallery/unogalitem.cxx | 18 --
svx/source/unogallery/unogalitem.hxx | 3
svx/source/unogallery/unogaltheme.cxx | 18 --
svx/source/unogallery/unogaltheme.hxx | 3
svx/source/xml/xmleohlp.cxx | 15 -
98 files changed, 229 insertions(+), 638 deletions(-)
New commits:
commit 883172375dbf5c0a79cbda5b615ff26ed27c78be
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Oct 26 14:59:38 2016 +0200
loplugin:expandablemethods in svx
Change-Id: I0d193ddf07cc0ddc89b6ce2df6eb71d44e49b631
Reviewed-on: https://gerrit.libreoffice.org/30295
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 545a667..86a583b 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -147,9 +147,6 @@ protected:
/// stops multiplexing the state changes of our aggregate context
void stopStateMultiplexing( );
- /// retrieves the SdrObject of the shape we represent
- SdrObject* getSdrObject( ) const;
-
/** adjusts our AccessibleRole, depending on the control type we're working for
<p>Only to be called during initialization</p>
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index f88d190..c5d0464 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -443,8 +443,6 @@ protected:
GetFullAccessibleName(AccessibleShape *shape)
throw (css::uno::RuntimeException, std::exception);
virtual OUString GetStyle();
- void UpdateDocumentAllSelState(css::uno::Reference<
- css::accessibility::XAccessibleStateSet > &xStateSet);
/** Update the <const>OPAQUE</const> and <const>SELECTED</const> state.
*/
void UpdateStates();
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index f75a7f3..a5f6209 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -117,8 +117,6 @@ private:
*/
void AssociateActionsWithRecognizers();
- void CreateBreakIterator() const;
-
public:
SmartTagMgr( const OUString& rApplicationName );
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 448d247..4fc8229 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -63,8 +63,6 @@ public:
bool IsStacked() const;
/** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */
sal_Int32 GetRotation( sal_Int32 nStdAngle ) const;
- /** Fills this item according to passed item values. */
- void SetFromRotation( sal_Int32 nRotation, bool bStacked );
};
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 2c97d85..e14939e 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -189,7 +189,6 @@ public:
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;
- OUString GetValueText() const;
virtual bool GetPresentation(SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 5954640..3396bcf 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -203,7 +203,6 @@ private:
protected:
- void ShowDateFields(SvxRedlinDateMode nKind);
void EnableDateLine1(bool bFlag);
void EnableDateLine2(bool bFlag);
@@ -351,7 +350,6 @@ public:
SvxTPFilter* GetFilterPage() { return pTPFilter;}
SvxTPView* GetViewPage() { return pTPView;}
- SvxRedlinTable* GetViewTable();
};
#endif // INCLUDED_SVX_CTREDLIN_HXX
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 05def09..6347df6 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -85,8 +85,6 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell
// (the FormView itself is not a broadcaster, therefore it can't always correctly notify the
// form explorer who is interested in the event)
- const OutputDevice* GetCurrentViewDevice() const { return m_pFormView ? m_pFormView->GetActualOutDev() : nullptr; }
-
public:
SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH)
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index f58d1f6..adfce10 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -344,8 +344,6 @@ private:
// moves the iterator with respect to the direction/overflow iterator/overflow cursor
SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const css::uno::Reference< css::container::XIndexAccess >& xAllFields, sal_Int32 nField);
- SVX_DLLPRIVATE bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); }
-
void OnSearchTerminated();
// is used by SearchThread, after the return from this handler the thread removes itself
DECL_LINK(OnNewRecordCount, sal_Int32, void);
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 97f6b66..7db266f 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -42,10 +42,6 @@ class SVX_DLLPUBLIC SvxHFPage : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
-private:
- //UUUU
- void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; }
-
public:
virtual bool FillItemSet( SfxItemSet* rOutSet ) override;
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index dccdfd6..b20e6f9 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -144,7 +144,6 @@ public:
const void* GetEditingObject() const { return pCheckObj; }
- void SetImageMap( const ImageMap& rImageMap );
const ImageMap& GetImageMap() const;
void SetTargetList( const TargetList& rTargetList );
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 8813a36..e711789 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -144,8 +144,6 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
MapUnit eCoreUnit;
// store the attributes passed from pSet
OUString aNumCharFmtName;
- void StoreBulCharFmtName_impl();
- void StoreMapUnit_impl();
NBOTypeMgrBase(const NBOTypeMgrBase&) = delete;
public:
@@ -164,7 +162,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
virtual bool IsCustomized(sal_uInt16 nIndex)=0;
static sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel);
// store the attributes passed from pSet
- void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();}
+ void SetItems(const SfxItemSet* pArg);
protected:
const OUString& GetBulCharFmtName() { return aNumCharFmtName;}
MapUnit GetMapUnit() { return eCoreUnit;}
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index c8601d0..f039ae9 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -211,7 +211,6 @@ private:
SVX_DLLPRIVATE ::std::vector<sal_uInt32>::iterator GetRemoved_Impl( size_t nKey );
SVX_DLLPRIVATE bool IsRemoved_Impl( size_t nKey );
SVX_DLLPRIVATE ::std::vector<sal_uInt32>::iterator GetAdded_Impl( size_t nKey );
- SVX_DLLPRIVATE bool IsAdded_Impl( size_t nKey );
SVX_DLLPRIVATE void GetPreviewString_Impl( OUString& rString,
Color*& rpColor );
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 294df95..1078f9d 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -195,7 +195,6 @@ public:
SvxColumnDescription& GetActiveColumnDescription();
sal_uInt16 Count() const;
- void Insert(const SvxColumnDescription& rDesc, sal_uInt16 nPos);
void Append(const SvxColumnDescription& rDesc);
void SetLeft(long aLeft);
void SetRight(long aRight);
diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx
index 0647755..1d1c16a 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -79,9 +79,6 @@ namespace sdr
SAL_DLLPRIVATE void Insert(Event* pNew);
SAL_DLLPRIVATE void Remove(Event* pOld);
- // clear list
- SAL_DLLPRIVATE void Clear();
-
// get first
SAL_DLLPRIVATE Event* GetFirst() { return mpHead; }
};
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index d3ebcf0..e883b9d 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -79,9 +79,6 @@ private:
// flag for preview renderer
bool mbIsPreviewRenderer : 1;
- // method to create a EventHandler. Needs to give a result.
- static sdr::event::TimerEventHandler* CreateEventHandler();
-
protected:
// Interface to allow derivates to travel over the registered VOC's
sal_uInt32 getViewObjectContactCount() const { return maViewObjectContactVector.size(); }
@@ -135,9 +132,6 @@ public:
// return a existing one or create a new one using CreateEventHandler().
sdr::event::TimerEventHandler& GetEventHandler() const;
- // delete the EventHandler
- void DeleteEventHandler();
-
// test if there is an EventHandler without creating one on demand
bool HasEventHandler() const;
diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index 2469e07..39777f9 100644
--- a/include/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
@@ -49,9 +49,6 @@ namespace sdr
void operator=(const MasterPageDescriptor& rCandidate) = delete;
- protected:
- sdr::contact::ViewContact* CreateObjectSpecificViewContact();
-
public:
MasterPageDescriptor(SdrPage& aOwnerPage, SdrPage& aUsedPage);
virtual ~MasterPageDescriptor();
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index d69607b8..ca4086f 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -27,7 +27,6 @@ class SVX_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer
private:
Idle m_aPanelLayoutIdle;
bool m_bInClose;
- bool hasPanelPendingLayout() const;
DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Idle*, void);
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 3743f27..df51ea8 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -130,7 +130,6 @@ protected:
// access for derivated classes to maOverlayObjectList
void addToOverlayObjectList(sdr::overlay::OverlayObject& rNew) { maOverlayObjectList.append(rNew); }
- basegfx::B2DRange getB2DRangeFromOverlayObjectList() const { return maOverlayObjectList.getBaseRange(); }
// access for derivated classes to mrSdrDragView
SdrDragView& getSdrDragView() { return mrSdrDragView; }
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 035053b..c1bf9895 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -491,8 +491,6 @@ protected:
virtual void CreateB2dIAObject() override;
BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize );
-
- static BitmapEx GetHandlesBitmap();
};
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 159c099..bb187a8 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -229,7 +229,6 @@ public:
protected:
// all available changing methods
SdrMarkList& GetMarkedObjectListWriteAccess() { return mpSdrViewSelection->GetMarkedObjectListWriteAccess(); }
- void SetEdgesOfMarkedNodesDirty() { mpSdrViewSelection->SetEdgesOfMarkedNodesDirty(); }
public:
// all available const methods for read access to selection
@@ -245,8 +244,6 @@ public:
OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); }
OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); }
- void GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { GetMarkedObjectList().TakeBoundRect(pPageView, rRect); }
- bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); }
// Get a list of all those links which are connected to marked nodes,
// but which are not marked themselves.
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index c7e6e4c..e1e3b64 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -110,7 +110,6 @@ public:
{}
Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode);
- const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return const_cast<SdrEdgeInfoRec*>(this)->ImpGetLineVersatzPoint(eLineCode); }
sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal);
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 28d94c9..5b69ed6 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -62,8 +62,6 @@ public:
void setMediaProperties( const ::avmedia::MediaItem& rState );
const ::avmedia::MediaItem& getMediaProperties() const;
- Size getPreferredSize() const;
-
const css::uno::Reference< css::graphic::XGraphic >
getSnapshot() const;
css::uno::Reference< css::io::XInputStream>
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 5d7e27a..6233d09 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -110,8 +110,6 @@ public:
const SdrPageWindow* FindPatchedPageWindow( const OutputDevice& rOutDev ) const;
private:
- SVX_DLLPRIVATE void CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow);
-
void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
void SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa);
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 2c96e13..026f930 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -287,7 +287,6 @@ class SVX_DLLPUBLIC SdrFormatter {
MapUnit eDstMU;
private:
SVX_DLLPRIVATE void Undirty();
- SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) const_cast<SdrFormatter*>(this)->Undirty(); }
public:
SdrFormatter(MapUnit eSrc, MapUnit eDst)
: nMul_(0)
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index 0bc40e8..d52e26a 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -68,9 +68,6 @@ protected:
virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *);
- // impGetMergedUnderflowingParaObject merges underflowing text with the one in the next box
- OutlinerParaObject *impGetMergedUnderflowParaObject(SdrOutliner *pOutliner);
-
private:
bool mbOFisUFinduced;
diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx
index f085dd4..61157fe 100644
--- a/include/svx/viewpt3d.hxx
+++ b/include/svx/viewpt3d.hxx
@@ -70,8 +70,6 @@ class SVX_DLLPUBLIC Viewport3D
double fWRatio; // device/view aspect ratio
double fHRatio;
- void MakeTransform();
-
public:
Viewport3D();
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index c76b446..24f9d30 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -111,8 +111,6 @@ public:
SvXMLEmbeddedObjectHelperMode eCreateMode );
static void Destroy( SvXMLEmbeddedObjectHelper* pSvXMLEmbeddedObjectHelper );
- void Flush();
-
// XEmbeddedObjectResolver
virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index ca6365d..afd77c7 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -61,7 +61,6 @@ private:
DECL_LINK(SplitHdl, Splitter*, void);
protected:
- void ThemeSelectionHasChanged();
virtual ~GalleryControl() override;
virtual void dispose() override;
};
diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
index ddd6c67..6cbca13 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx
@@ -30,13 +30,6 @@ namespace sdr
{
class ViewContactOfSdrCaptionObj : public ViewContactOfSdrRectObj
{
- protected:
- // internal access to SdrCaptionObj
- const SdrCaptionObj& GetCaptionObj() const
- {
- return static_cast<const SdrCaptionObj&>(GetSdrObject());
- }
-
public:
// basic constructor, used from SdrObject.
explicit ViewContactOfSdrCaptionObj(SdrCaptionObj& rCaptionObj);
diff --git a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 35775fd..7cef6d7 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
@@ -36,9 +36,6 @@ namespace sdr
ViewObjectContactOfMasterPageDescriptor(ObjectContact& rObjectContact, ViewContact& rViewContact);
virtual ~ViewObjectContactOfMasterPageDescriptor() override;
- // access to MasterPageDescriptor
- sdr::MasterPageDescriptor& GetMasterPageDescriptor() const;
-
virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override;
virtual drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const override;
};
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index 31ad144..31d5be7 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
@@ -29,8 +29,6 @@ namespace sdr { namespace contact {
class ViewObjectContactOfSdrOle2Obj : public ViewObjectContactOfSdrObj
{
protected:
- const SdrOle2Obj& getSdrOle2Object() const;
-
// This method is responsible for creating the graphical visualisation data
virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index cec0225..faa18da 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -138,11 +138,6 @@ AccessibleControlShape::~AccessibleControlShape()
// ourself) to this proxy, and thus delete it
}
-SdrObject* AccessibleControlShape::getSdrObject() const
-{
- return GetSdrObjectFromXShape (mxShape);
-}
-
namespace {
Reference< XContainer > lcl_getControlContainer( const vcl::Window* _pWin, const SdrView* _pView )
{
@@ -188,7 +183,7 @@ void AccessibleControlShape::Init()
// get the control which belongs to our model (relative to our view)
const vcl::Window* pViewWindow = maShapeTreeInfo.GetWindow();
- SdrUnoObj* pUnoObjectImpl = dynamic_cast<SdrUnoObj*>( getSdrObject() );
+ SdrUnoObj* pUnoObjectImpl = dynamic_cast<SdrUnoObj*>( GetSdrObjectFromXShape(mxShape) );
SdrView* pView = maShapeTreeInfo.GetSdrView();
OSL_ENSURE( pView && pViewWindow && pUnoObjectImpl, "AccessibleControlShape::Init: no view, or no view window, no SdrUnoObj!" );
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 6ecb797..26ae123 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -483,16 +483,10 @@ IMPL_LINK( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void
{
vcl::Window* pWindow = rEvent.GetWindow();
DBG_ASSERT( pWindow, "AccFrameSelector::WindowEventListener: no window!" );
- if ( !pWindow->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) )
- {
- ProcessWindowEvent( rEvent );
- }
-}
+ if ( pWindow->IsAccessibilityEventsSuppressed() && ( rEvent.GetId() != VCLEVENT_OBJECT_DYING ) )
+ return;
-
-void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
-{
- switch ( rVclWindowEvent.GetId() )
+ switch ( rEvent.GetId() )
{
case VCLEVENT_WINDOW_GETFOCUS:
{
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index ca132f9..c1c39be 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -485,7 +485,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
xStateSet.set( new ::utl::AccessibleStateSetHelper (*pStateSet));
}
}
- UpdateDocumentAllSelState(xStateSet);
+ if (mpParent && mpParent->IsDocumentSelAll())
+ {
+ ::utl::AccessibleStateSetHelper* pStateSet =
+ static_cast< ::utl::AccessibleStateSetHelper*>(xStateSet.get());
+ pStateSet->AddState (AccessibleStateType::SELECTED);
+ }
return xStateSet;
}
@@ -1332,21 +1337,6 @@ sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole()
}
-void AccessibleShape::UpdateDocumentAllSelState(Reference<XAccessibleStateSet> &xStateSet)
-{
- if (mpParent && mpParent->IsDocumentSelAll())
- {
- ::utl::AccessibleStateSetHelper* pStateSet =
- static_cast< ::utl::AccessibleStateSetHelper*>(xStateSet.get());
- pStateSet->AddState (AccessibleStateType::SELECTED);
-
- //uno::Any NewValue;
- //NewValue <<= AccessibleStateType::SELECTED;
-
- //CommitChange(AccessibleEventId::STATE_CHANGED,NewValue,uno::Any());
- }
-}
-
//sort the drawing objects from up to down, from left to right
struct XShapePosCompareHelper
{
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index f0bdc4c..7bfce1f 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -171,7 +171,6 @@ namespace accessibility
// syntactic sugar for FireEvent
void GotPropertyEvent( const uno::Any& rNewValue, const sal_Int16 nEventId ) const { FireEvent( nEventId, rNewValue ); }
- void LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const { FireEvent( nEventId, uno::Any(), rOldValue ); }
// shutdown usage of current edit source on myself and the children.
void ShutdownEditSource();
@@ -437,7 +436,7 @@ namespace accessibility
{
AccessibleCell* pAccessibleCell = dynamic_cast< AccessibleCell* > ( mxFrontEnd.get() );
if ( !pAccessibleCell )
- LostPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED), AccessibleEventId::STATE_CHANGED );
+ FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::makeAny(AccessibleStateType::FOCUSED) );
else
{
AccessibleTableShape* pAccTable = pAccessibleCell->GetParentTable();
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 7e6b09c..261bb8c 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -276,17 +276,10 @@ void SvxGraphCtrlAccessibleContext::CommitChange (
rNewValue,
rOldValue);
- FireEvent (aEvent);
-}
-
-/** sends an AccessibleEventObject to all added XAccessibleEventListeners */
-void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEvent)
-{
if (mnClientId)
comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent );
}
-
Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception )
{
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 0761799..97f523c 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -236,7 +236,8 @@ SvxShowCharSetItem::~SvxShowCharSetItem()
if ( m_xAcc.is() )
{
m_pItem->ParentDestroyed();
- ClearAccessible();
+ m_pItem = nullptr;
+ m_xAcc = nullptr;
}
}
@@ -253,15 +254,6 @@ uno::Reference< css::accessibility::XAccessible > const & SvxShowCharSetItem::Ge
}
-void SvxShowCharSetItem::ClearAccessible()
-{
- if ( m_xAcc.is() )
- {
- m_pItem = nullptr;
- m_xAcc = nullptr;
- }
-}
-
SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(new VCLExternalSolarLock())
,m_pParent( _pParent )
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 4aa8168..83dd81b2 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -222,7 +222,8 @@ uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoin
throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
- ensureIsAlive();
+ if( !IsAlive() )
+ throw lang::DisposedException();
uno::Reference <XAccessible> xAcc;
Point childPoint;
@@ -364,14 +365,6 @@ void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw
{
}
-// Added by lq
-void SvxPixelCtlAccessible::ensureIsAlive() const
- throw ( lang::DisposedException )
-{
- if( !IsAlive() )
- throw lang::DisposedException();
-}
-
//XAccessibleEventBroadcaster
void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception )
{
@@ -399,17 +392,13 @@ void SAL_CALL SvxPixelCtlAccessible::removeAccessibleEventListener( const uno::R
}
}
}
-void SvxPixelCtlAccessible::CommitChange( const AccessibleEventObject& rEvent )
-{
- if (mnClientId)
- comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
-}
//Solution:Add the event handling method
void SvxPixelCtlAccessible::FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew)
{
const uno::Reference< XInterface > xSource( *this );
- CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) );
+ if (mnClientId)
+ comphelper::AccessibleEventNotifier::addEvent( mnClientId, AccessibleEventObject( xSource, nEventId, rNew,rOld ) );
}
void SAL_CALL SvxPixelCtlAccessible::disposing()
@@ -543,7 +532,8 @@ void SvxPixelCtlAccessibleChild::FireAccessibleEvent (
const css::uno::Any& rNew)
{
const uno::Reference< XInterface > xSource( *this );
- CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) );
+ if (mnClientId)
+ comphelper::AccessibleEventNotifier::addEvent( mnClientId, AccessibleEventObject( xSource, nEventId, rNew,rOld ) );
}
SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
@@ -788,13 +778,6 @@ Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNam
return aRet;
}
-// internal
-void SvxPixelCtlAccessibleChild::CommitChange( const AccessibleEventObject& rEvent )
-{
- if (mnClientId)
- comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
-}
-
void SAL_CALL SvxPixelCtlAccessibleChild::disposing()
{
if( !rBHelper.bDisposed )
@@ -816,7 +799,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing()
void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive() throw( lang::DisposedException )
{
- if( IsNotAlive() )
+ if( rBHelper.bDisposed || rBHelper.bInDispose )
throw lang::DisposedException();
}
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 828166b..64734ae 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -529,7 +529,9 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccess
{
::osl::MutexGuard aGuard( m_aMutex );
- checkChildIndexOnSelection( nIndex );
+ if( nIndex || mnSelectedChild == NOCHILDSELECTED )
+ // in our case only for the first (0) _selected_ child this is a valid request
+ throw lang::IndexOutOfBoundsException();
return getAccessibleChild( mnSelectedChild );
}
@@ -550,13 +552,6 @@ void SvxRectCtlAccessibleContext::checkChildIndex( long nIndex ) throw( lang::In
throw lang::IndexOutOfBoundsException();
}
-void SvxRectCtlAccessibleContext::checkChildIndexOnSelection( long nIndex ) throw( lang::IndexOutOfBoundsException )
-{
- if( nIndex || mnSelectedChild == NOCHILDSELECTED )
- // in our case only for the first (0) _selected_ child this is a valid request
- throw lang::IndexOutOfBoundsException();
-}
-
void SvxRectCtlAccessibleContext::FireChildFocus( RectPoint eButton )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -580,7 +575,9 @@ void SvxRectCtlAccessibleContext::FireChildFocus( RectPoint eButton )
Any aOld;
Any aNew;
aNew <<= AccessibleStateType::FOCUSED;
- CommitChange( AccessibleEventObject( xSource, AccessibleEventId::STATE_CHANGED, aNew, aOld ) );
+ if (mnClientId)
+ comphelper::AccessibleEventNotifier::addEvent( mnClientId,
+ AccessibleEventObject( xSource, AccessibleEventId::STATE_CHANGED, aNew, aOld ) );
}
}
else
@@ -623,12 +620,6 @@ void SvxRectCtlAccessibleContext::selectChild(RectPoint eButton )
selectChild(PointToIndex( eButton, mbAngleMode ));
}
-void SvxRectCtlAccessibleContext::CommitChange( const AccessibleEventObject& rEvent )
-{
- if (mnClientId)
- comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
-}
-
void SAL_CALL SvxRectCtlAccessibleContext::disposing()
{
if( !rBHelper.bDisposed )
@@ -690,7 +681,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException
void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException )
{
- if( IsNotAlive() )
+ if( rBHelper.bDisposed || rBHelper.bInDispose )
throw lang::DisposedException();
}
@@ -1046,7 +1037,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing()
void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException )
{
- if( IsNotAlive() )
+ if( rBHelper.bDisposed || rBHelper.bInDispose )
throw lang::DisposedException();
}
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 3f62c8d..fe877794 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -421,16 +421,6 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicL
aUpdateIdle.Start();
}
-bool SvxSuperContourDlg::IsUndoPossible() const
-{
- return aUndoGraphic.GetType() != GraphicType::NONE;
-}
-
-bool SvxSuperContourDlg::IsRedoPossible() const
-{
- return aRedoGraphic.GetType() != GraphicType::NONE;
-}
-
// Click handler for ToolBox
IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void )
@@ -635,8 +625,8 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void )
m_pTbx1->EnableItem(mnAutoContourId, bDontHide && bDrawEnabled);
m_pTbx1->EnableItem(mnPipetteId, !bWorkplace && bDrawEnabled && bBitmap);
- m_pTbx1->EnableItem(mnUndoId, bDontHide && IsUndoPossible());
- m_pTbx1->EnableItem(mnRedoId, bDontHide && IsRedoPossible());
+ m_pTbx1->EnableItem(mnUndoId, bDontHide && aUndoGraphic.GetType() != GraphicType::NONE);
+ m_pTbx1->EnableItem(mnRedoId, bDontHide && aRedoGraphic.GetType() != GraphicType::NONE);
if ( bPolyEdit )
{
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index c6eae9a..3b90b0b 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -112,9 +112,6 @@ public:
const void* GetEditingObject() const { return pCheckObj; }
- bool IsUndoPossible() const;
- bool IsRedoPossible() const;
-
void UpdateGraphic( const Graphic& rGraphic, bool bGraphicLinked,
const tools::PolyPolygon* pPolyPoly,
void* pEditingObj );
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 86bf1a9..26dd996 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -629,43 +629,6 @@ void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
pRedlinTable=pTable;
}
-void SvxTPFilter::ShowDateFields(SvxRedlinDateMode nKind)
-{
- switch(nKind)
- {
- case SvxRedlinDateMode::BEFORE:
- EnableDateLine1(true);
- EnableDateLine2(false);
- break;
- case SvxRedlinDateMode::SINCE:
- EnableDateLine1(true);
- EnableDateLine2(false);
- break;
- case SvxRedlinDateMode::EQUAL:
- EnableDateLine1(true);
- m_pTfDate->Disable();
- m_pTfDate->SetText(OUString());
- EnableDateLine2(false);
- break;
- case SvxRedlinDateMode::NOTEQUAL:
- EnableDateLine1(true);
- m_pTfDate->Disable();
- m_pTfDate->SetText(OUString());
- EnableDateLine2(false);
- break;
- case SvxRedlinDateMode::BETWEEN:
- EnableDateLine1(true);
- EnableDateLine2(true);
- break;
- case SvxRedlinDateMode::SAVE:
- EnableDateLine1(false);
- EnableDateLine2(false);
- break;
- case SvxRedlinDateMode::NONE:
- break;
- }
-}
-
void SvxTPFilter::EnableDateLine1(bool bFlag)
{
if(bFlag && m_pCbDate->IsChecked())
@@ -898,7 +861,40 @@ void SvxTPFilter::ShowAction(bool bShow)
IMPL_LINK_NOARG( SvxTPFilter, SelDateHdl, ListBox&, void )
{
- ShowDateFields(static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos()));
+ SvxRedlinDateMode nKind = static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos());
+ switch(nKind)
+ {
+ case SvxRedlinDateMode::BEFORE:
+ EnableDateLine1(true);
+ EnableDateLine2(false);
+ break;
+ case SvxRedlinDateMode::SINCE:
+ EnableDateLine1(true);
+ EnableDateLine2(false);
+ break;
+ case SvxRedlinDateMode::EQUAL:
+ EnableDateLine1(true);
+ m_pTfDate->Disable();
+ m_pTfDate->SetText(OUString());
+ EnableDateLine2(false);
+ break;
+ case SvxRedlinDateMode::NOTEQUAL:
+ EnableDateLine1(true);
+ m_pTfDate->Disable();
+ m_pTfDate->SetText(OUString());
+ EnableDateLine2(false);
+ break;
+ case SvxRedlinDateMode::BETWEEN:
+ EnableDateLine1(true);
+ EnableDateLine2(true);
+ break;
+ case SvxRedlinDateMode::SAVE:
+ EnableDateLine1(false);
+ EnableDateLine2(false);
+ break;
+ case SvxRedlinDateMode::NONE:
+ break;
+ }
bModified=true;
}
@@ -1071,7 +1067,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTop
SetTabPage(m_nViewPageId, pTPView);
SetTabPage(m_nFilterPageId, pTPFilter);
- pTPFilter->SetRedlinTable(GetViewTable());
+ pTPFilter->SetRedlinTable(pTPView->GetTableControl());
SetCurPageId(m_nViewPageId);
@@ -1096,9 +1092,4 @@ void SvxAcceptChgCtr::ShowFilterPage()
SetCurPageId(m_nFilterPageId);
}
-SvxRedlinTable* SvxAcceptChgCtr::GetViewTable()
-{
- return pTPView ? pTPView->GetTableControl() : nullptr;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 4fbc527..a459bf4 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -591,12 +591,6 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder )
mpVirDev->DrawImage( aPos2, maILArrows.GetImage( nImgId2 + nSelectAdd ) );
}
-void FrameSelectorImpl::DrawAllArrows()
-{
- for(FrameBorderCIter aIt(maEnabBorders); aIt.Is(); ++aIt)
- DrawArrows(**aIt);
-}
-
Color FrameSelectorImpl::GetDrawLineColor( const Color& rColor ) const
{
Color aColor( mbHCMode ? maHCLineCol : rColor );
@@ -662,7 +656,8 @@ void FrameSelectorImpl::DrawAllFrameBorders()
void FrameSelectorImpl::DrawVirtualDevice()
{
DrawBackground();
- DrawAllArrows();
+ for(FrameBorderCIter aIt(maEnabBorders); aIt.Is(); ++aIt)
+ DrawArrows(**aIt);
DrawAllFrameBorders();
mbFullRepaint = false;
}
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 583e80e..46b6d77 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -1160,7 +1160,7 @@ void SvxHFPage::PageCreated(const SfxAllItemSet &rSet)
{
const bool bNew(pSupportDrawingLayerFillStyleItem->GetValue());
- EnableDrawingLayerFillStyles(bNew);
+ mbEnableDrawingLayerFillStyles = bNew;
}
}
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index ebc66b0..8afc2c1 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::SetImageMap( const ImageMap& rImageMap )
-{
- pIMapWnd->SetImageMap( rImageMap );
-}
-
const ImageMap& SvxIMapDlg::GetImageMap() const
{
return pIMapWnd->GetImageMap();
@@ -733,7 +728,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Idle *, void)
}
pIMapWnd->SetGraphic( pOwnData->aUpdateGraphic );
- SetImageMap( pOwnData->aUpdateImageMap );
+ pIMapWnd->SetImageMap( pOwnData->aUpdateImageMap );
SetTargetList( pOwnData->aUpdateTargetList );
pCheckObj = pOwnData->pUpdateEditingObject;
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 45952e2..241b9f7 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -589,14 +589,9 @@ const SvxColumnDescription& SvxColumnItem::operator[](sal_uInt16 index) const
return aColumns[index];
}
-void SvxColumnItem::Insert(const SvxColumnDescription &rDesc, sal_uInt16 nPos)
-{
- aColumns.insert(aColumns.begin() + nPos, rDesc);
-}
-
void SvxColumnItem::Append(const SvxColumnDescription &rDesc)
{
- Insert(rDesc, Count());
+ aColumns.push_back(rDesc);
}
void SvxColumnItem::SetLeft(long left)
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index 8ff54c0..7c8a73c 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -57,15 +57,7 @@ void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH)
const basegfx::B3DPoint& Viewport3D::GetViewPoint()
{
- MakeTransform();
-
- return aViewPoint;
-}
-
-// Calculate View transformations matrix
-
-void Viewport3D::MakeTransform()
-{
+ // Calculate View transformations matrix
if ( !bTfValid )
{
double fV, fXupVp, fYupVp;
@@ -123,6 +115,7 @@ void Viewport3D::MakeTransform()
bTfValid = true;
}
+ return aViewPoint;
}
void Viewport3D::SetDeviceWindow(const Rectangle& rRect)
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 1648940..c557751 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -67,7 +67,6 @@ namespace svx
private:
void impl_initFilterProperties_nothrow();
void impl_onBrowseButtonClicked();
- void impl_onLocationModified();
OUString impl_getCurrentURL() const;
DECL_LINK( OnControlAction, VclWindowEvent&, void );
@@ -209,7 +208,7 @@ namespace svx
&& ( _rEvent.GetId() == VCLEVENT_EDIT_MODIFY )
)
{
- impl_onLocationModified();
+ m_bNeedExistenceCheck = true;
}
}
@@ -253,11 +252,6 @@ namespace svx
}
- void DatabaseLocationInputController_Impl::impl_onLocationModified()
- {
- m_bNeedExistenceCheck = true;
- }
-
DatabaseLocationInputController::DatabaseLocationInputController( const Reference<XComponentContext>& _rContext,
::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton )
:m_pImpl( new DatabaseLocationInputController_Impl( _rContext, _rLocationInput, _rBrowseButton ) )
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index a28f98f..b60024b 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -539,10 +539,13 @@ void FmFormShell::Execute(SfxRequest &rReq)
const bool bHasControlFocus = GetImpl()->HasControlFocus();
if ( bHasControlFocus )
{
- const OutputDevice* pDevice = GetCurrentViewDevice();
- vcl::Window* pWindow = dynamic_cast< vcl::Window* >( const_cast< OutputDevice* >( pDevice ) );
- if ( pWindow )
- pWindow->GrabFocus();
+ if (m_pFormView)
+ {
+ const OutputDevice* pDevice = m_pFormView->GetActualOutDev();
+ vcl::Window* pWindow = dynamic_cast< vcl::Window* >( const_cast< OutputDevice* >( pDevice ) );
+ if ( pWindow )
+ pWindow->GrabFocus();
+ }
}
else
{
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index b2db675..10a9b75 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -886,7 +886,7 @@ void FmSearchEngine::SearchNextImpl()
sal_Int32 nFieldPos;
- if (HasPreviousLoc())
+ if (m_aPreviousLocBookmark.hasValue())
{
DBG_ASSERT(EQUAL_BOOKMARKS(m_aPreviousLocBookmark, m_xSearchCursor.getBookmark()),
"FmSearchEngine::SearchNextImpl : ungueltige Position !");
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index c175583..1110e8f 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1279,8 +1279,11 @@ namespace svx
}
- void FmTextControlShell::impl_parseURL_nothrow( URL& _rURL )
+ FmTextControlFeature* FmTextControlShell::implGetFeatureDispatcher( const Reference< XDispatchProvider >& _rxProvider, SfxApplication* _pApplication, SfxSlotId _nSlot )
{
+ OSL_PRECOND( _rxProvider.is() && _pApplication, "FmTextControlShell::implGetFeatureDispatcher: invalid arg(s)!" );
+ URL aFeatureURL;
+ aFeatureURL.Complete = lcl_getUnoSlotName( *_pApplication, _nSlot );
try
{
if ( !m_xURLTransformer.is() )
@@ -1288,21 +1291,12 @@ namespace svx
m_xURLTransformer = util::URLTransformer::create( ::comphelper::getProcessComponentContext() );
}
if ( m_xURLTransformer.is() )
- m_xURLTransformer->parseStrict( _rURL );
+ m_xURLTransformer->parseStrict( aFeatureURL );
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
- }
-
-
- FmTextControlFeature* FmTextControlShell::implGetFeatureDispatcher( const Reference< XDispatchProvider >& _rxProvider, SfxApplication* _pApplication, SfxSlotId _nSlot )
- {
- OSL_PRECOND( _rxProvider.is() && _pApplication, "FmTextControlShell::implGetFeatureDispatcher: invalid arg(s)!" );
- URL aFeatureURL;
- aFeatureURL.Complete = lcl_getUnoSlotName( *_pApplication, _nSlot );
- impl_parseURL_nothrow( aFeatureURL );
Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, OUString(), 0xFF );
if ( xDispatcher.is() )
return new FmTextControlFeature( xDispatcher, aFeatureURL, _nSlot, this );
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 2f5d539..705b9b1 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -464,7 +464,14 @@ FmXFormView::~FmXFormView()
void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
{
if ( m_xWindow.is() && Source.Source == m_xWindow )
- removeGridWindowListening();
+ {
+ m_xWindow->removeFocusListener(this);
+ if ( m_pView )
+ {
+ m_pView->SetMoveOutside( false, FmFormView::ImplAccess() );
+ }
+ m_xWindow = nullptr;
+ }
}
// XFormControllerListener
@@ -1916,20 +1923,6 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
}
}
-void FmXFormView::removeGridWindowListening()
-{
- if ( m_xWindow.is() )
- {
- m_xWindow->removeFocusListener(this);
- if ( m_pView )
- {
- m_pView->SetMoveOutside( false, FmFormView::ImplAccess() );
- }
- m_xWindow = nullptr;
- }
-}
-
-
DocumentType FmXFormView::impl_getDocumentType() const
{
if ( GetFormShell() && GetFormShell()->GetImpl() )
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index d418518..d78e0bd 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -713,12 +713,6 @@ namespace svxform
}
- sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const ::Point& _rDropPos, bool _bDnD )
- {
- return implAcceptDataTransfer( _rFlavors, _nAction, GetEntry( _rDropPos ), _bDnD );
- }
-
-
sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD )
{
// no target -> no drop
@@ -907,7 +901,7 @@ namespace svxform
m_aDropActionTimer.Stop();
}
- return implAcceptDataTransfer( GetDataFlavorExVector(), rEvt.mnAction, aDropPos, true );
+ return implAcceptDataTransfer( GetDataFlavorExVector(), rEvt.mnAction, GetEntry( aDropPos ), true );
}
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index f907049..8082289 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -39,17 +39,16 @@ GalleryControl::GalleryControl (
: Window(pParentWindow, WB_SIZEABLE|WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE),
mpGallery (Gallery::GetGalleryInstance()),
mpSplitter(VclPtr<GallerySplitter>::Create(
-
this,
WB_HSCROLL,
[this] () { return this->InitSettings(); })),
mpBrowser1(VclPtr<GalleryBrowser1>::Create(
-
this,
mpGallery,
[this] (KeyEvent const& rEvent, vcl::Window *const pWindow)
{ return this->GalleryKeyInput(rEvent, pWindow); },
- [this] () { return this->ThemeSelectionHasChanged(); })),
+ [this] ()
+ { return mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); })),
mpBrowser2(VclPtr<GalleryBrowser2>::Create(this, mpGallery)),
maLastSize(GetOutputSizePixel()),
mbIsInitialResize(true)
@@ -220,11 +219,6 @@ void GalleryControl::GetFocus()
mpBrowser1->GrabFocus();
}
-void GalleryControl::ThemeSelectionHasChanged()
-{
- mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme());
-}
-
IMPL_LINK_NOARG( GalleryControl, SplitHdl, Splitter*, void )
{
if(mpSplitter->IsHorizontal())
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index de2a2c4f..1a8e3c3 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -103,8 +103,6 @@ public:
protected:
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
- void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-
private:
void IsValid() throw (css::uno::RuntimeException);
void RemoveFrameSelEventListener();
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 0f4f171..4e271d9 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -190,7 +190,6 @@ private:
throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException );
void CommitChange (sal_Int16 aEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue);
- void FireEvent (const css::accessibility::AccessibleEventObject& aEvent);
css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessible( const SdrObject* pObj );
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 6e78475..73bc31e 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -109,7 +109,6 @@ namespace svx
~SvxShowCharSetItem();
css::uno::Reference< css::accessibility::XAccessible > const & GetAccessible();
- void ClearAccessible();
};
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index 3e79e7f..c8a5da5 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -78,9 +78,6 @@ namespace sdr
TimerEventHandler();
~TimerEventHandler() override;
- // Trigger and consume the events
- void ExecuteEvents();
-
bool IsEmpty() const;
// The timer when it is triggered; from class Timer
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index d62995f..6695d6b 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -515,7 +515,6 @@ namespace svxform
using SvTreeListBox::Notify;
private:
- sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const Point& _rDropPos, bool _bDnD );
sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD );
sal_Int8 implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const Point& _rDropPos, bool _bDnD );
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 6a7fccb..fb8027d 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -192,10 +192,6 @@ namespace svx
*/
void stopControllerListening( );
- /** parses the given URL's Complete member, by calling XURLTransformer::parseString
- */
- void impl_parseURL_nothrow( css::util::URL& _rURL );
-
DECL_LINK( OnInvalidateClipboard, Timer*, void );
};
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index f2f0a68..d423df5 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -177,8 +177,6 @@ class FmXFormView : public ::cppu::WeakImplHelper<
FmFormShell* GetFormShell() const;
- void removeGridWindowListening();
-
protected:
FmXFormView( FmFormView* _pView );
virtual ~FmXFormView() override;
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index a74cfd2b..73bbe55 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -178,8 +178,6 @@ struct FrameSelectorImpl : public Resource
/** Draws selection arrows for the specified frame border. */
void DrawArrows( const FrameBorder& rBorder );
- /** Draws arrows in current selection state for all enabled frame borders. */
- void DrawAllArrows();
/** Returns the color that has to be used to draw a frame border. */
Color GetDrawLineColor( const Color& rColor ) const;
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 791328b..b4855eb2 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -127,7 +127,6 @@ public:
removeAccessibleEventListener(
const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
throw( css::uno::RuntimeException, std::exception ) override;
- void CommitChange( const css::accessibility::AccessibleEventObject& rEvent );
//Solution: Add the event handling method
void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew);
@@ -139,8 +138,6 @@ public:
/// @returns true if it's disposed or in disposing
inline bool IsAlive() const;
- /// @returns true if it's not disposed and no in disposing
- inline bool IsNotAlive() const;
/// throws the exception DisposedException if it's not alive
void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
@@ -171,8 +168,6 @@ public:
SvxPixelCtlAccessible(SvxPixelCtl& rWindow);
virtual ~SvxPixelCtlAccessible() override;
- void ensureIsAlive() const throw ( css::lang::DisposedException );
-
//XAccessible
virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
@@ -224,7 +219,6 @@ public:
removeAccessibleEventListener(
const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
throw( css::uno::RuntimeException, std::exception ) override;
- void CommitChange( const css::accessibility::AccessibleEventObject& rEvent );
//Solution: Add the event handling method
void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew);
virtual void SAL_CALL disposing() override;
@@ -253,12 +247,6 @@ inline bool SvxPixelCtlAccessibleChild::IsAlive() const
return !rBHelper.bDisposed && !rBHelper.bInDispose;
}
-inline bool SvxPixelCtlAccessibleChild::IsNotAlive() const
-{
- return rBHelper.bDisposed || rBHelper.bInDispose;
-}
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 131c6ec..622feca 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -202,8 +202,6 @@ protected:
// internals
void checkChildIndex( long nIndexOfChild ) throw( css::lang::IndexOutOfBoundsException );
- void checkChildIndexOnSelection( long nIndexOfChild ) throw( css::lang::IndexOutOfBoundsException );
-
/** Selects a new child by index.
<p>If the child was not selected before, the state of the child will
@@ -234,17 +232,11 @@ protected:
/// @Return the object's current bounding box relative to the parent object.
Rectangle GetBoundingBox() throw( css::uno::RuntimeException );
- /// Calls all Listener to tell they the change.
- void CommitChange( const css::accessibility::AccessibleEventObject& rEvent );
-
virtual void SAL_CALL disposing() override;
/// @returns true if it's disposed or in disposing
inline bool IsAlive() const;
- /// @returns true if it's not disposed and no in disposing
- inline bool IsNotAlive() const;
-
/// throws the exception DisposedException if it's not alive
void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
@@ -283,11 +275,6 @@ inline bool SvxRectCtlAccessibleContext::IsAlive() const
return !rBHelper.bDisposed && !rBHelper.bInDispose;
}
-inline bool SvxRectCtlAccessibleContext::IsNotAlive() const
-{
- return rBHelper.bDisposed || rBHelper.bInDispose;
-}
-
typedef ::cppu::WeakAggComponentImplHelper7<
css::accessibility::XAccessible,
css::accessibility::XAccessibleComponent,
@@ -434,9 +421,6 @@ protected:
/// @returns true if it's disposed or in disposing
inline bool IsAlive() const;
- /// @returns true if it's not disposed and no in disposing
- inline bool IsNotAlive() const;
-
/// throws the exception DisposedException if it's not alive
void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
@@ -481,11 +465,6 @@ inline bool SvxRectCtlChildAccessibleContext::IsAlive() const
return !rBHelper.bDisposed && !rBHelper.bInDispose;
}
-inline bool SvxRectCtlChildAccessibleContext::IsNotAlive() const
-{
- return rBHelper.bDisposed || rBHelper.bInDispose;
-}
-
#endif
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 1b7d2c1..998cc9b 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -53,7 +53,16 @@ SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, const sal_uInt16 nId ) :
SfxEnumItem( nId )
{
- SetFromRotation( nRotation, bStacked );
+ if( bStacked )
+ {
+ SetValue( SVX_ORIENTATION_STACKED );
+ }
+ else switch( nRotation )
+ {
+ case 9000: SetValue( SVX_ORIENTATION_BOTTOMTOP ); break;
+ case 27000: SetValue( SVX_ORIENTATION_TOPBOTTOM ); break;
+ default: SetValue( SVX_ORIENTATION_STANDARD );
+ }
}
@@ -151,20 +160,6 @@ sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const
return nAngle;
}
-void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, bool bStacked )
-{
- if( bStacked )
- {
- SetValue( SVX_ORIENTATION_STACKED );
- }
- else switch( nRotation )
- {
- case 9000: SetValue( SVX_ORIENTATION_BOTTOMTOP ); break;
- case 27000: SetValue( SVX_ORIENTATION_TOPBOTTOM ); break;
- default: SetValue( SVX_ORIENTATION_STANDARD );
- }
-}
-
SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 192c96d..0efa60b 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -169,12 +169,6 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) :
}
-OUString SvxDoubleItem::GetValueText() const
-{
- return rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.' );
-}
-
-
bool SvxDoubleItem::GetPresentation
( SfxItemPresentation /*ePresentation*/, MapUnit /*eCoreMetric*/,
MapUnit /*ePresentationMetric*/, OUString& rText,
@@ -187,7 +181,7 @@ bool SvxDoubleItem::GetPresentation
pIntlWrapper->getLocaleData()->getNumDecimalSep()[0], true );
}
else
- rText = GetValueText();
+ rText = rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.' );
return true;
}
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index aba7875..765ec8d 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -295,7 +295,7 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos,
if ( bInserted )
{
nCurFormatKey = nAddKey;
- DBG_ASSERT( !IsAdded_Impl( nCurFormatKey ), "duplicate format!" );
+ DBG_ASSERT( GetAdded_Impl( nCurFormatKey ) == aAddList.end(), "duplicate format!" );
aAddList.push_back( nCurFormatKey );
// get current table
@@ -1148,11 +1148,6 @@ bool SvxNumberFormatShell::IsRemoved_Impl( size_t nKey )
}
-bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey )
-{
- return GetAdded_Impl( nKey ) != aAddList.end();
-}
-
// Konvertierungs-Routinen:
void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short& rCategory)
{
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 84e1ce3..3841272 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -72,7 +72,12 @@ namespace sdr
EventList::~EventList()
{
- Clear();
+ while(mpHead)
+ {
+ Event* pNext = mpHead->GetNext();
+ mpHead->SetNext(nullptr);
+ mpHead = pNext;
+ }
}
void EventList::Insert(Event* pNew)
@@ -127,16 +132,6 @@ namespace sdr
}
}
- void EventList::Clear()
- {
- while(mpHead)
- {
- Event* pNext = mpHead->GetNext();
- mpHead->SetNext(nullptr);
- mpHead = pNext;
- }
- }
-
} // end of namespace animation
} // end of namespace sdr
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index c111e76..7322e3c 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -66,7 +66,12 @@ ObjectContact::~ObjectContact()
DBG_ASSERT(maViewObjectContactVector.empty(), "Corrupted ViewObjectContactList (!)");
// delete the EventHandler. This will destroy all still contained events.
- DeleteEventHandler();
+ if(mpEventHandler)
+ {
+ // If there are still Events registered, something has went wrong
+ delete mpEventHandler;
+ mpEventHandler = nullptr;
+ }
}
// LazyInvalidate request. Default implementation directly handles
@@ -138,13 +143,6 @@ bool ObjectContact::AreGluePointsVisible() const
return false;
}
-// method to create a EventHandler. Needs to give a result.
-sdr::event::TimerEventHandler* ObjectContact::CreateEventHandler()
-{
- // Create and return a new EventHandler
- return new sdr::event::TimerEventHandler();
-}
-
// method to get the primitiveAnimator
// method to get the EventHandler. It will
@@ -153,24 +151,11 @@ sdr::event::TimerEventHandler& ObjectContact::GetEventHandler() const
{
if(!HasEventHandler())
{
- const_cast< ObjectContact* >(this)->mpEventHandler = sdr::contact::ObjectContact::CreateEventHandler();
- DBG_ASSERT(mpEventHandler, "ObjectContact::GetEventHandler(): Got no EventHandler (!)");
+ const_cast< ObjectContact* >(this)->mpEventHandler = new sdr::event::TimerEventHandler();
}
-
return *mpEventHandler;
}
-// delete the EventHandler
-void ObjectContact::DeleteEventHandler()
-{
- if(mpEventHandler)
- {
- // If there are still Events registered, something has went wrong
- delete mpEventHandler;
- mpEventHandler = nullptr;
- }
-}
-
// test if there is an EventHandler without creating one on demand
bool ObjectContact::HasEventHandler() const
{
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index dfc78ec..cfe7042 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -54,7 +54,7 @@ namespace sdr
drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrCaptionObj::createViewIndependentPrimitive2DSequence() const
{
drawinglayer::primitive2d::Primitive2DContainer xRetval;
- const SdrCaptionObj& rCaptionObj(GetCaptionObj());
+ const SdrCaptionObj& rCaptionObj(static_cast<const SdrCaptionObj&>(GetSdrObject()));
const SfxItemSet& rItemSet = rCaptionObj.GetMergedItemSet();
const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
index feb15fd..fccbabc 100644
--- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
@@ -44,11 +44,6 @@ namespace sdr
{
}
- sdr::MasterPageDescriptor& ViewObjectContactOfMasterPageDescriptor::GetMasterPageDescriptor() const
- {
- return static_cast< ViewContactOfMasterPageDescriptor& >(GetViewContact()).GetMasterPageDescriptor();
- }
-
bool ViewObjectContactOfMasterPageDescriptor::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
{
if(rDisplayInfo.GetControlLayerProcessingActive())
@@ -68,7 +63,7 @@ namespace sdr
{
drawinglayer::primitive2d::Primitive2DContainer xRetval;
drawinglayer::primitive2d::Primitive2DContainer xMasterPageSequence;
- const sdr::MasterPageDescriptor& rDescriptor = GetMasterPageDescriptor();
+ const sdr::MasterPageDescriptor& rDescriptor = static_cast< ViewContactOfMasterPageDescriptor& >(GetViewContact()).GetMasterPageDescriptor();
// used range (retval) is fixed here, it's the MasterPage fill range
const SdrPage& rOwnerPage = rDescriptor.GetOwnerPage();
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index b7c642a..854f88b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -37,11 +37,6 @@ using namespace com::sun::star;
namespace sdr { namespace contact {
-const SdrOle2Obj& ViewObjectContactOfSdrOle2Obj::getSdrOle2Object() const
-{
- return static_cast< ViewContactOfSdrOle2Obj& >(GetViewContact()).GetOle2Obj();
-}
-
drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence(
const DisplayInfo& /*rDisplayInfo*/) const
{
@@ -49,7 +44,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrOle2Obj::c
// In the future, some of these may be solved different, but ATM try to stay compatible
// with the old behaviour
drawinglayer::primitive2d::Primitive2DContainer xRetval;
- const SdrOle2Obj& rSdrOle2 = getSdrOle2Object();
+ const SdrOle2Obj& rSdrOle2 = static_cast< ViewContactOfSdrOle2Obj& >(GetViewContact()).GetOle2Obj();
sal_Int32 nState(-1);
{
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 681d9cf..4f3c6ba 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -96,19 +96,6 @@ namespace sdr
}
}
- // Trigger and consume the events
- void TimerEventHandler::ExecuteEvents()
- {
- for(;;)
- {
- BaseEvent* pEvent = GetEvent();
- if(pEvent == nullptr)
- break;
- pEvent->ExecuteEvent();
- delete pEvent;
- }
- }
-
// for control
bool TimerEventHandler::IsEmpty() const
{
@@ -118,7 +105,15 @@ namespace sdr
// The timer when it is triggered; from class Timer
void TimerEventHandler::Invoke()
{
- ExecuteEvents();
+ // Trigger and consume the events
+ for(;;)
+ {
+ BaseEvent* pEvent = GetEvent();
+ if(pEvent == nullptr)
+ break;
+ pEvent->ExecuteEvent();
+ delete pEvent;
+ }
}
// reset the timer
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 9ef444c..2f492fe 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -57,16 +57,11 @@ Size PanelLayout::GetOptimalSize() const
return Control::GetOptimalSize();
}
-bool PanelLayout::hasPanelPendingLayout() const
-{
- return m_aPanelLayoutIdle.IsActive();
-}
-
void PanelLayout::queue_resize(StateChangedType /*eReason*/)
{
if (m_bInClose)
return;
- if (hasPanelPendingLayout())
+ if (m_aPanelLayoutIdle.IsActive())
return;
if (!isLayoutEnabled(this))
return;
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index f3798af..45396bc 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -67,7 +67,7 @@ LinePropertyPanel::LinePropertyPanel(
mpBindings(pBindings),
maContext()
{
- Initialize();
+ setMapUnit(maWidthControl.GetCoreMetric());
}
LinePropertyPanel::~LinePropertyPanel()
@@ -91,11 +91,6 @@ void LinePropertyPanel::dispose()
LinePropertyPanelBase::dispose();
}
-void LinePropertyPanel::Initialize()
-{
- setMapUnit(maWidthControl.GetCoreMetric());
-}
-
VclPtr<vcl::Window> LinePropertyPanel::Create (
vcl::Window* pParent,
const uno::Reference<css::frame::XFrame>& rxFrame,
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index 0dd37aa..57f16c0 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -112,8 +112,6 @@ private:
SfxBindings* mpBindings;
vcl::EnumContext maContext;
-
- void Initialize();
};
} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index d5db8f9..7614dd8 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -138,18 +138,34 @@ sal_uInt16 NBOTypeMgrBase:: IsSingleLevel(sal_uInt16 nCurLevel)
return (sal_uInt16)0xFFFF;
}
-void NBOTypeMgrBase::StoreBulCharFmtName_impl() {
- if ( pSet )
+void NBOTypeMgrBase::SetItems(const SfxItemSet* pArg) {
+ pSet = pArg;
+ if ( pSet )
+ {
+ SfxAllItemSet aSet(*pSet);
+ const SfxStringItem* pBulletCharFmt = aSet.GetItem<SfxStringItem>(SID_BULLET_CHAR_FMT, false);
+
+ if ( pBulletCharFmt )
{
- SfxAllItemSet aSet(*pSet);
- const SfxStringItem* pBulletCharFmt = aSet.GetItem<SfxStringItem>(SID_BULLET_CHAR_FMT, false);
+ aNumCharFmtName = pBulletCharFmt->GetValue();
+ }
- if ( pBulletCharFmt )
+ const SfxPoolItem* pItem;
+ SfxItemState eState = pSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
+ if(eState == SfxItemState::SET)
+ {
+ eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
+ } else {
+ //sd use different sid for numbering rule
+ eState = pSet->GetItemState(EE_PARA_NUMBULLET, false, &pItem);
+ if(eState == SfxItemState::SET)
{
- aNumCharFmtName = pBulletCharFmt->GetValue();
+ eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(EE_PARA_NUMBULLET));
}
}
+ }
}
+
void NBOTypeMgrBase::ImplLoad(const OUString& filename)
{
bIsLoading = true;
@@ -220,24 +236,6 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename)
eCoreUnit = eOldCoreUnit;
}
-void NBOTypeMgrBase::StoreMapUnit_impl() {
- if ( pSet )
- {
- const SfxPoolItem* pItem;
- SfxItemState eState = pSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
- if(eState == SfxItemState::SET)
- {
- eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
- } else {
- //sd use different sid for numbering rule
- eState = pSet->GetItemState(EE_PARA_NUMBULLET, false, &pItem);
- if(eState == SfxItemState::SET)
- {
- eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(EE_PARA_NUMBULLET));
- }
- }
- }
-}
// Character Bullet Type lib
BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr};
sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '};
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index d62bb71..21c485f 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -369,13 +369,45 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void )
IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosXHdl, Edit&, void )
{
- executePosX();
+ if ( mpMtrPosX->IsValueModified())
+ {
+ long lX = GetCoreValue( *mpMtrPosX, mePoolUnit );
+ long lY = GetCoreValue( *mpMtrPosY, mePoolUnit );
+
+ Fraction aUIScale = mpView->GetModel()->GetUIScale();
+ lX += maAnchorPos.X();
+ lX = Fraction( lX ) * aUIScale;
+ lY += maAnchorPos.Y();
+ lY = Fraction( lY ) * aUIScale;
+
+ SfxInt32Item aPosXItem( SID_ATTR_TRANSFORM_POS_X,(sal_uInt32) lX);
+ SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
+
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_TRANSFORM, SfxCallMode::RECORD, { &aPosXItem });
+ }
}
IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl, Edit&, void )
{
- executePosY();
+ if ( mpMtrPosY->IsValueModified() )
+ {
+ long lX = GetCoreValue( *mpMtrPosX, mePoolUnit );
+ long lY = GetCoreValue( *mpMtrPosY, mePoolUnit );
+
+ Fraction aUIScale = mpView->GetModel()->GetUIScale();
+ lX += maAnchorPos.X();
+ lX = Fraction( lX ) * aUIScale;
+ lY += maAnchorPos.Y();
+ lY = Fraction( lY ) * aUIScale;
+
+ SfxInt32Item aPosXItem( SID_ATTR_TRANSFORM_POS_X,(sal_uInt32) lX);
+ SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
+
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_TRANSFORM, SfxCallMode::RECORD, { &aPosYItem });
+ }
}
@@ -849,50 +881,6 @@ void PosSizePropertyPanel::executeSize()
}
-void PosSizePropertyPanel::executePosX()
-{
- if ( mpMtrPosX->IsValueModified())
- {
- long lX = GetCoreValue( *mpMtrPosX, mePoolUnit );
- long lY = GetCoreValue( *mpMtrPosY, mePoolUnit );
-
- Fraction aUIScale = mpView->GetModel()->GetUIScale();
- lX += maAnchorPos.X();
- lX = Fraction( lX ) * aUIScale;
- lY += maAnchorPos.Y();
- lY = Fraction( lY ) * aUIScale;
-
- SfxInt32Item aPosXItem( SID_ATTR_TRANSFORM_POS_X,(sal_uInt32) lX);
- SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
-
- GetBindings()->GetDispatcher()->ExecuteList(
- SID_ATTR_TRANSFORM, SfxCallMode::RECORD, { &aPosXItem });
- }
-}
-
-
-void PosSizePropertyPanel::executePosY()
-{
- if ( mpMtrPosY->IsValueModified() )
- {
- long lX = GetCoreValue( *mpMtrPosX, mePoolUnit );
- long lY = GetCoreValue( *mpMtrPosY, mePoolUnit );
-
- Fraction aUIScale = mpView->GetModel()->GetUIScale();
- lX += maAnchorPos.X();
- lX = Fraction( lX ) * aUIScale;
- lY += maAnchorPos.Y();
- lY = Fraction( lY ) * aUIScale;
-
- SfxInt32Item aPosXItem( SID_ATTR_TRANSFORM_POS_X,(sal_uInt32) lX);
- SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
-
- GetBindings()->GetDispatcher()->ExecuteList(
- SID_ATTR_TRANSFORM, SfxCallMode::RECORD, { &aPosYItem });
- }
-}
-
-
void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pState )
{
bool bPosXBlank = false;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 7bb65f5..1ed3a06 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -157,8 +157,6 @@ private:
DECL_LINK( FlipHdl, ToolBox *, void );
void Initialize();
- void executePosX();
- void executePosY();
void executeSize();
void MetricState( SfxItemState eState, const SfxPoolItem* pState );
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index bee80ea..a1ea387 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -137,7 +137,8 @@ void ShadowPropertyPanel::Initialize()
mpShadowTransSlider->SetRange(Range(0,100));
mpShadowTransSlider->SetUpdateMode(true);
mpShadowTransSlider->SetSlideHdl( LINK(this, ShadowPropertyPanel, ModifyShadowTransSliderHdl) );
- InsertDistanceValues();
+ for(sal_uInt16 i = 0; i <= 20 ; i++)
+ mpShadowDistance->InsertValue(i*2,FUNIT_POINT);
InsertAngleValues();
}
}
@@ -256,12 +257,6 @@ void ShadowPropertyPanel::DataChanged(const DataChangedEvent& /*rEvent*/)
{
}
-void ShadowPropertyPanel::InsertDistanceValues()
-{
- for(sal_uInt16 i = 0; i <= 20 ; i++)
- mpShadowDistance->InsertValue(i*2,FUNIT_POINT);
-}
-
void ShadowPropertyPanel::InsertAngleValues()
{
mpShadowAngle->InsertValue(0, FUNIT_CUSTOM);
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index 8834363..7e72886 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -80,7 +80,6 @@ private:
SfxBindings* mpBindings;
long nX,nY,nXY;
- void InsertDistanceValues();
void InsertAngleValues();
void SetTransparencyValue(long);
void UpdateControls();
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 81f2223..6320d8f 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -74,14 +74,6 @@ void SmartTagMgr::Init( const OUString& rConfigurationGroupName )
RegisterListener();
LoadLibraries();
}
-void SmartTagMgr::CreateBreakIterator() const
-{
- if ( !mxBreakIter.is() )
- {
- // get the break iterator
- mxBreakIter.set( BreakIterator::create(mxContext) );
- }
-}
/** Dispatches the recognize call to all installed smart tag recognizers
*/
@@ -108,7 +100,11 @@ void SmartTagMgr::RecognizeString( const OUString& rText,
if ( bCallRecognizer )
{
- CreateBreakIterator();
+ // get the break iterator
+ if ( !mxBreakIter.is() )
+ {
+ mxBreakIter.set( BreakIterator::create(mxContext) );
+ }
i->recognize( rText, nStart, nLen,
smarttags::SmartTagRecognizerMode_PARAGRAPH,
rLocale, xMarkup, maApplicationName, xController,
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index 2d9a80f..c35a8cd 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -28,12 +28,6 @@ using namespace com::sun::star;
namespace sdr
{
- // ViewContact part
- sdr::contact::ViewContact* MasterPageDescriptor::CreateObjectSpecificViewContact()
- {
- return new sdr::contact::ViewContactOfMasterPageDescriptor(*this);
- }
-
MasterPageDescriptor::MasterPageDescriptor(SdrPage& aOwnerPage, SdrPage& aUsedPage)
: maOwnerPage(aOwnerPage),
maUsedPage(aUsedPage),
@@ -64,7 +58,7 @@ namespace sdr
if(!mpViewContact)
{
const_cast< MasterPageDescriptor* >(this)->mpViewContact =
- const_cast< MasterPageDescriptor* >(this)->CreateObjectSpecificViewContact();
+ new sdr::contact::ViewContactOfMasterPageDescriptor(*const_cast< MasterPageDescriptor* >(this));
}
return *mpViewContact;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 9d119f3..8dc2744 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -303,7 +303,7 @@ void SdrDragMethod::resetSdrDragEntries()
basegfx::B2DRange SdrDragMethod::getCurrentRange() const
{
- return getB2DRangeFromOverlayObjectList();
+ return maOverlayObjectList.getBaseRange();
}
void SdrDragMethod::clearSdrDragEntries()
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index eb90259..642337d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2213,12 +2213,6 @@ SdrCropHdl::SdrCropHdl(
}
-BitmapEx SdrCropHdl::GetHandlesBitmap()
-{
- return BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
-}
-
-
BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize )
{
int nPixelSize = 0, nX = 0, nY = 0, nOffset = 0;
@@ -2273,7 +2267,7 @@ void SdrCropHdl::CreateB2dIAObject()
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
int nHdlSize = pHdlList->GetHdlSize();
- const BitmapEx aHandlesBitmap( GetHandlesBitmap() );
+ const BitmapEx aHandlesBitmap( ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()) );
BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 78f1d04..2c83aa4 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1304,8 +1304,8 @@ void SdrMarkView::SetMarkRects()
if(pPV)
{
- pPV->SetHasMarkedObj(GetSnapRectFromMarkedObjects(pPV, pPV->MarkSnap()));
- GetBoundRectFromMarkedObjects(pPV, pPV->MarkBound());
+ pPV->SetHasMarkedObj(GetMarkedObjectList().TakeSnapRect(pPV, pPV->MarkSnap()));
+ GetMarkedObjectList().TakeBoundRect(pPV, pPV->MarkBound());
}
}
@@ -2094,7 +2094,7 @@ void SdrMarkView::EnterMarkedGroup()
void SdrMarkView::MarkListHasChanged()
{
GetMarkedObjectListWriteAccess().SetNameDirty();
- SetEdgesOfMarkedNodesDirty();
+ mpSdrViewSelection->SetEdgesOfMarkedNodesDirty();
mbMarkedObjRectDirty=true;
mbMarkedPointsRectsDirty=true;
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 69c1dd2..ff76043 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -137,9 +137,11 @@ void SdrEdgeInfoRec::ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon
long SdrEdgeInfoRec::ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
{
- const Point& rPt=ImpGetLineVersatzPoint(eLineCode);
- if (ImpIsHorzLine(eLineCode,rXP)) return rPt.Y();
- else return rPt.X();
+ const Point& rPt = const_cast<SdrEdgeInfoRec*>(this)->ImpGetLineVersatzPoint(eLineCode);
+ if (ImpIsHorzLine(eLineCode,rXP))
+ return rPt.Y();
+ else
+ return rPt.X();
}
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 7a55d02..2a70bf9 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -184,7 +184,9 @@ const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const
void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly /* = false */ )
{
- Size aSize( Application::GetDefaultDevice()->PixelToLogic( getPreferredSize(), MapUnit::Map100thMM ) );
+ Size aSize( Application::GetDefaultDevice()->PixelToLogic(
+ static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize(),
+ MapUnit::Map100thMM ) );
Size aMaxSize( rMaxRect.GetSize() );
if( aSize.Height() != 0 && aSize.Width() != 0 )
@@ -251,11 +253,6 @@ const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const
return m_xImpl->m_MediaProperties;
}
-Size SdrMediaObj::getPreferredSize() const
-{
- return static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize();
-}
-
uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream()
{
if (!m_xImpl->m_pTempFile)
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index c520ac7..fabe609 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -166,16 +166,11 @@ SdrPageView::~SdrPageView()
ClearPageWindows();
}
-void SdrPageView::CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow)
-{
- maPageWindows.push_back(new SdrPageWindow(*this, rPaintWindow));
-}
-
void SdrPageView::AddPaintWindowToPageView(SdrPaintWindow& rPaintWindow)
{
if(!FindPageWindow(rPaintWindow))
{
- CreateNewPageWindowEntry(rPaintWindow);
+ maPageWindows.push_back(new SdrPageWindow(*this, rPaintWindow));
}
}
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 5b18a2b..a47439f 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -739,7 +739,8 @@ void SdrFormatter::TakeStr(long nVal, OUString& rStr) const
SvtSysLocale aSysLoc;
const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
- ForceUndirty();
+ if (bDirty)
+ const_cast<SdrFormatter*>(this)->Undirty();
sal_Int16 nC(nKomma_);
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 4a376f9..98a77d9 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -157,7 +157,8 @@ void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
//GetTextChain()->SetNilChainingEvent(mpTargetLink, true);
// making whole text
bool bNewTextTransferred = false;
- OutlinerParaObject *pNewText = impGetMergedUnderflowParaObject(pOutl);
+ // merges underflowing text with the one in the next box
+ OutlinerParaObject *pNewText = mpUnderflChText->CreateMergedUnderflowParaObject(pOutl, mpNextLink->GetOutlinerParaObject());
// Set the other box empty; it will be replaced by the rest of the text if overflow occurs
if (!mpTargetLink->GetPreventChainable())
@@ -247,11 +248,6 @@ SdrTextObj *TextChainFlow::GetLinkTarget() const
return mpTargetLink;
}
-OutlinerParaObject *TextChainFlow::impGetMergedUnderflowParaObject(SdrOutliner *pOutliner)
-{
- return mpUnderflChText->CreateMergedUnderflowParaObject(pOutliner, mpNextLink->GetOutlinerParaObject());
-}
-
TextChain *TextChainFlow::GetTextChain() const
{
return mpTextChain;
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 0b8ee3c..6c19f3d 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -507,7 +507,7 @@ namespace sdr
drawinglayer::primitive2d::Primitive2DContainer ViewContactOfTableObj::createViewIndependentPrimitive2DSequence() const
{
- const sdr::table::SdrTableObj& rTableObj = GetTableObj();
+ const sdr::table::SdrTableObj& rTableObj = static_cast<const sdr::table::SdrTableObj&>(GetSdrObject());
const uno::Reference< css::table::XTable > xTable = rTableObj.getTable();
if(xTable.is())
diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx
index a0581e2..8ee5af2 100644
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
@@ -30,12 +30,6 @@ namespace sdr
class ViewContactOfTableObj : public ViewContactOfSdrObj
{
protected:
- // internal access to SdrTextObj
- const sdr::table::SdrTableObj& GetTableObj() const
- {
- return static_cast<const sdr::table::SdrTableObj&>(GetSdrObject());
- }
-
// This method is responsible for creating the graphical visualisation data derived ONLY from
// the model data
virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 037991f..1b439c0 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -117,24 +117,10 @@ void SAL_CALL GalleryItem::release()
}
-OUString GalleryItem::getImplementationName_Static()
- throw()
-{
- return OUString( "com.sun.star.comp.gallery.GalleryItem" );
-}
-
-
-uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static()
- throw()
-{
- uno::Sequence< OUString > aSeq { "com.sun.star.gallery.GalleryItem" };
- return aSeq;
-}
-
OUString SAL_CALL GalleryItem::getImplementationName()
throw( uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
+ return OUString( "com.sun.star.comp.gallery.GalleryItem" );
}
sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName )
@@ -146,7 +132,7 @@ sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName )
uno::Sequence< OUString > SAL_CALL GalleryItem::getSupportedServiceNames()
throw( uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return { "com.sun.star.gallery.GalleryItem" };
}
uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes()
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index 92f57ec..d36754b 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -49,9 +49,6 @@ public:
bool isValid() const;
- static OUString getImplementationName_Static() throw();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
-
protected:
// XInterface
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 325721d..4cee8ce 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -67,24 +67,10 @@ GalleryTheme::~GalleryTheme()
}
-OUString GalleryTheme::getImplementationName_Static()
- throw()
-{
- return OUString( "com.sun.star.comp.gallery.GalleryTheme" );
-}
-
-
-uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static()
- throw()
-{
- uno::Sequence< OUString > aSeq { "com.sun.star.gallery.GalleryTheme" };
- return aSeq;
-}
-
OUString SAL_CALL GalleryTheme::getImplementationName()
throw( uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
+ return OUString( "com.sun.star.comp.gallery.GalleryTheme" );
}
sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName )
@@ -96,7 +82,7 @@ sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName )
uno::Sequence< OUString > SAL_CALL GalleryTheme::getSupportedServiceNames()
throw( uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return { "com.sun.star.gallery.GalleryTheme" };
}
uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes()
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index de1ff9d..daf53d5 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -47,9 +47,6 @@ public:
explicit GalleryTheme( const OUString& rThemeName );
virtual ~GalleryTheme() override;
- static OUString getImplementationName_Static() throw();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
-
protected:
// XServiceInfo
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 99b7016..a993cb7 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -175,7 +175,11 @@ SvXMLEmbeddedObjectHelper::~SvXMLEmbeddedObjectHelper()
void SAL_CALL SvXMLEmbeddedObjectHelper::disposing()
{
- Flush();
+ if( mxTempStorage.is() )
+ {
+ Reference < XComponent > xComp( mxTempStorage, UNO_QUERY );
+ xComp->dispose();
+ }
}
void SvXMLEmbeddedObjectHelper::splitObjectURL(const OUString& _aURLNoPar,
@@ -595,15 +599,6 @@ void SvXMLEmbeddedObjectHelper::Destroy(
}
}
-void SvXMLEmbeddedObjectHelper::Flush()
-{
- if( mxTempStorage.is() )
- {
- Reference < XComponent > xComp( mxTempStorage, UNO_QUERY );
- xComp->dispose();
- }
-}
-
// XGraphicObjectResolver: alien objects!
OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL(const OUString& rURL)
throw(RuntimeException, std::exception)
More information about the Libreoffice-commits
mailing list