9 files changed, 608 insertions, 0 deletions
diff --git a/vcl/inc/graphic/DetectorTools.hxx b/vcl/inc/graphic/DetectorTools.hxx
new file mode 100644
index 000000000..3847457fc
--- /dev/null
+++ b/vcl/inc/graphic/DetectorTools.hxx
@@ -0,0 +1,61 @@
+/* -*- 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/.
+ *
+ */
+
+#pragma once
+
+namespace vcl
+{
+const char* matchArray(const char* pSource, sal_Int32 nSourceSize, const char* pSearch,
+                       sal_Int32 nSearchSize)
+{
+    for (sal_Int32 increment = 0; increment <= (nSourceSize - nSearchSize); ++increment)
+    {
+        bool bMatch = true;
+        // search both arrays if they match
+        for (sal_Int32 index = 0; index < nSearchSize && bMatch; ++index)
+        {
+            if (pSource[index] != pSearch[index])
+                bMatch = false;
+        }
+        // match has been found
+        if (bMatch)
+            return pSource;
+        pSource++;
+    }
+    return nullptr;
+}
+
+const char* matchArrayWithString(const char* pSource, sal_Int32 nSourceSize, OString const& rString)
+{
+    return matchArray(pSource, nSourceSize, rString.getStr(), rString.getLength());
+}
+
+bool checkArrayForMatchingStrings(const char* pSource, sal_Int32 nSourceSize,
+                                  std::vector<OString> const& rStrings)
+{
+    if (rStrings.empty())
+        return false;
+    if (rStrings.size() < 2)
+        return matchArrayWithString(pSource, nSourceSize, rStrings[0]) != nullptr;
+
+    const char* pBegin = pSource;
+    const char* pCurrent = pSource;
+    for (OString const& rString : rStrings)
+    {
+        sal_Int32 nCurrentSize = nSourceSize - sal_Int32(pCurrent - pBegin);
+        pCurrent = matchArray(pCurrent, nCurrentSize, rString.getStr(), rString.getLength());
+        if (pCurrent == nullptr)
+            return false;
+    }
+    return true;
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx b/vcl/inc/graphic/GraphicFormatDetector.hxx
new file mode 100644
index 000000000..dc1bbf0b3
--- /dev/null
+++ b/vcl/inc/graphic/GraphicFormatDetector.hxx
@@ -0,0 +1,99 @@
+/* -*- 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_INC_GRAPHICFORMATDETECTOR_HXX
+#define INCLUDED_VCL_INC_GRAPHICFORMATDETECTOR_HXX
+
+#include <tools/stream.hxx>
+#include <vector>
+
+namespace vcl
+{
+/***
+ * This function is has two modes:
+ * - determine the file format when bTest = false
+ *   returns true, success
+ *   out rFormatExtension - on success: file format string
+ * - verify file format when bTest = true
+ *   returns false, if file type can't be verified
+ *           true, if the format is verified or the format is not known
+ */
+VCL_DLLPUBLIC bool peekGraphicFormat(SvStream& rStream, OUString& rFormatExtension, bool bTest);
+
+class VCL_DLLPUBLIC GraphicFormatDetector
+{
+public:
+    SvStream& mrStream;
+    OUString maExtension;
+
+    std::vector<sal_uInt8> maFirstBytes;
+    sal_uInt32 mnFirstLong;
+    sal_uInt32 mnSecondLong;
+
+    sal_uInt64 mnStreamPosition;
+    sal_uInt64 mnStreamLength;
+
+    OUString msDetectedFormat;
+
+    GraphicFormatDetector(SvStream& rStream, OUString const& rFormatExtension);
+
+    bool detect();
+
+    bool checkMET();
+    bool checkBMP();
+    bool checkWMForEMF();
+    bool checkPCX();
+    bool checkTIF();
+    bool checkGIF();
+    bool checkPNG();
+    bool checkJPG();
+    bool checkSVM();
+    bool checkPCD();
+    bool checkPSD();
+    bool checkEPS();
+    bool checkDXF();
+    bool checkPCT();
+    bool checkPBMorPGMorPPM();
+    bool checkRAS();
+    bool checkXPM();
+    bool checkXBM();
+    bool checkSVG();
+    bool checkTGA();
+    bool checkMOV();
+    bool checkPDF();
+    bool checkWEBP();
+
+private:
+    /**
+     * @brief Checks whether mrStream needs to be uncompressed and returns a pointer to the
+     * to aUncompressedBuffer or a pointer to maFirstBytes if it doesn't need to be uncompressed
+     *
+     * @param aUncompressedBuffer the buffer to hold the uncompressed data
+     * @param nSize the amount of bytes to uncompress
+     * @param nRetSize the amount of bytes actually uncompressed
+     * @return sal_uInt8* a pointer to maFirstBytes or aUncompressed buffer
+     */
+    sal_uInt8* checkAndUncompressBuffer(sal_uInt8* aUncompressedBuffer, sal_uInt32 nSize,
+                                        sal_uInt64& nDecompressedSize);
+};
+}
+
+#endif // INCLUDED_VCL_INC_GRAPHICFORMATDETECTOR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/GraphicID.hxx b/vcl/inc/graphic/GraphicID.hxx
new file mode 100644
index 000000000..87ac6a50f
--- /dev/null
+++ b/vcl/inc/graphic/GraphicID.hxx
@@ -0,0 +1,47 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+#include <vcl/dllapi.h>
+#include <rtl/string.hxx>
+#include <vcl/checksum.hxx>
+
+class ImpGraphic;
+
+class GraphicID
+{
+private:
+    sal_uInt32 mnID1;
+    sal_uInt32 mnID2;
+    sal_uInt32 mnID3;
+    BitmapChecksum mnID4;
+
+public:
+    GraphicID(ImpGraphic const& rGraphic);
+
+    bool operator==(const GraphicID& rID) const
+    {
+        return rID.mnID1 == mnID1 && rID.mnID2 == mnID2 && rID.mnID3 == mnID3 && rID.mnID4 == mnID4;
+    }
+
+    OString getIDString() const;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/GraphicReader.hxx b/vcl/inc/graphic/GraphicReader.hxx
new file mode 100644
index 000000000..9576d4253
--- /dev/null
+++ b/vcl/inc/graphic/GraphicReader.hxx
@@ -0,0 +1,40 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <tools/gen.hxx>
+#include <memory>
+
+class GraphicReader
+{
+public:
+    virtual ~GraphicReader();
+
+    const OUString& GetUpperFilterName() const { return maUpperName; }
+
+protected:
+    OUString maUpperName;
+
+    GraphicReader();
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
new file mode 100644
index 000000000..6324ff89a
--- /dev/null
+++ b/vcl/inc/graphic/Manager.hxx
@@ -0,0 +1,78 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_VCL_INC_GRAPHIC_MANAGER_HXX
+#define INCLUDED_VCL_INC_GRAPHIC_MANAGER_HXX
+
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/animate/Animation.hxx>
+#include <vcl/vectorgraphicdata.hxx>
+#include <vcl/timer.hxx>
+#include <vcl/GraphicExternalLink.hxx>
+#include <vcl/gfxlink.hxx>
+
+#include <memory>
+#include <mutex>
+#include <chrono>
+#include <o3tl/sorted_vector.hxx>
+
+class ImpGraphic;
+
+namespace vcl::graphic
+{
+class Manager final
+{
+private:
+    std::mutex maMutex; // instead of SolarMutex because graphics can live past vcl main
+    o3tl::sorted_vector<ImpGraphic*> m_pImpGraphicList;
+    std::chrono::seconds mnAllowedIdleTime;
+    bool mbSwapEnabled;
+    bool mbReducingGraphicMemory;
+    sal_Int64 mnMemoryLimit;
+    sal_Int64 mnUsedSize;
+    Timer maSwapOutTimer;
+
+    Manager();
+
+    void registerGraphic(const std::shared_ptr<ImpGraphic>& rImpGraphic);
+    void loopGraphicsAndSwapOut(std::unique_lock<std::mutex>& rGuard);
+
+    DECL_LINK(SwapOutTimerHandler, Timer*, void);
+
+    static sal_Int64 getGraphicSizeBytes(const ImpGraphic* pImpGraphic);
+    void reduceGraphicMemory(std::unique_lock<std::mutex>& rGuard);
+
+public:
+    static Manager& get();
+
+    void swappedIn(const ImpGraphic* pImpGraphic, sal_Int64 nSizeBytes);
+    void swappedOut(const ImpGraphic* pImpGraphic, sal_Int64 nSizeBytes);
+
+    void changeExisting(const ImpGraphic* pImpGraphic, sal_Int64 nOldSize);
+    void unregisterGraphic(ImpGraphic* pImpGraphic);
+
+    std::shared_ptr<ImpGraphic> copy(std::shared_ptr<ImpGraphic> const& pImpGraphic);
+    std::shared_ptr<ImpGraphic> newInstance();
+    std::shared_ptr<ImpGraphic> newInstance(const BitmapEx& rBitmapEx);
+    std::shared_ptr<ImpGraphic> newInstance(std::shared_ptr<GfxLink> const& rLink,
+                                            sal_Int32 nPageIndex = 0);
+    std::shared_ptr<ImpGraphic>
+    newInstance(const std::shared_ptr<VectorGraphicData>& rVectorGraphicDataPtr);
+    std::shared_ptr<ImpGraphic> newInstance(const Animation& rAnimation);
+    std::shared_ptr<ImpGraphic> newInstance(const GDIMetaFile& rMtf);
+    std::shared_ptr<ImpGraphic> newInstance(const GraphicExternalLink& rGraphicLink);
+};
+
+} // end namespace vcl::graphic
+
+#endif // INCLUDED_VCL_INC_GRAPHIC_MANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/UnoBinaryDataContainer.hxx b/vcl/inc/graphic/UnoBinaryDataContainer.hxx
new file mode 100644
index 000000000..5447c4bdc
--- /dev/null
+++ b/vcl/inc/graphic/UnoBinaryDataContainer.hxx
@@ -0,0 +1,45 @@
+/* -*- 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:
+ *
+ */
+
+#pragma once
+
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <comphelper/servicehelper.hxx>
+
+#include <com/sun/star/util/XBinaryDataContainer.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+#include <vcl/BinaryDataContainer.hxx>
+
+class UnoBinaryDataContainer final
+    : public cppu::WeakImplHelper<css::util::XBinaryDataContainer, css::lang::XUnoTunnel>
+{
+private:
+    BinaryDataContainer maBinaryDataContainer;
+
+public:
+    UnoBinaryDataContainer(BinaryDataContainer const& rBinaryDataContainer)
+        : maBinaryDataContainer(rBinaryDataContainer)
+    {
+    }
+
+    BinaryDataContainer const& getBinaryDataContainer() const { return maBinaryDataContainer; }
+
+    // XBinaryDataContainer
+    css::uno::Sequence<sal_Int8> SAL_CALL getCopyAsByteSequence() override;
+
+    UNO3_GETIMPLEMENTATION_DECL(UnoBinaryDataContainer)
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/UnoGraphic.hxx b/vcl/inc/graphic/UnoGraphic.hxx
new file mode 100644
index 000000000..7ab50a0b9
--- /dev/null
+++ b/vcl/inc/graphic/UnoGraphic.hxx
@@ -0,0 +1,93 @@
+/* -*- 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_SOURCE_GRAPHIC_GRAPHIC_HXX
+#define INCLUDED_VCL_SOURCE_GRAPHIC_GRAPHIC_HXX
+
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/awt/XBitmap.hpp>
+#include <com/sun/star/graphic/XGraphicTransformer.hpp>
+
+#include <graphic/UnoGraphicDescriptor.hxx>
+
+#include <vcl/graph.hxx>
+
+namespace unographic {
+
+class Graphic final : public css::graphic::XGraphic,
+                public css::awt::XBitmap,
+                public css::lang::XUnoTunnel,
+                public css::graphic::XGraphicTransformer,
+                public ::unographic::GraphicDescriptor
+{
+public:
+    Graphic();
+    virtual ~Graphic() noexcept override;
+
+    using ::unographic::GraphicDescriptor::init;
+    void init(const ::Graphic& rGraphic);
+
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
+    virtual void SAL_CALL acquire() noexcept override;
+    virtual void SAL_CALL release() noexcept override;
+private:
+    // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+    // XTypeProvider
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
+
+    // XGraphic
+    virtual ::sal_Int8 SAL_CALL getType(  ) override;
+
+    // XBitmap
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getDIB(  ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getMaskDIB(  ) override;
+
+    // XUnoTunnel
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
+
+    // XGraphicTransformer
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL colorChange(
+        const css::uno::Reference< css::graphic::XGraphic >& rGraphic,
+        sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) override;
+
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyDuotone(
+        const css::uno::Reference< css::graphic::XGraphic >& rGraphic,
+        sal_Int32 nColorOne, sal_Int32 nColorTwo ) override;
+
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyBrightnessContrast(
+        const css::uno::Reference< css::graphic::XGraphic >& rxGraphic,
+        sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso ) override;
+
+    ::Graphic maGraphic;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/UnoGraphicDescriptor.hxx b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
new file mode 100644
index 000000000..096b30fd6
--- /dev/null
+++ b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
@@ -0,0 +1,121 @@
+/* -*- 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_SOURCE_GRAPHIC_DESCRIPTOR_HXX
+#define INCLUDED_VCL_SOURCE_GRAPHIC_DESCRIPTOR_HXX
+
+#include <comphelper/propertysethelper.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+
+#include <cppuhelper/weakagg.hxx>
+#include <comphelper/propertysetinfo.hxx>
+#include <vcl/graph.hxx>
+
+#define MIMETYPE_BMP        "image/x-MS-bmp"
+#define MIMETYPE_GIF        "image/gif"
+#define MIMETYPE_JPG        "image/jpeg"
+#define MIMETYPE_PCD        "image/x-photo-cd"
+#define MIMETYPE_PCX        "image/x-pcx"
+#define MIMETYPE_PNG        "image/png"
+#define MIMETYPE_TIF        "image/tiff"
+#define MIMETYPE_XBM        "image/x-xbitmap"
+#define MIMETYPE_XPM        "image/x-xpixmap"
+#define MIMETYPE_PBM        "image/x-portable-bitmap"
+#define MIMETYPE_PGM        "image/x-portable-graymap"
+#define MIMETYPE_PPM        "image/x-portable-pixmap"
+#define MIMETYPE_RAS        "image/x-cmu-raster"
+#define MIMETYPE_TGA        "image/x-targa"
+#define MIMETYPE_PSD        "image/vnd.adobe.photoshop"
+#define MIMETYPE_EPS        "image/x-eps"
+#define MIMETYPE_DXF        "image/vnd.dxf"
+#define MIMETYPE_MET        "image/x-met"
+#define MIMETYPE_PCT        "image/x-pict"
+#define MIMETYPE_SVM        "image/x-svm"
+#define MIMETYPE_WMF        "image/x-wmf"
+#define MIMETYPE_EMF        "image/x-emf"
+#define MIMETYPE_SVG        "image/svg+xml"
+#define MIMETYPE_PDF        "application/pdf"
+#define MIMETYPE_WEBP       "image/webp"
+inline constexpr OUStringLiteral MIMETYPE_VCLGRAPHIC = u"image/x-vclgraphic";
+
+namespace comphelper { class PropertySetInfo; }
+namespace com::sun::star::io { class XInputStream; }
+
+class Graphic;
+
+namespace unographic {
+
+class GraphicDescriptor : public ::cppu::OWeakAggObject,
+                          public css::lang::XServiceInfo,
+                          public css::lang::XTypeProvider,
+                          public ::comphelper::PropertySetHelper
+{
+public:
+
+    GraphicDescriptor();
+    virtual ~GraphicDescriptor() noexcept override;
+
+    void init( const ::Graphic& rGraphic );
+    void init( const OUString& rURL );
+    void init( const css::uno::Reference< css::io::XInputStream >& rxIStm, const OUString& rURL );
+
+    static rtl::Reference<::comphelper::PropertySetInfo> createPropertySetInfo();
+
+    // XInterface
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
+    virtual void SAL_CALL acquire() noexcept override;
+    virtual void SAL_CALL release() noexcept override;
+
+protected:
+    // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+    // XTypeProvider
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
+
+    // PropertySetHelper
+     virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+     virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
+
+private:
+
+    const ::Graphic*        mpGraphic;
+    GraphicType             meType;
+    OUString                maMimeType;
+    Size                    maSizePixel;
+    Size                    maSize100thMM;
+    sal_uInt16              mnBitsPerPixel;
+    bool                    mbTransparent;
+
+    GraphicDescriptor( const GraphicDescriptor& rDescriptor ) = delete;
+
+    GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete;
+
+    void implCreate( SvStream& rIStm, const OUString* pPath );
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/VectorGraphicLoader.hxx b/vcl/inc/graphic/VectorGraphicLoader.hxx
new file mode 100644
index 000000000..943f7b8dc
--- /dev/null
+++ b/vcl/inc/graphic/VectorGraphicLoader.hxx
@@ -0,0 +1,24 @@
+/* -*- 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/.
+ *
+ */
+
+#pragma once
+
+#include <tools/stream.hxx>
+#include <vcl/vectorgraphicdata.hxx>
+#include <vcl/BinaryDataContainer.hxx>
+#include <memory>
+
+namespace vcl
+{
+std::shared_ptr<VectorGraphicData> loadVectorGraphic(BinaryDataContainer const& rDataContainer,
+                                                     VectorGraphicDataType eType);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */