[Libreoffice-commits] core.git: include/vcl vcl/win

[Libreoffice Gerrit user]

 include/vcl/bitmap.hxx |    1 -
 vcl/win/gdi/salbmp.cxx |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 71ab9a658bf3ac8fd2486833dc2372b238acf98b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Dec 26 16:39:28 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Dec 26 16:40:56 2018 +0200

    The Windows-specific BitmapSystemData::pDDB is unused
    
    Its comment, "if not NULL then this is actually an HBITMAP", makes me
    wonder whether we lost some functionality, or broke something, or
    pessimized code, when the field became unused, whenever that was...
    
    Change-Id: I8bc95a1c5aca3ed80448c7c03ae0b1bb586bf5ae

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index c1a353f643c8..b66d4efb122b 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -92,7 +92,6 @@ struct BitmapSystemData
 {
     #if defined(_WIN32)
     void* pDIB; // device independent byte buffer
-    void* pDDB; // if not NULL then this is actually an HBITMAP
     #elif defined( MACOSX ) || defined( IOS )
     void* rImageContext;     //Image context (CGContextRef)
     #else
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 3fe763daa16f..87f88c88ce90 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -1035,7 +1035,6 @@ bool WinSalBitmap::GetSystemData( BitmapSystemData& rData )
     {
         bRet = true;
         rData.pDIB = mhDIB;
-        rData.pDDB = mhDDB;
         const Size& rSize = GetSize ();
         rData.mnWidth = rSize.Width();
         rData.mnHeight = rSize.Height();