mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move prewin.h and postwin.h to solenv and adapt

Browse Source
This commit is contained in:
Tor Lillqvist
2011-02-08 13:09:39 +02:00
parent 2646398801
commit f10a74f4fd
26 changed files with 46 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
canvas/source/cairo/cairo_cairo.cxx
View File

@@ -33,9 +33,9 @@
#include "cairo_cairo.hxx"
#ifdef WNT
# include <tools/prewin.h>
# include <prewin.h>
# include <windows.h>
# include <tools/postwin.h>
# include <postwin.h>
#endif
#include <vcl/sysdata.hxx>

4
canvas/source/cairo/cairo_canvas.cxx
View File

@@ -49,9 +49,9 @@
#include <basegfx/numeric/ftools.hxx>
#ifdef WNT
# include <tools/prewin.h>
# include <prewin.h>
# include <windows.h>
# include <tools/postwin.h>
# include <postwin.h>
#endif
#include <vcl/sysdata.hxx>

4
canvas/source/cairo/cairo_textlayout.cxx
View File

@@ -39,9 +39,9 @@
#include <vcl/virdev.hxx>
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#ifdef max
#undef max
#endif

4
canvas/source/cairo/cairo_win32_cairo.cxx
View File

@@ -36,9 +36,9 @@
* Win32 surface backend for OpenOffice.org Cairo Canvas *
************************************************************************/
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#include <osl/diagnose.h>
#include <vcl/bitmap.hxx>

4
canvas/source/cairo/cairo_win32_cairo.hxx
View File

@@ -30,9 +30,9 @@
#define _CAIROCANVAS_WIN32_CAIRO_HXX
#ifdef WNT
# include <tools/prewin.h>
# include <prewin.h>
# include <windows.h>
# include <tools/postwin.h>
# include <postwin.h>
#endif
#include "cairo_cairo.hxx"

4
l10ntools/source/directory.cxx
View File

@@ -102,9 +102,9 @@ void Directory::readDirectory()
}
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
void Directory::readDirectory ( const rtl::OUString& sFullpath )
{

4
l10ntools/source/help/HelpCompiler.cxx
View File

@@ -36,8 +36,8 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#ifdef __MINGW32__
#include <tools/prewin.h>
#include <tools/postwin.h>
#include <prewin.h>
#include <postwin.h>
#endif
#include <osl/thread.hxx>

4
l10ntools/source/helpmerge.cxx
View File

@@ -44,9 +44,9 @@
#include "rtl/strbuf.hxx"
#ifdef WNT
#include <direct.h>
#include "tools/prewin.h"
#include "prewin.h"
#include <windows.h>
#include "tools/postwin.h"
#include "postwin.h"
#endif
/*****************************************************************************/

4
l10ntools/source/xmlparse.cxx
View File

@@ -39,8 +39,8 @@
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#ifdef __MINGW32__
#include <tools/prewin.h>
#include <tools/postwin.h>
#include <prewin.h>
#include <postwin.h>
#endif
using namespace std;
using namespace osl;

4
sot/inc/sot/formats.hxx
View File

@@ -36,9 +36,9 @@
#pragma warning(push, 1)
#pragma warning(disable: 4917)
#endif
#include <tools/prewin.h>
#include <prewin.h>
#include <shlobj.h>
#include <tools/postwin.h>
#include <postwin.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif

4
svl/source/svdde/ddeimp.hxx
View File

@@ -42,9 +42,9 @@
#else
#include <tools/prewin.h>
#include <prewin.h>
#include <ddeml.h>
#include <tools/postwin.h>
#include <postwin.h>
#include "ddewrap.hxx"
/*

4
svtools/source/misc/transfer.cxx
View File

@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#if defined _MSC_VER
#pragma warning(push, 1)
#pragma warning(disable: 4917)
@@ -38,7 +38,7 @@
#if defined _MSC_VER
#pragma warning(pop)
#endif
#include <tools/postwin.h>
#include <postwin.h>
#endif
#include <osl/mutex.hxx>
#include <rtl/memory.h>

4
toolkit/source/awt/vclxdialog.cxx
View File

@@ -39,9 +39,9 @@
#include <toolkit/helper/property.hxx>
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>

4
toolkit/source/awt/vclxsystemdependentwindow.cxx
View File

@@ -41,9 +41,9 @@
#include <cppuhelper/typeprovider.hxx>
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>

4
toolkit/source/awt/vclxtoolkit.cxx
View File

@@ -53,9 +53,9 @@
#include <rtl/process.h>
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#elif (defined QUARTZ)
#include "premac.h"
#include <Cocoa/Cocoa.h>

4
toolkit/source/awt/vclxtopwindow.cxx
View File

@@ -32,9 +32,9 @@
#include <com/sun/star/awt/SystemDependentXWindow.hpp>
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>

4
toolkit/source/awt/vclxwindow1.cxx
View File

@@ -38,9 +38,9 @@
#include <vcl/window.hxx>
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#elif defined ( QUARTZ )
#include "premac.h"
#include <Cocoa/Cocoa.h>

261
tools/inc/tools/postwin.h
View File

@@ -1,261 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
/* nicht geschuetz, muss als gegenstueck zu prewin.h includet werden */
#ifdef WNT
#ifdef __cplusplus
}
#endif
#endif
#undef Region
#undef PolyPolygon
#undef Polygon
#undef Rectangle
#undef BYTE
#undef BOOL
#undef DELETE
#ifndef VCL_NEED_BASETSD
#undef INT64
#undef UINT64
#undef INT32
#undef UINT32
#undef ULONG
#endif
#undef Folder
#undef GradientStyle_RECT
/* Hilfe-Ids umbenennen */
#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
// keine Yield-Definition
#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
#ifdef WNT
extern "C"
{
WIN_BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
WIN_BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
WIN_BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
}
#endif
// svwin.h nicht mehr includen
#define _SVWIN_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

