diff options
29 files changed, 36 insertions, 94 deletions
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 71b57e5079f8..9cc594c2d22f 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 6376ff57203c..99b755d8bfdc 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 953a2eca6550..f5ea57652729 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 271bb625d52e..df8fe04d6f34 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 685fa6fe0cf7..85bb59efc4cb 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 68590630322c..491a411a795a 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 347d409ed0ea..ae602125a715 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 3d5baa38b6a8..a0dbbf5bb870 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 02d42597a134..8b4383221e89 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 89fccde2bdd7..b26229ffd2ae 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 efb88fa02c63..003a900ecfec 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 7d35e5c99b68..b2de591f9513 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 3b562047f237..4f6e441acbef 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 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 { diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 8adfabdb6467..bf9089b841eb 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 1ad651bc7133..a79b979f79bf 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 8c50f3bde173..327d821dd227 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 3422d8819fda..4da80fda76fd 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 60dfa11c8853..2f95d5e06756 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 016d86ef61f0..62805f60948c 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 d6f824f955ee..542e135722f9 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 e6406bef630a..f45a2a45054c 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 e16dcb489294..3125b96c32a3 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 4d40b3445d87..17a5b995419c 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 5c0c9d77ef0b..01376495a6f6 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 344bb4c84a3b..a495c80c27ee 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 739834ef286e..c0e068993614 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 acc30e15f155..3028610459a6 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> |