diff options
| -rw-r--r-- | include/svx/xbitmap.hxx | 7 | ||||
| -rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 44 |
2 files changed, 4 insertions, 47 deletions
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx index 32a8e9fab11b..0a2128e3d1a8 100644 --- a/include/svx/xbitmap.hxx +++ b/include/svx/xbitmap.hxx @@ -39,13 +39,14 @@ private: const GraphicObject& GetGraphicObject() const; + XOBitmap(const XOBitmap& rXBmp) = delete; + XOBitmap& operator=(const XOBitmap& rXOBitmap) = delete; + + public: XOBitmap( const Bitmap& rBitmap ); - XOBitmap( const XOBitmap& rXBmp ); ~XOBitmap(); - XOBitmap& operator=( const XOBitmap& rXOBitmap ); - void Bitmap2Array(); void Array2Bitmap(); diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 93abb7e0ddd3..343c0f859ac4 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -52,55 +52,11 @@ XOBitmap::XOBitmap( const Bitmap& rBmp ) : { } -XOBitmap::XOBitmap( const XOBitmap& rXBmp ) : - pPixelArray ( nullptr ) -{ - eType = rXBmp.eType; - aGraphicObject = rXBmp.aGraphicObject; - aArraySize = rXBmp.aArraySize; - aPixelColor = rXBmp.aPixelColor; - aBckgrColor = rXBmp.aBckgrColor; - bGraphicDirty = rXBmp.bGraphicDirty; - - if( rXBmp.pPixelArray ) - { - if( eType == XBitmapType::N8x8 ) - { - pPixelArray = new sal_uInt16[ 64 ]; - - for( sal_uInt16 i = 0; i < 64; i++ ) - *( pPixelArray + i ) = *( rXBmp.pPixelArray + i ); - } - } -} - XOBitmap::~XOBitmap() { delete [] pPixelArray; } -XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp ) -{ - eType = rXBmp.eType; - aGraphicObject = rXBmp.aGraphicObject; - aArraySize = rXBmp.aArraySize; - aPixelColor = rXBmp.aPixelColor; - aBckgrColor = rXBmp.aBckgrColor; - bGraphicDirty = rXBmp.bGraphicDirty; - - if( rXBmp.pPixelArray ) - { - if( eType == XBitmapType::N8x8 ) - { - pPixelArray = new sal_uInt16[ 64 ]; - - for( sal_uInt16 i = 0; i < 64; i++ ) - *( pPixelArray + i ) = *( rXBmp.pPixelArray + i ); - } - } - return *this; -} - Bitmap XOBitmap::GetBitmap() const { return GetGraphicObject().GetGraphic().GetBitmap(); |