[Libreoffice-commits] core.git: extensions/source include/postwin.h include/prewin.h include/tools sfx2/source shell/source
Thomas Arnhold
thomas at arnhold.org
Fri May 9 11:17:50 PDT 2014
extensions/source/ole/wincrap.hxx | 6
include/postwin.h | 5
include/prewin.h | 2
include/tools/postsys.h | 234 -----------------------------
include/tools/presys.h | 34 ----
sfx2/source/doc/graphhelp.cxx | 15 -
shell/source/tools/lngconvex/lngconvex.cxx | 11 -
7 files changed, 10 insertions(+), 297 deletions(-)
New commits:
commit 9037e2289d10aa8208d0e8f75847204d73ea21a7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri May 9 18:29:54 2014 +0200
remove presys.h and postsys.h
Both files are nearly identical to prewin.h and postwin.h
Change-Id: I1f45e46dfcc00043a9e2df82e0070cd1b976c4af
Reviewed-on: https://gerrit.libreoffice.org/9294
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx
index 389d3ce..210ccf9 100644
--- a/extensions/source/ole/wincrap.hxx
+++ b/extensions/source/ole/wincrap.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_WINCRAP_HXX
#define INCLUDED_EXTENSIONS_SOURCE_OLE_WINCRAP_HXX
-/* wrap all includes that need to be wrapped by presys.h/postsys.h here */
+/* wrap all includes that need to be wrapped by prewin.h/postwin.h here */
#define STRICT
@@ -37,7 +37,7 @@
#include <tchar.h>
#include <dispex.h>
-#include <tools/presys.h>
+#include <prewin.h>
#include <list>
// from oleobjw.hxx
@@ -49,7 +49,7 @@ extern CComModule _Module;
// from unoobjw.cxx
#include <olectl.h>
-#include <tools/postsys.h>
+#include <postwin.h>
#pragma warning (pop)
diff --git a/include/postwin.h b/include/postwin.h
index d5cf912..f494b23 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/* nicht geschuetz, muss als gegenstueck zu prewin.h includet werden */
+/* not protected, do only include once! */
#undef Region
#undef PolyPolygon
@@ -29,7 +29,7 @@
#undef Folder
#undef GradientStyle_RECT
-/* Hilfe-Ids umbenennen */
+/* rename help IDs */
#define WIN_HELP_INDEX 0x0003
#define WIN_HELP_HELPONHELP 0x0004
#undef HELP_INDEX
@@ -209,7 +209,6 @@
#define WIN_FindWindow FindWindow
#endif
-// keine Yield-Definition
#undef Yield
/* new StretchBlt() Modes (simpler names) */
diff --git a/include/prewin.h b/include/prewin.h
index a30afb8..4720586 100644
--- a/include/prewin.h
+++ b/include/prewin.h
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/* nicht geschuetzt, darf nur einmal includet werden */
+/* not protected, do only include once! */
#if defined WNT
diff --git a/include/tools/postsys.h b/include/tools/postsys.h
deleted file mode 100644
index 3c3431e..0000000
--- a/include/tools/postsys.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-/* not protected, must be included together with prestl.h! */
-
-#if defined WNT
-
-#undef Region
-#undef PolyPolygon
-#undef Polygon
-#undef Rectangle
-#undef DELETE
-
-/* rename help IDs */
-#define WIN_HELP_INDEX 0x0003
-#define WIN_HELP_HELPONHELP 0x0004
-#undef HELP_INDEX
-#undef HELP_HELPONHELP
-
-#define WIN_MOUSE_MOVED 0x0001
-#undef MOUSE_MOVED
-
-#define WIN_WB_LEFT 0
-#define WIN_WB_RIGHT 1
-#undef WB_LEFT
-#undef WB_RIGHT
-
-#ifdef GetObject
-#undef GetObject
-#ifdef UNICODE
-#define WIN_GetObject GetObjectW
-#else
-#define WIN_GetObject GetObjectA
-#endif
-#else
-#define WIN_GetObject GetObject
-#endif
-
-#ifdef SetPrinter
-#undef SetPrinter
-#ifdef UNICODE
-#define WIN_SetPrinter SetPrinterW
-#else
-#define WIN_SetPrinter SetPrinterA
-#endif
-#else
-#define WIN_SetPrinter SetPrinter
-#endif
-
-#ifdef GetPrinter
-#undef GetPrinter
-#ifdef UNICODE
-#define WIN_GetPrinter GetPrinterW
-#else
-#define WIN_GetPrinter GetPrinterA
-#endif
-#else
-#define WIN_GetPrinter GetPrinter
-#endif
-
-#ifdef DrawText
-#undef DrawText
-#ifdef UNICODE
-#define WIN_DrawText DrawTextW
-#else
-#define WIN_DrawText DrawTextA
-#endif
-#else
-#define WIN_DrawText DrawText
-#endif
-
-#ifdef mciSetCommand
-#undef mciSetCommand
-#ifdef UNICODE
-#define WIN_mciSetCommand mciSetCommandW
-#else
-#define WIN_mciSetCommand mciSetCommandA
-#endif
-#else
-#define mciSetCommand mciSetCommand
-#endif
-
-#ifdef SetPort
-#undef SetPort
-#ifdef UNICODE
-#define WIN_SetPort SetPortW
-#else
-#define WIN_SetPort SetPortA
-#endif
-#else
-#define WIN_SetPort SetPort
-#endif
-
-#ifdef CopyFile
-#undef CopyFile
-#ifdef UNICODE
-#define WIN_CopyFile CopyFileW
-#else
-#define WIN_CopyFile CopyFileA
-#endif
-#else
-#define WIN_CopyFile CopyFile
-#endif
-
-#ifdef GetUserName
-#undef GetUserName
-#ifdef UNICODE
-#define WIN_GetUserName GetUserNameW
-#else
-#define WIN_GetUserName GetUserNameA
-#endif
-#else
-#define WIN_GetUserName GetUserName
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#ifdef UNICODE
-#define WIN_GetClassName GetClassNameW
-#else
-#define WIN_GetClassName GetClassNameA
-#endif
-#else
-#define WIN_GetClassName GetClassName
-#endif
-
-#ifdef GetCharWidth
-#undef GetCharWidth
-#ifdef UNICODE
-#define WIN_GetCharWidth GetCharWidthW
-#else
-#define WIN_GetCharWidth GetCharWidthA
-#endif
-#else
-#define WIN_GetCharWidth GetCharWidth
-#endif
-
-#ifdef GetMetaFile
-#undef GetMetaFile
-#ifdef UNICODE
-#define WIN_GetMetaFile GetMetaFileW
-#else
-#define WIN_GetMetaFile GetMetaFileA
-#endif
-#else
-#define WIN_GetMetaFile GetMetaFile
-#endif
-
-#ifdef GetNumberFormat
-#undef GetNumberFormat
-#ifdef UNICODE
-#define WIN_GetNumberFormat GetNumberFormatW
-#else
-#define WIN_GetNumberFormat GetNumberFormatA
-#endif
-#else
-#define WIN_GetNumberFormat GetNumberFormat
-#endif
-
-#ifdef GetGlyphOutline
-#undef GetGlyphOutline
-#ifdef UNICODE
-#define WIN_GetGlyphOutline GetGlyphOutlineW
-#else
-#define WIN_GetGlyphOutline GetGlyphOutlineA
-#endif
-#else
-#define WIN_GetGlyphOutline GetGlyphOutline
-#endif
-
-#ifdef GetKerningPairs
-#undef GetKerningPairs
-#ifdef UNICODE
-#define WIN_GetKerningPairs GetKerningPairsW
-#else
-#define WIN_GetKerningPairs GetKerningPairsA
-#endif
-#else
-#define WIN_GetKerningPairs GetKerningPairs
-#endif
-
-#ifdef FindWindow
-#undef FindWindow
-#ifdef UNICODE
-#define WIN_FindWindow FindWindowW
-#else
-#define WIN_FindWindow FindWindowA
-#endif
-#else
-#define WIN_FindWindow FindWindow
-#endif
-
-#undef Yield
-
-/* new StretchBlt() Modes (simpler names) */
-#ifndef STRETCH_ANDSCANS
-#define STRETCH_ANDSCANS 1
-#endif
-#ifndef STRETCH_ORSCANS
-#define STRETCH_ORSCANS 2
-#endif
-#ifndef STRETCH_DELETESCANS
-#define STRETCH_DELETESCANS 3
-#endif
-
-extern "C"
-{
- BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
- BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
- BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
-}
-
-#endif
-
-// avoid conflict with Pair in tools
-#undef Pair
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/presys.h b/include/tools/presys.h
deleted file mode 100644
index 5217686..0000000
--- a/include/tools/presys.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-/* not protected, do only include once! */
-
-// avoid conflict with pair in tools
-#define Pair StlPair
-
-#if defined WNT
-
-#define Rectangle BLA_Rectangle
-#define Polygon BLA_Polygon
-#define PolyPolygon BLA_PolyPolygon
-#define Region WIN_Region
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 7d40cc8..d0c9db6 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -19,21 +19,10 @@
#ifdef WNT
-
-#undef WB_LEFT
-#undef WB_RIGHT
-
-#include <tools/presys.h>
-#if defined _MSC_VER
-#pragma warning(push, 1)
+#include <prewin.h>
+#include <postwin.h>
#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-#include <tools/postsys.h>
-#endif
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index a174dd0..22c0bc1 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -23,15 +23,8 @@
#ifdef WNT
-#include <tools/presys.h>
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-#include <tools/postsys.h>
+#include <prewin.h>
+#include <postwin.h>
#else
// From MinGW
typedef unsigned short WORD;
More information about the Libreoffice-commits
mailing list