84
tools/inc/tools/prewin.h
View File

@@ -1,84 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
/* nicht geschuetzt, darf nur einmal includet werden */
#if defined WNT
#define BOOL WIN_BOOL
#define BYTE WIN_BYTE
#ifndef VCL_NEED_BASETSD
#define INT64 WIN_INT64
#define UINT64 WIN_UINT64
#define INT32 WIN_INT32
#define UINT32 WIN_UINT32
#define ULONG WIN_ULONG
#endif
#define Rectangle BLA_Rectangle
#define Polygon BLA_Polygon
#define PolyPolygon BLA_PolyPolygon
#define Region WIN_Region
#define Folder WIN_Folder
#define GradientStyle_RECT WIN_GradientStyle_RECT
#ifdef __cplusplus
extern "C" {
#endif
#define STRICT
#ifdef _MSC_VER
#pragma warning(push, 1)
#endif
#include <windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <shellapi.h>
#include <commdlg.h>
#include <dlgs.h>
#ifdef USE_TOOLHELP
#include <tlhelp32.h>
#endif
#ifdef USE_IMAGEHLP
#include <imagehlp.h>
#endif
#ifdef INCLUDE_MMSYSTEM
#include <mmsystem.h>
#endif
#ifdef _MSC_VER
#pragma warning(push, 1)
#endif
#include <commctrl.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
tools/inc/tools/svwin.h
View File

@@ -30,8 +30,8 @@
#define _SVWIN_H
#if defined WNT
#include <tools/prewin.h>
#include <tools/postwin.h>
#include <prewin.h>
#include <postwin.h>
#endif
#endif

3
tools/prj/d.lst
View File

@@ -27,9 +27,6 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx
..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h
..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h
..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h
..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h

4
tools/qa/test_reversemap.cxx
View File

@@ -27,9 +27,9 @@
*/
#ifdef WNT
# include <tools/prewin.h>
# include <prewin.h>
# include <windows.h>
# include <tools/postwin.h>
# include <postwin.h>
#endif
#include "precompiled_tools.hxx"

4
tools/win/inc/winshell.hxx
View File

@@ -31,9 +31,9 @@
#if defined WNT
#include <tools/prewin.h>
#include <prewin.h>
#include "shutil.h"
#include <tools/postwin.h>
#include <postwin.h>
#include <tools/string.hxx>

4
vcl/source/app/settings.cxx
View File

@@ -48,9 +48,9 @@
#include <unotools/syslocaleoptions.hxx>
#ifdef WNT
#include "tools/prewin.h"
#include "prewin.h"
#include <windows.h>
#include "tools/postwin.h"
#include "postwin.h"
#endif
using namespace rtl;

4
vcl/source/app/svmain.cxx
View File

@@ -30,10 +30,10 @@
#include "precompiled_vcl.hxx"
#ifdef WNT
#include <tools/prewin.h>
#include <prewin.h>
#include <process.h> // for _beginthreadex
#include <ole2.h> // for _beginthreadex
#include <tools/postwin.h>
#include <postwin.h>
#endif
// [ed 5/14/02 Add in explicit check for quartz graphics. OS X will define

4
vcl/win/source/gdi/salgdi3.cxx
View File

@@ -32,9 +32,9 @@
#include <string.h>
#include <malloc.h>
#include <tools/prewin.h>
#include <prewin.h>
#include <windows.h>
#include <tools/postwin.h>
#include <postwin.h>
#include <vcl/sysdata.hxx>
#include "tools/svwin.h"