summaryrefslogtreecommitdiff
path: root/include/cppcanvas/bitmap.hxx
blob: 1e257d4dfb271c91e2cd9f572a0b41eaadcd11ee (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
/* -*- 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_CPPCANVAS_BITMAP_HXX
#define INCLUDED_CPPCANVAS_BITMAP_HXX

#include <com/sun/star/uno/Reference.hxx>
#include <cppcanvas/canvasgraphic.hxx>
#include <cppcanvas/bitmapcanvas.hxx>
#include <memory>

namespace com { namespace sun { namespace star { namespace rendering
{
    class  XBitmap;
} } } }


/* Definition of Bitmap interface */

namespace cppcanvas
{

    /** This interface defines a Bitmap canvas object

        Consider this object part of the view, and not of the model
        data, as this bitmap can only be painted on its parent canvas
     */
    class Bitmap : public virtual CanvasGraphic
    {
    public:
        /** Render to parent canvas, with global alpha.

            This method renders the content to the parent canvas,
            i.e. the canvas this object was constructed for.

            @param nAlphaModulation
            Global alpha value, with which each pixel alpha value gets
            multiplied. For a normal, opaque bitmap, this will make
            the bitmap appear transparent with the given alpha value
            (value must be in the range [0,1]).

            @return whether the rendering finished successfully.
         */
        virtual bool                        drawAlphaModulated( double nAlphaModulation ) const = 0;

        virtual BitmapCanvasSharedPtr       getBitmapCanvas() const = 0;

        virtual css::uno::Reference< css::rendering::XBitmap >  getUNOBitmap() const = 0;
    };

    typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
}

#endif // INCLUDED_CPPCANVAS_BITMAP_HXX

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
r> -rw-r--r--drawinglayer/source/attribute/lineattribute.cxx7
-rw-r--r--drawinglayer/source/attribute/linestartendattribute.cxx8
-rw-r--r--drawinglayer/source/attribute/materialattribute3d.cxx8
-rw-r--r--drawinglayer/source/attribute/sdrallattribute3d.cxx8
-rw-r--r--drawinglayer/source/attribute/sdrfillattribute.cxx8
-rw-r--r--drawinglayer/source/attribute/sdrfillgraphicattribute.cxx8
-rw-r--r--drawinglayer/source/attribute/sdrlightattribute3d.cxx7
-rw-r--r--drawinglayer/source/attribute/sdrlightingattribute3d.cxx8
-rw-r--r--drawinglayer/source/attribute/sdrlineattribute.cxx7
-rw-r--r--drawinglayer/source/attribute/sdrlinestartendattribute.cxx8
-rw-r--r--drawinglayer/source/attribute/sdrobjectattribute3d.cxx7
-rw-r--r--drawinglayer/source/attribute/sdrsceneattribute3d.cxx7
-rw-r--r--drawinglayer/source/attribute/sdrshadowattribute.cxx8
-rw-r--r--drawinglayer/source/attribute/strokeattribute.cxx8
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx21
-rw-r--r--drawinglayer/source/geometry/viewinformation2d.cxx15
-rw-r--r--drawinglayer/source/geometry/viewinformation3d.cxx15
-rw-r--r--drawinglayer/source/primitive2d/animatedprimitive2d.cxx21
-rw-r--r--drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/bitmapprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/borderlineprimitive2d.cxx8
-rw-r--r--drawinglayer/source/primitive2d/controlprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/cropprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx14
-rw-r--r--drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/epsprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx14
-rw-r--r--drawinglayer/source/primitive2d/gridprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/groupprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/helplineprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/invertprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/maskprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/mediaprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/patternfillprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/polygonprimitive2d.cxx28
-rw-r--r--drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx58
-rw-r--r--drawinglayer/source/primitive2d/primitivetools2d.cxx29
-rw-r--r--drawinglayer/source/primitive2d/sceneprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx8
-rw-r--r--drawinglayer/source/primitive2d/shadowprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/structuretagprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/svggradientprimitive2d.cxx35
-rw-r--r--drawinglayer/source/primitive2d/textbreakuphelper.cxx7
-rw-r--r--drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/texteffectprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/textenumsprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx43
-rw-r--r--drawinglayer/source/primitive2d/textlayoutdevice.cxx15
-rw-r--r--drawinglayer/source/primitive2d/textlineprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/textprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx19
-rw-r--r--drawinglayer/source/primitive2d/transformprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/transparenceprimitive2d.cxx8
-rw-r--r--drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx8
-rw-r--r--drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/baseprimitive3d.cxx20
-rw-r--r--drawinglayer/source/primitive3d/groupprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/polygonprimitive3d.cxx13
-rw-r--r--drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx14
-rw-r--r--drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/shadowprimitive3d.cxx7
-rw-r--r--drawinglayer/source/primitive3d/textureprimitive3d.cxx32
-rw-r--r--drawinglayer/source/primitive3d/transformprimitive3d.cxx7
-rw-r--r--drawinglayer/source/processor2d/baseprocessor2d.cxx8
-rw-r--r--drawinglayer/source/processor2d/contourextractor2d.cxx7
-rw-r--r--drawinglayer/source/processor2d/hittestprocessor2d.cxx7
-rw-r--r--drawinglayer/source/processor2d/linegeometryextractor2d.cxx8
-rw-r--r--drawinglayer/source/processor2d/objectinfoextractor2d.cxx8
-rw-r--r--drawinglayer/source/processor2d/processor2dtools.cxx8
-rw-r--r--drawinglayer/source/processor2d/processorfromoutputdevice.cxx7
-rw-r--r--drawinglayer/source/processor2d/textaspolygonextractor2d.cxx8
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx7
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx8
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx5
-rw-r--r--drawinglayer/source/processor3d/baseprocessor3d.cxx8
-rw-r--r--drawinglayer/source/processor3d/cutfindprocessor3d.cxx8
-rw-r--r--drawinglayer/source/processor3d/defaultprocessor3d.cxx8
-rw-r--r--drawinglayer/source/processor3d/geometry2dextractor.cxx8
-rw-r--r--drawinglayer/source/processor3d/shadow3dextractor.cxx7
-rw-r--r--drawinglayer/source/processor3d/zbufferprocessor3d.cxx8
-rw-r--r--drawinglayer/source/texture/texture.cxx63
-rw-r--r--drawinglayer/source/texture/texture3d.cxx26
-rw-r--r--drawinglayer/source/tools/wmfemfhelper.cxx8
113 files changed, 283 insertions, 893 deletions
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index 0ab3d98b1ba2..7be8ac2d94e8 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -22,10 +22,8 @@
#include <drawinglayer/animation/animationtiming.hxx>
#include <basegfx/numeric/ftools.hxx>
-namespace drawinglayer
+namespace drawinglayer::animation
{
- namespace animation
- {
AnimationEntry::AnimationEntry()
@@ -344,7 +342,6 @@ namespace drawinglayer
return fNewTime;
}
- } // end of namespace animation
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx b/drawinglayer/source/attribute/fillgradientattribute.cxx
index e4931abab825..fe38a07d41ac 100644
--- a/drawinglayer/source/attribute/fillgradientattribute.cxx
+++ b/drawinglayer/source/attribute/fillgradientattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFillGradientAttribute
{
public:
@@ -183,7 +181,6 @@ namespace drawinglayer
return mpFillGradientAttribute->getSteps();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index 11e40a3fd50c..fa9b4fd57138 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -24,10 +24,8 @@
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
#include <vcl/graph.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFillGraphicAttribute
{
public:
@@ -152,7 +150,6 @@ namespace drawinglayer
return mpFillGraphicAttribute->getOffsetY();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx b/drawinglayer/source/attribute/fillhatchattribute.cxx
index 03399892ddbf..69dd76c53d97 100644
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFillHatchAttribute
{
public:
@@ -162,7 +160,6 @@ namespace drawinglayer
return mpFillHatchAttribute->isFillBackground();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx
index 37b73bf2bc4a..33903003f8c7 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/ustring.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpFontAttribute
{
public:
@@ -200,7 +198,6 @@ namespace drawinglayer
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx
index 8aee1dab9427..48d1f73380eb 100644
--- a/drawinglayer/source/attribute/lineattribute.cxx
+++ b/drawinglayer/source/attribute/lineattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpLineAttribute
{
public:
@@ -148,7 +146,6 @@ namespace drawinglayer
return mpLineAttribute->getMiterMinimumAngle();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx
index 1779b1e44148..dcfa94f35c39 100644
--- a/drawinglayer/source/attribute/linestartendattribute.cxx
+++ b/drawinglayer/source/attribute/linestartendattribute.cxx
@@ -23,10 +23,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpLineStartEndAttribute
{
public:
@@ -127,7 +125,7 @@ namespace drawinglayer
&& 0 != getB2DPolyPolygon().count()
&& 0 != getB2DPolyPolygon().getB2DPolygon(0).count());
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx
index 7172dec3d89d..f9473b480337 100644
--- a/drawinglayer/source/attribute/materialattribute3d.cxx
+++ b/drawinglayer/source/attribute/materialattribute3d.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpMaterialAttribute3D
{
public:
@@ -131,7 +129,7 @@ namespace drawinglayer
{
return mpMaterialAttribute3D->getSpecularIntensity();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index 315dfc5cc967..079f655796d9 100644
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
@@ -20,10 +20,8 @@
#include <drawinglayer/attribute/sdrallattribute3d.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
SdrLineFillShadowAttribute3D::SdrLineFillShadowAttribute3D(
const SdrLineAttribute& rLine,
const SdrFillAttribute& rFill,
@@ -55,7 +53,7 @@ namespace drawinglayer
&& getShadow() == rCandidate.getShadow()
&& getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient());
}
- } // end of namespace overlay
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx
index e39dfcc02370..393df42637c5 100644
--- a/drawinglayer/source/attribute/sdrfillattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillattribute.cxx
@@ -25,10 +25,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrFillAttribute
{
public:
@@ -151,7 +149,7 @@ namespace drawinglayer
{
return mpSdrFillAttribute->getFillGraphic();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index b88b2a9a31a5..a00c45521e17 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -27,10 +27,8 @@
#include <vcl/graph.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrFillGraphicAttribute
{
public:
@@ -304,7 +302,7 @@ namespace drawinglayer
fOffsetX,
fOffsetY);
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
index 6f33b0c1c044..56f0b384129a 100644
--- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
@@ -23,10 +23,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdr3DLightAttribute
{
public:
@@ -100,7 +98,6 @@ namespace drawinglayer
return mpSdr3DLightAttribute->getSpecular();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
index 0de72b179b88..93b4cf4cec0a 100644
--- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
@@ -24,10 +24,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrLightingAttribute
{
public:
@@ -163,7 +161,7 @@ namespace drawinglayer
return aRetval;
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 5b13d37599d2..257d934d83bd 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrLineAttribute
{
public:
@@ -178,7 +176,6 @@ namespace drawinglayer
return mpSdrLineAttribute->getCap();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
index b890132f39b6..c0a88b6f8c0b 100644
--- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrLineStartEndAttribute
{
public:
@@ -183,7 +181,7 @@ namespace drawinglayer
{
return mpSdrLineStartEndAttribute->isEndCentered();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
index bc20ecaab087..78e919d9ab3f 100644
--- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
@@ -22,10 +22,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdr3DObjectAttribute
{
public:
@@ -188,7 +186,6 @@ namespace drawinglayer
return mpSdr3DObjectAttribute->getReducedLineGeometry();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
index 494edcb525b6..128abf2027cf 100644
--- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
@@ -21,10 +21,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrSceneAttribute
{
public:
@@ -142,7 +140,6 @@ namespace drawinglayer
return mpSdrSceneAttribute->getTwoSidedLighting();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index 0075cf4c2ba7..29e2e6f8bbb4 100644
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
@@ -23,10 +23,8 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpSdrShadowAttribute
{
public:
@@ -124,7 +122,7 @@ namespace drawinglayer
{
return mpSdrShadowAttribute->getColor();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index 34324b6e0fda..493c906ba91b 100644
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
@@ -22,10 +22,8 @@
#include <numeric>
-namespace drawinglayer
+namespace drawinglayer::attribute
{
- namespace attribute
- {
class ImpStrokeAttribute
{
public:
@@ -120,7 +118,7 @@ namespace drawinglayer
{
return mpStrokeAttribute->getFullDotDashLen();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index b47ffc6cda69..35d94b1ded56 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -40,10 +40,8 @@
using namespace ::com::sun::star;
-namespace drawinglayer
+namespace drawinglayer::unorenderer
{
- namespace unorenderer
- {
namespace {
class XPrimitive2DRenderer:
@@ -72,15 +70,12 @@ namespace drawinglayer
};
}
- } // end of namespace unorenderer
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
// uno functions
-namespace drawinglayer
-{
- namespace unorenderer
+namespace drawinglayer::unorenderer
{
uno::Sequence< OUString > XPrimitive2DRenderer_getSupportedServiceNames()
{
@@ -96,13 +91,10 @@ namespace drawinglayer
{
return static_cast< ::cppu::OWeakObject* >(new XPrimitive2DRenderer);
}
- } // end of namespace unorenderer
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace unorenderer
+namespace drawinglayer::unorenderer
{
XPrimitive2DRenderer::XPrimitive2DRenderer()
{
@@ -196,7 +188,6 @@ namespace drawinglayer
return XPrimitive2DRenderer_getSupportedServiceNames();
}
- } // end of namespace unorenderer
-} // end of namespace drawinglayer
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 3fc5f6cd14aa..7dd74bd112ce 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx