Clean up function declarations and some unused functions

Change-Id: I2b743ee6e184af5f9020309ea5e184aa17c19405

6 files changed, 59 insertions, 54 deletions

diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
index b3b686a6057f..e2786fcccfc8 100644
--- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
@@ -48,13 +48,6 @@ namespace drawinglayer
             {
             }
 
-            ImpSdr3DLightAttribute()
-            :   maColor(basegfx::BColor()),
-                maDirection(basegfx::B3DVector()),
-                mbSpecular(false)
-            {
-            }
-
             // data read access
             const basegfx::BColor& getColor() const { return maColor; }
             const basegfx::B3DVector& getDirection() const { return maDirection; }
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 15e2e8df189e..5afcac016887 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -57,17 +57,6 @@ namespace drawinglayer
             {
             }
 
-            explicit ImpSdrLineAttribute(const basegfx::BColor& rColor)
-            :   meJoin(basegfx::B2DLINEJOIN_NONE),
-                mfWidth(0.0),
-                mfTransparence(0.0),
-                maColor(rColor),
-                meCap(com::sun::star::drawing::LineCap_BUTT),
-                maDotDashArray(),
-                mfFullDotDashLen(0.0)
-            {
-            }
-
             ImpSdrLineAttribute()
             :   meJoin(basegfx::B2DLINEJOIN_ROUND),
                 mfWidth(0.0),
diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
index 7366170f428d..b0d9abb8d285 100644
--- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
@@ -71,21 +71,6 @@ namespace drawinglayer
             {
             }
 
-            ImpSdr3DObjectAttribute()
-            :   maNormalsKind(::com::sun::star::drawing::NormalsKind_SPECIFIC),
-                maTextureProjectionX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC),
-                maTextureProjectionY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC),
-                maTextureKind(::com::sun::star::drawing::TextureKind2_LUMINANCE),
-                maTextureMode(::com::sun::star::drawing::TextureMode_REPLACE),
-                maMaterial(MaterialAttribute3D()),
-                mbNormalsInvert(false),
-                mbDoubleSided(false),
-                mbShadow3D(false),
-                mbTextureFilter(false),
-                mbReducedLineGeometry(false)
-            {
-            }
-
             // data read access
             ::com::sun::star::drawing::NormalsKind getNormalsKind() const { return maNormalsKind; }
             ::com::sun::star::drawing::TextureProjectionMode getTextureProjectionX() const { return maTextureProjectionX; }
diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
index ba9e79c57682..5d0620dc5ca4 100644
--- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
+++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
@@ -26,23 +26,10 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <cppuhelper/factory.hxx>
 
-
+#include <xprimitive2drenderer.hxx>
 
 using namespace ::com::sun::star;
 
-
-// predefines
-
-namespace drawinglayer
-{
-    namespace unorenderer
-    {
-        extern uno::Sequence< OUString > SAL_CALL XPrimitive2DRenderer_getSupportedServiceNames();
-        extern OUString SAL_CALL XPrimitive2DRenderer_getImplementationName();
-        extern uno::Reference< uno::XInterface > SAL_CALL XPrimitive2DRenderer_createInstance( const uno::Reference< lang::XMultiServiceFactory > & );
-    } // end of namespace unorenderer
-} // end of namespace drawinglayer
-
 extern "C"
 {
     SAL_DLLPUBLIC_EXPORT void* SAL_CALL drawinglayer_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 6c9327bae761..03c12fd60948 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
 #include <com/sun/star/graphic/XPrimitive2DRenderer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -33,7 +36,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 
-
+#include <xprimitive2drenderer.hxx>
 
 using namespace ::com::sun::star;
 
@@ -43,13 +46,11 @@ namespace drawinglayer
 {
     namespace unorenderer
     {
-        class XPrimitive2DRenderer : public ::cppu::WeakAggImplHelper2< graphic::XPrimitive2DRenderer, lang::XServiceInfo >
+        class XPrimitive2DRenderer:
+            public cppu::WeakAggImplHelper2<
+                css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>,
+            private boost::noncopyable
         {
-        private:
-            XPrimitive2DRenderer(const XPrimitive2DRenderer&);
-            XPrimitive2DRenderer& operator=(const XPrimitive2DRenderer&);
-
-        protected:
         public:
             XPrimitive2DRenderer();
             virtual ~XPrimitive2DRenderer();
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
new file mode 100644
index 000000000000..58584f61486e
--- /dev/null
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
@@ -0,0 +1,50 @@
+/* -*- 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_DRAWINGLAYER_SOURCE_DRAWINGLAYERUNO_XPRIMITIVE2DRENDERER_HXX
+#define INCLUDED_DRAWINGLAYER_SOURCE_DRAWINGLAYERUNO_XPRIMITIVE2DRENDERER_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XInterface; }
+} } }
+
+namespace drawinglayer { namespace unorenderer {
+
+css::uno::Sequence<OUString> SAL_CALL
+XPrimitive2DRenderer_getSupportedServiceNames();
+
+OUString SAL_CALL XPrimitive2DRenderer_getImplementationName();
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL
+XPrimitive2DRenderer_createInstance(
+    css::uno::Reference<css::lang::XMultiServiceFactory> const &);
+
+} }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */