diff options
author | Noel Grandin <noel@peralex.com> | 2016-01-13 15:06:54 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-01-14 08:50:44 +0200 |
commit | d6318214908b088f8820033f62c47fbc4821c3a1 (patch) | |
tree | 156ee4efb624aff31ca64f58f06da1346aad8ca1 | |
parent | 5adcc4f6da434af9b6baeba06699321ceaa15478 (diff) |
loplugin:unusedmethods unused return value in svx
Change-Id: I15a87da20487ce031c6aab2f3df0b18fd3e4c249
24 files changed, 42 insertions, 105 deletions
diff --git a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx index 4735ce443eb3..89c03e490304 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx @@ -44,8 +44,8 @@ namespace sdr // async graphics loading helpers. Only to be used internally or from the // event helper class (in .cxx file) - bool impPrepareGraphicWithAsynchroniousLoading(); - bool impPrepareGraphicWithSynchroniousLoading(); + void impPrepareGraphicWithAsynchroniousLoading(); + void impPrepareGraphicWithSynchroniousLoading(); void doAsynchGraphicLoading(); void forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent* pEvent); diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index e6a5fc249a6c..41fad873ab25 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -75,7 +75,7 @@ public: void Clear(); void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr); sal_uInt16 GetCurrentWhich() const; - bool EndChangeEntry(); + void EndChangeEntry(); void BreakChangeEntry(); /** GetCellText returns the text at the given position diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index c6a94c65bfe8..a5feea3f82ed 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -519,15 +519,6 @@ public: ); } - /** The ordering defined by this operator is only used in order to be able - to put child descriptors in some STL containers. The ordering itself is - not so important, its 'features' are not used. - */ - inline bool operator < (const ChildDescriptor& aDescriptor) const - { - return (mxShape.get() < aDescriptor.mxShape.get()); - } - }; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index a174415953a6..397c708414d2 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -129,11 +129,10 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, bool /*bScaleToGrap } } -bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) +void IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) { const SdrObject* pSdrObj = GetSelectedSdrObject(); IMapObject* pIMapObj; - bool bRet = false; if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != nullptr ) ) { @@ -142,11 +141,7 @@ bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) pIMapObj->SetTarget( rNewInfo.aMarkTarget ); pModel->SetChanged(); UpdateInfo( false ); - - bRet = true; } - - return bRet; } const ImageMap& IMapWindow::GetImageMap() diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 7b85f1a8f756..727eda88a3fc 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -123,7 +123,7 @@ public: virtual ~IMapWindow(); virtual void dispose() override; - bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); + void ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); void SetImageMap( const ImageMap& rImageMap ); const ImageMap& GetImageMap(); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 3c56f853e57e..264e83a8c83b 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1067,14 +1067,14 @@ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) } -bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) +void FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) { OSL_PRECOND( canConvertCurrentSelectionToControl( _nSlotId ), "FmXFormShell::executeControlConversionSlot: illegal call!" ); InterfaceBag::const_iterator aSelectedElement = m_aCurrentSelection.begin(); if ( aSelectedElement == m_aCurrentSelection.end() ) - return false; + return; - return executeControlConversionSlot( Reference< XFormComponent >( *aSelectedElement, UNO_QUERY ), _nSlotId ); + executeControlConversionSlot( Reference< XFormComponent >( *aSelectedElement, UNO_QUERY ), _nSlotId ); } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 9b787da6af25..c3dbf76259c9 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -750,7 +750,7 @@ namespace svx } - bool FmTextControlShell::executeSelectAll( ) + void FmTextControlShell::executeSelectAll( ) { try { @@ -758,18 +758,16 @@ namespace svx { sal_Int32 nTextLen = m_xActiveTextComponent->getText().getLength(); m_xActiveTextComponent->setSelection( css::awt::Selection( 0, nTextLen ) ); - return true; } } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } - return false; // not handled } - bool FmTextControlShell::executeClipboardSlot( SfxSlotId _nSlot ) + void FmTextControlShell::executeClipboardSlot( SfxSlotId _nSlot ) { try { @@ -800,14 +798,12 @@ namespace svx default: OSL_FAIL( "FmTextControlShell::executeClipboardSlot: invalid slot!" ); } - return true; } } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } - return false; // not handled } diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 853aed3cd538..85258b8ade19 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -131,9 +131,9 @@ namespace svxform } - sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel ) + void FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel ) { - return initializeControlModel( + initializeControlModel( _eDocType, _rxControlModel, Rectangle() ); } diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index d5138b3f0196..81057e8aa294 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -431,7 +431,7 @@ public: /** executes a control conversion slot for the current selection @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/> */ - SAL_DLLPRIVATE bool executeControlConversionSlot( sal_uInt16 _nSlotId ); + SAL_DLLPRIVATE void executeControlConversionSlot( sal_uInt16 _nSlotId ); /// checks whether the given slot id denotes a control conversion slot SAL_DLLPRIVATE static bool isControlConversionSlot( sal_uInt16 _nSlotId ); diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 0d3b9b2344d4..148c88b500f4 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -150,8 +150,8 @@ namespace svx protected: enum AttributeSet { eCharAttribs, eParaAttribs }; void executeAttributeDialog( AttributeSet _eSet, SfxRequest& _rReq ); - bool executeSelectAll( ); - bool executeClipboardSlot( SfxSlotId _nSlot ); + void executeSelectAll( ); + void executeClipboardSlot( SfxSlotId _nSlot ); private: inline bool isControllerListening() const { return !m_aControlObservers.empty(); } diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index aceb739699a6..020a457a50c2 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -70,7 +70,7 @@ namespace svxform ); sal_Int16 initializeControlModel( const DocumentType _eDocType, const SdrUnoObj& _rObject ); - sal_Int16 initializeControlModel( const DocumentType _eDocType, const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel ); + void initializeControlModel( const DocumentType _eDocType, const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel ); void initializeTextFieldLineEnds( const css::uno::Reference< css::beans::XPropertySet >& _rxModel diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index ffbed7f7c01c..74cc598f7331 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -118,8 +118,6 @@ namespace svx // access to the instance which implements the functionality. Not to be used when not assigned inline const FormControllerHelper* operator->() const { return m_pImpl; } inline FormControllerHelper* operator->() { return m_pImpl; } - inline const FormControllerHelper& operator*() const { return *m_pImpl; } - inline FormControllerHelper& operator*() { return *m_pImpl; } }; diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 3ab1663ed2d9..db7c8a51beb0 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -48,9 +48,6 @@ namespace svxform // (which is checked via the supported interfaces) _all_ members will be set to // void !, even if the object has some of the needed interfaces. - DataColumn* operator ->() { return this; } - operator css::uno::Reference< css::uno::XInterface> () const{ return m_xColumn.get(); } - // 'conversions' inline const css::uno::Reference< css::sdb::XColumn>& getColumn() const { diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 02f59f183697..c7822b97bb67 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -73,9 +73,8 @@ namespace sdr { // Test graphics state and eventually trigger a SwapIn event or an Asynchronous // load event. Return value gives info if SwapIn was triggered or not - bool ViewObjectContactOfGraphic::impPrepareGraphicWithAsynchroniousLoading() + void ViewObjectContactOfGraphic::impPrepareGraphicWithAsynchroniousLoading() { - bool bRetval(false); SdrGrafObj& rGrafObj = getSdrGrafObj(); if(rGrafObj.IsSwappedOut()) @@ -133,8 +132,6 @@ namespace sdr rGrafObj.ForceSwapIn(); rGrafObj.mbInsidePaint = false; } - - bRetval = true; } } } @@ -160,15 +157,12 @@ namespace sdr GetViewContact().ActionChanged(); } } - - return bRetval; } // Test graphics state and eventually trigger a SwapIn event. Return value // gives info if SwapIn was triggered or not - bool ViewObjectContactOfGraphic::impPrepareGraphicWithSynchroniousLoading() + void ViewObjectContactOfGraphic::impPrepareGraphicWithSynchroniousLoading() { - bool bRetval(false); SdrGrafObj& rGrafObj = getSdrGrafObj(); if(rGrafObj.IsSwappedOut()) @@ -196,12 +190,8 @@ namespace sdr rGrafObj.ForceSwapIn(); rGrafObj.mbInsidePaint = false; } - - bRetval = true; } } - - return bRetval; } // This is the call from the asynch graphic loading. This may only be called from diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index dc8518706782..5500bdf6aa72 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -569,7 +569,7 @@ namespace sdr { namespace contact { Failure of this method will be reported via an assertion in a non-product version. */ - bool ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL ); + void ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL ); /** returns our XControl, if it already has been created @@ -964,27 +964,28 @@ namespace sdr { namespace contact { } - bool ViewObjectContactOfUnoControl_Impl::ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL ) + void ViewObjectContactOfUnoControl_Impl::ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL ) { OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::ensureControl: already disposed()" ); if ( impl_isDisposed_nofail() ) - return false; + return; ObjectContactOfPageView* pPageViewContact = dynamic_cast< ObjectContactOfPageView* >( &m_pAntiImpl->GetObjectContact() ); if ( pPageViewContact ) { SdrPageViewAccess aPVAccess( pPageViewContact->GetPageWindow().GetPageView() ); const OutputDevice& rDevice( m_pAntiImpl->getPageViewOutputDevice().get() ); - return impl_ensureControl_nothrow( + impl_ensureControl_nothrow( aPVAccess, rDevice, _pInitialViewTransformationOrNULL ? *_pInitialViewTransformationOrNULL : rDevice.GetViewTransformation() ); + return; } DummyPageViewAccess aNoPageView; const OutputDevice& rDevice( impl_getOutputDevice_throw() ); - return impl_ensureControl_nothrow( + impl_ensureControl_nothrow( aNoPageView, rDevice, _pInitialViewTransformationOrNULL ? *_pInitialViewTransformationOrNULL : rDevice.GetViewTransformation() diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index b1bd6743ac16..2da9c09deca5 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -530,14 +530,13 @@ bool _SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) return bRet; } -bool _SdrItemBrowserControl::EndChangeEntry() +void _SdrItemBrowserControl::EndChangeEntry() { if (!pEditControl) - return false; + return; aEntryChangedHdl.Call(*this); BreakChangeEntry(); - return true; } void _SdrItemBrowserControl::BreakChangeEntry() diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index e54cb52223f6..9ffba232f3d0 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -120,7 +120,7 @@ public: const OUString& rMimeType, const css::uno::Any & rValue ) override; void DataChanged( const Graphic& rGraphic ); - bool Connect() { return nullptr != GetRealObject(); } + void Connect() { GetRealObject(); } void UpdateAsynchron(); void RemoveGraphicUpdater(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 88e8eed822d6..63aaa6c90b6f 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -267,15 +267,15 @@ public: void ResetFormFlags() { bBezier=false; bCurve=false; bCircle=false; bLine=false; bRect=false; } bool IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; } XPolygon GetFormPoly() const; - bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); + void CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); XPolygon GetBezierPoly() const; static XPolygon GetCurvePoly() { return XPolygon(); } - bool CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + void CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetCirclePoly() const; - bool CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + void CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); static Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView); XPolygon GetLinePoly() const; - bool CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + void CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetRectPoly() const; }; @@ -289,7 +289,7 @@ XPolygon ImpPathCreateUser::GetFormPoly() const return XPolygon(); } -bool ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown) +void ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown) { bool bRet = true; aBezStart=rP1; @@ -301,7 +301,6 @@ bool ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Poi if (!bMouseDown || (0L == aBezEnd.X() && 0L == aBezEnd.Y())) aBezEnd=rP2; bBezier=bRet; - return bRet; } XPolygon ImpPathCreateUser::GetBezierPoly() const @@ -314,7 +313,7 @@ XPolygon ImpPathCreateUser::GetBezierPoly() const return aXP; } -bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +void ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { long nTangAngle=GetAngle(rDir); aCircStart=rP1; @@ -359,7 +358,6 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi nCircRadius=nRad; if (nRad==0 || std::abs(nCircRelAngle)<5) bRet=false; bCircle=bRet; - return bRet; } XPolygon ImpPathCreateUser::GetCirclePoly() const @@ -411,12 +409,12 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr return Point(x,y); } -bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +void ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { aLineStart=rP1; aLineEnd=rP2; bLine90=false; - if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=false; return false; } + if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=false; return; } Point aTmpPt(rP2-rP1); long nDirX=rDir.X(); long nDirY=rDir.Y(); @@ -430,7 +428,6 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point aLineEnd+=aP2; } bLine=true; - return true; } XPolygon ImpPathCreateUser::GetLinePoly() const @@ -441,12 +438,12 @@ XPolygon ImpPathCreateUser::GetLinePoly() const return aXP; } -bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +void ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { aRectP1=rP1; aRectP2=rP1; aRectP3=rP2; - if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=false; return false; } + if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=false; return; } Point aTmpPt(rP2-rP1); long nDirX=rDir.X(); long nDirY=rDir.Y(); @@ -491,7 +488,6 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point } } bRect=true; - return true; } XPolygon ImpPathCreateUser::GetRectPoly() const diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 0aec0e7a8a45..af68170477a2 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -135,12 +135,6 @@ bool AccessibleCell::ResetState (sal_Int16 aState) -bool AccessibleCell::operator== (const AccessibleCell& rAccessibleCell) -{ - return this == &rAccessibleCell; -} - - // XInterface diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 12e61c36d00a..edc8e8fc2c23 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -56,8 +56,6 @@ public: void Init(); - bool operator== (const AccessibleCell& rAccessibleCell); - virtual bool SetState (sal_Int16 aState) override; virtual bool ResetState (sal_Int16 aState) override; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 4f575d75a40c..b54e4150543b 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -211,7 +211,7 @@ public: CellRef getCell( const CellPos& rPos ) const; void LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHeight ); - bool ApplyCellStyles(); + void ApplyCellStyles(); void UpdateCells( Rectangle& rArea ); SdrTableObjImpl(); @@ -366,12 +366,10 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) -bool SdrTableObjImpl::ApplyCellStyles() +void SdrTableObjImpl::ApplyCellStyles() { if( !mxTable.is() || !mxTableStyle.is() ) - return false; - - bool bChanges = false; + return; const sal_Int32 nColCount = getColumnCount(); const sal_Int32 nRowCount = getRowCount(); @@ -451,15 +449,12 @@ bool SdrTableObjImpl::ApplyCellStyles() CellRef xCell( getCell( aPos ) ); if( xCell.is() && ( xCell->GetStyleSheet() != pStyle ) ) { - bChanges = true; xCell->SetStyleSheet( pStyle, true ); } } } } } - - return bChanges; } diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 616aa6c23625..854d0bf630ed 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -52,7 +52,7 @@ class SdrTableRtfExporter { public: SdrTableRtfExporter( SvStream& rStrmP, SdrTableObj& rObj ); - sal_uLong Write(); + void Write(); void WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart ); void WriteCell( sal_Int32 nCol, sal_Int32 nRow ); @@ -83,7 +83,7 @@ long HundMMToTwips( long nIn ) return nRet; } -sal_uLong SdrTableRtfExporter::Write() +void SdrTableRtfExporter::Write() { mrStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING ); @@ -126,7 +126,6 @@ sal_uLong SdrTableRtfExporter::Write() } mrStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING ); - return mrStrm.GetError(); } void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 054e5fdc2cac..b1db568aef9d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -359,13 +359,6 @@ DictionaryEntry::~DictionaryEntry() { } -bool DictionaryEntry::operator==( const DictionaryEntry& rE ) const -{ - return m_aTerm == rE.m_aTerm - && m_aMapping == rE.m_aMapping - && m_nConversionPropertyType == rE.m_nConversionPropertyType; -} - void DictionaryList::setColSizes() { HeaderBar &rBar = GetTheHeaderBar(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 4c048f8c302c..a0e2e15bc6e3 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -37,9 +37,6 @@ namespace textconversiondlgs -/** -*/ - struct DictionaryEntry { DictionaryEntry( const OUString& rTerm, const OUString& rMapping @@ -48,8 +45,6 @@ struct DictionaryEntry virtual ~DictionaryEntry(); - bool operator==( const DictionaryEntry& rE ) const; - OUString m_aTerm; OUString m_aMapping; sal_Int16 m_nConversionPropertyType; //linguistic2::ConversionPropertyType |