Clean up OutputDevice and derived classes noncopyable-ness
Change-Id: Id29e52c94a89cac20e29ae0a1f0b9f90ffdfcf09
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index cefffe2..199ca08 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -42,6 +42,7 @@
#include <unotools/fontdefs.hxx>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#ifdef check
# //some problem with MacOSX and a check define
@@ -244,7 +245,7 @@ extern const sal_uLong nVCLBLut[ 6 ];
extern const sal_uLong nVCLDitherLut[ 256 ];
extern const sal_uLong nVCLLut[ 256 ];
class VCL_DLLPUBLIC OutputDevice
class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable
{
friend class Application;
friend class Bitmap;
@@ -350,15 +351,9 @@ private:
protected:
OutputDevice();
private:
SAL_DLLPRIVATE OutputDevice( const OutputDevice& rOutDev );
public:
virtual ~OutputDevice();
private:
SAL_DLLPRIVATE OutputDevice& operator =( const OutputDevice& rOutDev );
public:
/** Get the graphic context that the output device uses to draw on.
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 098f49e..f5a1eca 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -158,13 +158,6 @@ public:
SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin );
private:
// Default construction is forbidden and not implemented.
SystemWindow();
// Copy assignment is forbidden and not implemented.
SystemWindow (const SystemWindow &);
SystemWindow & operator= (const SystemWindow &);
SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin );
protected:
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ddf010d..3cf10320 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -619,14 +619,6 @@ private:
public:
virtual Region GetActiveClipRegion() const SAL_OVERRIDE;
private:
// Default construction is forbidden and not implemented.
SAL_DLLPRIVATE Window();
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE Window (const Window &);
SAL_DLLPRIVATE Window & operator= (const Window &);
protected:
// Single argument ctors shall be explicit.
explicit Window( WindowType nType );