diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-25 09:05:21 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-26 07:50:33 +0000 |
commit | 74713b34a36577f19eb3194246de73fa4f2bb741 (patch) | |
tree | 334f601b030923ab621a92bae3f512ff67c99374 | |
parent | 132f7b2a8cc986ee79c4124ed2bc368d6dfaa418 (diff) |
loplugin:unusedmethods
Change-Id: Ib36bc0e87d00abb638cbfec511cd13b6179eabda
Reviewed-on: https://gerrit.libreoffice.org/25431
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
79 files changed, 4 insertions, 885 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 1850c76eec45..65d41aa40b57 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -1143,35 +1143,6 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c return GetGraphicStream( GetEmbeddedObjectName( xObj ), pMediaType ); } -uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( const OUString& aName, OUString* pMediaType ) -{ - uno::Reference < io::XInputStream > xInputStream; - - SAL_WARN_IF( aName.isEmpty(), "comphelper.container", "Retrieving stream for unknown object!" ); - if ( !aName.isEmpty() ) - { - try - { - uno::Reference < io::XStream > xStream = pImpl->mxStorage->cloneStreamElement( aName ); //get a readonly clone - xInputStream = xStream->getInputStream(); - if ( pMediaType ) - { - uno::Reference < beans::XPropertySet > xSet( xInputStream, uno::UNO_QUERY ); - if ( xSet.is() ) - { - uno::Any aAny = xSet->getPropertyValue("MediaType"); - aAny >>= *pMediaType; - } - } - } - catch (const uno::Exception&) - { - } - } - - return xInputStream; -} - bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { try diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index e0abf1339287..0bc3a96505f9 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -105,13 +105,10 @@ IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl); IMPL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl) IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl) IMPL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl) -IMPL_ABSTDLG_BASE(AbstractSearchProgress_Impl); -IMPL_ABSTDLG_BASE(AbstractTakeProgress_Impl); IMPL_ABSTDLG_BASE(AbstractTitleDialog_Impl); IMPL_ABSTDLG_BASE(AbstractScriptSelectorDialog_Impl); IMPL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl); IMPL_ABSTDLG_BASE(AbstractURLDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl); IMPL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl); @@ -124,7 +121,6 @@ IMPL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxObjectNameDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxObjectTitleDescDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxPathSelectDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl); @@ -409,16 +405,6 @@ SfxBindings& AbstractSpellDialog_Impl::GetBindings() return pDlg->GetBindings(); } -void AbstractSearchProgress_Impl::Update() -{ - pDlg->Update(); -} - -void AbstractTakeProgress_Impl::Update() -{ - pDlg->Update(); -} - OUString AbstractTitleDialog_Impl::GetTitle() const { return pDlg->GetTitle(); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 057284609158..7359f06cca45 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -201,22 +201,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog virtual SfxBindings& GetBindings() override; }; -class SearchProgress; -class AbstractSearchProgress_Impl : public AbstractSearchProgress -{ - DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress) - virtual void Update() override ; - -}; - -class TakeProgress; -class AbstractTakeProgress_Impl : public AbstractTakeProgress -{ - DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress) - virtual void Update() override ; - -}; - class TitleDialog; class AbstractTitleDialog_Impl : public AbstractTitleDialog { @@ -255,13 +239,6 @@ class AbstractURLDlg_Impl :public AbstractURLDlg virtual OUString GetName() const override; }; -class SvxHlinkDlgMarkWnd; -class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd -{ - DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd) - -}; - class SvxSearchSimilarityDialog; class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog { @@ -356,12 +333,6 @@ class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDi virtual void GetDescription(OUString& rName) override; }; -class SvxMessDialog; -class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog -{ - DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog) -}; - class SvxMultiPathDialog; class AbstractSvxMultiPathDialog_Impl : public AbstractSvxMultiPathDialog { diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 79d1f33a7a74..965579943d58 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -263,7 +263,6 @@ private: DECL_LINK_TYPED( ModifyGradientHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void ); - void ModifyStepCountHdl_Impl(void*); //UUUU DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void ); diff --git a/extensions/source/update/check/updateinfo.hxx b/extensions/source/update/check/updateinfo.hxx index 0f23e8463e71..4788405fdb09 100644 --- a/extensions/source/update/check/updateinfo.hxx +++ b/extensions/source/update/check/updateinfo.hxx @@ -42,7 +42,6 @@ struct ReleaseNote OUString URL2; ReleaseNote(sal_uInt8 pos, const OUString& aURL) : Pos(pos), URL(aURL), Pos2(0), URL2() {}; - ReleaseNote(sal_uInt8 pos, const OUString& aURL, sal_uInt8 pos2, const OUString& aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {}; ReleaseNote(const ReleaseNote& rn) :Pos(rn.Pos), URL(rn.URL), Pos2(rn.Pos2), URL2(rn.URL2) {}; ReleaseNote & operator=( const ReleaseNote& rn) { Pos=rn.Pos; URL=rn.URL; Pos2=rn.Pos2; URL2=rn.URL2; return *this; }; diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 200d3cd59c08..8ca373ea8125 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -65,9 +65,6 @@ bool PlainTextFilterDetect_supportsService(const OUString& ServiceName); css::uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames(); -css::uno::Reference<css::uno::XInterface> -PlainTextFilterDetect_createInstance(const css::uno::Reference<css::uno::XComponentContext>& rCxt); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 8cbceb3e5e8d..2c613867cba1 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -779,57 +779,6 @@ FormulaTokenArray& FormulaTokenArray::operator=( const FormulaTokenArray& rArr ) return *this; } -FormulaTokenArray* FormulaTokenArray::Clone() const -{ - FormulaTokenArray* p = new FormulaTokenArray; - p->nLen = nLen; - p->nRPN = nRPN; - p->nMode = nMode; - p->nError = nError; - p->bHyperLink = bHyperLink; - p->mbFromRangeName = mbFromRangeName; - FormulaToken** pp; - if( nLen ) - { - pp = p->pCode = new FormulaToken*[ nLen ]; - memcpy( pp, pCode, nLen * sizeof( FormulaToken* ) ); - for( sal_uInt16 i = 0; i < nLen; i++, pp++ ) - { - *pp = (*pp)->Clone(); - (*pp)->IncRef(); - } - } - if( nRPN ) - { - pp = p->pRPN = new FormulaToken*[ nRPN ]; - memcpy( pp, pRPN, nRPN * sizeof( FormulaToken* ) ); - for( sal_uInt16 i = 0; i < nRPN; i++, pp++ ) - { - FormulaToken* t = *pp; - if( t->GetRef() > 1 ) - { - FormulaToken** p2 = pCode; - sal_uInt16 nIdx = 0xFFFF; - for( sal_uInt16 j = 0; j < nLen; j++, p2++ ) - { - if( *p2 == t ) - { - nIdx = j; break; - } - } - if( nIdx == 0xFFFF ) - *pp = t->Clone(); - else - *pp = p->pCode[ nIdx ]; - } - else - *pp = t->Clone(); - (*pp)->IncRef(); - } - } - return p; -} - void FormulaTokenArray::Clear() { if( nRPN ) DelRPN(); diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx index 52dfac39c83f..a54aa2a845fd 100644 --- a/include/comphelper/embeddedobjectcontainer.hxx +++ b/include/comphelper/embeddedobjectcontainer.hxx @@ -143,9 +143,6 @@ public: // move an embedded object to another container (keep the persistent name) bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& ); - // get the stored representation for the object - css::uno::Reference < css::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType ); - // get the stored graphical representation for the object css::uno::Reference < css::io::XInputStream > GetGraphicStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=nullptr ); diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index cd0f430f365c..e14714cc6c15 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -159,7 +159,6 @@ public: /// Assignment with references to FormulaToken entries (not copied!) FormulaTokenArray( const FormulaTokenArray& ); virtual ~FormulaTokenArray(); - FormulaTokenArray* Clone() const; /// True copy! void SetFromRangeName( bool b ) { mbFromRangeName = b; } bool IsFromRangeName() const { return mbFromRangeName; } diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 33db87efaad0..be0484e6654c 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -117,10 +117,6 @@ private: | +- EditWrapper [1] | +- ColorListBoxWrapper [1] | | - | +- NumericFieldWrapper< ValueT > [1] - | | | - | | +- [ValueType]NumericFieldWrapper [1] [2] - | | | +- MetricFieldWrapper< ValueT > [1] | | | | | +- [ValueType]MetricFieldWrapper [1] [2] @@ -265,22 +261,6 @@ public: }; -/** A wrapper for the VCL NumericField. */ -template< typename ValueT > -class NumericFieldWrapper : public SingleControlWrapper< NumericField, ValueT > -{ -public: - inline explicit NumericFieldWrapper( NumericField& rField ) : - SingleControlWrapper< NumericField, ValueT >( rField ) {} - - virtual bool IsControlDontKnow() const SAL_OVERRIDE; - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - - virtual ValueT GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; -}; - - /** A wrapper for the VCL MetricField. Adds support for field units during accessing the control value. The @@ -499,32 +479,6 @@ inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eE template< typename ValueT > -bool NumericFieldWrapper< ValueT >::IsControlDontKnow() const -{ - return this->GetControl().GetText().Len() == 0; -} - -template< typename ValueT > -void NumericFieldWrapper< ValueT >::SetControlDontKnow( bool bSet ) -{ - if( bSet ) - this->GetControl().SetText( OUString() ); -} - -template< typename ValueT > -ValueT NumericFieldWrapper< ValueT >::GetControlValue() const -{ - return static_cast< ValueT >( this->GetControl().Denormalize( this->GetControl().GetValue() ) ); -} - -template< typename ValueT > -void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) -{ - this->GetControl().SetValue( this->GetControl().Normalize( static_cast< sal_Int64 >( nValue ) ) ); -} - - -template< typename ValueT > bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const { return this->GetControl().GetText().isEmpty(); diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index dfec93dc57b1..8c884010b900 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -69,15 +69,11 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor INetURLObject aActualURL; OUString aName; Size aMargin; - long nWidth; ScrollingMode eScroll; - SizeSelector eSizeSelector; bool bHasBorder; bool bHasBorderSet; - sal_uInt16 nItemId; bool bResizeHorizontal; bool bResizeVertical; - bool bHasUI; bool bReadOnly; std::unique_ptr< SfxFrameDescriptor_Impl > pImpl; @@ -130,9 +126,6 @@ public: { return bHasBorderSet; } void ResetBorder() { bHasBorder = false; bHasBorderSet = false; } - - // Copy for example for Views - SfxFrameDescriptor* Clone() const; }; #endif // INCLUDED_SFX2_FRMDESCR_HXX diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 903c997abd99..38445864a56a 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -95,9 +95,6 @@ public: const OUString& getCurRegionName () const { return maCurRegionName;} - // Check if the root region is visible or not. - bool isNonRootRegionVisible () const { return mnCurRegionId > 0;} - void setOpenRegionHdl(const Link<void*,void> &rLink); void setRightClickHdl(const Link<ThumbnailViewItem*,void> &rLink); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index bdae55693f76..8521ca51143d 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -99,10 +99,6 @@ private: void OnCategoryNew (); void OnCategoryDelete(); - void OnRegionState (const ThumbnailViewItem *pItem); - - void OnRepositoryDelete (); - void createRepositoryMenu (); void createDefaultTemplateMenu (); diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 1cfc8d86f285..654f3d0c37fc 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -51,8 +51,6 @@ public: DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, bool); - sal_uInt16 getCurRegionItemId () const; - TemplateContainerItem* getRegion(OUString const & sStr); sal_uInt16 getRegionId (size_t pos) const; @@ -81,9 +79,6 @@ public: bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail, const OUString &rPath); - // Import a template to the current region - bool copyFrom (const OUString &rPath); - bool copyFrom(TemplateContainerItem *pItem, const OUString &rPath); bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index c58ddb99ae4f..96946fa09028 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -228,9 +228,6 @@ public: void filterItems (const std::function<bool (const ThumbnailViewItem*) > &func); - void sortItems (const std::function<bool (const ThumbnailViewItem*, - const ThumbnailViewItem*) > &func); - void setItemStateHdl (const Link<const ThumbnailViewItem*,void> &aLink) { maItemStateHdl = aLink; } virtual void Resize() override; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index a18354fdf3b6..50e7ea3ca498 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -231,9 +231,6 @@ public: NfCurrencyEntry( const css::i18n::Currency & rCurr, const LocaleDataWrapper& rLocaleData, LanguageType eLang ); - inline NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol, - LanguageType eLang, sal_uInt16 nPositiveFmt, - sal_uInt16 nNegativeFmt, sal_uInt16 nDig, sal_Unicode cZero); ~NfCurrencyEntry() {} /// Symbols and language identical @@ -282,19 +279,6 @@ public: static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); } }; -/** - * Necessary for ptr_vector on Windows. Please don't remove these, or at - * least check it on Windows before attempting to remove them. - */ -NfCurrencyEntry::NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol, - LanguageType eLang, sal_uInt16 nPositiveFmt, - sal_uInt16 nNegativeFmt, sal_uInt16 nDig, sal_Unicode cZero) - : aSymbol(rSymbol), aBankSymbol(rBankSymbol), eLanguage(eLang) - , nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt) - , nDigits(nDig), cZeroChar(cZero) -{ -} - typedef std::vector< OUString > NfWSStringsDtor; class SvNumberFormatterRegistry_Impl; diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index 99ca1268f872..b5e153b1fff4 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -104,7 +104,6 @@ public: // instead of the automatic color ColorConfigValue GetColorValue(ColorConfigEntry eEntry, bool bSmart = true) const; static Color GetDefaultColor(ColorConfigEntry eEntry); - void Reload(); }; class SVT_DLLPUBLIC EditableColorConfig diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index a6c2286defaa..844c79285caf 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -55,7 +55,6 @@ public: protected: bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; - bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const; private: diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 4362ff1b98e7..45d600c84bf2 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -139,7 +139,6 @@ public: bool IsCompletelyDisabled() const { return mbCompleteDisable; } void DoCompletelyDisable(bool bNew); - void SetCS(CTL_STYLE eNew); }; /************************************************************************* diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index e029b9913cda..bd7696a4049c 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -102,7 +102,6 @@ private: public: // Construction/Destruction - CursorWrapper() { } CursorWrapper(const css::uno::Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned = false); SVX_DLLPUBLIC CursorWrapper(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false); // if bUseCloned == sal_True, the cursor is first doubled over the XCloneable interface (which it must implement) diff --git a/include/tools/line.hxx b/include/tools/line.hxx index 8a0486adf3fe..ec023abfc516 100644 --- a/include/tools/line.hxx +++ b/include/tools/line.hxx @@ -32,7 +32,6 @@ private: Point maEnd; public: - Line() {}; Line( const Point& rStartPt, const Point& rEndPt ) : maStart( rStartPt ), maEnd( rEndPt ) {} void SetStart( const Point& rStartPt ) { maStart = rStartPt; } diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index 5e5767ae26f9..2a8a656d4189 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -83,7 +83,6 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator sal_Int32 nFirst; sal_Int32 nLast; - Range() : nFirst( -1 ), nLast( -1 ) {} Range( sal_Int32 i_nFirst, sal_Int32 i_nLast ) : nFirst( i_nFirst ), nLast( i_nLast ) {} }; std::vector< StringRangeEnumerator::Range > maSequence; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index a75341eb107c..c31bc8cc19da 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -138,21 +138,6 @@ public: typedef tools::SvRef<SvLockBytes> SvLockBytesRef; -// SvOpenLockBytes - -class TOOLS_DLLPUBLIC SvOpenLockBytes: public SvLockBytes -{ -public: - - SvOpenLockBytes() : SvLockBytes(nullptr, false) {} - SvOpenLockBytes(SvStream * pStream, bool bOwner): - SvLockBytes(pStream, bOwner) {} - - virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, - sal_Size * pWritten) = 0; -}; - - // SvStream class TOOLS_DLLPUBLIC SvStream diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index fd792082dde3..3b3fc02bb113 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -81,10 +81,6 @@ class VBAHELPER_DLLPUBLIC SimpleEnumerationBase : public EnumerationHelper_BASE { public: explicit SimpleEnumerationBase( - const css::uno::Reference< css::container::XEnumeration >& rxEnumeration ) throw (css::uno::RuntimeException) : - mxEnumeration( rxEnumeration ) {} - - explicit SimpleEnumerationBase( const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) throw (css::uno::RuntimeException) : mxEnumeration( new SimpleIndexAccessToEnumeration( rxIndexAccess ) ) {} diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index 7e1b5f3b75b6..35f5146f3c54 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -58,8 +58,6 @@ protected: css::uno::WeakReference< ov::XHelperInterface > mxParent; css::uno::Reference< css::uno::XComponentContext > mxContext; public: - InheritedHelperInterfaceImpl() {} - InheritedHelperInterfaceImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxContext( xContext ) {} InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {} virtual OUString getServiceImplName() = 0; virtual css::uno::Sequence<OUString> getServiceNames() = 0; @@ -102,8 +100,6 @@ class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceWeakImpl : public Inherited { typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper< Ifc... > > Base; public: - InheritedHelperInterfaceWeakImpl< Ifc... >() {} - InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xContext ) {} InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {} }; diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index cc759c32742b..7da0808588a6 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.hxx @@ -51,24 +51,6 @@ namespace ooo ReturnInteger( sal_Int32 nValue ) : ReturnInteger_BASE( nValue ){} }; - typedef DefaultReturnHelper< sal_Bool, ov::msforms::XReturnBoolean > ReturnBoolean_BASE; - class ReturnBoolean : public ReturnBoolean_BASE - { - public: - ReturnBoolean( bool bValue ) : ReturnBoolean_BASE( bValue ){} - }; - typedef DefaultReturnHelper< float, ov::msforms::XReturnSingle > ReturnSingle_BASE; - class ReturnSingle : public ReturnSingle_BASE - { - public: - ReturnSingle( float nValue ) : ReturnSingle_BASE( nValue ){} - }; - typedef DefaultReturnHelper< short, ov::msforms::XReturnEffect > ReturnEffect_BASE; - class ReturnEffect : public ReturnEffect_BASE - { - public: - ReturnEffect( short nValue ) : ReturnEffect_BASE( nValue ){} - }; } // vba } // ooo diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx index 060708f6f16b..077ea02a6dba 100644 --- a/include/xmloff/numehelp.hxx +++ b/include/xmloff/numehelp.hxx @@ -37,12 +37,6 @@ struct XMLNumberFormat sal_Int32 nNumberFormat; sal_Int16 nType; bool bIsStandard : 1; - XMLNumberFormat() - : nNumberFormat(0) - , nType(0) - , bIsStandard(false) - { - } XMLNumberFormat(const OUString& sTempCurrency, sal_Int32 nTempFormat) : sCurrency(sTempCurrency) diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 41e8ddd8d417..48aebd413bfc 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -238,12 +238,6 @@ protected: ::xmloff::token::XMLTokenEnum eGroupName; css::uno::Sequence< css::beans::PropertyValue > aSettings; - SettingsGroup() - :eGroupName( ::xmloff::token::XML_TOKEN_INVALID ) - ,aSettings() - { - } - SettingsGroup( const ::xmloff::token::XMLTokenEnum _eGroupName, const css::uno::Sequence< css::beans::PropertyValue >& _rSettings ) diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx index 4d1000c01f64..ad3bd875dd11 100644 --- a/l10ntools/inc/xmlparse.hxx +++ b/l10ntools/inc/xmlparse.hxx @@ -117,7 +117,6 @@ private: protected: XMLParentNode( XMLParentNode *pPar ) : XMLChildNode( pPar ) {} - XMLParentNode() {} XMLParentNode( const XMLParentNode& ); diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx index a42cd8936f1d..f356a494a4ea 100644 --- a/linguistic/source/defs.hxx +++ b/linguistic/source/defs.hxx @@ -39,8 +39,6 @@ struct LangSvcEntries bool bAlreadyWarned; bool bDoWarnAgain; - LangSvcEntries() : nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) {} - explicit LangSvcEntries( const css::uno::Sequence< OUString > &rSvcImplNames ) : aSvcImplNames(rSvcImplNames), nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index ba229faf55d4..1fbbb1850881 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -194,7 +194,6 @@ class RscTypCont RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ); RscTop * InitClassRadioButton( RscTop * pSuper ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); - RscTop * InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ); RscTop * InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index c9ef7f40f4c0..874c03a0249c 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -145,7 +145,6 @@ public: sal_uLong GetFileKey() const { return lFileKey; } void Evaluate(); sal_Int32 GetNumber() const { return lId; } - OString GetMacro(); }; typedef ::std::vector< RscDefine* > RscSubDefList; diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 4e0b2fcb6949..ae3b865b481a 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -643,34 +643,6 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) return pClassKeyCode; } -RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ) -{ - Atom nId; - RscTop * pClassAccel; - - // initialize class - nId = pHS->getID( "Accelerator" ); - pClassAccel = new RscClass( nId, RSC_ACCEL, pSuper ); - pClassAccel->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - aNmTb.Put( nId, CLASSNAME, pClassAccel ); - - // initialize variables - nId = aNmTb.Put( "HelpText", VARNAME ); - pClassAccel->SetVariable( nId, &aLangString ); - { - RscCont * pCont; - - aBaseLst.push_back( - pCont = new RscCont( pHS->getID( "ContAcceleratorKey" ), RSC_NOTYPE ) - ); - pCont->SetTypeClass( pClassAccelItem ); - nId = aNmTb.Put( "ItemList", VARNAME ); - pClassAccel->SetVariable( nId, pCont ); - } - - return pClassAccel; -} - RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap ) { diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index 820c3f0688f9..baf90d263740 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -173,13 +173,6 @@ RscDefine * RscDefine::Search( const char * pStr ) return static_cast<RscDefine *>(StringNode::Search( pStr )); } -OString RscDefine::GetMacro() -{ - if( pExp ) - return pExp->GetMacro(); - return OString::number(lId); -} - RscDefine * RscDefineList::New( sal_uLong lFileKey, const OString& rDefName, sal_Int32 lDefId, size_t lPos ) { diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index 8fc3aaf33a76..b4423c6c9a47 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -59,7 +59,6 @@ public: void GetVars( sal_Int32& nColP, sal_Int32& nRowP, sal_Int32& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - inline void PutInOrder( ScBigAddress& r ); bool IsValid( const ScDocument* pDoc ) const; inline ScAddress MakeAddress() const; @@ -73,29 +72,6 @@ public: { return !operator==( r ); } }; -inline void ScBigAddress::PutInOrder( ScBigAddress& r ) -{ - sal_Int32 nTmp; - if ( r.nCol < nCol ) - { - nTmp = r.nCol; - r.nCol = nCol; - nCol = nTmp; - } - if ( r.nRow < nRow ) - { - nTmp = r.nRow; - r.nRow = nRow; - nRow = nTmp; - } - if ( r.nTab < nTab ) - { - nTmp = r.nTab; - r.nTab = nTab; - nTab = nTmp; - } -} - inline ScAddress ScBigAddress::MakeAddress() const { SCCOL nColA; diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx index 68a5c4eaa785..1a2e9d43aa9d 100644 --- a/sc/inc/colcontainer.hxx +++ b/sc/inc/colcontainer.hxx @@ -55,7 +55,6 @@ public: return static_cast<SCCOL>( aCols.size() ); } - bool ColumnExists( SCCOL nColIdx ) const; void Clear(); }; diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 940d96d5a7d7..cbe45b4ee876 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -74,8 +74,6 @@ public: ScColorScaleEntryType GetType() const { return meType;} void SetType( ScColorScaleEntryType eType ); - - bool NeedsRepaint() const; }; namespace databar diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index b6e69c172e5b..a284d275d0c6 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -911,7 +911,6 @@ public: SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow ); const SvtBroadcaster* GetBroadcaster( SCCOL nCol, SCROW nRow ) const; void DeleteBroadcasters( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, SCROW nRow1, SCROW nRow2 ); - bool HasBroadcaster( SCCOL nCol ) const; void FillMatrix( ScMatrix& rMat, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, svl::SharedStringPool* pPool = nullptr ) const; diff --git a/sc/source/core/data/colcontainer.cxx b/sc/source/core/data/colcontainer.cxx index a4cf1c677953..7433240c8999 100644 --- a/sc/source/core/data/colcontainer.cxx +++ b/sc/source/core/data/colcontainer.cxx @@ -36,13 +36,6 @@ ScColContainer::~ScColContainer() } -bool ScColContainer::ColumnExists( SCCOL nColIdx ) const -{ - if ( nColIdx < 0 || nColIdx >= size() ) - return false; - return true; -} - void ScColContainer::Clear() { SCCOL nSize = size(); diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 1a088851aa4f..72c016ce421b 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -276,14 +276,6 @@ void ScColorScaleEntry::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) mpListener.reset(new ScFormulaListener(mpCell.get())); } -bool ScColorScaleEntry::NeedsRepaint() const -{ - if(mpListener) - return mpListener->NeedsRepaint(); - - return false; -} - void ScColorScaleEntry::SetColor(const Color& rColor) { maColor = rColor; diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 277f6c139519..0eb5b19f7f08 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -2226,14 +2226,6 @@ void ScTable::DeleteBroadcasters( aCol[nCol].DeleteBroadcasters(rBlockPos, nRow1, nRow2); } -bool ScTable::HasBroadcaster( SCCOL nCol ) const -{ - if (!ValidCol(nCol)) - return false; - - return aCol[nCol].HasBroadcaster(); -} - void ScTable::FillMatrix( ScMatrix& rMat, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, svl::SharedStringPool* pPool ) const { size_t nMatCol = 0; diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 52d3c5929cdc..6213aa971664 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -90,7 +90,6 @@ struct BinAddress inline explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {} inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} - inline explicit BinAddress( const css::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {} void read( SequenceInputStream& rStrm ); @@ -297,27 +296,11 @@ public: @return true = Cell address could be parsed from the passed string. */ static bool convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, - const OUString& rString, - sal_Int16 nSheet ); - - /** Converts the passed string to a single cell address, without checking - any sheet limits. - - @param orAddress (out-parameter) Returns the converted cell address. - @param rString Cell address string in A1 notation. - @param nSheet Sheet index to be inserted into orAddress. - @return true = Cell address could be parsed from the passed string. - */ - static bool convertToCellAddressUnchecked( ScAddress& orAddress, const OUString& rString, sal_Int16 nSheet ); static bool convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); - - static bool convertToCellAddressUnchecked( ScAddress& orAddress, const char* pStr, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -359,18 +342,6 @@ public: @param nSheet Sheet index to be inserted into orAddress. */ static void convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, - const BinAddress& rBinAddress, - sal_Int16 nSheet ); - - /** Converts the passed address to a single cell address, without checking - any sheet limits. - - @param orAddress (out-parameter) Returns the converted cell address. - @param rBinAddress Binary cell address struct. - @param nSheet Sheet index to be inserted into orAddress. - */ - static void convertToCellAddressUnchecked( ScAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ); diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 997b5632c4ce..a46baca71954 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -335,15 +335,6 @@ private: sal_Int64 mnRecPos; }; -/** Stores the current position of the passed stream on construction and - restores it automatically on destruction. */ -class BiffInputStreamPosGuard : private BiffInputStreamPos -{ -public: - explicit BiffInputStreamPosGuard( BiffInputStream& rStrm ); - ~BiffInputStreamPosGuard(); -}; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index b72dc086fa09..1cb323b7c217 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -123,30 +123,19 @@ private: public: explicit FormulaBuffer( const WorkbookHelper& rHelper ); void finalizeImport(); - void setCellFormula( const css::table::CellAddress& rAddress, const OUString& ); void setCellFormula( const ScAddress& rAddress, const OUString& ); void setCellFormula( - const css::table::CellAddress& rAddress, sal_Int32 nSharedId, - const OUString& rCellValue, sal_Int32 nValueType ); - void setCellFormula( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); void setCellFormulaValue( - const css::table::CellAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ); - void setCellFormulaValue( const ScAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ); void setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, - const css::table::CellAddress& rTokenAddress, - const OUString& ); - void setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const ScAddress& rTokenAddress, const OUString& ); - void createSharedFormulaMapEntry( const css::table::CellAddress& rAddress, - sal_Int32 nSharedId, const OUString& rTokens ); void createSharedFormulaMapEntry( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index b4813386cce8..8090953328df 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -468,8 +468,6 @@ public: /** Writes all border attributes to the passed property map. */ void writeToPropertyMap( PropertyMap& rPropMap ) const; - bool hasBorder() const; - private: /** Returns the border line struct specified by the passed XML token identifier. */ BorderLineModel* getBorderLine( sal_Int32 nElement ); @@ -657,8 +655,6 @@ public: /** Writes all formatting attributes to the passed property map. */ void writeToPropertyMap( PropertyMap& rPropMap ) const; - /** Writes all formatting attributes to the passed property set. */ - void writeToPropertySet( PropertySet& rPropSet ) const; void writeToDoc( ScDocumentImport& rDoc, const css::table::CellRangeAddress& rRange ); diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index a00e4e48c30c..96230596aec5 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -289,8 +289,6 @@ public: /** Inserts a formula cell directly into the Calc sheet. */ void putFormulaTokens( - const css::table::CellAddress& rAddress, const ApiTokenSequence& rTokens ); - void putFormulaTokens( const ScAddress& rAddress, const ApiTokenSequence& rTokens ); /** Initial conversion before importing the worksheet. */ diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 5c434c5b6cdb..8036d58421b1 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -349,20 +349,6 @@ bool AddressConverter::checkCellAddress( const ScAddress& rAddress, bool bTrackO checkRow( rAddress.Row(), bTrackOverflow ); } -bool AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress, - const OUString& rString, sal_Int16 nSheet ) -{ - orAddress.Sheet = nSheet; - return parseOoxAddress2d( orAddress.Column, orAddress.Row, rString ); -} - -bool AddressConverter::convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) -{ - orAddress.Sheet = nSheet; - return parseOoxAddress2d(orAddress.Column, orAddress.Row, pStr); -} - bool AddressConverter::convertToCellAddressUnchecked( ScAddress& orAddress, const OUString& rString, sal_Int16 nSheet ) { @@ -420,14 +406,6 @@ ScAddress AddressConverter::createValidCellAddress( return aAddress; } -void AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress, - const BinAddress& rBinAddress, sal_Int16 nSheet ) -{ - orAddress.Sheet = nSheet; - orAddress.Column = rBinAddress.mnCol; - orAddress.Row = rBinAddress.mnRow; -} - void AddressConverter::convertToCellAddressUnchecked( ScAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ) { diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index c9840ba2f84d..0607e067e669 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -492,16 +492,6 @@ void BiffInputStreamPos::restorePosition() mrStrm.seek( mnRecPos ); } -BiffInputStreamPosGuard::BiffInputStreamPosGuard( BiffInputStream& rStrm ) : - BiffInputStreamPos( rStrm ) -{ -} - -BiffInputStreamPosGuard::~BiffInputStreamPosGuard() -{ - restorePosition(); -} - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 14e3f45eaa1c..b265093696ea 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -467,16 +467,6 @@ FormulaBuffer::SheetItem FormulaBuffer::getSheetItem( SCTAB nTab ) } void FormulaBuffer::createSharedFormulaMapEntry( - const table::CellAddress& rAddress, - sal_Int32 nSharedId, const OUString& rTokens ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maSharedFormulas.size() ); - std::vector<SharedFormulaEntry>& rSharedFormulas = maSharedFormulas[ rAddress.Sheet ]; - SharedFormulaEntry aEntry(rAddress, rTokens, nSharedId); - rSharedFormulas.push_back( aEntry ); -} - -void FormulaBuffer::createSharedFormulaMapEntry( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { @@ -486,12 +476,6 @@ void FormulaBuffer::createSharedFormulaMapEntry( rSharedFormulas.push_back( aEntry ); } -void FormulaBuffer::setCellFormula( const css::table::CellAddress& rAddress, const OUString& rTokenStr ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maCellFormulas.size() ); - maCellFormulas[ rAddress.Sheet ].push_back( TokenAddressItem( rTokenStr, rAddress ) ); -} - void FormulaBuffer::setCellFormula( const ScAddress& rAddress, const OUString& rTokenStr ) { assert( rAddress.Tab() >= 0 && (size_t)rAddress.Tab() < maCellFormulas.size() ); @@ -499,14 +483,6 @@ void FormulaBuffer::setCellFormula( const ScAddress& rAddress, const OUString& r } void FormulaBuffer::setCellFormula( - const table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maSharedFormulaIds.size() ); - maSharedFormulaIds[rAddress.Sheet].push_back( - SharedFormulaDesc(rAddress, nSharedId, rCellValue, nValueType)); -} - -void FormulaBuffer::setCellFormula( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ) { assert( rAddress.Tab() >= 0 && (size_t)rAddress.Tab() < maSharedFormulaIds.size() ); @@ -514,14 +490,6 @@ void FormulaBuffer::setCellFormula( SharedFormulaDesc(rAddress, nSharedId, rCellValue, nValueType)); } -void FormulaBuffer::setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const css::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) -{ - - TokenAddressItem tokenPair( rTokenStr, rTokenAddress ); - assert( rRangeAddress.Sheet >= 0 && (size_t)rRangeAddress.Sheet < maCellArrayFormulas.size() ); - maCellArrayFormulas[ rRangeAddress.Sheet ].push_back( TokenRangeAddressItem( tokenPair, rRangeAddress ) ); -} - void FormulaBuffer::setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const ScAddress& rTokenAddress, const OUString& rTokenStr ) { @@ -531,17 +499,6 @@ void FormulaBuffer::setCellArrayFormula( const css::table::CellRangeAddress& rRa } void FormulaBuffer::setCellFormulaValue( - const css::table::CellAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maCellFormulaValues.size() ); - FormulaValue aVal; - aVal.maCellAddress = ScAddress ( rAddress.Column, rAddress.Row, rAddress.Sheet ); - aVal.maValueStr = rValueStr; - aVal.mnCellType = nCellType; - maCellFormulaValues[rAddress.Sheet].push_back(aVal); -} - -void FormulaBuffer::setCellFormulaValue( const ScAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ) { assert( rAddress.Tab() >= 0 && (size_t)rAddress.Tab() < maCellFormulaValues.size() ); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 6b056a08fd55..f6eaddfdbf76 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -1629,23 +1629,6 @@ void Border::writeToPropertyMap( PropertyMap& rPropMap ) const } } -bool Border::hasBorder() const -{ - if (lcl_isBorder(maApiData.maBottom)) - return true; - - if (lcl_isBorder(maApiData.maTop)) - return true; - - if (lcl_isBorder(maApiData.maLeft)) - return true; - - if (lcl_isBorder(maApiData.maRight)) - return true; - - return false; -} - BorderLineModel* Border::getBorderLine( sal_Int32 nElement ) { switch( nElement ) @@ -2228,13 +2211,6 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId ); } -void Xf::writeToPropertySet( PropertySet& rPropSet ) const -{ - PropertyMap aPropMap; - writeToPropertyMap( aPropMap ); - rPropSet.setProperties( aPropMap ); -} - void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRange ) { const StylesBuffer& rStyles = getStyles(); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index cda819bafa0f..81c92e00ff8e 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1622,16 +1622,6 @@ void WorksheetHelper::putRichString( const ScAddress& rAddress, const RichString getDocImport().setEditCell(rAddress, rString.convert(rEE, pFirstPortionFont)); } -void WorksheetHelper::putFormulaTokens( const CellAddress& rAddress, const ApiTokenSequence& rTokens ) -{ - ScDocumentImport& rDoc = getDocImport(); - ScTokenArray aTokenArray; - ScAddress aCellPos; - ScUnoConversion::FillScAddress( aCellPos, rAddress ); - ScTokenConversion::ConvertToTokenArray(rDoc.getDoc(), aTokenArray, rTokens); - rDoc.setFormulaCell(aCellPos, new ScTokenArray(aTokenArray)); -} - void WorksheetHelper::putFormulaTokens( const ScAddress& rAddress, const ApiTokenSequence& rTokens ) { ScDocumentImport& rDoc = getDocImport(); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 5b26fecc6330..af6b1cd82ec6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -73,7 +73,6 @@ #include "xmlsourcedlg.hxx" #include "editutil.hxx" -IMPL_ABSTDLG_BASE(ScVclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl); diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index d2d3626e44f1..95294ae1470e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -98,11 +98,6 @@ long Class::GetResult() \ return pDlg->GetResult(); \ } -class ScVclAbstractDialog_Impl : public VclAbstractDialog -{ - DECL_ABSTDLG_BASE(ScVclAbstractDialog_Impl,Dialog) -}; - class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg { DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg) diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index b3e15bf108e2..9dfc4320c141 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -57,7 +57,6 @@ IMPL_ABSTDLG_BASE(AbstractAssistentDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdModifyFieldDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdSnapLineDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractMorphDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSdStartPresDlg_Impl); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index cf7cf462b9a7..1299598c5a22 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -154,12 +154,6 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg virtual void SetHelpId( const OString& rHelpId ) override ; }; -class SdInsertPasteDlg; -class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg -{ - DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) -}; - class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 31ec4e51e027..676ada7afad0 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -76,63 +76,6 @@ class StringLength : public ::cppu::WeakImplHelper< XStringWidth > } }; -void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const OUString& aURLString, sal_uInt32 nNo ) -{ - OUStringBuffer aPickEntry; - - if ( nNo < 9 ) - { - aPickEntry.append('~'); - aPickEntry.append(OUString::number(nNo + 1)); - } - else if ( nNo == 9 ) - aPickEntry.append("1~0"); - else - aPickEntry.append(OUString::number(nNo + 1)); - aPickEntry.append(": "); - - INetURLObject aURL( aURLString ); - OUString aTipHelpText; - OUString aAccessibleName = aPickEntry.toString(); - - if ( aURL.GetProtocol() == INetProtocol::File ) - { - // Do handle file URL differently => convert it to a system - // path and abbreviate it with a special function: - OUString aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - - OUString aSystemPath( aFileSystemPath ); - OUString aCompactedSystemPath; - - aTipHelpText = aSystemPath; - aAccessibleName += aSystemPath; - oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr ); - if ( !nError ) - aPickEntry.append( aCompactedSystemPath ); - else - aPickEntry.append( aFileSystemPath ); - - if ( aPickEntry.getLength() > 50 ) - { - aPickEntry.setLength( 47 ); - aPickEntry.append("..."); - } - } - else - { - // Use INetURLObject to abbreviate all other URLs - OUString aShortURL; - aShortURL = aURL.getAbbreviated( m_xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); - aPickEntry.append(aShortURL); - aTipHelpText = aURLString; - aAccessibleName += aURLString; - } - - // Set menu item text, tip help and accessible name - pMenu->SetItemText( nItemId, aPickEntry.toString() ); - pMenu->SetTipHelpText( nItemId, aTipHelpText ); - pMenu->SetAccessibleName( nItemId, aAccessibleName ); -} namespace { @@ -261,78 +204,6 @@ SfxPickList::~SfxPickList() RemovePickListEntries(); } -void SfxPickList::CreatePickListEntries() -{ - RemovePickListEntries(); - - // Reading the pick list - Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( ePICKLIST ); - - sal_uInt32 nCount = seqPicklist.getLength(); - sal_uInt32 nEntries = ::std::min( m_nAllowedMenuSize, nCount ); - - for( sal_uInt32 nItem=0; nItem < nEntries; ++nItem ) - { - Sequence< PropertyValue > seqPropertySet = seqPicklist[ nItem ]; - - INetURLObject aURL; - OUString sURL; - OUString sFilter; - OUString sTitle; - - sal_uInt32 nPropertyCount = seqPropertySet.getLength(); - for( sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) - { - if( seqPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_URL ) - { - seqPropertySet[nProperty].Value >>= sURL; - } - else if( seqPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_FILTER ) - { - seqPropertySet[nProperty].Value >>= sFilter; - } - else if( seqPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_TITLE ) - { - seqPropertySet[nProperty].Value >>= sTitle; - } - } - - aURL.SetSmartURL( sURL ); - aURL.SetPass( OUString() ); - - PickListEntry *pPick = new PickListEntry( aURL.GetMainURL( INetURLObject::NO_DECODE ), sFilter ); - m_aPicklistVector.push_back( pPick ); - } -} - -void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) -{ - ::osl::ClearableMutexGuard aGuard( thePickListMutex::get() ); - - PickListEntry *pPick = SfxPickList::Get().GetPickListEntry( nIndex ); - - if ( pPick ) - { - SfxRequest aReq( SID_OPENDOC, SfxCallMode::ASYNCHRON, SfxGetpApp()->GetPool() ); - aReq.AppendItem( SfxStringItem( SID_FILE_NAME, pPick->aName )); - aReq.AppendItem( SfxStringItem( SID_REFERER, "private:user" ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, "_default" ) ); - OUString aFilter( pPick->aFilter ); - aGuard.clear(); - - sal_Int32 nPos = aFilter.indexOf('|'); - if( nPos != -1 ) - { - OUString aOptions(aFilter.copy(nPos+1)); - aFilter = aFilter.copy( 0, nPos ); - aReq.AppendItem( SfxStringItem(SID_FILE_FILTEROPTIONS, aOptions)); - } - - aReq.AppendItem(SfxStringItem( SID_FILTER_NAME, aFilter )); - aReq.AppendItem( SfxBoolItem( SID_TEMPLATE, false ) ); - SfxGetpApp()->ExecuteSlot( aReq ); - } -} void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) { diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 2070a4836396..f985d3cfffad 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -238,17 +238,6 @@ IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) return false; } -sal_uInt16 TemplateLocalView::getCurRegionItemId() const -{ - for (TemplateContainerItem* pRegion : maRegions) - { - if (pRegion->mnRegionId == mnCurRegionId-1) - return pRegion->mnId; - } - - return 0; -} - sal_uInt16 TemplateLocalView::getRegionId(size_t pos) const { assert(pos < maRegions.size()); @@ -662,42 +651,6 @@ bool TemplateLocalView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx return false; } -bool TemplateLocalView::copyFrom(const OUString &rPath) -{ - assert(mnCurRegionId); - - TemplateContainerItem *pRegItem = maRegions[mnCurRegionId-1]; - - sal_uInt16 nId = getNextItemId(); - sal_uInt16 nDocId = 0; - sal_uInt16 nRegionId = pRegItem->mnRegionId; - - OUString aPath(rPath); - - if (!pRegItem->maTemplates.empty()) - nDocId = (pRegItem->maTemplates.back()).nDocId+1; - - if (!mpDocTemplates->CopyFrom(nRegionId,nDocId,aPath)) - return false; - - TemplateItemProperties aTemplate; - aTemplate.nId = nId; - aTemplate.nDocId = nDocId; - aTemplate.nRegionId = nRegionId; - aTemplate.aName = aPath; - aTemplate.aThumbnail = TemplateAbstractView::fetchThumbnail(rPath, - TEMPLATE_THUMBNAIL_MAX_WIDTH, - TEMPLATE_THUMBNAIL_MAX_HEIGHT); - aTemplate.aPath = rPath; - aTemplate.aRegionName = getRegionName(nRegionId); - - pRegItem->maTemplates.push_back(aTemplate); - - insertItem(aTemplate); - - return true; -} - bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString &rPath) { sal_uInt16 nId = 1; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 894db1e56cd5..6f68e8444292 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -1213,15 +1213,6 @@ void ThumbnailView::filterItems(const std::function<bool (const ThumbnailViewIte Invalidate(); } -void ThumbnailView::sortItems(const std::function<bool (const ThumbnailViewItem*, const ThumbnailViewItem*)> &func) -{ - std::sort(mItemList.begin(),mItemList.end(),func); - - CalculateItemPositions(); - - Invalidate(); -} - bool ThumbnailView::renameItem(ThumbnailViewItem*, const OUString&) { // Do nothing by default diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 86c654a8b206..964e8777de81 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -40,15 +40,11 @@ struct SfxFrameDescriptor_Impl SfxFrameDescriptor::SfxFrameDescriptor() : aMargin( -1, -1 ), - nWidth( 0L ), eScroll( ScrollingAuto ), - eSizeSelector( SIZE_ABS ), bHasBorder( true ), bHasBorderSet( false ), - nItemId( 0 ), bResizeHorizontal( true ), bResizeVertical( true ), - bHasUI( true ), bReadOnly( false ), pImpl( new SfxFrameDescriptor_Impl ) { @@ -93,38 +89,6 @@ bool SfxFrameDescriptor::IsEditable() const return pImpl->bEditable; } -SfxFrameDescriptor* SfxFrameDescriptor::Clone() const -{ - SfxFrameDescriptor *pFrame = new SfxFrameDescriptor; - - pFrame->aURL = aURL; - pFrame->aActualURL = aActualURL; - pFrame->aName = aName; - pFrame->aMargin = aMargin; - pFrame->nWidth = nWidth; - pFrame->eSizeSelector = eSizeSelector; - pFrame->eScroll = eScroll; - pFrame->bResizeHorizontal = bResizeHorizontal; - pFrame->bResizeVertical = bResizeVertical; - pFrame->bHasBorder = bHasBorder; - pFrame->bHasBorderSet = bHasBorderSet; - pFrame->bHasUI = bHasUI; - pFrame->SetReadOnly( IsReadOnly() ); - pFrame->SetEditable( IsEditable() ); - if ( pImpl->pWallpaper ) - pFrame->pImpl->pWallpaper = new Wallpaper( *pImpl->pWallpaper ); - if( pImpl->pArgs ) - { - // Currently in the clone of SfxAllItemSets there is still a bug ... - pFrame->pImpl->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() ); - pFrame->pImpl->pArgs->Put(*pImpl->pArgs); - } - - pFrame->nItemId = nItemId; - - return pFrame; -} - void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper ) { DELETEZ( pImpl->pWallpaper ); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index ee43d48c77b2..156e0c2b5948 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1245,17 +1245,6 @@ void SfxTemplateManagerDlg::OnCategoryDelete() mpCBFolder->SelectEntryPos(0); } -void SfxTemplateManagerDlg::OnRepositoryDelete() -{ - if(deleteRepository(mpRemoteView->getCurRegionId())) - { - // switch to local view - switchMainView(true); - - createRepositoryMenu(); - } -} - void SfxTemplateManagerDlg::createRepositoryMenu() { mpRepositoryMenu->Clear(); diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index a9a13ae7ff1f..8cfd1904700f 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -47,9 +47,7 @@ class SfxPickList : public SfxListener SfxPickList( sal_uInt32 nMenuSize ); virtual ~SfxPickList(); - void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const OUString& aURL, sal_uInt32 nNo ); PickListEntry* GetPickListEntry( sal_uInt32 nIndex ); - void CreatePickListEntries(); void RemovePickListEntries(); /** * Adds the given document to the pick list (recent documents) if it satisfies @@ -62,8 +60,6 @@ class SfxPickList : public SfxListener static SfxPickList& Get(); static void ensure() { Get(); } - static void ExecuteEntry( sal_uInt32 nIndex ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx index 34e02d3b3fca..31564746fd66 100644 --- a/sfx2/source/inc/slotserv.hxx +++ b/sfx2/source/inc/slotserv.hxx @@ -25,26 +25,17 @@ class SfxSlotServer { private: const SfxSlot* _pSlot; - sal_uInt16 _nShellLevel; + sal_uInt16 _nShellLevel; public: - SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ); SfxSlotServer(); - sal_uInt16 GetShellLevel() const; + sal_uInt16 GetShellLevel() const; void SetShellLevel(sal_uInt16 nLevel) { _nShellLevel = nLevel; } - void SetSlot(const SfxSlot* pSlot) { - _pSlot = pSlot; - } + void SetSlot(const SfxSlot* pSlot) { _pSlot = pSlot; } const SfxSlot* GetSlot() const; }; -inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ): - _pSlot( &rSlot), - _nShellLevel( nShell ) -{ -} - inline SfxSlotServer::SfxSlotServer(): _pSlot(nullptr), _nShellLevel(0) diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 1d1d07e0911c..bde49a1e85bd 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -511,11 +511,6 @@ ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, bool bSmart return aRet; } -void ColorConfig::Reload() -{ - m_pImpl->Load(OUString()); -} - EditableColorConfig::EditableColorConfig() : m_pImpl(new ColorConfig_Impl), m_bModified(false) diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 4579966143cc..09fa9c48c72f 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -271,34 +271,6 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const } -bool SfxErrorHandler::GetMessageString( - sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const - -/* [Description] - - Creates the string to output a message box - - */ - -{ - bool bRet = false; - std::unique_ptr<ResId> pResId(new ResId(nId, *pMgr)); - - ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId); - if(aEr) - { - ResString aErrorString(aEr); - sal_uInt16 nResFlags = aErrorString.GetFlags(); - if( nResFlags ) - nFlags=aErrorString.GetFlags(); - rStr = aErrorString.GetString(); - bRet = true; - } - - return bRet; -} - - bool SfxErrorHandler::GetErrorString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx index 883bbe4a723b..da889bb823d8 100644 --- a/svx/inc/sxmsitm.hxx +++ b/svx/inc/sxmsitm.hxx @@ -28,7 +28,6 @@ class SdrMeasureScaleItem: public SdrScaleItem { public: SdrMeasureScaleItem() : SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {} - SdrMeasureScaleItem(const Fraction& rFr): SdrScaleItem(SDRATTR_MEASURESCALE,rFr) {} virtual SfxPoolItem* Clone(SfxItemPool*) const override { return new SdrMeasureScaleItem(*this); diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx index d681bb0dba93..8235b18b4387 100644 --- a/svx/inc/sxreaitm.hxx +++ b/svx/inc/sxreaitm.hxx @@ -26,7 +26,6 @@ class SdrResizeXAllItem: public SdrFractionItem { public: SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} - SdrResizeXAllItem(const Fraction& rFact): SdrFractionItem(SDRATTR_RESIZEXALL,rFact) {} virtual SfxPoolItem* Clone(SfxItemPool*) const override { return new SdrResizeXAllItem(*this); @@ -36,7 +35,6 @@ public: class SdrResizeYAllItem: public SdrFractionItem { public: SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} - SdrResizeYAllItem(const Fraction& rFact): SdrFractionItem(SDRATTR_RESIZEYALL,rFact) {} virtual SfxPoolItem* Clone(SfxItemPool*) const override { return new SdrResizeYAllItem(*this); diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx index b2ddb98b6875..f0a5c318e05e 100644 --- a/svx/inc/sxreoitm.hxx +++ b/svx/inc/sxreoitm.hxx @@ -26,7 +26,6 @@ class SdrResizeXOneItem: public SdrFractionItem { public: SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} - SdrResizeXOneItem(const Fraction& rFact): SdrFractionItem(SDRATTR_RESIZEXONE,rFact) {} SfxPoolItem* Clone(SfxItemPool*) const override { return new SdrResizeXOneItem(*this); @@ -36,8 +35,7 @@ public: class SdrResizeYOneItem: public SdrFractionItem { public: SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} - SdrResizeYOneItem(const Fraction& rFact): SdrFractionItem(SDRATTR_RESIZEYONE,rFact) {} - SfxPoolItem* Clone(SfxItemPool*) const override + SfxPoolItem* Clone(SfxItemPool*) const override { return new SdrResizeYOneItem(*this); } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index db445e009491..786c4534ff34 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -740,11 +740,6 @@ void SvxRectCtl::DoCompletelyDisable(bool bNew) Invalidate(); } -void SvxRectCtl::SetCS(CTL_STYLE eNew) -{ - eCS = eNew; -} - // Control for editing bitmaps css::uno::Reference< css::accessibility::XAccessible > SvxPixelCtl::CreateAccessible() diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 22f752fc4ce2..617232a50da5 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -45,10 +45,6 @@ class SwTableLineFormat : public SwFrameFormat friend class SwDoc; protected: - SwTableLineFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrame ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableLineSetRange ) - {} SwTableLineFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableLineSetRange ) diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index ee2b1812c05d..b9a98642a02d 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -37,11 +37,6 @@ class SwGlossaryHdl; class FEdit : public Edit { public: - FEdit(vcl::Window* pParent, const ResId& rResId) - : Edit(pParent, rResId) - { - } - FEdit(vcl::Window* pParent) : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK) { diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index 7713246fc059..1d28e428ee5b 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -146,8 +146,6 @@ public: bMailMergeSourceView = bIsSource; } SwMailMergeConfigItem* GetMailMergeConfigItem() {return pConfigItem;} - sal_uInt16 GetMailMergeRestartPage() const {return nMailMergeRestartPage;} - bool IsMailMergeSourceView() const { return bMailMergeSourceView; } #endif //#i33307# restore editing position diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index b115f7e49744..0124c2edc404 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -42,7 +42,6 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper { //::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently SolarMutexGuard aGuard; - DispatchMutexLock_Impl(); public: DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&); ~DispatchMutexLock_Impl(); diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index ac684da32a2c..551adc16e034 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -156,15 +156,6 @@ void VbaCommandBarHelper::ApplyTempChange( const OUString& sResourceUrl, const c } } -void VbaCommandBarHelper::persistChanges() throw (css::uno::RuntimeException) -{ - uno::Reference< css::ui::XUIConfigurationPersistence > xConfigPersistence( m_xDocCfgMgr, uno::UNO_QUERY_THROW ); - if( xConfigPersistence->isModified() ) - { - xConfigPersistence->store(); - } -} - uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager() throw (uno::RuntimeException) { uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx index bb945563e95b..3279fb4c112d 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx @@ -69,7 +69,6 @@ public: { return m_xWindowState; } - void persistChanges() throw (css::uno::RuntimeException); css::uno::Reference< css::container::XIndexAccess > getSettings( const OUString& sResourceUrl ) throw (css::uno::RuntimeException); void removeSettings( const OUString& sResourceUrl ) throw (css::uno::RuntimeException); void ApplyTempChange( const OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings) throw (css::uno::RuntimeException); diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx index 8c5124009529..4ab17d577aaf 100644 --- a/writerfilter/inc/ooxml/OOXMLDocument.hxx +++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx @@ -87,8 +87,6 @@ public: virtual css::uno::Reference<css::io::XInputStream> getDocumentStream() = 0; - virtual css::uno::Reference<css::io::XInputStream> getStorageStream() = 0; - /** Returns component context for this stream. */ diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 2b7bff9f0abe..4790d5eee53e 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -391,11 +391,6 @@ uno::Reference<io::XInputStream> OOXMLStreamImpl::getDocumentStream() return xResult; } -uno::Reference<io::XInputStream> OOXMLStreamImpl::getStorageStream() -{ - return mxStorageStream; -} - uno::Reference<uno::XComponentContext> OOXMLStreamImpl::getContext() { return mxContext; diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index 0edb52eafd2b..e50676da6e2c 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -72,7 +72,6 @@ public: virtual css::uno::Reference<css::xml::sax::XFastParser> getFastParser() override; virtual css::uno::Reference<css::io::XInputStream> getDocumentStream() override; - virtual css::uno::Reference<css::io::XInputStream> getStorageStream() override; virtual css::uno::Reference<css::uno::XComponentContext> getContext() override; virtual OUString getTargetForId(const OUString & rId) override; virtual const OUString & getTarget() const override; diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx index abf60bd46599..10de65df90f2 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx @@ -40,16 +40,6 @@ private: virtual void doRegisterHandlers(OdpGenerator &rGenerator) override; }; -OUString MWAWPresentationImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - -css::uno::Sequence< OUString > SAL_CALL MWAWPresentationImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL MWAWPresentationImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index c4226026ae68..7ebdf2633bd3 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -75,19 +75,9 @@ public: }; -OUString WordPerfectImportFilter_getImplementationName() -throw (css::uno::RuntimeException); - bool SAL_CALL WordPerfectImportFilter_supportsService(const OUString &ServiceName) throw (css::uno::RuntimeException); -css::uno::Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames() -throw (css::uno::RuntimeException); - -css::uno::Reference< css::uno::XInterface > -SAL_CALL WordPerfectImportFilter_createInstance(const css::uno::Reference< css::uno::XComponentContext > &rContext) -throw (css::uno::Exception); - #endif |