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

Change-Id: I962544005b5d408f7c044a02eefe09b87d8a81fe

2 files changed, 35 insertions, 67 deletions

diff --git a/include/vcl/graph.h b/include/vcl/graph.h
deleted file mode 100644
index ec196d08205a..000000000000
--- a/include/vcl/graph.h
+++ /dev/null
@@ -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: */
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index d102d4f30d7a..81df1a4508f6 100644
--- 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;} } } }
+namespace vcl { class Font; }
 
+class GfxLink;
+class ImpGraphic;
+class OutputDevice;
+class ReaderData;
 
-// - Graphic -
+class VCL_DLLPUBLIC GraphicReader
+{
+protected:
 
+    OUString        maUpperName;
+    ReaderData*     mpReaderData;
 
-class   ImpGraphic;
-class   OutputDevice;
-namespace vcl { class Font; }
-class   GfxLink;
+                    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
 {