No need for a separate <vcl/graph.h>

Change-Id: I962544005b5d408f7c044a02eefe09b87d8a81fe
2015-12-11 16:17:06 +02:00
parent e67a834c5d
commit a643222794
29 changed files with 39 additions and 97 deletions
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -124,7 +124,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -141,7 +141,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -129,7 +129,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
@@ -108,7 +108,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/impdel.hxx>
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -138,7 +138,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/help.hxx>
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -116,7 +116,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/keycod.hxx>
--- a/dbaccess/inc/pch/precompiled_dbmm.hxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.hxx
@@ -109,7 +109,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/impdel.hxx>
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -127,7 +127,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -24,7 +24,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/graph.h>
 #include <vcl/window.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -113,7 +113,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/framework/inc/pch/precompiled_fwi.hxx
+++ b/framework/inc/pch/precompiled_fwi.hxx
@@ -94,7 +94,6 @@
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/graph.h>
 #include <vcl/keycodes.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/region.hxx>
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -127,7 +127,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -128,7 +128,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/i18nhelp.hxx>
--- a/include/vcl/graph.h
+++ b/include/vcl/graph.h
@@ -1,61 +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_GRAPH_H
-#define INCLUDED_VCL_GRAPH_H
-
-#include <rtl/ustring.hxx>
-#include <vcl/dllapi.h>
-
-enum GraphicType
-{
-    GRAPHIC_NONE,
-    GRAPHIC_BITMAP,
-    GRAPHIC_GDIMETAFILE,
-    GRAPHIC_DEFAULT
-};
-
-class ReaderData;
-
-class VCL_DLLPUBLIC GraphicReader
-{
-protected:
-
-    OUString        maUpperName;
-    ReaderData*     mpReaderData;
-
-                    GraphicReader() :
-                        mpReaderData( NULL ) {}
-
-public:
-
-    virtual         ~GraphicReader();
-
-    const OUString&   GetUpperFilterName() const { return maUpperName; }
-
-    // TODO: when incompatible changes are possible again
-    // the preview size hint should be redone
-    void            DisablePreviewMode();
-    void            SetPreviewSize( const Size& );
-    Size            GetPreviewSize() const;
-};
-
-#endif // INCLUDED_VCL_GRAPH_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -23,25 +23,54 @@
 #include <tools/stream.hxx>
 #include <vcl/dllapi.h>
 #include <tools/solar.h>
+#include <rtl/ustring.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/graph.h>
 #include <vcl/gfxlink.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <vcl/svgdata.hxx>

+
+enum GraphicType
+{
+    GRAPHIC_NONE,
+    GRAPHIC_BITMAP,
+    GRAPHIC_GDIMETAFILE,
+    GRAPHIC_DEFAULT
+};
+
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } }
-
-
-// - Graphic -
-
-
-class   ImpGraphic;
-class   OutputDevice;
 namespace vcl { class Font; }
-class   GfxLink;
+
+class GfxLink;
+class ImpGraphic;
+class OutputDevice;
+class ReaderData;
+
+class VCL_DLLPUBLIC GraphicReader
+{
+protected:
+
+    OUString        maUpperName;
+    ReaderData*     mpReaderData;
+
+                    GraphicReader() :
+                        mpReaderData( NULL ) {}
+
+public:
+
+    virtual         ~GraphicReader();
+
+    const OUString&   GetUpperFilterName() const { return maUpperName; }
+
+    // TODO: when incompatible changes are possible again
+    // the preview size hint should be redone
+    void            DisablePreviewMode();
+    void            SetPreviewSize( const Size& );
+    Size            GetPreviewSize() const;
+};

 class VCL_DLLPUBLIC GraphicConversionParameters
 {
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -86,7 +86,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/svgdata.hxx>
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -132,7 +132,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -141,7 +141,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -144,7 +144,6 @@
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -94,7 +94,6 @@
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -137,7 +137,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -125,7 +125,6 @@
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/impdel.hxx>
 #include <vcl/inputctx.hxx>
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -126,7 +126,6 @@
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/idle.hxx>
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -139,7 +139,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/hatch.hxx>
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -140,7 +140,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/group.hxx>
 #include <vcl/hatch.hxx>
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -134,7 +134,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/image.hxx>
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -116,7 +116,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/image.hxx>
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -24,7 +24,7 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/graph.h>
+#include <vcl/graph.hxx>
 #include <vcl/svgdata.hxx>

 // - ImpSwapInfo -
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -127,7 +127,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/gradient.hxx>
-#include <vcl/graph.h>
 #include <vcl/graph.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/idle.hxx>