mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compact namespace: cppcanvas

Browse Source 
Change-Id: I53826803bd7749b7fead5e464e2dc65212d5bb9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98908
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-07-16 15:34:53 +02:00
parent 1ebe85bc1f
commit baed93c802
20 changed files with 28 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cppcanvas/source/inc/action.hxx
View File

@@ -30,9 +30,7 @@ namespace basegfx
/* Definition of Action interface */ /* Definition of Action interface */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
/** Interface for internal render actions /** Interface for internal render actions
@@ -142,7 +140,6 @@ namespace cppcanvas
*/ */
virtual sal_Int32 getActionCount() const = 0; virtual sal_Int32 getActionCount() const = 0;
}; };
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
cppcanvas/source/inc/canvasgraphichelper.hxx
View File

@@ -35,10 +35,7 @@ namespace com::sun::star::rendering
/* Definition of CanvasGraphicHelper class */ /* Definition of CanvasGraphicHelper class */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
class CanvasGraphicHelper : public virtual CanvasGraphic class CanvasGraphicHelper : public virtual CanvasGraphic
@@ -65,7 +62,6 @@ namespace cppcanvas
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
}; };
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

7
cppcanvas/source/inc/implrenderer.hxx
View File

@@ -50,10 +50,7 @@ namespace basegfx {
class B2DPolygon; class B2DPolygon;
} }
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
struct OutDevState; struct OutDevState;
struct ActionFactoryParameters; struct ActionFactoryParameters;
@@ -241,7 +238,7 @@ namespace cppcanvas
const Renderer::Parameters& mrParms; const Renderer::Parameters& mrParms;
sal_Int32& mrCurrActionIndex; sal_Int32& mrCurrActionIndex;
}; };
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
cppcanvas/source/inc/outdevstate.hxx
View File

@@ -33,9 +33,7 @@
#include <vcl/outdevstate.hxx> #include <vcl/outdevstate.hxx>
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
struct OutDevState struct OutDevState
{ {
@@ -120,7 +118,7 @@ namespace cppcanvas
bool isTextOverlineColorSet; bool isTextOverlineColorSet;
bool isTextLineColorSet; bool isTextLineColorSet;
}; };
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
cppcanvas/source/inc/tools.hxx
View File

@@ -22,14 +22,11 @@
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <cppcanvas/color.hxx> #include <cppcanvas/color.hxx>
namespace cppcanvas namespace cppcanvas::tools
{
namespace tools
{ {
css::uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA ); css::uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA );
IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Sequence< double >& rColor ); IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Sequence< double >& rColor );
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
cppcanvas/source/mtfrenderer/bitmapaction.hxx
View File

@@ -30,10 +30,8 @@ class BitmapEx;
/* Definition of internal::BitmapActionFactory */ /* Definition of internal::BitmapActionFactory */
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
struct OutDevState; struct OutDevState;
/** Creates encapsulated converters between GDIMetaFile and /** Creates encapsulated converters between GDIMetaFile and
@@ -58,7 +56,6 @@ namespace cppcanvas
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
} }
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
View File

@@ -32,9 +32,7 @@ namespace basegfx { class B2DHomMatrix; }
/* Definition of internal::CachedPrimitiveBase class */ /* Definition of internal::CachedPrimitiveBase class */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
/** Base class providing cached re-rendering, if XCanvas /** Base class providing cached re-rendering, if XCanvas
returns XCachedPrimitive returns XCachedPrimitive
@@ -79,7 +77,7 @@ namespace cppcanvas
mutable ::basegfx::B2DHomMatrix maLastTransformation; mutable ::basegfx::B2DHomMatrix maLastTransformation;
const bool mbOnlyRedrawWithSameTransform; const bool mbOnlyRedrawWithSameTransform;
}; };
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
cppcanvas/source/mtfrenderer/lineaction.hxx
View File

@@ -29,9 +29,7 @@ namespace basegfx {
/* Definition of internal::LineActionFactory */ /* Definition of internal::LineActionFactory */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
struct OutDevState; struct OutDevState;
@@ -50,7 +48,7 @@ namespace cppcanvas
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
} }
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
cppcanvas/source/mtfrenderer/pointaction.hxx
View File

@@ -29,9 +29,7 @@ namespace basegfx {
/* Definition of internal::PointActionFactory */ /* Definition of internal::PointActionFactory */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
struct OutDevState; struct OutDevState;
@@ -55,7 +53,7 @@ namespace cppcanvas
const OutDevState&, const OutDevState&,
const ::Color& ); const ::Color& );
} }
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
cppcanvas/source/mtfrenderer/polypolyaction.hxx
View File

@@ -35,9 +35,7 @@ namespace com::sun::star::rendering
/* Definition of internal::PolyPolyActionFactory */ /* Definition of internal::PolyPolyActionFactory */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
struct OutDevState; struct OutDevState;
@@ -78,7 +76,7 @@ namespace cppcanvas
const OutDevState&, const OutDevState&,
int nTransparency ); int nTransparency );
} }
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
cppcanvas/source/mtfrenderer/textaction.hxx
View File

@@ -31,9 +31,7 @@ class Color;
/* Definition of internal::TextActionFactory */ /* Definition of internal::TextActionFactory */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
struct OutDevState; struct OutDevState;
@@ -76,7 +74,6 @@ namespace cppcanvas
const Renderer::Parameters& rParms, const Renderer::Parameters& rParms,
bool bSubsettable ); bool bSubsettable );
} }
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

11
cppcanvas/source/mtfrenderer/textlineshelper.hxx
View File

@@ -15,19 +15,10 @@
#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dsize.hxx>
#include <cppcanvas/canvas.hxx> #include <cppcanvas/canvas.hxx>
namespace com namespace com::sun::star::rendering
{
namespace sun
{
namespace star
{
namespace rendering
{ {
class XPolyPolygon2D; class XPolyPolygon2D;
} }
}
}
}
namespace cppcanvas namespace cppcanvas
{ {

6
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
View File

@@ -35,9 +35,7 @@ class Gradient;
/* Definition of internal::TransparencyGroupActionFactory */ /* Definition of internal::TransparencyGroupActionFactory */
namespace cppcanvas namespace cppcanvas::internal
{
namespace internal
{ {
struct OutDevState; struct OutDevState;
@@ -84,7 +82,7 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ); const OutDevState& rState );
} }
}
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

7
cppcanvas/source/wrapper/implbitmap.hxx
View File

@@ -29,11 +29,8 @@
/*Definition of ImplBitmap */ /*Definition of ImplBitmap */
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
// share partial CanvasGraphic implementation from CanvasGraphicHelper // share partial CanvasGraphic implementation from CanvasGraphicHelper
class ImplBitmap : public virtual ::cppcanvas::Bitmap, protected CanvasGraphicHelper class ImplBitmap : public virtual ::cppcanvas::Bitmap, protected CanvasGraphicHelper
{ {
@@ -60,7 +57,7 @@ namespace cppcanvas
const css::uno::Reference< css::rendering::XBitmap > mxBitmap; const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
BitmapCanvasSharedPtr mpBitmapCanvas; BitmapCanvasSharedPtr mpBitmapCanvas;
}; };
}
} }
#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX

5
cppcanvas/source/wrapper/implbitmapcanvas.hxx
View File

@@ -27,10 +27,8 @@
#include "implcanvas.hxx" #include "implcanvas.hxx"
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
// share Canvas implementation from ImplCanvas // share Canvas implementation from ImplCanvas
class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas
{ {
@@ -51,7 +49,6 @@ namespace cppcanvas
const css::uno::Reference< css::rendering::XBitmapCanvas > mxBitmapCanvas; const css::uno::Reference< css::rendering::XBitmapCanvas > mxBitmapCanvas;
const css::uno::Reference< css::rendering::XBitmap > mxBitmap; const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
}; };
}
} }
#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX

6
cppcanvas/source/wrapper/implcanvas.hxx
View File

@@ -42,12 +42,9 @@ namespace com::sun::star::rendering
/* Definition of ImplCanvas */ /* Definition of ImplCanvas */
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
class ImplCanvas : public virtual Canvas class ImplCanvas : public virtual Canvas
{ {
public: public:
@@ -81,7 +78,6 @@ namespace cppcanvas
const css::uno::Reference< css::rendering::XCanvas > mxCanvas; const css::uno::Reference< css::rendering::XCanvas > mxCanvas;
}; };
}
} }
#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX

5
cppcanvas/source/wrapper/implcustomsprite.hxx
View File

@@ -25,10 +25,8 @@
#include "implsprite.hxx" #include "implsprite.hxx"
#include "implspritecanvas.hxx" #include "implspritecanvas.hxx"
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
// share Sprite implementation of ImplSprite // share Sprite implementation of ImplSprite
class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite
{ {
@@ -49,7 +47,6 @@ namespace cppcanvas
mutable CanvasSharedPtr mpLastCanvas; mutable CanvasSharedPtr mpLastCanvas;
const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite; const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite;
}; };
}
} }
#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX

5
cppcanvas/source/wrapper/implpolypolygon.hxx
View File

@@ -33,10 +33,8 @@ namespace com::sun::star::rendering
} }
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
class ImplPolyPolygon : public virtual ::cppcanvas::PolyPolygon, protected CanvasGraphicHelper class ImplPolyPolygon : public virtual ::cppcanvas::PolyPolygon, protected CanvasGraphicHelper
{ {
@@ -73,7 +71,6 @@ namespace cppcanvas
bool mbStrokeColorSet; bool mbStrokeColorSet;
}; };
}
} }
#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX

5
cppcanvas/source/wrapper/implsprite.hxx
View File

@@ -26,10 +26,8 @@
#include <cppcanvas/sprite.hxx> #include <cppcanvas/sprite.hxx>
#include "implspritecanvas.hxx" #include "implspritecanvas.hxx"
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
class ImplSprite : public virtual Sprite class ImplSprite : public virtual Sprite
{ {
public: public:
@@ -61,7 +59,6 @@ namespace cppcanvas
const css::uno::Reference< css::rendering::XSprite > mxSprite; const css::uno::Reference< css::rendering::XSprite > mxSprite;
ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter; ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter;
}; };
}
} }
#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX

5
cppcanvas/source/wrapper/implspritecanvas.hxx
View File

@@ -26,10 +26,8 @@
#include <cppcanvas/spritecanvas.hxx> #include <cppcanvas/spritecanvas.hxx>
#include "implcanvas.hxx" #include "implcanvas.hxx"
namespace cppcanvas namespace cppcanvas::internal
{ {
namespace internal
{
class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas
{ {
public: public:
@@ -78,7 +76,6 @@ namespace cppcanvas
const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas; const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas;
TransformationArbiterSharedPtr mpTransformArbiter; TransformationArbiterSharedPtr mpTransformArbiter;
}; };
}
} }
#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX #endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX