From 107e5981b45f8ee042f6fbf5e1aa84aa557f8989 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 30 Aug 2016 14:41:11 +0100 Subject: default dtors are fine here Change-Id: I503f954a2729aa2737d783ed8c72f62d8a68da4c --- forms/source/richtext/rtattributes.hxx | 6 ------ forms/source/xforms/mip.cxx | 6 ------ forms/source/xforms/mip.hxx | 1 - include/oox/drawingml/color.hxx | 3 +-- include/oox/ole/axcontrol.hxx | 1 - include/sfx2/docmacromode.hxx | 1 - include/vcl/bitmapex.hxx | 1 - include/vcl/gfxlink.hxx | 1 - oox/source/drawingml/color.cxx | 4 ---- oox/source/ole/axcontrol.cxx | 4 ---- sfx2/source/doc/docmacromode.cxx | 11 ----------- vcl/source/gdi/bitmapex.cxx | 4 ---- vcl/source/gdi/gfxlink.cxx | 4 ---- 13 files changed, 1 insertion(+), 46 deletions(-) diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx index 5e61f55dbffa..a47c5e22abd3 100644 --- a/forms/source/richtext/rtattributes.hxx +++ b/forms/source/richtext/rtattributes.hxx @@ -51,7 +51,6 @@ namespace frm inline AttributeState( ); inline explicit AttributeState( AttributeCheckState _eCheckState ); inline AttributeState( const AttributeState& _rSource ); - inline ~AttributeState( ); inline AttributeState& operator=( const AttributeState& _rSource ); @@ -80,11 +79,6 @@ namespace frm operator=( _rSource ); } - inline AttributeState::~AttributeState( ) - { -// delete(pItemHandle); - } - inline AttributeState& AttributeState::operator=( const AttributeState& _rSource ) { if ( &_rSource == this ) diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx index ddeb96864890..0edf32e53a09 100644 --- a/forms/source/xforms/mip.cxx +++ b/forms/source/xforms/mip.cxx @@ -20,11 +20,9 @@ #include "mip.hxx" - namespace xforms { - MIP::MIP() { resetReadonly(); @@ -35,8 +33,6 @@ MIP::MIP() resetTypeName(); } -MIP::~MIP() {} - void MIP::inherit( const MIP& rMip ) { if( ! mbHasReadonly ) @@ -92,14 +88,12 @@ void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanation = s; } - void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; } void MIP::resetCalculate() { mbHasCalculate = false; } void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = true; } void MIP::resetTypeName() { msTypeName.clear(); mbHasTypeName = false; } - } // namespace xforms /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx index 5db986d9cf55..4996fe162d58 100644 --- a/forms/source/xforms/mip.hxx +++ b/forms/source/xforms/mip.hxx @@ -52,7 +52,6 @@ class MIP public: MIP(); - ~MIP(); /// inherit from upper-level MIPs void inherit( const MIP& ); diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index cde7bf1fa82e..2ba97d49cf36 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -38,8 +38,7 @@ namespace drawingml { class OOX_DLLPUBLIC Color { public: - Color(); - ~Color(); + Color(); /** Returns the RGB value for the passed DrawingML color token, or nDefaultRgb on error. */ static sal_Int32 getDmlPresetColor( sal_Int32 nToken, sal_Int32 nDefaultRgb ); diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 71c8118678c2..66ab0d0d0f4d 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -906,7 +906,6 @@ class OOX_DLLPUBLIC EmbeddedControl { public: explicit EmbeddedControl( const OUString& rName ); - virtual ~EmbeddedControl(); /** Creates and returns the internal control model of the specified type. */ template< typename ModelType > diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index ebe2e198c344..01a1d7a3a593 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -190,7 +190,6 @@ namespace sfx2 DocumentMacroMode instance lives, at least */ DocumentMacroMode( IMacroDocumentAccess& _rDocumentAccess ); - ~DocumentMacroMode(); /** allows macro execution in the document diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index fd2c9a79fc30..6b45883c6a1c 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -53,7 +53,6 @@ public: BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ); BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ); BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ); - ~BitmapEx(); BitmapEx& operator=( const BitmapEx& rBitmapEx ); bool operator==( const BitmapEx& rBitmapEx ) const; diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 0fcca069bfbb..3632b66d23f3 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -82,7 +82,6 @@ public: // pBuff = The Graphic data. This class takes ownership of this GfxLink( std::unique_ptr pBuf, sal_uInt32 nBufSize, GfxLinkType nType ); - ~GfxLink(); bool IsEqual( const GfxLink& ) const; diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 74598fc020c2..47aff71124a5 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -202,10 +202,6 @@ Color::Color() : { } -Color::~Color() -{ -} - sal_Int32 Color::getDmlPresetColor( sal_Int32 nToken, sal_Int32 nDefaultRgb ) { /* Do not pass nDefaultRgb to ContainerHelper::getVectorElement(), to be diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 1455d5d51ff9..92a9aa1c6851 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2614,10 +2614,6 @@ EmbeddedControl::EmbeddedControl( const OUString& rName ) : { } -EmbeddedControl::~EmbeddedControl() -{ -} - ControlModelBase* EmbeddedControl::createModelFromGuid( const OUString& rClassId ) { if( rClassId.equalsIgnoreAsciiCase( AX_GUID_COMMANDBUTTON ) ) return &createModel< AxCommandButtonModel >(); diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 9edaa2bcb47b..934d42562546 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -121,35 +121,24 @@ namespace sfx2 } } - //= DocumentMacroMode - - DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess& rDocumentAccess ) :m_xData( new DocumentMacroMode_Data( rDocumentAccess ) ) { } - - DocumentMacroMode::~DocumentMacroMode() - { - } - - bool DocumentMacroMode::allowMacroExecution() { m_xData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::ALWAYS_EXECUTE_NO_WARN ); return true; } - bool DocumentMacroMode::disallowMacroExecution() { m_xData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::NEVER_EXECUTE ); return false; } - bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction ) { sal_uInt16 nMacroExecutionMode = m_xData->m_rDocumentAccess.getCurrentMacroExecMode(); diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 2066c1b8eff2..53b38e41da7f 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -184,10 +184,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ) : "BitmapEx::BitmapEx(): size mismatch for bitmap and alpha mask." ); } -BitmapEx::~BitmapEx() -{ -} - BitmapEx& BitmapEx::operator=( const BitmapEx& rBitmapEx ) { if( &rBitmapEx != this ) diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index d9680e610aef..cddf455af34a 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -45,10 +45,6 @@ GfxLink::GfxLink( std::unique_ptr pBuf, sal_uInt32 nSize, GfxLinkTy mpSwapInData = std::shared_ptr(pBuf.release(), pBuf.get_deleter()); // std::move(pBuf) does not compile on Jenkins MacOSX (24 May 2016) } -GfxLink::~GfxLink() -{ -} - bool GfxLink::IsEqual( const GfxLink& rGfxLink ) const { bool bIsEqual = false; -- cgit