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

[Noel Grandin]

 vcl/inc/win/salsys.h    |   14 ++++----------
 vcl/inc/win/wincomp.hxx |    2 --
 vcl/win/app/salinfo.cxx |    8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit 6656693836a382e6dac3a8c7ae794517b5f92bcc
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Apr 14 09:12:31 2016 +0200

    remove dead fields from WinSalSystem::DisplayMonitor
    
    Change-Id: I76254f194ac1bbd019b8c46f3f3f0f28e4e7f0ec
    Reviewed-on: https://gerrit.libreoffice.org/24074
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index 7efce50..5dd8de6 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -31,19 +31,13 @@ public:
     struct DisplayMonitor
     {
         OUString        m_aName;
-        OUString        m_aDeviceName;
-        Rectangle            m_aArea;
-        sal_Int32            m_nStateFlags;
+        Rectangle       m_aArea;
 
-        DisplayMonitor() : m_nStateFlags( 0 ) {}
+        DisplayMonitor() {}
         DisplayMonitor( const OUString& rName,
-                        const OUString& rDevName,
-                        const Rectangle& rArea,
-                        DWORD nStateFlags )
+                        const Rectangle& rArea )
                         : m_aName( rName ),
-                          m_aDeviceName( rDevName ),
-                          m_aArea( rArea ),
-                          m_nStateFlags( nStateFlags )
+                          m_aArea( rArea )
         {
         }
         ~DisplayMonitor() {}
diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index 549b3f4..8d13770 100644
--- a/vcl/inc/win/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -171,8 +171,6 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
 }
 
 
-#define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG"
-
 #define MOUSEZ_CLASSNAME  "MouseZ"            // wheel window class
 #define MOUSEZ_TITLE      "Magellan MSWHEEL"  // wheel window title
 
diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index ae80798..8b70632 100644
--- a/vcl/win/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
@@ -94,9 +94,7 @@ bool WinSalSystem::initMonitors()
         int w = GetSystemMetrics( SM_CXSCREEN );
         int h = GetSystemMetrics( SM_CYSCREEN );
         m_aMonitors.push_back( DisplayMonitor( OUString(),
-                                               OUString(),
-                                               Rectangle( Point(), Size( w, h ) ),
-                                               0 ) );
+                                               Rectangle( Point(), Size( w, h ) ) ) );
         m_aDeviceNameToMonitor[ OUString() ] = 0;
         m_nPrimary = 0;
     }
@@ -121,9 +119,7 @@ bool WinSalSystem::initMonitors()
                     aDeviceStringCount[ aDeviceString ]++;
                 m_aDeviceNameToMonitor[ aDeviceName ] = m_aMonitors.size();
                 m_aMonitors.push_back( DisplayMonitor( aDeviceString,
-                                                       aDeviceName,
-                                                       Rectangle(),
-                                                       aDev.StateFlags ) );
+                                                       Rectangle() ) );
             }
         }
         HDC aDesktopRC = GetDC( NULL );