[Libreoffice-commits] core.git: fpicker/source

Stephan Bergmann sbergman at redhat.com
Fri Oct 14 05:39:46 UTC 2016


 fpicker/source/win32/filepicker/FileOpenDlg.hxx |   17 -----------------
 1 file changed, 17 deletions(-)

New commits:
commit f74a76391cc8c41514ead1698f92037081a2e257
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 13 21:28:41 2016 +0200

    _OPENFILENAME_SIZE_VERISON_400 is unused
    
    ...since b30f91c58419e90a789f79a1391b13f2064997ab "Drop Win9x stuff"
    
    Change-Id: I4ef6b13865165c84288a77c83daf0758f5083810
    Reviewed-on: https://gerrit.libreoffice.org/29793
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 6d2d655..d3d09d5 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -32,10 +32,6 @@
 // into our build environment if have stolen the definition
 // for the new OPENFILENAME structure from the new headers
 
-#ifndef _CDSIZEOF_STRUCT
-#define _CDSIZEOF_STRUCT(structname, member)  (((int)((LPBYTE)(&((structname*)0)->member) - ((LPBYTE)((structname*)0)))) + sizeof(((structname*)0)->member))
-#endif
-
 typedef struct _tagOFNA {
    DWORD        lStructSize;
    HWND         hwndOwner;
@@ -100,19 +96,6 @@ typedef _OPENFILENAMEA _OPENFILENAME;
 typedef _LPOPENFILENAMEA _LPOPENFILENAME;
 #endif // UNICODE
 
-#if (_WIN32_WINNT >= 0x0500)
-    #define _OPENFILENAME_SIZE_VERSION_400A  _CDSIZEOF_STRUCT(_OPENFILENAMEA,lpTemplateName)
-    #define _OPENFILENAME_SIZE_VERSION_400W  _CDSIZEOF_STRUCT(_OPENFILENAMEW,lpTemplateName)
-    #ifdef UNICODE
-        #define _OPENFILENAME_SIZE_VERSION_400  _OPENFILENAME_SIZE_VERSION_400W
-    #else
-        #define _OPENFILENAME_SIZE_VERSION_400  _OPENFILENAME_SIZE_VERSION_400A
-    #endif // !UNICODE
-#else
-    #error _WIN32_WINNT seems not to be valid.
-#endif // (_WIN32_WINNT >= 0x0500)
-
-
 // A simple wrapper class around the Win32 GetOpenFileName API.
 // This class is not thread-safe and only one instance at a
 // time is allowed


More information about the Libreoffice-commits mailing list