diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-07 08:56:18 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-07 11:05:00 +0200 |
commit | 3c443852d25a61b61353d630d8dc8753bad6ab30 (patch) | |
tree | 4db6d2c94e8f1dca799e7dda1f45f46f7aefd1dd /vcl/win | |
parent | 9b77f8142bf665a47c3a179e3fe3f82623a99f8a (diff) |
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
Diffstat (limited to 'vcl/win')
-rw-r--r-- | vcl/win/gdi/gdiimpl.cxx | 4 | ||||
-rw-r--r-- | vcl/win/gdi/salprn.cxx | 2 | ||||
-rw-r--r-- | vcl/win/gdi/wntgdi.cxx | 37 |
3 files changed, 3 insertions, 40 deletions
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: */ |