diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-20 14:23:53 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-21 06:52:35 +0000 |
commit | d69d4f7174ffae502c4aa9cc69786c897662dddc (patch) | |
tree | 3de4099cd9d62e922834d9a3eec531a417d341cf | |
parent | 564805d6f825a7889e039c3f95a638fa7c00b4f4 (diff) |
loplugin:unusedmethods reportdesign,scaddins
Change-Id: I3e2ccdbc0dd97f276a96eae5c041c09e69cede91
Reviewed-on: https://gerrit.libreoffice.org/17235
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
26 files changed, 7 insertions, 123 deletions
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index e11a09675a9e..d5b8532141c0 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -342,9 +342,6 @@ namespace reportdesign virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // document::XEventListener - void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); - // XUIConfigurationManagerSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 4e270da70b17..a9eff84462ea 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -52,7 +52,6 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo { private: DlgEdHintKind eHintKind; - OUnoObject* pDlgEdObj; DlgEdHint(DlgEdHint&) SAL_DELETED_FUNCTION; void operator =(DlgEdHint&) SAL_DELETED_FUNCTION; @@ -61,7 +60,6 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo virtual ~DlgEdHint(); inline DlgEdHintKind GetKind() const { return eHintKind; } - inline OUnoObject* GetObject() const { return pDlgEdObj; } }; @@ -93,9 +91,7 @@ protected: void SetPropsFromRect(const Rectangle& _rRect); - virtual void SetSnapRectImpl(const Rectangle& _rRect) = 0; virtual SdrPage* GetImplPage() const = 0; - virtual void SetObjectItemHelper(const SfxPoolItem& rItem); /** called by instances of derived classes to implement their overriding of getUnoShape */ @@ -117,8 +113,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const { return m_xReportComponent;} virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); - inline void setOldParent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) { m_xSection = _xSection; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getOldParent() const { return m_xSection;} ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getSection() const; inline const OUString getServiceName() const { return m_sComponentName; } @@ -152,9 +146,7 @@ protected: virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; - virtual void SetSnapRectImpl(const Rectangle& _rRect) SAL_OVERRIDE; virtual SdrPage* GetImplPage() const SAL_OVERRIDE; - void SetObjectItemHelper(const SfxPoolItem& rItem) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -199,7 +191,6 @@ protected: virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; - virtual void SetSnapRectImpl(const Rectangle& _rRect) SAL_OVERRIDE; virtual SdrPage* GetImplPage() const SAL_OVERRIDE; public: @@ -246,7 +237,6 @@ protected: virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; - virtual void SetSnapRectImpl(const Rectangle& _rRect) SAL_OVERRIDE; virtual SdrPage* GetImplPage() const SAL_OVERRIDE; public: diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 64c91c9c9bdf..3f86109aa2c2 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1872,14 +1872,6 @@ void SAL_CALL OReportDefinition::removeEventListener( const uno::Reference< docu m_pImpl->m_aDocEventListeners.removeInterface(_xListener); } -// document::XEventListener -void SAL_CALL OReportDefinition::notifyEvent( const document::EventObject& aEvent ) throw (uno::RuntimeException) -{ - // used only to forward external events (e.g. for doc creation) from the frame loader - // to the global event broadcaster and all other interested doc event listener. - notifyEvent(aEvent.EventName); -} - // document::XViewDataSupplier uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewData( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 1d759faecd11..f63a91242911 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -67,7 +67,6 @@ namespace reportdesign } l.notify(); } - void checkIndex(sal_Int32 _nIndex); protected: virtual ~OFixedLine(); public: diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index 2b19fab22956..e1b198a210ac 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -80,7 +80,6 @@ namespace reportdesign } l.notify(); } - void checkIndex(sal_Int32 _nIndex); protected: virtual ~OFixedText(); public: diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 26f7d8bcff86..55140f014ef6 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -83,7 +83,6 @@ namespace reportdesign } l.notify(); } - void checkIndex(sal_Int32 _nIndex); protected: virtual ~OFormattedField(); public: diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index df687ccf6c06..b62f39474afc 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -74,7 +74,6 @@ namespace reportdesign } l.notify(); } - void checkIndex(sal_Int32 _nIndex); protected: virtual ~OImageControl(); public: diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index 39c14dcbf5cc..d0da9068f3ad 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -84,7 +84,6 @@ namespace reportdesign } l.notify(); } - void checkIndex(sal_Int32 _nIndex); cppu::IPropertyArrayHelper& getInfoHelper(); protected: virtual ~OShape(); diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index c83ab3364248..00611a8835d9 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -408,12 +408,6 @@ void OObjectBase::_propertyChange( const beans::PropertyChangeEvent& /*evt*/ ) { } -void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/) -{ - // do nothing -} - - bool OObjectBase::supportsService( const OUString& _sServiceName ) const { bool bSupports = false; @@ -502,11 +496,6 @@ SdrPage* OCustomShape::GetImplPage() const return GetPage(); } -void OCustomShape::SetSnapRectImpl(const Rectangle& _rRect) -{ - SetSnapRect( _rRect ); -} - void OCustomShape::NbcMove( const Size& rSize ) { if ( m_bIsListening ) @@ -562,14 +551,6 @@ bool OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } -void OCustomShape::SetObjectItemHelper(const SfxPoolItem& rItem) -{ - SetObjectItem(rItem); - // TODO - //getSectionWindow()->getView()->AdjustMarkHdl(); -} - - uno::Reference< beans::XPropertySet> OCustomShape::getAwtComponent() { return uno::Reference< beans::XPropertySet>(m_xReportComponent,uno::UNO_QUERY); @@ -678,11 +659,6 @@ SdrPage* OUnoObject::GetImplPage() const return GetPage(); } -void OUnoObject::SetSnapRectImpl(const Rectangle& _rRect) -{ - SetSnapRect( _rRect ); -} - void OUnoObject::NbcMove( const Size& rSize ) { @@ -965,11 +941,6 @@ SdrPage* OOle2Obj::GetImplPage() const return GetPage(); } -void OOle2Obj::SetSnapRectImpl(const Rectangle& _rRect) -{ - SetSnapRect( _rRect ); -} - void OOle2Obj::NbcMove( const Size& rSize ) { diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index b645263dd97e..bdb1ff9bb96c 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -61,7 +61,6 @@ void SAL_CALL OObjectListener::propertyChange( const ::com::sun::star::beans::P DlgEdHint::DlgEdHint(DlgEdHintKind eHint) : eHintKind(eHint) - , pDlgEdObj(NULL) { } diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 54534c238f0c..cdef154f4b3a 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -72,9 +72,7 @@ namespace rptxml virtual void SetDefaults() SAL_OVERRIDE; - void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); - - sal_Int32 GetNumberFormat() { return m_nNumberFormat; } + void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); }; class OReportStylesContext : public SvXMLStylesContext diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index c54674eb81a7..ebcb55a55640 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -77,9 +77,6 @@ namespace rptxml void incrementRowIndex(); inline void incrementColumnIndex() { ++m_nColumnIndex; } - inline sal_Int32 getRowIndex() const { return m_nRowIndex; } - inline sal_Int32 getColumnIndex() const { return m_nColumnIndex; } - void addCell(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xElement); inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; } diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 66a601549d50..6bba19178761 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -127,13 +127,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - inline Reference< XComponentContext > getORB() { return SvXMLImport::GetComponentContext(); } inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } - /** return the SdrModel of the real model - * - * \return - */ - ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_pReportModel; } void FinishStyles(); virtual void SAL_CALL startDocument() @@ -158,7 +152,6 @@ public: inline rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return m_xCellStylesPropertySetMapper; } inline rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return m_xColumnStylesPropertySetMapper; } inline rtl::Reference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return m_xRowStylesPropertySetMapper; } - inline rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return m_xTableStylesPropertySetMapper; } static OUString convertFormula(const OUString& _sFormula); /** inserts a new function * diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 36dcc2d747f0..4fab22fc611c 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -90,7 +90,6 @@ public: inline bool GetEscapeProcessing() const { return m_bEscapeProcessing; } inline void SetCreateHdl(const Link<>& _aCreateLink) { m_aCreateLink = _aCreateLink; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getColumns() const { return m_xColumns; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getSelectedFieldDescriptors(); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index fd9342e69025..33fe9dca6247 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -72,12 +72,9 @@ namespace rptui Idle m_aMarkIdle; Point m_aScrollOffset; DlgEdMode m_eMode; - sal_uInt16 m_nCurrentPosition; sal_uInt16 m_eActObj; - bool m_bFirstDraw; Size m_aGridSizeCoarse; Size m_aGridSizeFine; - bool m_bGridVisible; bool m_bGridSnap; bool m_bDeleted; @@ -263,10 +260,6 @@ namespace rptui */ void fillControlModelSelection(::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rSelection) const; - /** returns the selected field from the add field dialog - */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getSelectedFieldDescriptors(); - /** calculates the zoom factor. @param _eType which kind of zoom is needed */ diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 499525178a25..1455d7e6260e 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -101,9 +101,6 @@ public: virtual void HideReference( bool bDoneRefMode = true ) SAL_OVERRIDE; virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - -protected: - void HighlightFunctionParas(const OUString& aFormula); }; diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 6f15fd376461..f3f74919b931 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -147,11 +147,6 @@ public: virtual ~OGroupsSortingDialog(); virtual void dispose() SAL_OVERRIDE; - /** sets the new columns at the groups dialog. - @param _xColumns the new columns - */ - void setColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xColumns); - /* updates the current view */ void UpdateData( ); diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index 3b77341b5a69..8253c11d7bdc 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -54,7 +54,6 @@ namespace rptui sal_Int32 m_nPaintEntranceCount; DlgEdMode m_eMode; - bool m_bDialogModelChanged; /** fills the section with all control from the report section */ @@ -120,8 +119,6 @@ namespace rptui inline OReportPage* getPage() const { return m_pPage; } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; } - void SetDialogModelChanged( bool bChanged = true ) { m_bDialogModelChanged = bChanged; } - bool IsDialogModelChanged() const { return m_bDialogModelChanged; } DlgEdMode GetMode() const { return m_eMode; } void SetMode( DlgEdMode m_eMode ); diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 1ad1b588c01c..af65cccbdcf7 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -81,7 +81,6 @@ namespace rptui void initialize(); inline Point getThumbPos() const { return Point(m_aHScroll->GetThumbPos(),m_aVScroll->GetThumbPos())/*m_aScrollOffset*/; } - inline const OReportWindow& getReportWindow() const { return *m_aReportWindow.get(); } void setTotalSize(sal_Int32 _nWidth, sal_Int32 _nHeight); inline Size getTotalSize() const { return m_aTotalPixelSize; } inline ScrollBar& GetHScroll() { return *m_aHScroll.get(); } diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 32639c87eeda..527654eb001f 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -144,8 +144,6 @@ public: virtual bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - - void SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, bool bQuickDrag); }; } diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 945be9a5ef5d..4f5b9f712c84 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -96,7 +96,6 @@ public: void Update( OSectionView* m_pView ); void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); - inline OSectionView* GetCurView() const { return m_pView; } OUString getCurrentPage() const; void setCurrentPage(const OUString& _sLastActivePage); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 59144e44c587..e43858882e14 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -94,12 +94,9 @@ ODesignView::ODesignView( vcl::Window* pParent, ,m_pCurrentView(NULL) ,m_pReportExplorer(NULL) ,m_eMode( RPTUI_SELECT ) - ,m_nCurrentPosition(USHRT_MAX) ,m_eActObj( OBJ_NONE ) - ,m_bFirstDraw(false) ,m_aGridSizeCoarse( 1000, 1000 ) // #i93595# 100TH_MM changed to grid using coarse 1 cm grid ,m_aGridSizeFine( 250, 250 ) // and a 0,25 cm subdivision for better visualisation - ,m_bGridVisible(true) ,m_bGridSnap(true) ,m_bDeleted( false ) { diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 81850df4c4e0..38d8aa540b71 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -87,7 +87,6 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re , m_xSection(_xSection) , m_nPaintEntranceCount(0) , m_eMode(RPTUI_SELECT) - , m_bDialogModelChanged(false) { //EnableChildTransparentMode(); SetHelpId(HID_REPORTSECTION); diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 1f94bb41f142..d82af307a9c5 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -190,11 +190,10 @@ public: inline sal_uInt16 GetUINameID() const; inline sal_uInt16 GetDescrID() const; - inline bool IsDouble() const; - inline bool HasIntParam() const; + inline bool IsDouble() const; sal_uInt16 GetStrIndex( sal_uInt16 nParamNum ) const; - inline bool Is( const OUString& rCompareTo ) const; + inline bool Is( const OUString& rCompareTo ) const; inline const std::vector<OUString> & GetCompNameList() const; @@ -572,12 +571,6 @@ inline bool FuncData::IsDouble() const } -inline bool FuncData::HasIntParam() const -{ - return bWithOpt; -} - - inline bool FuncData::Is( const OUString& r ) const { return aIntName == r; diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index 333ed402932f..9922bdfa1d11 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -92,7 +92,6 @@ public: inline OUString* Next(); using ScaList::Append; - inline void Append( OUString* pNew ); inline void Append( const OUString& rNew ); }; @@ -112,11 +111,6 @@ inline OUString* ScaStringList::Next() return static_cast< OUString* >( ScaList::Next() ); } -inline void ScaStringList::Append( OUString* pNew ) -{ - ScaList::Append( pNew ); -} - inline void ScaStringList::Append( const OUString& rNew ) { ScaList::Append( new OUString( rNew ) ); @@ -232,11 +226,10 @@ public: inline sal_uInt16 GetUINameID() const { return nUINameID; } inline sal_uInt16 GetDescrID() const { return nDescrID; } inline ScaCategory GetCategory() const { return eCat; } - inline bool IsDouble() const { return bDouble; } - inline bool HasIntParam() const { return bWithOpt; } + inline bool IsDouble() const { return bDouble; } sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const; - inline bool Is( const OUString& rCompare ) const + inline bool Is( const OUString& rCompare ) const { return aIntName == rCompare; } inline const ScaStringList& GetCompNameList() const { return aCompList; } diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 0acf09a1f940..21a3c4984563 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -104,7 +104,6 @@ public: inline OUString* Next(); using ScaList::Append; - inline void Append( OUString* pNew ); inline void Append( const OUString& rNew ); }; @@ -124,11 +123,6 @@ inline OUString* ScaStringList::Next() return static_cast< OUString* >( ScaList::Next() ); } -inline void ScaStringList::Append( OUString* pNew ) -{ - ScaList::Append( pNew ); -} - inline void ScaStringList::Append( const OUString& rNew ) { ScaList::Append( new OUString( rNew ) ); @@ -244,11 +238,10 @@ public: inline sal_uInt16 GetUINameID() const { return nUINameID; } inline sal_uInt16 GetDescrID() const { return nDescrID; } inline ScaCategory GetCategory() const { return eCat; } - inline bool IsDouble() const { return bDouble; } - inline bool HasIntParam() const { return bWithOpt; } + inline bool IsDouble() const { return bDouble; } sal_uInt16 GetStrIndex( sal_uInt16 nParam ) const; - inline bool Is( const OUString& rCompare ) const + inline bool Is( const OUString& rCompare ) const { return aIntName == rCompare; } inline const ScaStringList& GetCompNameList() const { return aCompList; } |