vcl/inc/unx/printergfx.hxx | 11 ----------- vcl/source/filter/wmf/winmtf.cxx | 4 ---- vcl/source/filter/wmf/winmtf.hxx | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-)
New commits: commit 3c117d18935fd216a3cda22d5a848f443270d019 Author: Caolán McNamara <[email protected]> Date: Tue Aug 30 12:05:58 2016 +0100 default dtor and assignment are ok here Change-Id: Ic349222f29b302fbd44907c2d21c993b59341107 diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx index eed4209..efa6b61 100644 --- a/vcl/inc/unx/printergfx.hxx +++ b/vcl/inc/unx/printergfx.hxx @@ -70,8 +70,6 @@ public: mnBlue ((nRGB & 0x000000ff) ), meColorspace (eRGB) {} - ~PrinterColor () - {} bool Is () const { return meColorspace != eInvalid; } @@ -91,15 +89,6 @@ public: } bool operator!= (const PrinterColor& aColor) const { return ! (aColor==*this); } - PrinterColor& operator= (const PrinterColor& aColor) - { - meColorspace = aColor.meColorspace; - mnRed = aColor.mnRed; - mnGreen = aColor.mnGreen; - mnBlue = aColor.mnBlue; - - return *this; - } PrinterColor& operator= (sal_uInt32 nRGB) { commit 4a5e15aea704cf80bf22076ca1bc35746e99e76a Author: Caolán McNamara <[email protected]> Date: Tue Aug 30 11:48:16 2016 +0100 can declare default dtor as virtual now I belive Change-Id: I48005f1e8b405b4fa374edfd0d6ff69ffac437d7 diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 58a2d6c..62bf50f 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -764,10 +764,6 @@ void WinMtfOutput::CreateObjectIndexed( sal_Int32 nIndex, std::unique_ptr<GDIObj } } -GDIObj::~GDIObj() -{ -} - void WinMtfOutput::DeleteObject( sal_Int32 nIndex ) { if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 1f4e274..d12a11c 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -291,7 +291,7 @@ public: struct GDIObj { - virtual ~GDIObj(); // Polymorphic base class + virtual ~GDIObj() = default; // Polymorphic base class }; struct WinMtfFontStyle : GDIObj
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
