svtools/source/graphic/provider.cxx | 40 +++++++++++++++-- svtools/source/graphic/renderer.cxx | 57 +++++++++++++++++++++---- svtools/source/inc/provider.hxx | 68 ----------------------------- svtools/source/inc/renderer.hxx | 82 ------------------------------------ 4 files changed, 85 insertions(+), 162 deletions(-)
New commits: commit 0ca0a9f2e2661b52428aa117e78570583a872a04 Author: Stephan Bergmann <[email protected]> Date: Wed Dec 21 14:28:20 2016 +0100 Merge renderer.hxx into .cxx Change-Id: I6a028a7e459f644769207a26def9a330703bdb26 diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 19c32bd..09fc338 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -21,10 +21,16 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/awt/XDevice.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/graphic/XGraphicRenderer.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/mutex.hxx> +#include <tools/gen.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <comphelper/propertysethelper.hxx> #include <comphelper/propertysetinfo.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> @@ -32,7 +38,6 @@ #include <svtools/grfmgr.hxx> #include <comphelper/servicehelper.hxx> #include "graphic.hxx" -#include "renderer.hxx" #define UNOGRAPHIC_DEVICE 1 #define UNOGRAPHIC_DESTINATIONRECT 2 @@ -42,19 +47,55 @@ using namespace ::com::sun::star; namespace { -GraphicRendererVCL::GraphicRendererVCL() : - ::comphelper::PropertySetHelper( createPropertySetInfo() ), - mpOutDev( nullptr ) +class GraphicRendererVCL : public ::cppu::OWeakAggObject, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider, + public ::comphelper::PropertySetHelper, + public css::graphic::XGraphicRenderer { -} + static ::comphelper::PropertySetInfo* createPropertySetInfo(); +public: -GraphicRendererVCL::~GraphicRendererVCL() - throw() + GraphicRendererVCL(); + + // XInterface + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; + + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + + // XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + + // PropertySetHelper + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override; + + // XGraphicRenderer + virtual void SAL_CALL render( const css::uno::Reference< css::graphic::XGraphic >& Graphic ) throw (css::uno::RuntimeException, std::exception) override; + +private: + + css::uno::Reference< css::awt::XDevice > mxDevice; + + VclPtr<OutputDevice> mpOutDev; + Rectangle maDestRect; + css::uno::Any maRenderData; +}; + +GraphicRendererVCL::GraphicRendererVCL() : + ::comphelper::PropertySetHelper( createPropertySetInfo() ), + mpOutDev( nullptr ) { } - uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx deleted file mode 100644 index 33c159b..0000000 --- a/svtools/source/inc/renderer.hxx +++ /dev/null @@ -1,82 +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_SVTOOLS_SOURCE_INC_RENDERER_HXX -#define INCLUDED_SVTOOLS_SOURCE_INC_RENDERER_HXX - -#include <tools/gen.hxx> -#include <comphelper/propertysethelper.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/graphic/XGraphicRenderer.hpp> - -class OutputDevice; - -namespace { - -class GraphicRendererVCL : public ::cppu::OWeakAggObject, - public css::lang::XServiceInfo, - public css::lang::XTypeProvider, - public ::comphelper::PropertySetHelper, - public css::graphic::XGraphicRenderer -{ - static ::comphelper::PropertySetInfo* createPropertySetInfo(); - -public: - - GraphicRendererVCL(); - virtual ~GraphicRendererVCL() throw() override; - - // XInterface - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; - - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; - - // PropertySetHelper - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override; - - // XGraphicRenderer - virtual void SAL_CALL render( const css::uno::Reference< css::graphic::XGraphic >& Graphic ) throw (css::uno::RuntimeException, std::exception) override; - -private: - - css::uno::Reference< css::awt::XDevice > mxDevice; - - VclPtr<OutputDevice> mpOutDev; - Rectangle maDestRect; - css::uno::Any maRenderData; -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 124396ecc6185ac05be80840cfdb5e84d8d41206 Author: Stephan Bergmann <[email protected]> Date: Wed Dec 21 14:27:50 2016 +0100 Merge provider.hxx into .cxx Change-Id: I361d044643b8f886f68e424e531f2fc82b8c5e40 diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 1f559d6..908d816 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -33,17 +33,20 @@ #include <svl/solar.hrc> #include <vcl/virdev.hxx> #include <vcl/settings.hxx> +#include <com/sun/star/awt/XBitmap.hpp> +#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/servicehelper.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include "descriptor.hxx" #include "graphic.hxx" #include <rtl/ref.hxx> #include <svtools/grfmgr.hxx> -#include "provider.hxx" #include <vcl/dibtools.hxx> #include <memory> @@ -53,11 +56,40 @@ namespace { #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" -GraphicProvider::GraphicProvider() +class GraphicProvider : public ::cppu::WeakImplHelper< css::graphic::XGraphicProvider, + css::lang::XServiceInfo > { -} +public: + + GraphicProvider(); + +protected: + + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; -GraphicProvider::~GraphicProvider() + // XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + + // XGraphicProvider + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL queryGraphic( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL storeGraphic( const css::uno::Reference< css::graphic::XGraphic >& Graphic, const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + +private: + + static css::uno::Reference< css::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ); + static css::uno::Reference< css::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ); + static css::uno::Reference< css::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ); + static css::uno::Reference< css::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ); + static css::uno::Reference< css::graphic::XGraphic > implLoadBitmap( const css::uno::Reference< css::awt::XBitmap >& rBitmap ); + static css::uno::Reference< css::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ); +}; + +GraphicProvider::GraphicProvider() { } diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx deleted file mode 100644 index 346429d..0000000 --- a/svtools/source/inc/provider.hxx +++ /dev/null @@ -1,68 +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_SVTOOLS_SOURCE_INC_PROVIDER_HXX -#define INCLUDED_SVTOOLS_SOURCE_INC_PROVIDER_HXX - -#include <cppuhelper/implbase.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/awt/XBitmap.hpp> - -namespace { - -class GraphicProvider : public ::cppu::WeakImplHelper< css::graphic::XGraphicProvider, - css::lang::XServiceInfo > -{ -public: - - GraphicProvider(); - virtual ~GraphicProvider() override; - -protected: - - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - - // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; - - // XGraphicProvider - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL queryGraphic( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeGraphic( const css::uno::Reference< css::graphic::XGraphic >& Graphic, const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - -private: - - static css::uno::Reference< css::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ); - static css::uno::Reference< css::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ); - static css::uno::Reference< css::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ); - static css::uno::Reference< css::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ); - static css::uno::Reference< css::graphic::XGraphic > implLoadBitmap( const css::uno::Reference< css::awt::XBitmap >& rBitmap ); - static css::uno::Reference< css::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ); -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
