Merge renderer.hxx into .cxx

Change-Id: I6a028a7e459f644769207a26def9a330703bdb26

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 )
 {

svtools/source/inc/renderer.hxx

-/* -*- 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: */