[Libreoffice-commits] core.git: include/postwin.h include/prewin.h vcl/Library_vcl.mk vcl/source vcl/win
Miklos Vajna
vmiklos at collabora.co.uk
Fri Apr 7 09:05:47 UTC 2017
include/postwin.h | 5 -----
include/prewin.h | 1 -
vcl/Library_vcl.mk | 1 -
vcl/source/filter/ipdf/pdfread.cxx | 6 ------
vcl/win/gdi/gdiimpl.cxx | 4 ++--
vcl/win/gdi/salprn.cxx | 2 +-
vcl/win/gdi/wntgdi.cxx | 37 -------------------------------------
7 files changed, 3 insertions(+), 53 deletions(-)
New commits:
commit 3c443852d25a61b61353d630d8dc8753bad6ab30
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 7 08:56:18 2017 +0200
vcl: remove no longer needed WIN_Rectangle()
Not needed anymore after commit a5a571307fb3306b74ab46b085cde6388270a770
(tdf#82580 tools: rename Rectangle to tools::Rectangle, 2017-03-30).
Change-Id: I25a11ca0b6c2e9e96847bd01b5e82835d1dd4a95
diff --git a/include/postwin.h b/include/postwin.h
index b2df82374da8..384950d68237 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -45,7 +45,6 @@
#undef OUT
#undef PASSTHROUGH
#undef RELATIVE
-#undef Rectangle
#undef STRICT
#undef SetPort
#undef SetPrinter
@@ -67,10 +66,6 @@
#if !defined INCLUDED_POSTWIN_H && defined __cplusplus
#define INCLUDED_POSTWIN_H
-extern "C"
-{
-BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
-}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/prewin.h b/include/prewin.h
index 17e27e352c92..38b2f29f387c 100644
--- a/include/prewin.h
+++ b/include/prewin.h
@@ -21,7 +21,6 @@
#if defined(_WIN32)
-#define Rectangle BLA_Rectangle
#define Folder WIN_Folder
#define GradientStyle_RECT WIN_GradientStyle_RECT
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a49eade8083c..246163c872bc 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -696,7 +696,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/win/gdi/salprn \
vcl/win/gdi/salvd \
vcl/win/gdi/winlayout \
- vcl/win/gdi/wntgdi \
vcl/win/window/salframe \
vcl/win/window/keynames \
vcl/win/window/salmenu \
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index f11f55a0b0f7..b2f68d02b07e 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -12,14 +12,8 @@
#include <config_features.h>
#if HAVE_FEATURE_PDFIUM
-#ifdef WNT
-#include <prewin.h>
-#endif
#include <fpdfview.h>
#include <fpdf_edit.h>
-#ifdef WNT
-#include <postwin.h>
-#endif
#endif
#include <vcl/bitmapaccess.hxx>
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index c2278538f582..b5d32a35bd2c 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -910,7 +910,7 @@ void WinSalGraphicsImpl::invert( long nX, long nY, long nWidth, long nHeight, Sa
HBRUSH hOldBrush = SelectBrush( mrParent.getHDC(), GetStockBrush( NULL_BRUSH ) );
int nOldROP = SetROP2( mrParent.getHDC(), R2_NOT );
- WIN_Rectangle( mrParent.getHDC(), (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) );
+ Rectangle( mrParent.getHDC(), (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) );
SetROP2( mrParent.getHDC(), nOldROP );
SelectPen( mrParent.getHDC(), hOldPen );
@@ -1661,7 +1661,7 @@ void WinSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeight )
}
}
else
- WIN_Rectangle( mrParent.getHDC(), (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) );
+ Rectangle( mrParent.getHDC(), (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) );
}
void WinSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 00e88b09560a..860351c3e990 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -1609,7 +1609,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobDat
// TODO: move into ImplCreateSalPrnGraphics()?
HPEN hTempPen = SelectPen( hDC, GetStockPen( NULL_PEN ) );
HBRUSH hTempBrush = SelectBrush( hDC, GetStockBrush( NULL_BRUSH ) );
- WIN_Rectangle( hDC, -8000, -8000, -7999, -7999 );
+ Rectangle( hDC, -8000, -8000, -7999, -7999 );
SelectPen( hDC, hTempPen );
SelectBrush( hDC, hTempBrush );
diff --git a/vcl/win/gdi/wntgdi.cxx b/vcl/win/gdi/wntgdi.cxx
deleted file mode 100644
index bf0ad25fe860..000000000000
--- a/vcl/win/gdi/wntgdi.cxx
+++ /dev/null
@@ -1,37 +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 .
- */
-
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-extern "C"
-{
-BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 )
-{
- return Rectangle( hDC, X1, Y1, X2, Y2 );
-}
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list