[Libreoffice-commits] core.git: accessibility/inc basctl/inc chart2/inc cppcanvas/inc cui/inc dbaccess/inc desktop/inc filter/source framework/inc include/vcl oox/inc reportdesign/inc sc/inc sd/inc slideshow/inc svx/inc sw/inc vbahelper/inc vcl/inc xmlsecurity/inc
Tor Lillqvist
tml at collabora.com
Fri Dec 11 09:16:27 PST 2015
accessibility/inc/pch/precompiled_acc.hxx | 1
basctl/inc/pch/precompiled_basctl.hxx | 1
chart2/inc/pch/precompiled_chartcontroller.hxx | 1
cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 1
cui/inc/pch/precompiled_cui.hxx | 1
dbaccess/inc/pch/precompiled_dba.hxx | 1
dbaccess/inc/pch/precompiled_dbmm.hxx | 1
desktop/inc/pch/precompiled_sofficeapp.hxx | 1
filter/source/graphicfilter/ieps/ieps.cxx | 1
framework/inc/pch/precompiled_fwe.hxx | 1
framework/inc/pch/precompiled_fwi.hxx | 1
framework/inc/pch/precompiled_fwk.hxx | 1
framework/inc/pch/precompiled_fwl.hxx | 1
include/vcl/graph.h | 61 ------------------------
include/vcl/graph.hxx | 41 +++++++++++++---
oox/inc/pch/precompiled_oox.hxx | 1
reportdesign/inc/pch/precompiled_rpt.hxx | 1
reportdesign/inc/pch/precompiled_rptui.hxx | 1
sc/inc/pch/precompiled_sc.hxx | 1
sc/inc/pch/precompiled_scfilt.hxx | 1
sd/inc/pch/precompiled_sdui.hxx | 1
slideshow/inc/pch/precompiled_slideshow.hxx | 1
svx/inc/pch/precompiled_svxcore.hxx | 1
sw/inc/pch/precompiled_msword.hxx | 1
sw/inc/pch/precompiled_swui.hxx | 1
sw/inc/pch/precompiled_vbaswobj.hxx | 1
vbahelper/inc/pch/precompiled_msforms.hxx | 1
vcl/inc/impgraph.hxx | 2
xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 1
29 files changed, 36 insertions(+), 94 deletions(-)
New commits:
commit a643222794fa0d0e76d18fc59cf9ef3c5ea5188f
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Dec 11 16:17:06 2015 +0200
No need for a separate <vcl/graph.h>
Change-Id: I962544005b5d408f7c044a02eefe09b87d8a81fe
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 71b57e5..9cc594c 100644
--- 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>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 6376ff5..99b755d 100644
--- 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>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index 953a2ec..f5ea576 100644
--- 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>
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index 271bb62..df8fe04 100644
--- 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>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 685fa6f..85bb59e 100644
--- 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>
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx
index 6859063..491a411 100644
--- 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>
diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx
index 347d409..ae60212 100644
--- 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>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx
index 3d5baa3..a0dbbf5 100644
--- 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>
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 02d4259..8b43832 100644
--- 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>
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index 89fccde..b26229f 100644
--- 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>
diff --git a/framework/inc/pch/precompiled_fwi.hxx b/framework/inc/pch/precompiled_fwi.hxx
index efb88fa..003a900 100644
--- 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>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 7d35e5c..b2de591 100644
--- 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>
diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx
index 3b56204..4f6e441 100644
--- 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>
diff --git a/include/vcl/graph.h b/include/vcl/graph.h
deleted file mode 100644
index ec196d0..0000000
--- 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 d102d4f..81df1a4 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
{
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 8adfabd..bf9089b 100644
--- 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>
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index 1ad651b..a79b979 100644
--- 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>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 8c50f3b..327d821 100644
--- 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>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 3422d88..4da80fd 100644
--- 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>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 60dfa11..2f95d5e 100644
--- 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>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 016d86e..62805f6 100644
--- 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>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index d6f824f..542e135 100644
--- 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>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index e6406be..f45a2a4 100644
--- 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>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index e16dcb4..3125b96 100644
--- 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>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 4d40b34..17a5b99 100644
--- 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>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index 5c0c9d7..0137649 100644
--- 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>
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx
index 344bb4c..a495c80 100644
--- 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>
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 739834e..c0e0689 100644
--- 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 -
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index acc30e1..3028610 100644
--- 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>
More information about the Libreoffice-commits
mailing list