include/svx/AccessibleControlShape.hxx | 2 include/svx/colrctrl.hxx | 1 include/svx/fmdmod.hxx | 1 include/svx/fmview.hxx | 3 - include/svx/gridctrl.hxx | 1 include/svx/imapdlg.hxx | 2 include/svx/itemwin.hxx | 1 include/svx/rubydialog.hxx | 1 include/svx/svdoashp.hxx | 5 -- include/svx/svdocapt.hxx | 3 - include/svx/svdograf.hxx | 2 include/svx/svdopath.hxx | 1 include/svx/svdorect.hxx | 3 - include/svx/svdotable.hxx | 22 --------- include/svx/svdouno.hxx | 3 - include/svx/unoshape.hxx | 11 ---- include/svx/xflasit.hxx | 1 include/svx/xlnasit.hxx | 1 svx/inc/AccessibleTableShape.hxx | 4 - svx/inc/sdr/properties/e3dcompoundproperties.hxx | 3 - svx/inc/sdr/properties/e3dsceneproperties.hxx | 3 - svx/source/accessibility/AccessibleControlShape.cxx | 5 -- svx/source/dialog/imapdlg.cxx | 5 -- svx/source/dialog/rubydialog.cxx | 5 -- svx/source/fmcomp/gridctrl.cxx | 5 -- svx/source/form/datanavi.cxx | 6 -- svx/source/form/fmdmod.cxx | 13 ----- svx/source/form/fmobj.cxx | 14 ----- svx/source/form/fmview.cxx | 5 -- svx/source/inc/datanavi.hxx | 1 svx/source/inc/fmobj.hxx | 3 - svx/source/inc/formdispatchinterceptor.hxx | 3 - svx/source/sdr/properties/e3dcompoundproperties.cxx | 6 -- svx/source/sdr/properties/e3dsceneproperties.cxx | 6 -- svx/source/svdraw/svdoashp.cxx | 17 ------- svx/source/svdraw/svdocapt.cxx | 17 ------- svx/source/svdraw/svdograf.cxx | 11 ---- svx/source/svdraw/svdopath.cxx | 6 -- svx/source/svdraw/svdorect.cxx | 10 ---- svx/source/svdraw/svdouno.cxx | 10 ---- svx/source/table/accessibletableshape.cxx | 12 ----- svx/source/table/cell.cxx | 36 --------------- svx/source/table/cell.hxx | 5 -- svx/source/table/svdotable.cxx | 47 -------------------- svx/source/tbxctrls/colrctrl.cxx | 6 -- svx/source/tbxctrls/itemwin.cxx | 6 -- svx/source/unodraw/unoshap2.cxx | 31 ------------- svx/source/unodraw/unoshap4.cxx | 5 -- svx/source/xoutdev/xattr.cxx | 13 ----- svx/workben/pixelctl.cxx | 42 ----------------- 50 files changed, 425 deletions(-)
New commits: commit eb6d4547a044b3eb7cb8945977e45647a37df28f Author: Noel Grandin <n...@peralex.com> Date: Wed Oct 5 15:07:49 2016 +0200 loplugin:unnecessaryoverride in svx Change-Id: Ib5e84838888b5fb56eb18c5334ffa3fdd203b997 diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 96c4c37..545a667 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -62,8 +62,6 @@ public: const css::uno::Reference< css::beans::XPropertySet >& SAL_CALL GetControlModel( ) { return m_xControlModel;} ; AccessibleControlShape* SAL_CALL GetLabeledByControlShape(); protected: - //--- XAccessible ---------------------------------------- - virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override; //--- XAccessibleComponent ------------------------------- /// forward the focus to the contained control(in alive mode) diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index aef95d3..03ba6c9 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -51,7 +51,6 @@ protected: // ValueSet virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; - virtual void Command(const CommandEvent& rCEvt ) override; // DragSourceHelper virtual void StartDrag( sal_Int8 nAction, const Point& rPtPixel ) override; diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index 8a5a167..4a9eb0d 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -31,7 +31,6 @@ public: virtual ~SvxFmMSFactory() {} virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 675500d..f719129 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -105,9 +105,6 @@ public: virtual SdrPageView* ShowSdrPage(SdrPage* pPage) override; virtual void HideSdrPage() override; - // for copying complete form structures, not only control models - virtual SdrModel* GetMarkedObjModel() const override; - virtual bool MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) override; /** grab the focus to the first form control on the view diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index dc3a1d1..c328dd9 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -308,7 +308,6 @@ protected: protected: virtual bool SeekRow(long nRow) override; virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows) override; - virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const override; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const override; virtual RowStatus GetRowStatus(long nRow) const override; virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) override; diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 6747d5a..1bc7086 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -154,8 +154,6 @@ public: void UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap, const TargetList* pTargetList = nullptr, void* pEditingObj = nullptr ); - - virtual void KeyInput( const KeyEvent& rKEvt ) override; }; SVX_DLLPUBLIC SvxIMapDlg* GetIMapDlg(); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index c5bc3c17..f992be4 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -120,7 +120,6 @@ public: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void Select() override; private: sal_uInt16 nCurPos; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index fb71960..048d959 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -157,7 +157,6 @@ public: virtual void dispose() override; virtual void Activate() override; - virtual void Deactivate() override; private: rtl::Reference<SvxRubyData_Impl> m_pImpl; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index faba91a..d2841c4 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -188,12 +188,7 @@ public: virtual void SetModel(SdrModel* pNewModel) override; - virtual const Rectangle& GetSnapRect() const override; - virtual const Rectangle& GetCurrentBoundRect() const override; - virtual const Rectangle& GetLogicRect() const override; - virtual void Move(const Size& rSiz) override; - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) override; virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual void SetSnapRect(const Rectangle& rRect) override; virtual void SetLogicRect(const Rectangle& rRect) override; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 7e08a90..6bbdbb8 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -118,10 +118,7 @@ public: virtual void NbcSetRelativePos(const Point& rPnt) override; virtual Point GetRelativePos() const override; - virtual void NbcSetAnchorPos(const Point& rPnt) override; - virtual const Point& GetAnchorPos() const override; - virtual const Rectangle& GetSnapRect() const override; virtual const Rectangle& GetLogicRect() const override; virtual void NbcSetLogicRect(const Rectangle& rRect) override; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index caae687..1d5a9e6 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -176,9 +176,7 @@ public: virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear) override; virtual SdrObjGeoData* NewGeoData() const override; virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; virtual void RestGeoData(const SdrObjGeoData& rGeo) override; diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 91b5bfe..08f6179 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -66,7 +66,6 @@ protected: void impDeleteDAC() const; public: - virtual void SetRectsDirty(bool bNotMyself = false) override; double GetBrightness() { return mdBrightness; } SdrPathObj(SdrObjKind eNewKind); diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index 0934c6f..c8e332b 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -106,9 +106,6 @@ public: virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override; - virtual bool DoMacro(const SdrObjMacroHitRec& rRec) override; - virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const override; - virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 71edde8..0931c29 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -184,7 +184,6 @@ public: virtual bool IsFontwork() const override; - virtual void SetPage(SdrPage* pNewPage) override; virtual void SetModel(SdrModel* pNewModel) override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; @@ -196,8 +195,6 @@ public: virtual OUString TakeObjNamePlural() const override; virtual SdrTableObj* Clone() const override; SdrTableObj& operator=(const SdrTableObj& rObj); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; - virtual basegfx::B2DPolyPolygon TakeContour() const override; virtual void RecalcSnapRect() override; virtual const Rectangle& GetSnapRect() const override; virtual void NbcSetSnapRect(const Rectangle& rRect) override; @@ -206,9 +203,6 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect) override; virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) override; - virtual sal_uInt32 GetSnapPointCount() const override; - virtual Point GetSnapPoint(sal_uInt32 i) const override; - virtual sal_uInt32 GetHdlCount() const override; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override; virtual void AddToHdlList(SdrHdlList& rHdlList) const override; @@ -217,7 +211,6 @@ public: virtual bool hasSpecialDrag() const override; virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override; virtual bool applySpecialDrag(SdrDragStat& rDrag) override; - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const override; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const override; virtual bool BegCreate(SdrDragStat& rStat) override; @@ -240,7 +233,6 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override; virtual OutlinerParaObject* GetOutlinerParaObject() const override; - virtual OutlinerParaObject* GetEditOutlinerParaObject() const override; virtual void NbcReformatText() override; virtual void ReformatText() override; @@ -258,20 +250,6 @@ public: virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; - // Transformation interface for StarOfficeAPI. This implements support for - // homogenous 3x3 matrices containing the transformation of the SdrObject. At the - // moment it contains a shearX, rotation and translation, but for setting all linear - // transforms like Scale, ShearX, ShearY, Rotate and Translate are supported. - - // Gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon - // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const override; - - // #103836# iterates over the paragraphs of a given SdrObject and removes all - // hard set character attributes with the which ids contained in the - // given vector -// virtual void RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds ); - /** Hack for clipboard with calc and writer, export and import table content as rtf table */ static void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); static void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index ea39a18..48098ae 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -66,9 +66,6 @@ public: const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac); virtual ~SdrUnoObj() override; - virtual void SetPage(SdrPage* pNewPage) override; - virtual void SetModel(SdrModel* pModel) override; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 749ff00..9161daa 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -565,9 +565,6 @@ public: bool createObject( const SvGlobalName &aClassName ); void createLink( const OUString& aLinkURL ); - - // XInterface - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; }; @@ -808,22 +805,14 @@ public: virtual ~SvxCustomShape() throw () override; - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; - // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; - // XShape virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XPropertySet void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) override; diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index 7423cd8..73ceb0c 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -34,7 +34,6 @@ public: SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const override; - virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const override; }; #endif diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index 8f13120..9b82dde 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -35,7 +35,6 @@ public: SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const override; - virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const override; }; #endif diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 5b4dec8..2adcc06 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -64,13 +64,9 @@ public: virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; - // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override; - // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; // XAccessibleTable diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx index b5d6bd6..271bbc4 100644 --- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx @@ -47,9 +47,6 @@ namespace sdr // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; - // get itemset - virtual const SfxItemSet& GetObjectItemSet() const override; - // Get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index 54f4981..3705fd6 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -46,9 +46,6 @@ namespace sdr // Clone() operator, normally just calls the local copy constructor virtual BaseProperties& Clone(SdrObject& rObj) const override; - // get itemset - virtual const SfxItemSet& GetObjectItemSet() const override; - // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overridden e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 2f68661..b6bb5de 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -278,11 +278,6 @@ void AccessibleControlShape::Init() } } -Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext() throw (RuntimeException, std::exception) -{ - return AccessibleShape::getAccessibleContext (); -} - void SAL_CALL AccessibleControlShape::grabFocus() throw (RuntimeException, std::exception) { if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) ) diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index adecbeb..fb09fe6 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -336,11 +336,6 @@ void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap, } -void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt ) -{ - SfxModelessDialog::KeyInput( rKEvt ); -} - // Click-handler for ToolBox IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void ) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index f9a9a40..e8c744f 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -399,11 +399,6 @@ void SvxRubyDialog::Activate() } } -void SvxRubyDialog::Deactivate() -{ - SfxModelessDialog::Deactivate(); -} - void SvxRubyDialog::SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) { OUString sLeft, sRight; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 6834a81..fdab1a3 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2034,11 +2034,6 @@ DbGridControl_Base::RowStatus DbGridControl::GetRowStatus(long nRow) const return DbGridControl_Base::CLEAN; } -void DbGridControl::PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const -{ - DbGridControl_Base::PaintStatusCell(rDev, rRect); -} - void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { if (!IsValid(m_xPaintRow)) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 077a88f..3ce5917 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2179,12 +2179,6 @@ namespace svxform } - void DataNavigator::GetFocus() - { - SfxDockingWindow::GetFocus(); - } - - Size DataNavigator::CalcDockingSize( SfxChildAlignment eAlign ) { if ( ( eAlign == SfxChildAlignment::TOP ) || ( eAlign == SfxChildAlignment::BOTTOM ) ) diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 3b980e4..0578d9f 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -47,19 +47,6 @@ using namespace ::svxform; } -// Encapsulation violation: We *know* that -// SvxUnoDrawMSFactory::createInstanceWithArguments() always throws. - -SAL_WNOUNREACHABLE_CODE_PUSH - -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) -{ - return SvxUnoDrawMSFactory::createInstanceWithArguments(ServiceSpecifier, Arguments ); -} - -SAL_WNOUNREACHABLE_CODE_POP - - ::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { static const OUStringLiteral aSvxComponentServiceNameList[] = diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index ea4e300..3f851c8 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -686,18 +686,4 @@ void FmFormObj::BrkCreate( SdrDragStat& rStat ) } -// #i70852# override Layer interface to force to FormControl layer - -SdrLayerID FmFormObj::GetLayer() const -{ - // #i72535# - // i70852 was too radical, in SW obects (and thus, FormControls, too) - // get moved to invisible layers to hide them (e.g. in hidden sections). - // This means that form controls ARE allowed to be on other layers than - // the form control layer ATM and that being member of form control layer - // is no criteria to find all FormControls of a document. - // To fix, use parent functionality - return SdrUnoObj::GetLayer(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index bbf494b..7622eb6 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -363,11 +363,6 @@ void FmFormView::HideSdrPage() } -SdrModel* FmFormView::GetMarkedObjModel() const -{ - return E3dView::GetMarkedObjModel(); -} - void FmFormView::ActivateControls(SdrPageView* pPageView) { if (!pPageView) diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index e0d65a2..dd027cc 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -379,7 +379,6 @@ namespace svxform protected: virtual void Resize() override; - virtual void GetFocus() override; virtual Size CalcDockingSize( SfxChildAlignment ) override; virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) override; diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 1a24654..cb0455d 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -99,9 +99,6 @@ protected: SAL_DLLPRIVATE virtual bool EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) override; SAL_DLLPRIVATE virtual void BrkCreate( SdrDragStat& rStat ) override; - // #i70852# override Layer interface to force to FormControl layer - SAL_DLLPRIVATE virtual SdrLayerID GetLayer() const override; - private: /** isolates the control model from its form component hierarchy, i.e. removes it from its parent. diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 2b26923..73ad565 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -79,9 +79,6 @@ namespace svxform DispatchInterceptor* _pMaster ); - // UNO - DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE) - // css::frame::XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index c454a6b..5b24f56 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -46,12 +46,6 @@ namespace sdr return *(new E3dCompoundProperties(*this, rObj)); } - const SfxItemSet& E3dCompoundProperties::GetObjectItemSet() const - { - //DBG_ASSERT(sal_False, "E3dCompoundProperties::GetObjectItemSet() maybe the wrong call (!)"); - return E3dProperties::GetObjectItemSet(); - } - const SfxItemSet& E3dCompoundProperties::GetMergedItemSet() const { // include Items of scene this object belongs to diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 8c402b3..f7e459a 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -49,12 +49,6 @@ namespace sdr return *(new E3dSceneProperties(*this, rObj)); } - const SfxItemSet& E3dSceneProperties::GetObjectItemSet() const - { - //DBG_ASSERT(sal_False, "E3dSceneProperties::GetObjectItemSet() maybe the wrong call (!)"); - return E3dProperties::GetObjectItemSet(); - } - const SfxItemSet& E3dSceneProperties::GetMergedItemSet() const { // prepare ItemSet diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 52545fb..20744f2 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1409,19 +1409,6 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const } -const Rectangle& SdrObjCustomShape::GetSnapRect() const -{ - return SdrTextObj::GetSnapRect(); -} -const Rectangle& SdrObjCustomShape::GetCurrentBoundRect() const -{ - return SdrTextObj::GetCurrentBoundRect(); -} -const Rectangle& SdrObjCustomShape::GetLogicRect() const -{ - return SdrTextObj::GetLogicRect(); -} - // #115391# This implementation is based on the TextFrame size of the CustomShape and the // state of the ResizeShapeToFitText flag to correctly set TextMinFrameWidth/Height void SdrObjCustomShape::AdaptTextMinSize() @@ -1546,10 +1533,6 @@ void SdrObjCustomShape::NbcMove( const Size& rSiz ) mpLastShadowGeometry->NbcMove( rSiz ); } } -void SdrObjCustomShape::Resize( const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative ) -{ - SdrTextObj::Resize( rRef, xFact, yFact, bUnsetRelative ); -} void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, const Fraction& ryFact ) { diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 15e3dfe..d660e87 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -627,23 +627,6 @@ Point SdrCaptionObj::GetRelativePos() const return aTailPoly.GetPoint(0)-aAnchor; } -void SdrCaptionObj::NbcSetAnchorPos(const Point& rPnt) -{ - SdrRectObj::NbcSetAnchorPos(rPnt); - // TODO: Implementation missing. -} - -const Point& SdrCaptionObj::GetAnchorPos() const -{ - // TODO: Implementation missing. - return SdrRectObj::GetAnchorPos(); -} - -const Rectangle& SdrCaptionObj::GetSnapRect() const -{ - return SdrRectObj::GetSnapRect(); -} - const Rectangle& SdrCaptionObj::GetLogicRect() const { return maRect; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 7660833..6fdb099 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -927,23 +927,12 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract bMirrored = !bMirrored; } -void SdrGrafObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs) -{ - SdrRectObj::NbcRotate(rRef,nAngle,sn,cs); -} - void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2) { SdrRectObj::NbcMirror(rRef1,rRef2); bMirrored = !bMirrored; } -void SdrGrafObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) -{ - // #i118485# Call Shear now, old version redirected to rotate - SdrRectObj::NbcShear(rRef, nAngle, tn, bVShear); -} - SdrObjGeoData* SdrGrafObj::NewGeoData() const { return new SdrGrafObjGeoData; diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index f91413b..db5197f 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2822,12 +2822,6 @@ void SdrPathObj::ToggleClosed() SendUserCall(SdrUserCallType::Resize, aBoundRect0); } -// for friend class SdrPolyEditView in some compilers: -void SdrPathObj::SetRectsDirty(bool bNotMyself) -{ - SdrTextObj::SetRectsDirty(bNotMyself); -} - ImpPathForDragAndCreate& SdrPathObj::impGetDAC() const { if(!mpDAC) diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 526f684..a1fca2a 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -517,16 +517,6 @@ void SdrRectObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetXPolyDirty(); } -bool SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec) -{ - return SdrTextObj::DoMacro(rRec); -} - -OUString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const -{ - return SdrTextObj::GetMacroPopupComment(rRec); -} - SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const { sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 9ef7d6c..a4a0ade 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -194,16 +194,6 @@ SdrUnoObj::~SdrUnoObj() } } -void SdrUnoObj::SetModel(SdrModel* pNewModel) -{ - SdrRectObj::SetModel(pNewModel); -} - -void SdrUnoObj::SetPage(SdrPage* pNewPage) -{ - SdrRectObj::SetPage(pNewPage); -} - void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bRotateFreeAllowed = false; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index b00e0bf..a008b80 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -393,12 +393,6 @@ void SAL_CALL AccessibleTableShape::release( ) throw () // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext() throw (RuntimeException, std::exception) -{ - return AccessibleShape::getAccessibleContext (); -} - - OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); @@ -427,12 +421,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_ } -Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) -{ - return AccessibleShape::getAccessibleRelationSet( ); -} - - sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::TABLE; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 5f1f1db..6acddfd 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -171,8 +171,6 @@ namespace sdr void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; - void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override; - sdr::table::CellRef mxCell; private: @@ -334,10 +332,6 @@ namespace sdr AttributeProperties::ItemChange( nWhich, pNewItem ); } - void CellProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) - { - TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr ); - } } // end of namespace properties } // end of namespace sdr @@ -1605,18 +1599,6 @@ void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent // XSimpleText -Reference< XTextCursor > SAL_CALL Cell::createTextCursor( ) throw (RuntimeException, std::exception) -{ - return SvxUnoTextBase::createTextCursor(); -} - - -Reference< XTextCursor > SAL_CALL Cell::createTextCursorByRange( const Reference< XTextRange >& aTextPosition ) throw (RuntimeException, std::exception) -{ - return SvxUnoTextBase::createTextCursorByRange( aTextPosition ); -} - - void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (RuntimeException, std::exception) { SvxUnoTextBase::insertString( xRange, aString, bAbsorb ); @@ -1634,24 +1616,6 @@ void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRang // XTextRange -Reference< XText > SAL_CALL Cell::getText( ) throw (RuntimeException, std::exception) -{ - return SvxUnoTextBase::getText(); -} - - -Reference< XTextRange > SAL_CALL Cell::getStart( ) throw (RuntimeException, std::exception) -{ - return SvxUnoTextBase::getStart(); -} - - -Reference< XTextRange > SAL_CALL Cell::getEnd( ) throw (RuntimeException, std::exception) -{ - return SvxUnoTextBase::getEnd(); -} - - OUString SAL_CALL Cell::getString( ) throw (RuntimeException, std::exception) { maSelection.nStartPara = EE_PARA_MAX_COUNT; diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 33e57b4..81bad8f 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -166,15 +166,10 @@ public: SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; // XSimpleText - SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor( ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) throw (css::uno::RuntimeException, std::exception) override; SVX_DLLPRIVATE virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (css::uno::RuntimeException, std::exception) override; SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XTextRange - SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XText > SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart( ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd( ) throw (css::uno::RuntimeException, std::exception) override; SVX_DLLPRIVATE virtual OUString SAL_CALL getString( ) throw (css::uno::RuntimeException, std::exception) override; SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 34b64cd..53f7a3b 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1362,12 +1362,6 @@ sal_uInt16 SdrTableObj::GetObjIdentifier() const } -void SdrTableObj::SetPage(SdrPage* pNewPage) -{ - SdrTextObj::SetPage(pNewPage); -} - - void SdrTableObj::SetModel(SdrModel* pNewModel) { SdrModel* pOldModel = GetModel(); @@ -1657,11 +1651,6 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const } -OutlinerParaObject* SdrTableObj::GetEditOutlinerParaObject() const -{ - return SdrTextObj::GetEditOutlinerParaObject(); -} - OUString SdrTableObj::TakeObjNameSingul() const { OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulTable)); @@ -1715,18 +1704,6 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj) } -basegfx::B2DPolyPolygon SdrTableObj::TakeXorPoly() const -{ - return SdrTextObj::TakeXorPoly(); -} - - -basegfx::B2DPolyPolygon SdrTableObj::TakeContour() const -{ - return SdrTextObj::TakeContour(); -} - - const Rectangle& SdrTableObj::GetSnapRect() const { return maRect; @@ -1750,18 +1727,6 @@ void SdrTableObj::RecalcSnapRect() } -sal_uInt32 SdrTableObj::GetSnapPointCount() const -{ - return SdrTextObj::GetSnapPointCount(); -} - - -Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const -{ - return SdrTextObj::GetSnapPoint(i); -} - - bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) { if( pEdtOutl != nullptr ) @@ -2026,13 +1991,6 @@ void SdrTableObj::SetSkipChangeLayout(bool bSkipChangeLayout) mpImpl->mbSkipChangeLayout = bSkipChangeLayout; } -// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon -// with the base geometry and returns TRUE. Otherwise it returns FALSE. -bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon ) const -{ - return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon ); -} - bool SdrTableObj::IsReallyEdited() const { return pEdtOutl && pEdtOutl->IsModified(); @@ -2277,11 +2235,6 @@ bool SdrTableObj::applySpecialDrag(SdrDragStat& rDrag) return bRet; } -OUString SdrTableObj::getSpecialDragComment(const SdrDragStat& rDrag) const -{ - return SdrTextObj::getSpecialDragComment( rDrag ); -} - basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag) const { basegfx::B2DPolyPolygon aRetval; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 72b3ccb..acef715 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -136,12 +136,6 @@ void SvxColorValueSet_docking::MouseButtonUp( const MouseEvent& rMEvt ) SetNoSelection(); } -void SvxColorValueSet_docking::Command(const CommandEvent& rCEvt) -{ - // Basisklasse - SvxColorValueSet::Command(rCEvt); -} - void SvxColorValueSet_docking::StartDrag( sal_Int8 , const Point& ) { Application::PostUserEvent(LINK(this, SvxColorValueSet_docking, ExecDragHdl), nullptr, true); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 0aa0942..fcf4af6 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -517,12 +517,6 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) } -void SvxFillAttrBox::Select() -{ - FillAttrLB::Select(); -} - - void SvxFillAttrBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index d83e6e93..e70f94b 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1601,12 +1601,6 @@ SvxCustomShape::~SvxCustomShape() throw() } -void SvxCustomShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) -{ - SvxShapeText::Create( pNewObj, pNewPage ); -} - - uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { @@ -1648,12 +1642,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() // css::drawing::XShape -OUString SAL_CALL SvxCustomShape::getShapeType() - throw( uno::RuntimeException, std::exception ) -{ - return SvxShape::getShapeType(); -} - awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1736,25 +1724,6 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s } -void SAL_CALL SvxCustomShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) -{ - SvxShapeText::setPosition(Position); -} - - -awt::Size SAL_CALL SvxCustomShape::getSize() throw(uno::RuntimeException, std::exception) -{ - return SvxShapeText::getSize(); -} - - -void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) -{ - SvxShapeText::setSize( rSize ); -} - - void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 4b0232d..7a3ec38 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -79,11 +79,6 @@ SvxOle2Shape::~SvxOle2Shape() throw() { } -css::uno::Any SAL_CALL SvxOle2Shape::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) -{ - return SvxShapeText::queryAggregation( rType ); -} - //XPropertySet bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 1a5e825..d378a28 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -3514,13 +3514,6 @@ SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion* return new XLineAttrSetItem( pSet2 ); } -/// save a set item in a stream -SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const -{ - return SfxSetItem::Store( rStream, nItemVersion ); -} - - /// fill attribute set item XFillAttrSetItem::XFillAttrSetItem( SfxItemSet* pItemSet ) : SfxSetItem( XATTRSET_FILL, pItemSet) @@ -3558,10 +3551,4 @@ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion* return new XFillAttrSetItem( pSet2 ); } -/// save a set item in a stream -SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const -{ - return SfxSetItem::Store( rStream, nItemVersion ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx index 9d2cb05..1a751be 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -88,13 +88,6 @@ public: disposeOnce(); } virtual void dispose() override; - void MouseMove( const MouseEvent& rMEvt ) override; - void MouseButtonDown( const MouseEvent& rMEvt ) override; - void MouseButtonUp( const MouseEvent& rMEvt ) override; - void KeyInput( const KeyEvent& rKEvt ) override; - void KeyUp( const KeyEvent& rKEvt ) override; - void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; - void Resize() override; bool Close() override; }; @@ -130,39 +123,4 @@ bool MyWin::Close() return bRet; } -void MyWin::MouseMove( const MouseEvent& rMEvt ) -{ - WorkWindow::MouseMove( rMEvt ); -} - -void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) -{ - WorkWindow::MouseButtonDown( rMEvt ); -} - -void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) -{ - WorkWindow::MouseButtonUp( rMEvt ); -} - -void MyWin::KeyInput( const KeyEvent& rKEvt ) -{ - WorkWindow::KeyInput( rKEvt ); -} - -void MyWin::KeyUp( const KeyEvent& rKEvt ) -{ - WorkWindow::KeyUp( rKEvt ); -} - -void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) -{ - WorkWindow::Paint(rRenderContext, rRect); -} - -void MyWin::Resize() -{ - WorkWindow::Resize(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits