Kaydet (Commit) 3c443852 authored tarafından Miklos Vajna's avatar Miklos Vajna

vcl: remove no longer needed WIN_Rectangle()

Not needed anymore after commit a5a57130
(tdf#82580 tools: rename Rectangle to tools::Rectangle, 2017-03-30).

Change-Id: I25a11ca0b6c2e9e96847bd01b5e82835d1dd4a95
üst 9b77f814
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#undef OUT #undef OUT
#undef PASSTHROUGH #undef PASSTHROUGH
#undef RELATIVE #undef RELATIVE
#undef Rectangle
#undef STRICT #undef STRICT
#undef SetPort #undef SetPort
#undef SetPrinter #undef SetPrinter
...@@ -67,10 +66,6 @@ ...@@ -67,10 +66,6 @@
#if !defined INCLUDED_POSTWIN_H && defined __cplusplus #if !defined INCLUDED_POSTWIN_H && defined __cplusplus
#define INCLUDED_POSTWIN_H #define INCLUDED_POSTWIN_H
extern "C"
{
BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
}
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#if defined(_WIN32) #if defined(_WIN32)
#define Rectangle BLA_Rectangle
#define Folder WIN_Folder #define Folder WIN_Folder
#define GradientStyle_RECT WIN_GradientStyle_RECT #define GradientStyle_RECT WIN_GradientStyle_RECT
......
...@@ -696,7 +696,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ ...@@ -696,7 +696,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/win/gdi/salprn \ vcl/win/gdi/salprn \
vcl/win/gdi/salvd \ vcl/win/gdi/salvd \
vcl/win/gdi/winlayout \ vcl/win/gdi/winlayout \
vcl/win/gdi/wntgdi \
vcl/win/window/salframe \ vcl/win/window/salframe \
vcl/win/window/keynames \ vcl/win/window/keynames \
vcl/win/window/salmenu \ vcl/win/window/salmenu \
......
...@@ -12,14 +12,8 @@ ...@@ -12,14 +12,8 @@
#include <config_features.h> #include <config_features.h>
#if HAVE_FEATURE_PDFIUM #if HAVE_FEATURE_PDFIUM
#ifdef WNT
#include <prewin.h>
#endif
#include <fpdfview.h> #include <fpdfview.h>
#include <fpdf_edit.h> #include <fpdf_edit.h>
#ifdef WNT
#include <postwin.h>
#endif
#endif #endif
#include <vcl/bitmapaccess.hxx> #include <vcl/bitmapaccess.hxx>
......
...@@ -910,7 +910,7 @@ void WinSalGraphicsImpl::invert( long nX, long nY, long nWidth, long nHeight, Sa ...@@ -910,7 +910,7 @@ void WinSalGraphicsImpl::invert( long nX, long nY, long nWidth, long nHeight, Sa
HBRUSH hOldBrush = SelectBrush( mrParent.getHDC(), GetStockBrush( NULL_BRUSH ) ); HBRUSH hOldBrush = SelectBrush( mrParent.getHDC(), GetStockBrush( NULL_BRUSH ) );
int nOldROP = SetROP2( mrParent.getHDC(), R2_NOT ); 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 ); SetROP2( mrParent.getHDC(), nOldROP );
SelectPen( mrParent.getHDC(), hOldPen ); SelectPen( mrParent.getHDC(), hOldPen );
...@@ -1661,7 +1661,7 @@ void WinSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeight ) ...@@ -1661,7 +1661,7 @@ void WinSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeight )
} }
} }
else 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 ) void WinSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
......
...@@ -1609,7 +1609,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobDat ...@@ -1609,7 +1609,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobDat
// TODO: move into ImplCreateSalPrnGraphics()? // TODO: move into ImplCreateSalPrnGraphics()?
HPEN hTempPen = SelectPen( hDC, GetStockPen( NULL_PEN ) ); HPEN hTempPen = SelectPen( hDC, GetStockPen( NULL_PEN ) );
HBRUSH hTempBrush = SelectBrush( hDC, GetStockBrush( NULL_BRUSH ) ); HBRUSH hTempBrush = SelectBrush( hDC, GetStockBrush( NULL_BRUSH ) );
WIN_Rectangle( hDC, -8000, -8000, -7999, -7999 ); Rectangle( hDC, -8000, -8000, -7999, -7999 );
SelectPen( hDC, hTempPen ); SelectPen( hDC, hTempPen );
SelectBrush( hDC, hTempBrush ); SelectBrush( hDC, hTempBrush );
......
/* -*- 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: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment