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

compact namespace: basegfx,canvas

Browse Source 
Change-Id: Idc808459b403bcdcccbd86b73dd22b424e507c8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98897
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-07-16 12:55:01 +02:00
parent cca705ad5f
commit 0178e36bc0
10 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
basegfx/source/inc/hommatrixtemplate.hxx
View File

@@ -27,9 +27,7 @@
#include <memory> #include <memory>
namespace basegfx namespace basegfx::internal
{
namespace internal
{ {
inline double implGetDefaultValue(sal_uInt16 nRow, sal_uInt16 nColumn) inline double implGetDefaultValue(sal_uInt16 nRow, sal_uInt16 nColumn)
@@ -523,8 +521,7 @@ namespace basegfx
} }
}; };
} // namespace internal } // namespace basegfx::internal
} // namespace basegfx
#endif // INCLUDED_BASEGFX_SOURCE_INC_HOMMATRIXTEMPLATE_HXX #endif // INCLUDED_BASEGFX_SOURCE_INC_HOMMATRIXTEMPLATE_HXX

7
basegfx/source/inc/stringconversiontools.hxx
View File

@@ -22,9 +22,7 @@
#include <sal/types.h> #include <sal/types.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
namespace basegfx namespace basegfx::internal
{
namespace internal
{ {
void skipSpaces(sal_Int32& io_rPos, void skipSpaces(sal_Int32& io_rPos,
const OUString& rStr, const OUString& rStr,
@@ -57,8 +55,7 @@ namespace basegfx
const OUString& rStr, const OUString& rStr,
const sal_Int32 nLen); const sal_Int32 nLen);
} // namespace internal } // namespace basegfx::internal
} // namespace basegfx
#endif // INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX #endif // INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX

7
canvas/source/directx/dx_impltools.cxx
View File

@@ -52,9 +52,7 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace dxcanvas namespace dxcanvas::tools
{
namespace tools
{ {
::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly ) ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( const uno::Reference< rendering::XPolyPolygon2D >& xPoly )
{ {
@@ -627,7 +625,6 @@ namespace dxcanvas
o_rAttr.SetColorMatrix( &aColorMatrix ); o_rAttr.SetColorMatrix( &aColorMatrix );
} }
} // namespace tools } // namespace dxcanvas::tools
} // namespace dxcanvas
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
canvas/source/directx/dx_impltools.hxx
View File

@@ -54,9 +54,7 @@ namespace com::sun::star::rendering
} }
namespace dxcanvas namespace dxcanvas::tools
{
namespace tools
{ {
struct RawRGBABitmap; struct RawRGBABitmap;
@@ -122,7 +120,7 @@ namespace dxcanvas
double nBlueModulation, double nBlueModulation,
double nAlphaModulation ); double nAlphaModulation );
} }
}
#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX

6
canvas/source/directx/dx_vcltools.cxx
View File

@@ -33,9 +33,7 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace dxcanvas namespace dxcanvas::tools
{
namespace tools
{ {
namespace namespace
{ {
@@ -463,6 +461,6 @@ namespace dxcanvas
return drawVCLBitmapEx( rGraphics, aBmpEx ); return drawVCLBitmapEx( rGraphics, aBmpEx );
} }
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
canvas/source/directx/dx_vcltools.hxx
View File

@@ -26,9 +26,7 @@
namespace Gdiplus { class Graphics; } namespace Gdiplus { class Graphics; }
namespace dxcanvas namespace dxcanvas::tools
{
namespace tools
{ {
/** Raw RGBA bitmap data, /** Raw RGBA bitmap data,
contiguous in memory contiguous in memory
@@ -44,7 +42,7 @@ namespace dxcanvas
const css::uno::Reference< const css::uno::Reference<
css::rendering::XBitmap >& xBitmap ); css::rendering::XBitmap >& xBitmap );
} }
}
#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_VCLTOOLS_HXX #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_VCLTOOLS_HXX

7
canvas/source/opengl/ogl_spritedevicehelper.hxx
View File

@@ -23,10 +23,9 @@
namespace vcl { class Window; } namespace vcl { class Window; }
class SystemChildWindow; class SystemChildWindow;
namespace basegfx{ class B2IVector; class B2DHomMatrix; } namespace basegfx{ class B2IVector; class B2DHomMatrix; }
namespace com::sun::star { namespace com::sun::star::awt { struct Rectangle; }
namespace awt { struct Rectangle; } namespace com::sun::star::geometry { struct AffineMatrix2D; }
namespace geometry { struct AffineMatrix2D; }
}
namespace oglcanvas namespace oglcanvas
{ {

5
canvas/source/opengl/ogl_texturecache.hxx
View File

@@ -13,9 +13,8 @@
#include <sal/types.h> #include <sal/types.h>
#include <unordered_map> #include <unordered_map>
namespace com::sun::star { namespace com::sun::star::geometry { struct IntegerSize2D; }
namespace geometry { struct IntegerSize2D; }
}
namespace oglcanvas namespace oglcanvas
{ {

5
include/basegfx/range/b2drangeclipper.hxx
View File

@@ -23,9 +23,7 @@
#include <vector> #include <vector>
#include <basegfx/basegfxdllapi.h> #include <basegfx/basegfxdllapi.h>
namespace basegfx namespace basegfx::utils
{
namespace utils
{ {
/** Extract poly-polygon w/o self-intersections from poly-range /** Extract poly-polygon w/o self-intersections from poly-range
@@ -37,6 +35,5 @@ namespace basegfx
BASEGFX_DLLPUBLIC B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges, BASEGFX_DLLPUBLIC B2DPolyPolygon solveCrossovers(const std::vector<B2DRange>& rRanges,
const std::vector<B2VectorOrientation>& rOrientations); const std::vector<B2VectorOrientation>& rOrientations);
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
include/canvas/elapsedtime.hxx
View File

@@ -23,9 +23,7 @@
#include <canvas/canvastoolsdllapi.h> #include <canvas/canvastoolsdllapi.h>
#include <memory> #include <memory>
namespace canvas namespace canvas::tools
{
namespace tools
{ {
/** Calculate elapsed time. /** Calculate elapsed time.
@@ -159,7 +157,6 @@ namespace canvas
}; };
} }
}
#endif /* INCLUDED_CANVAS_ELAPSEDTIME_HXX */ #endif /* INCLUDED_CANVAS_ELAPSEDTIME_HXX */