[Libreoffice-commits] core.git: basctl/source forms/source include/canvas include/vcl oox/inc oox/source scaddins/source sc/inc sc/source sd/source svx/source sw/source ucb/source vcl/source vcl/unx writerfilter/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu Dec 12 13:36:49 UTC 2019
basctl/source/basicide/bastypes.cxx | 6 ------
basctl/source/inc/bastypes.hxx | 2 --
forms/source/component/GroupManager.cxx | 4 ----
forms/source/component/GroupManager.hxx | 1 -
include/canvas/spriteredrawmanager.hxx | 2 --
include/vcl/builder.hxx | 1 -
oox/inc/drawingml/customshapeproperties.hxx | 1 -
oox/inc/drawingml/table/tablecell.hxx | 1 -
oox/inc/drawingml/table/tablerow.hxx | 1 -
oox/inc/drawingml/table/tablestyle.hxx | 1 -
oox/inc/drawingml/textbody.hxx | 1 -
oox/source/drawingml/customshapeproperties.cxx | 3 ---
oox/source/drawingml/table/tablecell.cxx | 3 ---
oox/source/drawingml/table/tablerow.cxx | 3 ---
oox/source/drawingml/table/tablestyle.cxx | 4 ----
oox/source/drawingml/textbody.cxx | 4 ----
sc/inc/dpgroup.hxx | 1 -
sc/source/core/data/dpgroup.cxx | 4 ----
sc/source/filter/excel/xistring.cxx | 4 ----
sc/source/filter/inc/xcl97rec.hxx | 1 -
sc/source/filter/inc/xistring.hxx | 2 --
sc/source/filter/xcl97/xcl97rec.cxx | 4 ----
sc/source/filter/xml/XMLStylesExportHelper.cxx | 4 ----
sc/source/filter/xml/XMLStylesExportHelper.hxx | 1 -
scaddins/source/analysis/analysishelper.cxx | 4 ----
scaddins/source/analysis/analysishelper.hxx | 1 -
scaddins/source/datefunc/datefunc.cxx | 4 ----
scaddins/source/datefunc/datefunc.hxx | 1 -
scaddins/source/pricing/pricing.cxx | 4 ----
scaddins/source/pricing/pricing.hxx | 1 -
sd/source/filter/eppt/epptbase.hxx | 1 -
sd/source/filter/eppt/pptx-text.cxx | 4 ----
svx/source/accessibility/ChildrenManagerImpl.cxx | 6 ------
svx/source/accessibility/ChildrenManagerImpl.hxx | 2 --
sw/source/core/doc/docsort.cxx | 8 --------
sw/source/core/inc/docsort.hxx | 2 --
sw/source/filter/ww8/ww8toolbar.cxx | 8 --------
sw/source/filter/ww8/ww8toolbar.hxx | 2 --
ucb/source/ucp/file/filtask.cxx | 5 -----
ucb/source/ucp/file/filtask.hxx | 1 -
vcl/source/gdi/pdfwriter_impl.cxx | 4 ----
vcl/source/gdi/pdfwriter_impl.hxx | 1 -
vcl/source/window/builder.cxx | 2 --
vcl/unx/generic/print/glyphset.cxx | 5 -----
vcl/unx/generic/print/glyphset.hxx | 2 +-
writerfilter/source/dmapper/PageBordersHandler.cxx | 4 ----
writerfilter/source/dmapper/PageBordersHandler.hxx | 1 -
47 files changed, 1 insertion(+), 131 deletions(-)
New commits:
commit 31fffe5538fd8011afa0076fdca39379c28fcff5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 12 11:07:24 2019 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Dec 12 14:35:24 2019 +0100
Remove some redundant user-provided dtors
...which silences various -Wdeprecated-copy-dtor warnings from Clang 10 trunk
about copy functions being implicitly defined as non-deleted even though the
class has a user-declared dtor
Change-Id: I3409d403c3c709de4ad94eccbc2d7869e41847cc
Reviewed-on: https://gerrit.libreoffice.org/85032
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index f38ba5d33e8c..006c6b00bc22 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -682,9 +682,6 @@ LibInfo::Key::Key (ScriptDocument const& rDocument, OUString const& rLibName) :
m_aDocument(rDocument), m_aLibName(rLibName)
{ }
-LibInfo::Key::~Key ()
-{ }
-
bool LibInfo::Key::operator == (Key const& rKey) const
{
return m_aDocument == rKey.m_aDocument && m_aLibName == rKey.m_aLibName;
@@ -706,9 +703,6 @@ LibInfo::Item::Item (
m_eCurrentType(eCurrentType)
{ }
-LibInfo::Item::~Item ()
-{ }
-
static bool QueryDel(const OUString& rName, const OUString &rStr, weld::Widget* pParent)
{
OUString aName = "\'" + rName + "\'";
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 3063c2bd6827..8ac2a4b3a9b1 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -257,7 +257,6 @@ private:
public:
Key (ScriptDocument const&, OUString const& rLibName);
- ~Key ();
public:
bool operator == (Key const&) const;
struct Hash
@@ -276,7 +275,6 @@ public:
public:
Item (OUString const& rCurrentName, ItemType eCurrentType);
- ~Item ();
const OUString& GetCurrentName() const { return m_aCurrentName; }
ItemType GetCurrentType() const { return m_eCurrentType; }
};
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 6b6069161877..7131dab79753 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -126,10 +126,6 @@ OGroup::OGroup( const OUString& rGroupName )
{
}
-OGroup::~OGroup()
-{
-}
-
void OGroup::InsertComponent( const Reference<XPropertySet>& xSet )
{
OGroupComp aNewGroupComp( xSet, m_nInsertPos );
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 0bbd915a6f51..51d1e9e16e98 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -138,7 +138,6 @@ class OGroup final
public:
explicit OGroup(const OUString& rGroupName);
- ~OGroup();
const OUString& GetGroupName() const { return m_aGroupName; }
css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> > GetControlModels() const;
diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index 093f1a32e392..f31ab8330370 100644
--- a/include/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
@@ -62,8 +62,6 @@ namespace canvas
class SpriteInfo
{
public:
- ~SpriteInfo() {}
-
/** Create sprite info
@param rRef
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 0dea516c7f2a..1016c3a8597d 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -153,7 +153,6 @@ private:
OString const m_sID;
VclPtr<Menu> m_pMenu;
MenuAndId(const OString &rId, Menu *pMenu);
- ~MenuAndId();
};
std::vector<MenuAndId> m_aMenus;
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx
index 1dc0270614e0..3caf8e150824 100644
--- a/oox/inc/drawingml/customshapeproperties.hxx
+++ b/oox/inc/drawingml/customshapeproperties.hxx
@@ -96,7 +96,6 @@ class CustomShapeProperties final
{
public:
CustomShapeProperties();
- ~CustomShapeProperties();
void pushToPropSet( const css::uno::Reference < css::beans::XPropertySet > & xPropSet,
const css::uno::Reference < css::drawing::XShape > & xShape,
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index 8955f7a47889..9c1bda2097d4 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -45,7 +45,6 @@ class TableCell
public:
TableCell();
- ~TableCell();
sal_Int32 getRowSpan() const { return mnRowSpan; };
void setRowSpan( sal_Int32 nRowSpan ){ mnRowSpan = nRowSpan; };
diff --git a/oox/inc/drawingml/table/tablerow.hxx b/oox/inc/drawingml/table/tablerow.hxx
index 29bc2d1457c5..1d3a1e2d531b 100644
--- a/oox/inc/drawingml/table/tablerow.hxx
+++ b/oox/inc/drawingml/table/tablerow.hxx
@@ -30,7 +30,6 @@ class TableRow
public:
TableRow();
- ~TableRow();
void setHeight( sal_Int32 nHeight ){ mnHeight = nHeight; };
sal_Int32 getHeight() const { return mnHeight; };
diff --git a/oox/inc/drawingml/table/tablestyle.hxx b/oox/inc/drawingml/table/tablestyle.hxx
index a0d1044a0e19..79c867ea4d6d 100644
--- a/oox/inc/drawingml/table/tablestyle.hxx
+++ b/oox/inc/drawingml/table/tablestyle.hxx
@@ -31,7 +31,6 @@ class TableStyle
public:
TableStyle();
- ~TableStyle();
OUString& getStyleId(){ return maStyleId; }
OUString& getStyleName() { return maStyleName; }
diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index 38996abe03ea..b3edd7392a2c 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -41,7 +41,6 @@ class TextBody
public:
TextBody();
TextBody( const TextBodyPtr& pBody );
- ~TextBody();
const TextParagraphVector& getParagraphs() const { return maParagraphs; }
TextParagraph& addParagraph();
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 2f4848088cc4..f9e19314414e 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -50,9 +50,6 @@ CustomShapeProperties::CustomShapeProperties()
, mnArcNum ( 0 )
{
}
-CustomShapeProperties::~CustomShapeProperties()
-{
-}
uno::Sequence< sal_Int8 > const & CustomShapeProperties::getShapePresetTypeName() const
{
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 24e1a5f89c1c..e270d5155d20 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -65,9 +65,6 @@ TableCell::TableCell()
, mnHorzOverflowToken( XML_clip )
{
}
-TableCell::~TableCell()
-{
-}
static void applyLineAttributes( const ::oox::core::XmlFilterBase& rFilterBase,
Reference< XPropertySet > const & rxPropSet, oox::drawingml::LineProperties const & rLineProperties,
diff --git a/oox/source/drawingml/table/tablerow.cxx b/oox/source/drawingml/table/tablerow.cxx
index ecf397de9d73..b87a72033d9e 100644
--- a/oox/source/drawingml/table/tablerow.cxx
+++ b/oox/source/drawingml/table/tablerow.cxx
@@ -37,9 +37,6 @@ TableRow::TableRow()
: mnHeight( 0 )
{
}
-TableRow::~TableRow()
-{
-}
} } }
diff --git a/oox/source/drawingml/table/tablestyle.cxx b/oox/source/drawingml/table/tablestyle.cxx
index db0f071b36b1..04d1173f7fe1 100644
--- a/oox/source/drawingml/table/tablestyle.cxx
+++ b/oox/source/drawingml/table/tablestyle.cxx
@@ -25,10 +25,6 @@ TableStyle::TableStyle()
{
}
-TableStyle::~TableStyle()
-{
-}
-
} } }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx
index 80ebb4d2287d..ab1659d8ada9 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -43,10 +43,6 @@ TextBody::TextBody( const TextBodyPtr& pBody )
}
}
-TextBody::~TextBody()
-{
-}
-
TextParagraph& TextBody::addParagraph()
{
std::shared_ptr< TextParagraph > xPara( new TextParagraph );
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index f109dd7bfd12..da7e9c078524 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -40,7 +40,6 @@ class ScDPGroupItem
public:
ScDPGroupItem( const ScDPItemData& rName );
- ~ScDPGroupItem();
void AddElement( const ScDPItemData& rName );
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 026d1a2639b7..a97ce449649c 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -306,10 +306,6 @@ ScDPGroupItem::ScDPGroupItem( const ScDPItemData& rName ) :
{
}
-ScDPGroupItem::~ScDPGroupItem()
-{
-}
-
void ScDPGroupItem::AddElement( const ScDPItemData& rName )
{
aElements.push_back( rName );
diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index 80b2e5140c21..f0878a6171fd 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -38,10 +38,6 @@ XclImpString::XclImpString( const OUString& rString ) :
{
}
-XclImpString::~XclImpString()
-{
-}
-
void XclImpString::Read( XclImpStream& rStrm, XclStrFlags nFlags )
{
if( !( nFlags & XclStrFlags::SeparateFormats ) )
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 0999f0ea3dd2..049f4aa57bee 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -397,7 +397,6 @@ private:
protected:
public:
ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab );
- virtual ~ExcEScenario() override;
virtual sal_uInt16 GetNum() const override;
virtual std::size_t GetLen() const override;
diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx
index 0d97b4c89357..6364f0a2eff9 100644
--- a/sc/source/filter/inc/xistring.hxx
+++ b/sc/source/filter/inc/xistring.hxx
@@ -36,8 +36,6 @@ public:
/** Constructs an unformatted string. */
explicit XclImpString( const OUString& rString );
- ~XclImpString();
-
/** Reads a complete string from the passed stream. */
void Read( XclImpStream& rStrm, XclStrFlags nFlags = XclStrFlags::NONE );
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index d05afbf27334..219e0f6d7905 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1404,10 +1404,6 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
}
}
-ExcEScenario::~ExcEScenario()
-{
-}
-
bool ExcEScenario::Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt )
{
if( aCells.size() == EXC_SCEN_MAXCELL )
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 400495d122e6..5c3b9b5163f1 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -57,10 +57,6 @@ ScMyValidation::ScMyValidation()
{
}
-ScMyValidation::~ScMyValidation()
-{
-}
-
bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const
{
return aVal.bIgnoreBlanks == bIgnoreBlanks &&
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 3bcea80b36df..6a8dd5462ffe 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -54,7 +54,6 @@ struct ScMyValidation
bool bIgnoreBlanks;
ScMyValidation();
- ~ScMyValidation();
bool IsEqual(const ScMyValidation& aVal) const;
};
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 87a9cbb8d8ce..799f1b801f0e 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1362,10 +1362,6 @@ FuncData::FuncData(const FuncDataBase& r) :
aCompList[1] = OUString(r.pCompListID[1], strlen(r.pCompListID[1]), RTL_TEXTENCODING_UTF8);
}
-FuncData::~FuncData()
-{
-}
-
sal_uInt16 FuncData::GetStrIndex( sal_uInt16 nParamNum ) const
{
if( !bWithOpt )
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 627315bb11f6..99a840a95678 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -216,7 +216,6 @@ private:
public:
FuncData(const FuncDataBase& rBaseData);
- ~FuncData();
inline const char* GetUINameID() const;
inline const char** GetDescrID() const;
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 595ae5dd279a..f566f3055b6a 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -71,10 +71,6 @@ ScaFuncData::ScaFuncData(const ScaFuncDataBase& rBaseData) :
aCompList.push_back(OUString::createFromAscii(rBaseData.pCompListID[1]));
}
-ScaFuncData::~ScaFuncData()
-{
-}
-
sal_uInt16 ScaFuncData::GetStrIndex( sal_uInt16 nParam ) const
{
if( !bWithOpt )
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 967837e35e06..b034ba26e2eb 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -70,7 +70,6 @@ private:
public:
ScaFuncData(const ScaFuncDataBase& rBaseData);
- ~ScaFuncData();
const char* GetUINameID() const { return pUINameID; }
const char** GetDescrID() const { return pDescrID; }
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 1b698fd0ec49..97d9401cdc1d 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -73,10 +73,6 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData ) :
aCompList.push_back(OUString::createFromAscii(rBaseData.pCompName));
}
-ScaFuncData::~ScaFuncData()
-{
-}
-
sal_uInt16 ScaFuncData::GetStrIndex( sal_uInt16 nParam ) const
{
if( !bWithOpt )
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index daed4c53ef2d..874a842a740e 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -86,7 +86,6 @@ private:
public:
ScaFuncData(const ScaFuncDataBase& rBaseData);
- ~ScaFuncData();
const char* GetUINameID() const { return pUINameID; }
const char** GetDescrID() const { return pDescrID; }
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 17fa61dd9e66..d04bafb81c20 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -169,7 +169,6 @@ struct FontCollectionEntry
{
ImplInit( rName );
};
- ~FontCollectionEntry();
private:
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 10ed9d3b69eb..6e57dacdd376 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1330,10 +1330,6 @@ bool TextObj::HasExtendedBullets() const
return mpImplTextObj->mbHasExtendedBullets;
}
-FontCollectionEntry::~FontCollectionEntry()
-{
-}
-
void FontCollectionEntry::ImplInit( const OUString& rName )
{
OUString aSubstName( GetSubsFontName( rName, SubsFontFlags::ONLYONE | SubsFontFlags::MS ) );
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index bedd363919f8..44ba6b1419ac 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -1001,12 +1001,6 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap
pAccessibleShape->SetState (AccessibleStateType::VISIBLE);
}
-
-ChildDescriptor::~ChildDescriptor()
-{
-}
-
-
AccessibleShape* ChildDescriptor::GetAccessibleShape() const
{
return static_cast<AccessibleShape*> (mxAccessibleShape.get());
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 325bed20d366..e09dec4b7e6d 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -462,8 +462,6 @@ public:
*/
explicit ChildDescriptor (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleShape);
- ~ChildDescriptor();
-
/** Dispose the accessible object of this descriptor. If that object
does not exist then do nothing.
@param rParent
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 75e432a701c0..d30249802487 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -187,10 +187,6 @@ SwSortTextElement::SwSortTextElement(const SwNodeIndex& rPos)
{
}
-SwSortTextElement::~SwSortTextElement()
-{
-}
-
OUString SwSortTextElement::GetKey(sal_uInt16 nId) const
{
SwTextNode* pTextNd = aPos.GetNode().GetTextNode();
@@ -226,10 +222,6 @@ SwSortBoxElement::SwSortBoxElement( sal_uInt16 nRC )
{
}
-SwSortBoxElement::~SwSortBoxElement()
-{
-}
-
/// Get Key for a cell
OUString SwSortBoxElement::GetKey(sal_uInt16 nKey) const
{
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 392cb8785e60..4bfdfc3143a8 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -103,7 +103,6 @@ struct SwSortTextElement : public SwSortElement
SwNodeIndex aPos;
SwSortTextElement( const SwNodeIndex& rPos );
- virtual ~SwSortTextElement() override;
virtual OUString GetKey( sal_uInt16 nKey ) const override;
};
@@ -114,7 +113,6 @@ struct SwSortBoxElement : public SwSortElement
sal_uInt16 const nRow;
SwSortBoxElement( sal_uInt16 nRC );
- virtual ~SwSortBoxElement() override;
virtual OUString GetKey( sal_uInt16 nKey ) const override;
virtual double GetValue( sal_uInt16 nKey ) const override;
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 5d34c76fee6e..cde6d4070d12 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -220,10 +220,6 @@ Customization::Customization( SwCTBWrapper* wrapper )
{
}
-Customization::~Customization()
-{
-}
-
bool Customization::Read( SvStream &rS)
{
SAL_INFO("sw.ww8","Customization::Read() stream pos 0x" << std::hex << rS.Tell() );
@@ -488,10 +484,6 @@ SwTBC::SwTBC()
{
}
-SwTBC::~SwTBC()
-{
-}
-
bool SwTBC::Read( SvStream &rS )
{
SAL_INFO("sw.ww8","SwTBC::Read() stream pos 0x" << std::hex << rS.Tell() );
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index bc6a232abc66..346c39535a09 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -35,7 +35,6 @@ class SwTBC : public TBBase
public:
SwTBC();
- virtual ~SwTBC() override;
bool Read(SvStream &rS) override;
bool ImportToolBarControl( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool );
OUString GetCustomText();
@@ -116,7 +115,6 @@ class Customization : public TBBase
public:
explicit Customization( SwCTBWrapper* rapper );
- virtual ~Customization() override;
bool Read(SvStream &rS) override;
bool ImportCustomToolBar( SwCTBWrapper&, CustomToolBarImportHelper& );
bool ImportMenu( SwCTBWrapper&, CustomToolBarImportHelper& );
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 1fc113901852..624e4e531dfa 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -112,11 +112,6 @@ TaskManager::MyProperty::MyProperty( bool theisNat
// empty
}
-TaskManager::MyProperty::~MyProperty()
-{
- // empty for now
-}
-
#include "filinl.hxx"
// Default properties
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 3c0eefebeae7..94f0b59ac208 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -174,7 +174,6 @@ namespace fileaccess
const css::beans::PropertyState& theState,
sal_Int16 theAttributes );
- ~MyProperty();
inline const bool& IsNative() const;
const OUString& getPropertyName() const { return PropertyName; }
inline const sal_Int32& getHandle() const;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index eefdc53b4db7..b267f75dd436 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -737,10 +737,6 @@ PDFWriterImpl::PDFPage::PDFPage( PDFWriterImpl* pWriter, double nPageWidth, doub
m_nPageObject = m_pWriter->createObject();
}
-PDFWriterImpl::PDFPage::~PDFPage()
-{
-}
-
void PDFWriterImpl::PDFPage::beginStream()
{
if (g_bDebugDisableCompression)
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 7e07d9e0d472..0a0a8fc3517d 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -128,7 +128,6 @@ public:
sal_uInt32 m_nTransTime;
PDFPage( PDFWriterImpl* pWriter, double nPageWidth, double nPageHeight, PDFWriter::Orientation eOrientation );
- ~PDFPage();
void beginStream();
void endStream();
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 07e54d1340db..b47ad027188f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -4643,6 +4643,4 @@ VclBuilder::MenuAndId::MenuAndId(const OString &rId, Menu *pMenu)
, m_pMenu(pMenu)
{}
-VclBuilder::MenuAndId::~MenuAndId() {}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx
index 1e4b0a0f291b..c27348afcff6 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -48,11 +48,6 @@ GlyphSet::GlyphSet (sal_Int32 nFontID, bool bVertical)
RTL_TEXTENCODING_ASCII_US);
}
-GlyphSet::~GlyphSet ()
-{
- /* FIXME delete the glyphlist ??? */
-}
-
void
GlyphSet::GetGlyphID (
sal_GlyphId nGlyph,
diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
index 4d5a06101743..0185559ee165 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -62,7 +62,7 @@ private:
public:
GlyphSet (sal_Int32 nFontID, bool bVertical);
- ~GlyphSet ();
+ /* FIXME delete the glyphlist in ~GlyphSet ??? */
sal_Int32 GetFontID () const { return mnFontID;}
static OString
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index d88f4d370f56..585e9619f710 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -31,10 +31,6 @@ PgBorder::PgBorder( ) :
{
}
-PgBorder::~PgBorder( )
-{
-}
-
PageBordersHandler::PageBordersHandler( ) :
LoggedProperties("PageBordersHandler"),
m_eBorderApply(SectionPropertyMap::BorderApply::ToAllInSection),
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index 7ce2e15eba79..c5a83d37a39a 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -42,7 +42,6 @@ public:
bool m_bShadow;
PgBorder( );
- ~PgBorder( );
};
class PageBordersHandler : public LoggedProperties
More information about the Libreoffice-commits
mailing list