The "source size" of a VCL bitmap is not used for anything

Thorsten thought it might have been used for to the handling of the "Original
Size" functionality originally. That seems slightly broken currently in some
use cases, and this change doesn't make it any worse. (To see the brokenness,
play with resizing an image, reloading the document, and using "Original
Size". With the right sequence of actions, LO seems to think that the
"original size" is very small (1x1 pixel perhaps).)

Change-Id: I4e0852d2b367def5bc40baf95aac273d59731eec

5 files changed, 1 insertions, 32 deletions

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index e5e3d6165c3a..adf6b63785a8 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -394,13 +394,6 @@ public:
 
     Size                    GetSizePixel() const;
 
-    /**
-     * The pixel size of a bitmap's source (e.g. an image file)
-     * and the pixel size of its resulting bitmap can differ,
-     * e.g. when the image reader has its preview mode enabled.
-     */
-    void                    SetSourceSizePixel( const Size& );
-
     sal_uInt16                  GetBitCount() const;
     inline sal_uLong            GetColorCount() const;
     inline sal_uLong            GetSizeBytes() const;
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index fa48db174bf8..b29cabe6562a 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -43,7 +43,6 @@ private:
     sal_uLong               mnRefCount;
     sal_uLong               mnChecksum;
     SalBitmap*          mpSalBitmap;
-    Size                maSourceSize;
 
 public:
 
@@ -63,8 +62,6 @@ public:
     sal_Bool                ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount );
 
     Size                ImplGetSize() const;
-    Size                ImplGetSourceSize() const;
-    void                ImplSetSourceSize( const Size&);
     sal_uInt16              ImplGetBitCount() const;
 
     BitmapBuffer*       ImplAcquireBuffer( sal_Bool bReadOnly );
@@ -80,16 +77,6 @@ public:
     inline sal_uLong        ImplGetChecksum() const { return mnChecksum; }
 };
 
-inline Size ImpBitmap::ImplGetSourceSize() const
-{
-    return maSourceSize;
-}
-
-inline void ImpBitmap::ImplSetSourceSize( const Size& rSize)
-{
-    maSourceSize = rSize;
-}
-
 #endif // INCLUDED_VCL_INC_IMPBMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 7ba90c7dbc53..41fff7466179 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -262,12 +262,6 @@ Size Bitmap::GetSizePixel() const
     return( mpImpBmp ? mpImpBmp->ImplGetSize() : Size() );
 }
 
-void Bitmap::SetSourceSizePixel( const Size& rSize)
-{
-    if( mpImpBmp )
-        mpImpBmp->ImplSetSourceSize( rSize);
-}
-
 sal_uInt16 Bitmap::GetBitCount() const
 {
     return( mpImpBmp ? mpImpBmp->ImplGetBitCount() : 0 );
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 5148163b526b..7181c0dc8483 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -32,8 +32,7 @@
 ImpBitmap::ImpBitmap() :
             mnRefCount  ( 1UL ),
             mnChecksum  ( 0UL ),
-            mpSalBitmap ( ImplGetSVData()->mpDefInst->CreateSalBitmap() ),
-            maSourceSize( 0, 0 )
+            mpSalBitmap ( ImplGetSVData()->mpDefInst->CreateSalBitmap() )
 {
 }
 
@@ -54,7 +53,6 @@ void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap )
 
 sal_Bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
 {
-    maSourceSize = rSize;
     return mpSalBitmap->Create( rSize, nBitCount, rPal );
 }
 
@@ -62,7 +60,6 @@ sal_Bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const B
 
 sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap )
 {
-    maSourceSize = rImpBitmap.maSourceSize;
     mnChecksum = rImpBitmap.mnChecksum;
     return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap );
 }
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index ad5eff05e241..1dc4f4d7f782 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -652,8 +652,6 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
     if( !mpAcc )
         return false;
 
-    mpBmp->SetSourceSizePixel( maOrigSize );
-
     if ( mbAlphaChannel )
     {
         mpAlphaMask = new AlphaMask( maTargetSize );