From 7a88d43902d1b2c3630b509e3de12fbda4c440ca Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Fri, 25 Apr 2014 22:55:47 +1000 Subject: VCL: Move OutputDevice map structures to own VCL header file Change-Id: Ifbaa51018d47fde72be80d5d1870fdda214db320 --- include/vcl/outdev.hxx | 22 +--------------------- include/vcl/outdevmap.hxx | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 include/vcl/outdevmap.hxx diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c0a230640594..40f3345a72d8 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -33,8 +33,8 @@ #include #include #include - #include +#include #include #include @@ -122,26 +122,6 @@ namespace vcl struct FontCapabilities; } -// OutputDevice-Data - -struct ImplMapRes -{ - long mnMapOfsX; // Offset in X direction - long mnMapOfsY; // Offset in Y direction - long mnMapScNumX; // Scaling factor - numerator in X direction - long mnMapScNumY; // Scaling factor - numerator in Y direction - long mnMapScDenomX; // Scaling factor - denominator in X direction - long mnMapScDenomY; // Scaling factor - denominator in Y direction -}; - -struct ImplThresholdRes -{ - long mnThresLogToPixX; // Thresholds for calculation - long mnThresLogToPixY; // with BigInts - long mnThresPixToLogX; // "" - long mnThresPixToLogY; // "" -}; - // OutputDevice-Types // Flags for DrawText() diff --git a/include/vcl/outdevmap.hxx b/include/vcl/outdevmap.hxx new file mode 100644 index 000000000000..cda9e629b864 --- /dev/null +++ b/include/vcl/outdevmap.hxx @@ -0,0 +1,44 @@ +/* -*- 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 . + */ + +#ifndef INCLUDED_VCL_INC_OUTDEVMAP_HXX +#define INCLUDED_VCL_INC_OUTDEVMAP_HXX + + +struct ImplMapRes +{ + long mnMapOfsX; // Offset in X direction + long mnMapOfsY; // Offset in Y direction + long mnMapScNumX; // Scaling factor - numerator in X direction + long mnMapScNumY; // Scaling factor - numerator in Y direction + long mnMapScDenomX; // Scaling factor - denominator in X direction + long mnMapScDenomY; // Scaling factor - denominator in Y direction +}; + +struct ImplThresholdRes +{ + long mnThresLogToPixX; // Thresholds for calculation + long mnThresLogToPixY; // with BigInts + long mnThresPixToLogX; // "" + long mnThresPixToLogY; // "" +}; + +#endif // INCLUDED_VCL_INC_OUTDEVMAP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit