summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-26 13:48:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-27 06:50:02 +0000
commit32a461bdd6ffda4b59ff262e1fcbcbe8bf2be7a0 (patch)
treeaa485a2f87ef09d7839fb1c7bedca0a6cfd5f865 /vcl
parentfab2f546d1fb3ceaf5ee5d4d728f1728a8f1e7f3 (diff)
loplugin: unnecessary destructor vbahelper..vcl
Change-Id: I6b7800d4a456391251168f7923a1ec7a5ca9efc9 Reviewed-on: https://gerrit.libreoffice.org/33577 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpglyphcache.cxx3
-rw-r--r--vcl/inc/BitmapScaleConvolution.hxx3
-rw-r--r--vcl/inc/controldata.hxx4
-rw-r--r--vcl/inc/svmconverter.hxx1
-rw-r--r--vcl/inc/unx/gendata.hxx1
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx6
-rw-r--r--vcl/source/app/svapp.cxx2
-rw-r--r--vcl/source/control/button.cxx5
-rw-r--r--vcl/source/control/edit.cxx5
-rw-r--r--vcl/source/fontsubset/cff.cxx6
-rw-r--r--vcl/source/gdi/dibtools.cxx12
-rw-r--r--vcl/source/gdi/impvect.cxx5
-rw-r--r--vcl/source/gdi/pdffontcache.hxx1
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx1
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx3
-rw-r--r--vcl/source/window/dockingarea.cxx5
-rw-r--r--vcl/source/window/dockwin.cxx5
-rw-r--r--vcl/source/window/floatwin.cxx5
-rw-r--r--vcl/source/window/menubarwindow.hxx1
-rw-r--r--vcl/source/window/popupmenuwindow.cxx5
-rw-r--r--vcl/source/window/status.cxx5
-rw-r--r--vcl/source/window/syswin.cxx5
-rw-r--r--vcl/source/window/toolbox.cxx5
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx5
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx1
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx1
26 files changed, 0 insertions, 101 deletions
diff --git a/vcl/headless/svpglyphcache.cxx b/vcl/headless/svpglyphcache.cxx
index cff68e31f337..aac6160e9748 100644
--- a/vcl/headless/svpglyphcache.cxx
+++ b/vcl/headless/svpglyphcache.cxx
@@ -47,9 +47,6 @@ namespace
{
return *m_pSvpGlyphCache;
}
- ~GlyphCacheHolder()
- {
- }
};
struct theGlyphCacheHolder :
diff --git a/vcl/inc/BitmapScaleConvolution.hxx b/vcl/inc/BitmapScaleConvolution.hxx
index e18c71fd1d0a..0ce161d611e5 100644
--- a/vcl/inc/BitmapScaleConvolution.hxx
+++ b/vcl/inc/BitmapScaleConvolution.hxx
@@ -43,9 +43,6 @@ public:
, meKernelType(eKernelType)
{}
- virtual ~BitmapScaleConvolution() override
- {}
-
virtual bool filter(Bitmap& rBitmap) override;
private:
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index 5554afc951dd..1ba107938858 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -34,10 +34,6 @@ namespace vcl
,mpReferenceDevice( nullptr )
{
}
-
- ~ImplControlData()
- {
- }
};
} // namespace vcl
diff --git a/vcl/inc/svmconverter.hxx b/vcl/inc/svmconverter.hxx
index a8ae99e1464a..bcb11dba2535 100644
--- a/vcl/inc/svmconverter.hxx
+++ b/vcl/inc/svmconverter.hxx
@@ -87,7 +87,6 @@ private:
public:
SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, sal_uLong nConvertMode );
- ~SVMConverter() {}
private:
SVMConverter( const SVMConverter& ) = delete;
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 943b9193996e..00c99627bbc6 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -33,7 +33,6 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
OUString m_aUnicodeEntry;
public:
SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); }
- virtual ~SalGenericData() override {}
virtual void Dispose() {}
SalGenericDisplay *GetDisplay() const { return m_pDisplay; }
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 763e8a2b5c5d..69d0303f0309 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -37,7 +37,6 @@ private:
public:
SalI18N_KeyboardExtension( Display *pDisplay );
- inline ~SalI18N_KeyboardExtension();
inline bool UseExtension() const ; // server and client support the
// extension
@@ -48,11 +47,6 @@ public:
inline int GetEventBase() const ;
};
-inline
-SalI18N_KeyboardExtension::~SalI18N_KeyboardExtension()
-{
-}
-
inline bool
SalI18N_KeyboardExtension::UseExtension() const
{
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 67a1bcbeb847..658126ae86ca 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -183,8 +183,6 @@ struct ImplPostEventData
ImplPostEventData( VclEventId nEvent, vcl::Window* pWin, const ScrollEvent& rScrollEvent ) :
mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maScrollEvent( rScrollEvent ) {}
#endif
-
- ~ImplPostEventData() {}
};
Application* GetpApp()
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index c928010d5add..571c84362e7c 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -72,7 +72,6 @@ class ImplCommonButtonData
{
public:
ImplCommonButtonData();
- ~ImplCommonButtonData();
Rectangle maFocusRect;
long mnSeparatorX;
@@ -92,10 +91,6 @@ mbSmallSymbol(false), maImage(), meImageAlign(ImageAlign::Top), meSymbolAlign(Sy
{
}
-ImplCommonButtonData::~ImplCommonButtonData()
-{
-}
-
Button::Button( WindowType nType ) :
Control( nType ),
mpButtonData( new ImplCommonButtonData )
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f228b8e81f6a..c6fe57110c7a 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -121,7 +121,6 @@ struct Impl_IMEInfos
bool bWasCursorOverwrite;
Impl_IMEInfos(sal_Int32 nPos, const OUString& rOldTextAfterStartPos);
- ~Impl_IMEInfos();
void CopyAttribs(const ExtTextInputAttr* pA, sal_Int32 nL);
void DestroyAttribs();
@@ -137,10 +136,6 @@ Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos
bWasCursorOverwrite = false;
}
-Impl_IMEInfos::~Impl_IMEInfos()
-{
-}
-
void Impl_IMEInfos::CopyAttribs(const ExtTextInputAttr* pA, sal_Int32 nL)
{
nLen = nL;
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index a50801f3ffe9..184f29e1ed7f 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -322,7 +322,6 @@ public:
static const int NMAXTRANS = 32; // see CFF.appendixB
public:
explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen);
- ~CffSubsetterContext();
bool initialCffRead();
bool emitAsType1( class Type1Emitter&,
@@ -433,11 +432,6 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
mpCffLocal = &maCffLocal[0];
}
-CffSubsetterContext::~CffSubsetterContext()
-{
- // TODO: delete[] maCffLocal;
-}
-
inline int CffSubsetterContext::popInt()
{
const ValType aVal = popVal();
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 2e85bbca22ee..b17897aaae60 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -54,9 +54,6 @@ struct CIEXYZ
aXyzY(0),
aXyzZ(0)
{}
-
- ~CIEXYZ()
- {}
};
struct CIEXYZTriple
@@ -70,9 +67,6 @@ struct CIEXYZTriple
aXyzGreen(),
aXyzBlue()
{}
-
- ~CIEXYZTriple()
- {}
};
struct DIBInfoHeader
@@ -102,9 +96,6 @@ struct DIBInfoHeader
nColsUsed(0UL),
nColsImportant(0UL)
{}
-
- ~DIBInfoHeader()
- {}
};
struct DIBV5Header : public DIBInfoHeader
@@ -139,9 +130,6 @@ struct DIBV5Header : public DIBInfoHeader
nV5ProfileSize(0UL),
nV5Reserved(0UL)
{}
-
- ~DIBV5Header()
- {}
};
inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount )
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 6a88538fb8c0..2350df20072d 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -281,7 +281,6 @@ private:
public:
ImplChain();
- ~ImplChain();
void ImplBeginAdd( const Point& rStartPt );
inline void ImplAdd( sal_uInt8 nCode );
@@ -297,10 +296,6 @@ ImplChain::ImplChain() :
mpCodes.reset( new sal_uInt8[ mnArraySize ] );
}
-ImplChain::~ImplChain()
-{
-}
-
void ImplChain::ImplGetSpace()
{
const sal_uLong nOldArraySize = mnArraySize;
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index c02e28b91d33..738a7ffd2b98 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -63,7 +63,6 @@ namespace vcl
FontData& getFont( const PhysicalFontFace*, bool bVertical );
public:
PDFFontCache() {}
- ~PDFFontCache() {}
sal_Int32 getGlyphWidth( const PhysicalFontFace*, sal_GlyphId, bool bVertical, SalGraphics* );
};
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 6bb422880592..2dd646477ee3 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -954,7 +954,6 @@ class Matrix3
void set( double *pn ) { for( int i = 0 ; i < 6; i++ ) f[i] = pn[i]; }
public:
Matrix3();
- ~Matrix3() {}
void skew( double alpha, double beta );
void scale( double sx, double sy );
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 979571f6e430..a1cb6d2efc57 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -297,9 +297,6 @@ public:
GlyphEmit() : m_nSubsetGlyphID(0)
{
}
- ~GlyphEmit()
- {
- }
void setGlyphId( sal_uInt8 i_nId ) { m_nSubsetGlyphID = i_nId; }
sal_uInt8 getGlyphId() const { return m_nSubsetGlyphID; }
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index a1de6bc606e7..f735949ecab8 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -30,7 +30,6 @@ class DockingAreaWindow::ImplData
{
public:
ImplData();
- ~ImplData();
WindowAlign meAlign;
};
@@ -40,10 +39,6 @@ DockingAreaWindow::ImplData::ImplData()
meAlign = WindowAlign::Top;
}
-DockingAreaWindow::ImplData::~ImplData()
-{
-}
-
DockingAreaWindow::DockingAreaWindow( vcl::Window* pParent ) :
Window( WINDOW_DOCKINGAREA )
{
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index f00bfdcbbbfe..a74d659aa68f 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -40,7 +40,6 @@ class DockingWindow::ImplData
{
public:
ImplData();
- ~ImplData();
VclPtr<vcl::Window> mpParent;
Size maMaxOutSize;
@@ -52,10 +51,6 @@ DockingWindow::ImplData::ImplData()
maMaxOutSize = Size( SHRT_MAX, SHRT_MAX );
}
-DockingWindow::ImplData::~ImplData()
-{
-}
-
class ImplDockFloatWin : public FloatingWindow
{
private:
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 0f650712e1b4..3e9cd967edf1 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -37,7 +37,6 @@ class FloatingWindow::ImplData
{
public:
ImplData();
- ~ImplData();
VclPtr<ToolBox> mpBox;
Rectangle maItemEdgeClipRect; // used to clip the common edge between a toolbar item and the border of this window
@@ -48,10 +47,6 @@ FloatingWindow::ImplData::ImplData()
mpBox = nullptr;
}
-FloatingWindow::ImplData::~ImplData()
-{
-}
-
Rectangle& FloatingWindow::ImplGetItemEdgeClipRect()
{
return mpImplData->maItemEdgeClipRect;
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index 188219c1957b..86f0192785ec 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -41,7 +41,6 @@ class DecoToolBox : public ToolBox
public:
explicit DecoToolBox(vcl::Window* pParent);
- virtual ~DecoToolBox() override {}
void DataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx
index 310d7550b202..d8cd337a1c91 100644
--- a/vcl/source/window/popupmenuwindow.cxx
+++ b/vcl/source/window/popupmenuwindow.cxx
@@ -26,7 +26,6 @@ struct PopupMenuFloatingWindow::ImplData
sal_uInt16 mnMenuStackLevel; // Store the stack level of a popup menu. 0 = top-level menu.
ImplData();
- ~ImplData();
};
PopupMenuFloatingWindow::ImplData::ImplData() :
@@ -34,10 +33,6 @@ PopupMenuFloatingWindow::ImplData::ImplData() :
{
}
-PopupMenuFloatingWindow::ImplData::~ImplData()
-{
-}
-
PopupMenuFloatingWindow::PopupMenuFloatingWindow( vcl::Window* pParent ) :
FloatingWindow(pParent, WB_SYSTEMFLOATWIN | WB_SYSTEMWINDOW | WB_NOBORDER ),
mpImplData(new ImplData)
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 8aab54b743a2..3739068c77ea 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -46,7 +46,6 @@ class StatusBar::ImplData
{
public:
ImplData();
- ~ImplData();
VclPtr<VirtualDevice> mpVirDev;
long mnItemBorderWidth;
@@ -60,10 +59,6 @@ StatusBar::ImplData::ImplData()
mnItemBorderWidth = 0;
}
-StatusBar::ImplData::~ImplData()
-{
-}
-
struct ImplStatusItem
{
sal_uInt16 mnId;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index e5df5863b6de..4932deee1a4f 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -49,7 +49,6 @@ class SystemWindow::ImplData
{
public:
ImplData();
- ~ImplData();
std::unique_ptr<TaskPaneList>
mpTaskPaneList;
@@ -64,10 +63,6 @@ SystemWindow::ImplData::ImplData()
maMaxOutSize = Size( SHRT_MAX, SHRT_MAX );
}
-SystemWindow::ImplData::~ImplData()
-{
-}
-
SystemWindow::SystemWindow(WindowType nType)
: Window(nType)
, mbRollUp(false)
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 495a5d2979a4..952ddfe90d90 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -113,7 +113,6 @@ private:
public:
ImplTBDragMgr();
- ~ImplTBDragMgr();
void push_back( ToolBox* pBox )
{ mpBoxList->push_back( pBox ); }
@@ -1143,10 +1142,6 @@ ImplTBDragMgr::ImplTBDragMgr()
maAccel.SetSelectHdl( LINK( this, ImplTBDragMgr, SelectHdl ) );
}
-ImplTBDragMgr::~ImplTBDragMgr()
-{
-}
-
ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect )
{
for (VclPtr<ToolBox> & i : *mpBoxList)
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 2f09e10b4891..ecdde447460e 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -54,7 +54,6 @@ class XKeyEventOp : public XKeyEvent
public:
XKeyEventOp();
- ~XKeyEventOp();
XKeyEventOp& operator= (const XKeyEvent &rEvent);
void erase ();
@@ -79,10 +78,6 @@ XKeyEventOp::XKeyEventOp()
init();
}
-XKeyEventOp::~XKeyEventOp()
-{
-}
-
XKeyEventOp&
XKeyEventOp::operator= (const XKeyEvent &rEvent)
{
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index ef1449e8daf6..7d6de7ca12f5 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -234,7 +234,6 @@ namespace x11 {
m_pTarget( rEntry.m_pTarget ),
m_aRootWindow( rEntry.m_aRootWindow )
{}
- ~DropTargetEntry() {}
DropTarget* operator->() const { return m_pTarget; }
DropTargetEntry& operator=(const DropTargetEntry& rEntry)
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 012ec9587491..a2d99e5a624f 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -77,7 +77,6 @@ namespace psp
key_translation_map m_aTranslations;
public:
PPDTranslator() {}
- ~PPDTranslator() {}
void insertValue(
const OUString& i_rKey,