From 7d32da410cb413f540f2127db4e6dc2807506510 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 26 Oct 2013 16:54:55 +0300 Subject: Seems that is private to VCL, so move it there Change-Id: I3fd1ac8aaea2e79efcd9e2d4b12347a387d0d28b --- include/vcl/cvtsvm.hxx | 102 ------------------------------------ svx/inc/pch/precompiled_svxcore.hxx | 1 - svx/source/svdraw/svdobj.cxx | 1 - vcl/inc/cvtsvm.hxx | 102 ++++++++++++++++++++++++++++++++++++ vcl/source/gdi/cvtsvm.cxx | 3 +- vcl/source/gdi/gdimtf.cxx | 2 +- 6 files changed, 105 insertions(+), 106 deletions(-) delete mode 100644 include/vcl/cvtsvm.hxx create mode 100644 vcl/inc/cvtsvm.hxx diff --git a/include/vcl/cvtsvm.hxx b/include/vcl/cvtsvm.hxx deleted file mode 100644 index c6597df53708..000000000000 --- a/include/vcl/cvtsvm.hxx +++ /dev/null @@ -1,102 +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 . - */ - -#ifndef INCLUDED_VCL_CVTSVM_HXX -#define INCLUDED_VCL_CVTSVM_HXX - -#include -#include -#include -#include - -#define CONVERT_TO_SVM1 0x00000001UL -#define CONVERT_FROM_SVM1 0x00000002UL - -#define GDI_PIXEL_ACTION 1 -#define GDI_POINT_ACTION 2 -#define GDI_LINE_ACTION 3 -#define GDI_RECT_ACTION 4 -#define GDI_ELLIPSE_ACTION 5 -#define GDI_ARC_ACTION 6 -#define GDI_PIE_ACTION 7 -#define GDI_INVERTRECT_ACTION 8 -#define GDI_HIGHLIGHTRECT_ACTION 9 -#define GDI_POLYLINE_ACTION 10 -#define GDI_POLYGON_ACTION 11 -#define GDI_POLYPOLYGON_ACTION 12 -#define GDI_TEXT_ACTION 13 -#define GDI_TEXTARRAY_ACTION 14 -#define GDI_STRETCHTEXT_ACTION 15 -#define GDI_ICON_ACTION 16 -#define GDI_BITMAP_ACTION 17 -#define GDI_BITMAPSCALE_ACTION 18 -#define GDI_PEN_ACTION 19 -#define GDI_FONT_ACTION 20 -#define GDI_BACKBRUSH_ACTION 21 -#define GDI_FILLBRUSH_ACTION 22 -#define GDI_MAPMODE_ACTION 23 -#define GDI_CLIPREGION_ACTION 24 -#define GDI_RASTEROP_ACTION 25 -#define GDI_PUSH_ACTION 26 -#define GDI_POP_ACTION 27 -#define GDI_MOVECLIPREGION_ACTION 28 -#define GDI_ISECTCLIPREGION_ACTION 29 -#define GDI_MTF_ACTION 30 -#define GDI_BITMAPSCALEPART_ACTION 32 -#define GDI_GRADIENT_ACTION 33 - -#define GDI_TRANSPARENT_COMMENT 1024 -#define GDI_HATCH_COMMENT 1025 -#define GDI_REFPOINT_COMMENT 1026 -#define GDI_TEXTLINECOLOR_COMMENT 1027 -#define GDI_TEXTLINE_COMMENT 1028 -#define GDI_FLOATTRANSPARENT_COMMENT 1029 -#define GDI_GRADIENTEX_COMMENT 1030 -#define GDI_COMMENT_COMMENT 1031 -#define GDI_UNICODE_COMMENT 1032 - -#define GDI_LINEJOIN_ACTION 1033 -#define GDI_EXTENDEDPOLYGON_ACTION 1034 -#define GDI_LINEDASHDOT_ACTION 1035 - -#define GDI_LINECAP_ACTION 1036 - -class VCL_PLUGIN_PUBLIC SVMConverter -{ -private: - SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); - SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ); - SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, - VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, - Color& rLineCol, ::std::stack& rLineColStack, - rtl_TextEncoding& rActualCharSet ); - -public: - SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, sal_uLong nConvertMode ); - ~SVMConverter() {} - -private: - // Not implemented - SVMConverter( const SVMConverter& ); - SVMConverter& operator=( const SVMConverter& ); -}; - -#endif // INCLUDED_VCL_CVTSVM_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index fcb75191ca05..85b7306f78d2 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -582,7 +582,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index bfd1d4b81f98..b495c5b98b8f 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx new file mode 100644 index 000000000000..c6597df53708 --- /dev/null +++ b/vcl/inc/cvtsvm.hxx @@ -0,0 +1,102 @@ +/* -*- 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_CVTSVM_HXX +#define INCLUDED_VCL_CVTSVM_HXX + +#include +#include +#include +#include + +#define CONVERT_TO_SVM1 0x00000001UL +#define CONVERT_FROM_SVM1 0x00000002UL + +#define GDI_PIXEL_ACTION 1 +#define GDI_POINT_ACTION 2 +#define GDI_LINE_ACTION 3 +#define GDI_RECT_ACTION 4 +#define GDI_ELLIPSE_ACTION 5 +#define GDI_ARC_ACTION 6 +#define GDI_PIE_ACTION 7 +#define GDI_INVERTRECT_ACTION 8 +#define GDI_HIGHLIGHTRECT_ACTION 9 +#define GDI_POLYLINE_ACTION 10 +#define GDI_POLYGON_ACTION 11 +#define GDI_POLYPOLYGON_ACTION 12 +#define GDI_TEXT_ACTION 13 +#define GDI_TEXTARRAY_ACTION 14 +#define GDI_STRETCHTEXT_ACTION 15 +#define GDI_ICON_ACTION 16 +#define GDI_BITMAP_ACTION 17 +#define GDI_BITMAPSCALE_ACTION 18 +#define GDI_PEN_ACTION 19 +#define GDI_FONT_ACTION 20 +#define GDI_BACKBRUSH_ACTION 21 +#define GDI_FILLBRUSH_ACTION 22 +#define GDI_MAPMODE_ACTION 23 +#define GDI_CLIPREGION_ACTION 24 +#define GDI_RASTEROP_ACTION 25 +#define GDI_PUSH_ACTION 26 +#define GDI_POP_ACTION 27 +#define GDI_MOVECLIPREGION_ACTION 28 +#define GDI_ISECTCLIPREGION_ACTION 29 +#define GDI_MTF_ACTION 30 +#define GDI_BITMAPSCALEPART_ACTION 32 +#define GDI_GRADIENT_ACTION 33 + +#define GDI_TRANSPARENT_COMMENT 1024 +#define GDI_HATCH_COMMENT 1025 +#define GDI_REFPOINT_COMMENT 1026 +#define GDI_TEXTLINECOLOR_COMMENT 1027 +#define GDI_TEXTLINE_COMMENT 1028 +#define GDI_FLOATTRANSPARENT_COMMENT 1029 +#define GDI_GRADIENTEX_COMMENT 1030 +#define GDI_COMMENT_COMMENT 1031 +#define GDI_UNICODE_COMMENT 1032 + +#define GDI_LINEJOIN_ACTION 1033 +#define GDI_EXTENDEDPOLYGON_ACTION 1034 +#define GDI_LINEDASHDOT_ACTION 1035 + +#define GDI_LINECAP_ACTION 1036 + +class VCL_PLUGIN_PUBLIC SVMConverter +{ +private: + SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); + SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ); + SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, + VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, + Color& rLineCol, ::std::stack& rLineColStack, + rtl_TextEncoding& rActualCharSet ); + +public: + SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, sal_uLong nConvertMode ); + ~SVMConverter() {} + +private: + // Not implemented + SVMConverter( const SVMConverter& ); + SVMConverter& operator=( const SVMConverter& ); +}; + +#endif // INCLUDED_VCL_CVTSVM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 8835e446797b..630cfcf8b611 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -27,9 +27,10 @@ #include #include #include -#include #include +#include + // Inlines void ImplReadRect( SvStream& rIStm, Rectangle& rRect ) { diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 9301a19db514..820f2a051524 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,7 @@ #include #include +#include #include #include #include -- cgit