diff options
343 files changed, 832 insertions, 564 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 0323ec0dbb56..7da1917a019b 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -171,6 +171,6 @@ uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames() return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME }; } -} // namespace avmedia +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index 0414437dfe3b..2b107e5c2dc5 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -66,6 +66,6 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) return { AVMEDIA_GST_MANAGER_SERVICENAME }; } -} // namespace avmedia +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index c581f6e19710..2c8dbc085ee9 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -923,6 +923,6 @@ uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames() return { AVMEDIA_GST_PLAYER_SERVICENAME }; } -} // namespace avmedia +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index 5c91cce1e920..61f1b6a4cb61 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -188,6 +188,6 @@ uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) return { AVMEDIA_GST_WINDOW_SERVICENAME }; } -} // namespace avmedia +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 2adae068bb7a..9fbaceea1145 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -168,6 +168,6 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& ) } -} // namespace avmedia +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index c6cb20df7a36..e34b7fb0d6a0 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -664,6 +664,6 @@ void MediaWindowImpl::StartDrag(sal_Int8 nAction, const Point& rPosPixel) mpMediaWindow->StartDrag(nAction, rPosPixel); } -} // namespace avmedia +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 2d378d82c427..60c02b259fb0 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -119,6 +119,6 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames() return { VLC_SERVICENAME }; } -} // end namespace avmedia +} // end namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx index 14f5e35780af..0ff808bc8367 100644 --- a/basegfx/source/color/bcolortools.cxx +++ b/basegfx/source/color/bcolortools.cxx @@ -189,6 +189,6 @@ namespace basegfx::utils } } -} // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx index 6cf751fc8b87..72256688c0b2 100644 --- a/basegfx/source/matrix/b2dhommatrixtools.cxx +++ b/basegfx/source/matrix/b2dhommatrixtools.cxx @@ -23,7 +23,7 @@ #include <osl/diagnose.h> namespace basegfx::utils - { +{ void createSinCosOrthogonal(double& o_rSin, double& o_rCos, double fRadiant) { if( fTools::equalZero( fmod( fRadiant, F_PI2 ) ) ) @@ -452,6 +452,6 @@ namespace basegfx::utils { return B2DTuple(rMatrix.get(0, nCol), rMatrix.get(1, nCol)); } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx b/basegfx/source/matrix/b3dhommatrixtools.cxx index f8860df4acf6..9125aca4e0a6 100644 --- a/basegfx/source/matrix/b3dhommatrixtools.cxx +++ b/basegfx/source/matrix/b3dhommatrixtools.cxx @@ -66,6 +66,6 @@ void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn, rMatrixOut.Line4.Column3 = rMatrixIn.get(3, 2); rMatrixOut.Line4.Column4 = rMatrixIn.get(3, 3); } -} // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 1ae29f2a6047..72c25f0c0593 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -33,7 +33,7 @@ #include <basegfx/polygon/b2dpolygontriangulator.hxx> namespace basegfx::utils - { +{ B2DPolyPolygon createAreaGeometryForLineStartEnd( const B2DPolygon& rCandidate, const B2DPolyPolygon& rArrow, @@ -124,7 +124,7 @@ namespace basegfx::utils return aRetval; } - } // end of namespace basegfx +} // end of namespace namespace basegfx { diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index 13a569575b02..cdcfeafbfaea 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -27,7 +27,7 @@ #include <basegfx/utils/rectcliptools.hxx> namespace basegfx::utils - { +{ B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke) { B2DPolyPolygon aRetval; @@ -812,6 +812,6 @@ namespace basegfx::utils return aResult; } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx index ed4af0843504..d96a38ac7f30 100644 --- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx +++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx @@ -839,7 +839,7 @@ namespace basegfx } // end of namespace basegfx namespace basegfx::utils - { +{ B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate) { @@ -1051,6 +1051,6 @@ namespace basegfx::utils return rCandidate; } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index c2089431e1fb..cf2de34859cd 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -40,7 +40,7 @@ #define STEPSPERQUARTER (3) namespace basegfx::utils - { +{ void openWithGeometryChange(B2DPolygon& rCandidate) { if(rCandidate.isClosed()) @@ -3485,6 +3485,6 @@ namespace basegfx::utils } } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx index cebe714386ef..880b1b5c310c 100644 --- a/basegfx/source/polygon/b2dpolygontriangulator.cxx +++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx @@ -369,7 +369,7 @@ namespace basegfx } // end of namespace basegfx namespace basegfx::triangulator - { +{ B2DTriangleVector triangulate(const B2DPolygon& rCandidate) { B2DTriangleVector aRetval; @@ -430,6 +430,6 @@ namespace basegfx::triangulator return aRetval; } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index fa0471403d92..ad185f47f336 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -681,7 +681,7 @@ namespace basegfx } // end of namespace basegfx namespace basegfx::utils - { +{ B2DPolyPolygon solveCrossovers(const B2DPolyPolygon& rCandidate) { @@ -1104,6 +1104,6 @@ namespace basegfx::utils return B2DPolyPolygon(); } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx index b7e3bacf19ae..75b6d38a19df 100644 --- a/basegfx/source/polygon/b2dpolypolygontools.cxx +++ b/basegfx/source/polygon/b2dpolypolygontools.cxx @@ -29,7 +29,7 @@ #include <numeric> namespace basegfx::utils - { +{ B2DPolyPolygon correctOrientations(const B2DPolyPolygon& rCandidate) { B2DPolyPolygon aRetval(rCandidate); @@ -650,6 +650,6 @@ namespace basegfx::utils } } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 0d846280b8b1..e8ec2cf6e76e 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -61,7 +61,7 @@ void putNumberChar(OUStringBuffer& rStr,double fValue, double fOldValue, bool bU } namespace basegfx::utils - { +{ bool PointIndex::operator<(const PointIndex& rComp) const { if(rComp.getPolygonIndex() == getPolygonIndex()) @@ -926,6 +926,6 @@ namespace basegfx::utils return aResult.makeStringAndClear(); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx index 8d7eab51337f..36c0c483a291 100644 --- a/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/basegfx/source/polygon/b2dtrapezoid.cxx @@ -27,7 +27,7 @@ #include <list> namespace basegfx::trapezoidhelper - { +{ // helper class to hold a simple edge. This is only used for horizontal edges // currently, thus the YPositions will be equal. I did not create a special @@ -189,10 +189,8 @@ namespace basegfx::trapezoidhelper typedef std::list< TrDeEdgeEntry > TrDeEdgeEntries; - } // end of namespace basegfx -namespace basegfx::trapezoidhelper - { + // FIXME: templatize this and use it for TrDeEdgeEntries too ... namespace { @@ -890,7 +888,7 @@ namespace basegfx::trapezoidhelper }; } - } // end of namespace basegfx +} // end of namespace namespace basegfx { @@ -944,7 +942,7 @@ namespace basegfx } // end of namespace basegfx namespace basegfx::utils - { +{ // convert Source utils::PolyPolygon to trapezoids void trapezoidSubdivide(B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon) { @@ -1168,6 +1166,6 @@ namespace basegfx::utils } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx index 4fbd1bfa2c94..1d97d4d43f0e 100644 --- a/basegfx/source/polygon/b3dpolygontools.cxx +++ b/basegfx/source/polygon/b3dpolygontools.cxx @@ -28,7 +28,7 @@ #include <numeric> namespace basegfx::utils - { +{ // B3DPolygon tools void checkClosed(B3DPolygon& rCandidate) { @@ -737,6 +737,6 @@ namespace basegfx::utils } } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index f8b29914f4ac..31581a0be298 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -33,7 +33,7 @@ #define nMaxSegments sal_uInt32(512) namespace basegfx::utils - { +{ // B3DPolyPolygon tools B3DRange getRange(const B3DPolyPolygon& rCandidate) { @@ -581,6 +581,6 @@ namespace basegfx::utils } } - } // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx index 4efe6fc2cb5e..aa5f655ccbc7 100644 --- a/basegfx/source/tools/b2dclipstate.cxx +++ b/basegfx/source/tools/b2dclipstate.cxx @@ -475,6 +475,6 @@ namespace basegfx::utils } -} // end of namespace basegfx +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx index d52ddcfdfe18..3ef52a85e197 100644 --- a/basegfx/source/tools/canvastools.cxx +++ b/basegfx/source/tools/canvastools.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; namespace basegfx::unotools - { +{ namespace { uno::Sequence< geometry::RealBezierSegment2D > bezierSequenceFromB2DPolygon(const ::basegfx::B2DPolygon& rPoly) @@ -470,6 +470,6 @@ namespace basegfx::unotools ceil(rRange.getMaxY()) ); } - } // namespace canvas +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx index cb1a050dc94e..725d52cf431a 100644 --- a/basegfx/source/tools/keystoplerp.cxx +++ b/basegfx/source/tools/keystoplerp.cxx @@ -41,7 +41,7 @@ static void validateInput(const std::vector<double>& rKeyStops) } namespace basegfx::utils - { +{ KeyStopLerp::KeyStopLerp( const std::vector<double>& rKeyStops ) : maKeyStops(rKeyStops), mnLastIndex(0) @@ -86,6 +86,6 @@ namespace basegfx::utils mnLastIndex, std::clamp(fRawLerp,0.0,1.0)); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/tools/stringconversiontools.cxx b/basegfx/source/tools/stringconversiontools.cxx index 994812fbaeb8..079966b27557 100644 --- a/basegfx/source/tools/stringconversiontools.cxx +++ b/basegfx/source/tools/stringconversiontools.cxx @@ -21,7 +21,7 @@ #include <rtl/math.hxx> namespace basegfx::internal - { +{ void skipSpaces(sal_Int32& io_rPos, const OUString& rStr, const sal_Int32 nLen) @@ -157,6 +157,6 @@ namespace basegfx::internal return true; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx index ac791656d1a0..4a7f2c962ab3 100644 --- a/basegfx/source/tools/tools.cxx +++ b/basegfx/source/tools/tools.cxx @@ -23,7 +23,7 @@ #include <algorithm> namespace basegfx::utils - { +{ namespace { double distance( const double& nX, @@ -106,6 +106,6 @@ namespace basegfx::utils moveLineOutsideRect( io_rLeftTop, io_rRightTop, aNormalTop, rFitTarget ); moveLineOutsideRect( io_rLeftBottom, io_rRightBottom, aNormalBottom, rFitTarget ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/tools/zoomtools.cxx b/basegfx/source/tools/zoomtools.cxx index 3acf23e8688b..488b19b31264 100644 --- a/basegfx/source/tools/zoomtools.cxx +++ b/basegfx/source/tools/zoomtools.cxx @@ -108,6 +108,6 @@ long zoomOut(long nCurrent) nNew = enforceStep(nNew, nCurrent, 25); return nNew; } -} // namespace basegfx +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index c0827dd92a24..231452612051 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -182,6 +182,6 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c } -} // namespace basic +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index c9e4c71284a6..957a7bb90b0a 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; namespace canvas::tools - { +{ geometry::RealSize2D createInfiniteSize2D() { return geometry::RealSize2D( @@ -1317,6 +1317,6 @@ namespace canvas::tools } } - } // namespace canvas +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index a73ffc5936dc..84a6ed5c48bd 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -124,6 +124,6 @@ void ElapsedTime::releaseTimer() m_bInHoldMode = false; } -} // namespace canvas +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index fab7e13b684b..052d8bbfb723 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; namespace canvas::tools - { +{ void verifyInput( const geometry::RealPoint2D& rPoint, const char* pStr, const uno::Reference< uno::XInterface >& xIf, @@ -708,6 +708,6 @@ namespace canvas::tools } - } // namespace canvas +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index c1e913b99fe4..754a34ce0806 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star; namespace vclcanvas::tools - { +{ ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XBitmap >& xBitmap ) { // TODO(F3): CanvasCustomSprite should also be tunnelled @@ -216,6 +216,6 @@ namespace vclcanvas::tools return vcl::bitmap::CanvasTransformBitmap(rBitmap, rTransform, aDestRect, aLocalTransform); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 83728eb4c993..8920b1eda076 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -172,6 +172,6 @@ css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() "com.sun.star.drawing.LineProperties" }; } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 6747d743f4b4..52dd240a1587 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -294,6 +294,6 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< css::chart return aPoint; } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 593ac535338d..6b48a91cb75d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1442,7 +1442,7 @@ css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServic }; } -} // namespace chart +} // namespace chart::wrapper extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation(css::uno::XComponentContext *context, diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index a08df2d94f0e..649086a1a458 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -182,6 +182,6 @@ css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() }; } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 4dce225ba570..cf47d80977bb 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -418,6 +418,6 @@ css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames( }; } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 606c98caead1..8b6d614be1dd 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -392,6 +392,6 @@ css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNa }; } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index cf41c0066406..29c81bec0b23 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -360,6 +360,6 @@ css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNam }; } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index e3e5f3b5ab3c..daa0f1de4f20 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -164,6 +164,6 @@ css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNam }; } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 3468b2cf317e..24a6dfb78a1c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -116,6 +116,6 @@ Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans return uno::Any( m_rChartDocumentWrapper.getUpdateAddIn() ); } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index d402cf7b3eda..76bfe053c46f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -118,6 +118,6 @@ void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< std: rList.emplace_back( new WrappedAutomaticPositionProperty() ); } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index ef438c8a1e86..5b69f2292d9c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -396,6 +396,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean return aRet; } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index ed24809c04f6..67ea51b0e913 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -133,6 +133,6 @@ WrappedComplexCharacterHeightProperty::~WrappedComplexCharacterHeightProperty() { } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index b36e1db06038..f55540f67db8 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -145,6 +145,6 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::Any( aLabel ) ); } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 0184f879e05b..90194dde22d7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -166,6 +166,6 @@ WrappedBarOverlapProperty::~WrappedBarOverlapProperty() { } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 28cf4de86522..a2da1089f555 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -116,6 +116,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans: return uno::Any( true ); // bLink } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 1799f83e7fea..b0670ca02a18 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -133,6 +133,6 @@ void WrappedScaleTextProperties::addWrappedProperties( std::vector< std::unique_ rList.emplace_back( new WrappedScaleTextProperty( spChart2ModelContact ) ); } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index d65b42cd4808..d3a883429172 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -96,6 +96,6 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans: return WrappedProperty::getPropertyValue( xInnerPropertySet ); } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index 127d6b4def67..88fa72696c03 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -46,6 +46,6 @@ OUString WrappedSeriesAreaOrLineProperty::getInnerName() const return m_aInnerAreaTypeName; } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index bdb38b8e7ad0..c7ac1bdcd354 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -286,6 +286,6 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue return uno::Any(aInnerValue); } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 1331e482292a..d4d262995afc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -276,6 +276,6 @@ void WrappedStockProperties::addWrappedProperties( std::vector< std::unique_ptr< rList.emplace_back( new WrappedUpDownProperty( spChart2ModelContact ) ); } -} //namespace chart +} //namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index ec37591200c0..5a8114c215c9 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -428,6 +428,6 @@ void ErrorBarItemConverter::FillSpecialItem( } } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index a16f9094210d..e767b40b15a7 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -179,6 +179,6 @@ void LegendItemConverter::FillSpecialItem( } } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 482c48e8efbe..8859158ac5b8 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -330,6 +330,6 @@ void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemS } } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 29538c0a371c..75638edfed22 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -205,6 +205,6 @@ void TitleItemConverter::FillSpecialItem( } } -} // namespace chart +} // namespace chart::wrapper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index 62ac3a90bc77..78bc1f6b0ef4 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -118,6 +118,6 @@ void SAL_CALL ShapeUndoElement::disposing() { } -} // namespace chart +} // namespace chart::impl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx index 8db9b79b7fd0..9c475bc759d1 100644 --- a/chart2/source/tools/BaseGFXHelper.cxx +++ b/chart2/source/tools/BaseGFXHelper.cxx @@ -193,6 +193,6 @@ void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix ) rB3DMatrix = aRotationMatrix; } -} // namespace chart +} // namespace chart::BaseGFXHelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index fa52b5d03ddc..d5f30096e49e 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -173,6 +173,6 @@ bool ImplOPropertySet::SetStyle( const Reference< style::XStyle > & xStyle ) return true; } -} // namespace chart +} // namespace property::impl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 4eb88a01cbe9..7d482f3e6d8a 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -178,6 +178,6 @@ void SAL_CALL ModifyEventForwarder::disposing() DisposeAndClear( this ); } -} // namespace chart +} // namespace chart::ModifyListenerHelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index fb242cd567c0..cb3e860c0350 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -292,6 +292,6 @@ void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMa setPropertyValueDefault( rOutMap, key, uno::Any()); } -} // namespace chart +} // namespace chart::PropertyHelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 6d9b5a2649e0..cc4749deee1f 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -387,6 +387,6 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) return aBuffer.makeStringAndClear(); } -} // namespace chart +} // namespace chart::XMLRangeHelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index 8a75db02f04b..d9eb6fc1b484 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -246,6 +246,6 @@ void statusIndicatorFinish() pStatusIndicatorCallback(pStatusIndicatorCallbackData, statusIndicatorCallbackType::Finish, 0); } -} // namespace comphelper +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index ebbca601ecbe..1955f6b56251 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -155,6 +155,6 @@ void* component_getFactoryHelper( const char* pImplName, return nullptr; } -} // namespace comphelper +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx index 04e97406b293..f506bc33affa 100644 --- a/comphelper/source/xml/xmltools.cxx +++ b/comphelper/source/xml/xmltools.cxx @@ -70,7 +70,7 @@ namespace } namespace comphelper::xml - { +{ OString makeXMLChaff() { rtlRandomPool pool = rtl_random_createPool(); @@ -102,5 +102,5 @@ namespace comphelper::xml return str; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/namespaceindentation.cxx b/compilerplugins/clang/namespaceindentation.cxx new file mode 100644 index 000000000000..c8483e9a17d9 --- /dev/null +++ b/compilerplugins/clang/namespaceindentation.cxx @@ -0,0 +1,219 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * Based on LLVM/Clang. + * + * This file is distributed under the University of Illinois Open Source + * License. See LICENSE.TXT for details. + * + */ +#ifndef LO_CLANG_SHARED_PLUGINS + +#include <cassert> +#include <string> +#include <iostream> +#include <fstream> +#include <set> +#include "plugin.hxx" + +/* +*/ + +namespace +{ +class NamespaceIndentation : public loplugin::FilteringPlugin<NamespaceIndentation> +{ +public: + explicit NamespaceIndentation(loplugin::InstantiationData const& data) + : FilteringPlugin(data) + { + } + + virtual bool preRun() override { return true; } + + virtual void run() override + { + if (preRun()) + TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); + } + + bool VisitNamespaceDecl(NamespaceDecl const*); + +private: + std::string GetFullNamespace(const NamespaceDecl* nsDecl); +}; + +void trim(std::string& str) +{ + // right trim + auto it1 = std::find_if(str.rbegin(), str.rend(), [](char ch) { + return !std::isspace<char>(ch, std::locale::classic()); + }); + str.erase(it1.base(), str.end()); + // left trim + auto it2 = std::find_if(str.begin(), str.end(), [](char ch) { + return !std::isspace<char>(ch, std::locale::classic()); + }); + str.erase(str.begin(), it2); +} + +bool NamespaceIndentation::VisitNamespaceDecl(NamespaceDecl const* nsDecl) +{ + if (ignoreLocation(nsDecl)) + return true; + if (nsDecl->isAnonymousNamespace()) + return true; + if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(nsDecl->getLocation()))) + return true; + + // right now, just fixing up the fallout from clang-tidy-modernize-namespaces, which + // does not touch header files + if (!compiler.getSourceManager().isInMainFile(nsDecl->getLocation())) + return true; + + auto& SM = compiler.getSourceManager(); + + // if we have a combined ns (.e.g namespace aaa::bbb), this appears in the AST + // as two nested namespace sharing the same source locations, so ignore the outer decls + if (!nsDecl->decls_empty()) + { + auto child = dyn_cast_or_null<NamespaceDecl>(*nsDecl->decls_begin()); + if (child) + { + bool invalid1 = false; + bool invalid2 = false; + unsigned line1 = SM.getPresumedLineNumber(compat::getBeginLoc(nsDecl), &invalid1); + unsigned line2 = SM.getPresumedLineNumber(compat::getBeginLoc(child), &invalid2); + if (line1 == line2) + return true; + } + } + + // Truly hacky way to find the actual beginning of an xxx::yyy namespace declaration + // if we are inside the yyy NameSpaceDecl of + // namespace xxx::yyy + // the beginLoc is just between the "xxx" and the "::" + auto nsDeclBeginLoc = compat::getBeginLoc(nsDecl); + bool foundMultiple = false; + { + constexpr int BACKSCAN = 32; + auto beginLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(-BACKSCAN); + auto endLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(3); + const char* p1 = SM.getCharacterData(beginLoc); + const char* p2 = SM.getCharacterData(endLoc); + unsigned n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts()); + if (p2 < p1 || n > 128 || (p2 - p1 + n) > 2048) + return true; + auto s = std::string(p1, p2 - p1); + auto idx1 = s.rfind(" "); // find the space preceding the namespace token + if (idx1 != std::string::npos) + { + auto namespaceToken = s.substr(idx1); + if (namespaceToken.find("::") != std::string::npos) + { + auto idx = s.rfind("\n"); + nsDeclBeginLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(idx - BACKSCAN + 1); + foundMultiple = true; + } + } + } + + // for now, I am only interested in fixing the fallout from clang-tidy-modernize-namespace, not + // anything else + if (!foundMultiple) + return true; + + bool invalid1 = false; + bool invalid2 = false; + unsigned col1 = SM.getPresumedColumnNumber(nsDeclBeginLoc, &invalid1); + unsigned col2 = SM.getPresumedColumnNumber(nsDecl->getRBraceLoc(), &invalid2); + unsigned line1 = SM.getPresumedLineNumber(nsDeclBeginLoc, &invalid1); + unsigned line2 = SM.getPresumedLineNumber(nsDecl->getRBraceLoc(), &invalid2); + if (invalid1 || invalid2) + return true; + if (line1 == line2) // single line declaration + return true; + if (col1 != col2) + report(DiagnosticsEngine::Warning, "statement right brace mis-aligned", + nsDecl->getRBraceLoc()); + + // no easy way to get the position of the left brace + auto endLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(256); + const char* p1 = SM.getCharacterData(SM.getExpansionLoc(compat::getBeginLoc(nsDecl))); + const char* p2 = SM.getCharacterData(SM.getExpansionLoc(endLoc)); + unsigned n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts()); + if (p2 < p1 || n > 128 || (p2 - p1 + n) > 2048) + return true; + auto s = std::string(p1, p2 - p1 + n); + auto idx1 = s.find("\n"); + auto idx2 = s.find("{"); + if (idx1 != std::string::npos && idx2 != std::string::npos) + if (idx1 < idx2) + { + auto col3 = idx2 - idx1; + if (col1 != col3) + report(DiagnosticsEngine::Warning, "statement left brace mis-aligned", + compat::getBeginLoc(nsDecl)); + } + + // extract the comment following the end brace + auto beginLoc = nsDecl->getRBraceLoc(); + endLoc = beginLoc.getLocWithOffset(128); + p1 = SM.getCharacterData(SM.getExpansionLoc(beginLoc)); + p2 = SM.getCharacterData(SM.getExpansionLoc(endLoc)); + n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts()); + if (p2 < p1 || n > 128 || (p2 - p1 + n) > 2048) + return true; + s = std::string(p1, p2 - p1 + n); + idx1 = s.find("//"); + idx2 = s.find("\n"); + if (idx1 != std::string::npos && idx2 != std::string::npos && idx1 < idx2) + { + idx1 += 2; + s = s.substr(idx1, idx2 - idx1); + trim(s); + std::string fullNamespace = GetFullNamespace(nsDecl); + if (!(s == fullNamespace || s == (fullNamespace + " namespace") || s == "namespace" + || s == ("namespace " + fullNamespace) || s == ("namespace ::" + fullNamespace) + || s == ("end " + fullNamespace) || s == "end namespace" + || s == ("end namespace " + fullNamespace) + || s == ("end " + fullNamespace + " namespace") || s == "end of namespace" + || s == ("end of namespace " + fullNamespace) + || s == ("end of namespace ::" + fullNamespace) + || s == ("eof of namespace " + fullNamespace))) + { + report(DiagnosticsEngine::Warning, "incorrect comment at end of namespace %0", + nsDecl->getRBraceLoc()) + << fullNamespace; + } + } + + return true; +} + +std::string NamespaceIndentation::GetFullNamespace(const NamespaceDecl* nsDecl) +{ + std::vector<llvm::StringRef> names; + auto ns = nsDecl; + while (ns) + { + names.push_back(ns->getName()); + ns = dyn_cast<NamespaceDecl>(ns->getParent()); + } + std::string fullNamespace; + for (auto it = names.rbegin(); it != names.rend(); ++it) + fullNamespace += "::" + it->str(); + fullNamespace = fullNamespace.substr(2); + return fullNamespace; +} + +// leave this off by default, so as not to annoy people +loplugin::Plugin::Registration<NamespaceIndentation> namespaceindentation("namespaceindentation", + false); + +} // namespace + +#endif // LO_CLANG_SHARED_PLUGINS + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/test/namespaceindentation.cxx b/compilerplugins/clang/test/namespaceindentation.cxx new file mode 100644 index 000000000000..f97f781fcae0 --- /dev/null +++ b/compilerplugins/clang/test/namespaceindentation.cxx @@ -0,0 +1,50 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#include "config_clang.h" + +// no warning expected +namespace xxx::yyy +{ +} +namespace xxx::yyy { +} +// expected-error@+1 {{statement left brace mis-aligned [loplugin:namespaceindentation]}} +namespace xxx::yyy + { +// expected-error@+1 {{statement right brace mis-aligned [loplugin:namespaceindentation]}} + } +namespace xxx::yyy +{ + // expected-error@+1 {{statement right brace mis-aligned [loplugin:namespaceindentation]}} + } +// expected-error@+1 {{statement left brace mis-aligned [loplugin:namespaceindentation]}} +namespace xxx::yyy + { +} +namespace xxx::yyy { +// expected-error@+1 {{statement right brace mis-aligned [loplugin:namespaceindentation]}} + } +namespace xxx::yyy +{ +} // fooo baaaar +// expected-error@-1 {{incorrect comment at end of namespace xxx::yyy [loplugin:namespaceindentation]}} +namespace aaa::bbb +{ +} // namespace foo +// expected-error@-1 {{incorrect comment at end of namespace aaa::bbb [loplugin:namespaceindentation]}} +namespace xxx::yyy +{ +} // xxx::yyy +// no warning expected +namespace com { namespace sun { namespace star { } } } +// no warning expected +namespace com::sun::star::uno { class XComponentContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index e56cf9e24f01..d0d36cdadbf9 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -347,7 +347,7 @@ namespace dbtools::param } -} // namespace dbtools::param +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 6045b0f3123c..a5efdd2a0e6a 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -45,7 +45,7 @@ namespace } namespace connectivity::evoab - { +{ static sal_Int32 const s_nCOLUMN_SIZE = 256; static sal_Int32 const s_nDECIMAL_DIGITS = 0; static sal_Int32 const s_nNULLABLE = 1; @@ -236,7 +236,7 @@ namespace connectivity::evoab } - } +} OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(OEvoabConnection* _pCon) diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index a3fd14970b22..daacdbf7aac8 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -39,7 +39,7 @@ #include <algorithm> namespace connectivity::file - { +{ using namespace dbtools; @@ -704,7 +704,7 @@ void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLPar // do nothing here } - }// namespace connectivity +}// namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 823c76ef3f6e..aa6f0d9d5c57 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -45,14 +45,14 @@ using namespace ::osl; using namespace connectivity::firebird; namespace connectivity::firebird - { +{ Reference< XInterface > FirebirdDriver_CreateInstance( const Reference< XMultiServiceFactory >& _rxFactory) { SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" ); return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory))); } - } +} // Static const variables namespace { @@ -228,7 +228,7 @@ uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByUR } namespace connectivity::firebird - { +{ void checkDisposed(bool _bThrow) { if (_bThrow) @@ -236,7 +236,7 @@ namespace connectivity::firebird } - } // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 0d49ce333575..598ef060bc4c 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -29,7 +29,7 @@ #include <algorithm> namespace connectivity::hsqldb - { +{ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -354,8 +354,7 @@ namespace connectivity::hsqldb env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } - } -// namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 4ecf06640096..7858230b07f6 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -25,12 +25,12 @@ using namespace com::sun::star::sdbc; namespace connectivity::mork - { +{ static sal_Int32 const s_nCOLUMN_SIZE = 256; static sal_Int32 const s_nDECIMAL_DIGITS = 0; static sal_Int32 const s_nNULLABLE = 1; static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535; - } +} ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo()) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index ab9f370989e0..4dd9110a6f0f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -23,7 +23,7 @@ #include "MNSINIParser.hxx" namespace connectivity::mozab - { +{ ProfileStruct::ProfileStruct() { } @@ -203,7 +203,7 @@ namespace connectivity::mozab ProductStruct &rProduct = m_ProductProfileList[index]; return rProduct.mProfileList.find(profileName) != rProduct.mProfileList.end(); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx index d58ac07d55ca..c7c88d03ebe6 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx @@ -134,7 +134,6 @@ void checkDisposed(bool _bThrow) throw DisposedException(); } } - -} /* connectivity */ +} /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index f6432dbf57cf..47576954a8f2 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -23,7 +23,7 @@ #include <odbc/OFunctions.hxx> namespace connectivity::odbc - { +{ namespace { class ORealOdbcDriver : public ODBCDriver @@ -287,6 +287,6 @@ SQLHANDLE ORealOdbcDriver::EnvironmentHandle(OUString &_rPath) } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx index 5f9ba6b36f75..8671af7bd5d9 100644 --- a/connectivity/source/drivers/writer/WCatalog.cxx +++ b/connectivity/source/drivers/writer/WCatalog.cxx @@ -55,6 +55,6 @@ void OWriterCatalog::refreshTables() m_pTables = std::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector); } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx index 7940d231bbf7..c4cc699e4ad2 100644 --- a/connectivity/source/drivers/writer/WConnection.cxx +++ b/connectivity/source/drivers/writer/WConnection.cxx @@ -243,6 +243,6 @@ uno::Reference<sdbc::XPreparedStatement> return nullptr; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx index 32bec31e5ec4..0c2e7129ed5c 100644 --- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx +++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx @@ -106,6 +106,6 @@ uno::Reference<sdbc::XResultSet> SAL_CALL OWriterDatabaseMetaData::getTables( return xRef; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx index fd285ff9bff2..63dc1f3f483d 100644 --- a/connectivity/source/drivers/writer/WDriver.cxx +++ b/connectivity/source/drivers/writer/WDriver.cxx @@ -75,6 +75,6 @@ ODriver::getPropertyInfo(const OUString& url, const uno::Sequence<beans::Propert return uno::Sequence<sdbc::DriverPropertyInfo>(); } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index 1c0b5d501699..118a098f9619 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -251,6 +251,6 @@ bool OWriterTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool return true; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WTables.cxx b/connectivity/source/drivers/writer/WTables.cxx index bfbe6f82c134..15dc9e0c1941 100644 --- a/connectivity/source/drivers/writer/WTables.cxx +++ b/connectivity/source/drivers/writer/WTables.cxx @@ -40,6 +40,6 @@ sdbcx::ObjectType OWriterTables::createObject(const OUString& rName) return xRet; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index a8c409f6081f..8a32a1b58b39 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -26,7 +26,7 @@ #include <algorithm> namespace connectivity::sdbcx - { +{ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -122,7 +122,7 @@ namespace connectivity::sdbcx return aTypes.getTypes(); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index b427142a874a..8040c9a018c0 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ namespace { @@ -214,6 +214,6 @@ namespace cppcanvas::internal rCanvas, rState ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx index afaa100dce8f..8d63d30a335a 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ CachedPrimitiveBase::CachedPrimitiveBase( const CanvasSharedPtr& rCanvas, bool bOnlyRedrawWithSameTransform ) : mpCanvas( rCanvas ), @@ -76,6 +76,6 @@ namespace cppcanvas::internal return renderPrimitive( mxCachedPrimitive, rTransformation ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index ca5b531138c7..14e3981547d5 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -229,7 +229,7 @@ namespace } namespace cppcanvas::internal - { +{ // state stack manipulators void VectorOfOutDevStates::clearStateStack() @@ -3069,6 +3069,6 @@ namespace cppcanvas::internal return false; } } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx index ba479ddc9e9e..066a2e0052f1 100644 --- a/cppcanvas/source/mtfrenderer/lineaction.cxx +++ b/cppcanvas/source/mtfrenderer/lineaction.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ namespace { class LineAction : public Action @@ -149,6 +149,6 @@ namespace cppcanvas::internal rState); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index 67e3fad6f720..f043162ee9f2 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; namespace cppcanvas::tools - { +{ void initRenderState( rendering::RenderState& renderState, const ::cppcanvas::internal::OutDevState& outdevState ) { @@ -666,6 +666,6 @@ namespace cppcanvas::tools createUnderlinePolyPolygon(rUnderlinePolyPoly, aStartPos, rLineWidth, rTextLineInfo); createStrikeoutPolyPolygon(rStrikeoutPolyPoly, aStartPos, rLineWidth, rTextLineInfo); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx index 67e2af712cd4..0f2340d9ae74 100644 --- a/cppcanvas/source/mtfrenderer/pointaction.cxx +++ b/cppcanvas/source/mtfrenderer/pointaction.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ namespace { class PointAction : public Action @@ -168,6 +168,6 @@ namespace cppcanvas::internal { return std::make_shared<PointAction>( rPoint, rCanvas, rState, rColor ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx index 5f570d662bfc..6d679cbd0a81 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ namespace { class PolyPolyAction : public CachedPrimitiveBase @@ -500,6 +500,6 @@ namespace cppcanvas::internal nTransparency ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index c6acfb330a11..277dc4e0d692 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ namespace { void init( rendering::RenderState& o_rRenderState, @@ -2311,6 +2311,6 @@ namespace cppcanvas::internal } return ret; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 5636b7608109..5512c0bdbf7d 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ // free support functions // ====================== namespace @@ -471,6 +471,6 @@ namespace cppcanvas::internal rState ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx index a233eda34453..2ccc1f0cbae5 100644 --- a/cppcanvas/source/tools/canvasgraphichelper.cxx +++ b/cppcanvas/source/tools/canvasgraphichelper.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; /* Implementation of CanvasGraphicHelper class */ namespace cppcanvas::internal - { +{ CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) : maClipPolyPolygon(), mpCanvas( rParentCanvas ) @@ -83,6 +83,6 @@ namespace cppcanvas::internal maRenderState.CompositeOperation = aOp; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx index 5813851e0065..a41f40b145c3 100644 --- a/cppcanvas/source/tools/tools.cxx +++ b/cppcanvas/source/tools/tools.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; namespace cppcanvas::tools - { +{ uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA aColor ) { uno::Sequence< double > aRes( 4 ); @@ -44,6 +44,6 @@ namespace cppcanvas::tools static_cast<sal_uInt8>( 255*rColor[2] + .5 ), static_cast<sal_uInt8>( 255*rColor[3] + .5 ) ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx index f7465e5d7188..8ce319539523 100644 --- a/cppcanvas/source/wrapper/implbitmap.cxx +++ b/cppcanvas/source/wrapper/implbitmap.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ ImplBitmap::ImplBitmap( const CanvasSharedPtr& rParentCanvas, const uno::Reference< rendering::XBitmap >& rBitmap ) : @@ -106,6 +106,6 @@ namespace cppcanvas::internal { return mxBitmap; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx index c4751d2923eb..bb34f8e5aa3c 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ ImplBitmapCanvas::ImplBitmapCanvas( const uno::Reference< rendering::XBitmapCanvas >& rCanvas ) : ImplCanvas( rCanvas ), mxBitmapCanvas( rCanvas ), @@ -54,6 +54,6 @@ namespace cppcanvas::internal { return std::make_shared<ImplBitmapCanvas>( *this ); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index da7eda676347..3a186404ce2e 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ ImplCanvas::ImplCanvas( const uno::Reference< rendering::XCanvas >& xCanvas ) : maViewState(), @@ -111,6 +111,6 @@ namespace cppcanvas::internal return maViewState; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx index 624c15dee7e1..e30adf085374 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.cxx +++ b/cppcanvas/source/wrapper/implcustomsprite.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, const uno::Reference< rendering::XCustomSprite >& rSprite, const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : @@ -65,6 +65,6 @@ namespace cppcanvas::internal return mpLastCanvas; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index a7d1124e61fb..1e8fc7c8b5f5 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ ImplPolyPolygon::ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas, const uno::Reference< rendering::XPolyPolygon2D >& rPolyPoly ) : CanvasGraphicHelper( rParentCanvas ), @@ -130,6 +130,6 @@ namespace cppcanvas::internal return mxPolyPoly; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx index 432a393a82dc..a7458d27a05a 100644 --- a/cppcanvas/source/wrapper/implsprite.cxx +++ b/cppcanvas/source/wrapper/implsprite.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas, const uno::Reference< rendering::XSprite >& rSprite, @@ -185,6 +185,6 @@ namespace cppcanvas::internal if( mxSprite.is() ) mxSprite->setPriority(fPriority); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index a33615eb9ef3..65b36077bae8 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace cppcanvas::internal - { +{ ImplSpriteCanvas::TransformationArbiter::TransformationArbiter() : maTransformation() { @@ -103,6 +103,6 @@ namespace cppcanvas::internal return mxSpriteCanvas; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index cc28d21b4f15..2216b071ae04 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -142,7 +142,7 @@ namespace dbaccess return bSuccess; } - } +} } // namespace dbaccess diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 2a578393be05..c07e093869d3 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -217,7 +217,7 @@ void LimitBoxController::dispatchCommand( } } -} ///dbaui namespace +} // dbaui namespace extern "C" void createRegistryInfo_LimitBoxController() { diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index 35d94b1ded56..e4708c4131b4 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -70,13 +70,13 @@ namespace drawinglayer::unorenderer }; } - } // end of namespace drawinglayer +} // end of namespace drawinglayer::unorenderer // uno functions namespace drawinglayer::unorenderer - { +{ uno::Sequence< OUString > XPrimitive2DRenderer_getSupportedServiceNames() { return { "com.sun.star.graphic.Primitive2DTools" }; @@ -91,11 +91,11 @@ namespace drawinglayer::unorenderer { return static_cast< ::cppu::OWeakObject* >(new XPrimitive2DRenderer); } - } // end of namespace drawinglayer +} // end of namespace drawinglayer::unorenderer namespace drawinglayer::unorenderer - { +{ XPrimitive2DRenderer::XPrimitive2DRenderer() { } diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 7dd74bd112ce..c5c053e07aff 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -387,11 +387,11 @@ namespace drawinglayer::geometry && mxExtendedInformation == rCandidate.mxExtendedInformation); } }; - } // end of namespace drawinglayer +} // end of namespace drawinglayer::geometry namespace drawinglayer::geometry - { +{ namespace { struct theGlobalDefault : diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index 879a85f94ef4..f59a88fa0071 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -412,11 +412,11 @@ namespace drawinglayer::geometry && mxExtendedInformation == rCandidate.mxExtendedInformation); } }; - } // end of namespace drawinglayer +} // end of namespace drawinglayer::geometry namespace drawinglayer::geometry - { +{ namespace { struct theGlobalDefault : diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 82f11460c581..19e586359395 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -83,11 +83,11 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(AnimatedSwitchPrimitive2D, PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d namespace drawinglayer::primitive2d - { +{ AnimatedBlinkPrimitive2D::AnimatedBlinkPrimitive2D( const animation::AnimationEntry& rAnimationEntry, const Primitive2DContainer& rChildren) @@ -111,11 +111,11 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(AnimatedBlinkPrimitive2D, PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d namespace drawinglayer::primitive2d - { +{ AnimatedInterpolatePrimitive2D::AnimatedInterpolatePrimitive2D( const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack, const animation::AnimationEntry& rAnimationEntry, diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index e66f76ce9785..b6b85390a711 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -302,11 +302,11 @@ namespace drawinglayer::primitive2d && getSpreadMethod() == rCompare.getSpreadMethod()); } - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d namespace drawinglayer::primitive2d - { +{ void SvgLinearGradientPrimitive2D::checkPreconditions() { // call parent @@ -574,11 +574,11 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SvgLinearGradientPrimitive2D, PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d namespace drawinglayer::primitive2d - { +{ void SvgRadialGradientPrimitive2D::checkPreconditions() { // call parent @@ -875,13 +875,13 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SvgRadialGradientPrimitive2D, PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d // SvgLinearAtomPrimitive2D class namespace drawinglayer::primitive2d - { +{ void SvgLinearAtomPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { const double fDelta(getOffsetB() - getOffsetA()); @@ -960,13 +960,13 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SvgLinearAtomPrimitive2D, PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d // SvgRadialAtomPrimitive2D class namespace drawinglayer::primitive2d - { +{ void SvgRadialAtomPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { const double fDeltaScale(getScaleB() - getScaleA()); diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 30d5591fadf0..d257be6dace7 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -38,6 +38,6 @@ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int3 -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx index a68d51951770..6eef9029a7d2 100644 --- a/oox/source/core/contexthandler.cxx +++ b/oox/source/core/contexthandler.cxx @@ -128,6 +128,6 @@ void ContextHandler::endRecord( sal_Int32 ) { } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index ef6075428554..a63a9b6ba1a5 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -256,6 +256,6 @@ void ContextHandler2::onEndRecord() { } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index f8aed31f32c3..8268b9bb6277 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -136,6 +136,6 @@ void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName parseStream( rStorage.openInputStream( rStreamName ), rStreamName ); } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index 9b3345acb82b..d6639136b3ca 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -71,7 +71,7 @@ sal_Int32 FastTokenHandler::getTokenDirect( const char *pToken, sal_Int32 nLengt return mrTokenMap.getTokenFromUTF8( pToken, nLength ); } -} // namespace oox +} // namespace oox::core extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_oox_core_FastTokenHandler_get_implementation( diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 6e63a5653e7b..0cb7f2a264b1 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -578,6 +578,6 @@ bool FilterBase::isExportTemplate() const return mxImpl->mbExportTemplate; } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 7581b40f332b..b76ed613d95c 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -432,7 +432,7 @@ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq return aFilterName; } -} // namespace oox +} // namespace oox::core extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_oox_FormatDetector_get_implementation(uno::XComponentContext* pCtx, diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx index 1036d0e4d116..22319fda6e85 100644 --- a/oox/source/core/fragmenthandler.cxx +++ b/oox/source/core/fragmenthandler.cxx @@ -114,6 +114,6 @@ const RecordInfo* FragmentHandler::getRecordInfos() const return nullptr; } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index 1f8ef418cb34..3e6112820bad 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -216,6 +216,6 @@ void FragmentHandler2::finalizeImport() { } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index c8f33fd1552e..d5a9a9866f13 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -153,7 +153,7 @@ void ContextStack::popContext() } } -} // namespace prv +} // namespace oox::core::prv namespace { @@ -322,6 +322,6 @@ const RecordInfo* RecordParser::getEndRecordInfo( sal_Int32 nRecId ) const return (aIt == maEndMap.end()) ? nullptr : &aIt->second; } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index e7442fd9ebb7..6f443abcf3b4 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -148,6 +148,6 @@ OUString Relations::getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& r return pRelation ? getFragmentPathFromRelation( *pRelation ) : OUString(); } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index ff604602db7a..6e80a0834dab 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -91,6 +91,6 @@ Reference< XFastContextHandler > RelationsFragment::createFastChildContext( return xRet; } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index f381beb3aec4..3957f51cca1f 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -1140,6 +1140,6 @@ void XmlFilterBase::exportCustomFragments() } } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx index c544b53441a0..5f0f9aab5653 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -819,6 +819,6 @@ void AgileEngine::encrypt(css::uno::Reference<css::io::XInputStream> & rxInputS encryptHmacValue(); } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index e55c0849f2bc..30832eb6bc16 100644 --- a/oox/source/crypto/CryptTools.cxx +++ b/oox/source/crypto/CryptTools.cxx @@ -480,6 +480,6 @@ std::vector<sal_uInt8> CryptoHash::finalize() return aHash; } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index a7806f8d32cb..a90bdada7bc9 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -110,6 +110,6 @@ bool DocumentDecryption::decrypt(const uno::Reference<io::XStream>& xDocumentStr return bResult; } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/DocumentEncryption.cxx b/oox/source/crypto/DocumentEncryption.cxx index c32c184db31a..13019246514f 100644 --- a/oox/source/crypto/DocumentEncryption.cxx +++ b/oox/source/crypto/DocumentEncryption.cxx @@ -67,6 +67,6 @@ bool DocumentEncryption::encrypt() return true; } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx index 1113542d886d..c3b23aa426d5 100644 --- a/oox/source/crypto/Standard2007Engine.cxx +++ b/oox/source/crypto/Standard2007Engine.cxx @@ -317,6 +317,6 @@ bool Standard2007Engine::readEncryptionInfo(css::uno::Reference<css::io::XInputS return !aBinaryStream.isEof(); } -} // namespace oox +} // namespace oox::core /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index cb1870f799f5..15bf005e84a4 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -684,6 +684,6 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars ) } } -} // namespace oox +} // namespace oox::docprop /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 5377c55099d6..6a222b4cf0c6 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -159,7 +159,7 @@ void SAL_CALL DocumentPropertiesImport::importProperties( } } -} // namespace oox +} // namespace oox::docprop extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_oox_docprop_DocumentPropertiesImporter_get_implementation( diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx index 730348ee33f1..45ccbdf44804 100644 --- a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx +++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx @@ -43,6 +43,6 @@ ContextHandlerRef ThemeOverrideFragmentHandler::onCreateContext( sal_Int32 nElem return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index 11127b3f7c38..b90857785e32 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -293,6 +293,6 @@ ContextHandlerRef ValAxisContext::onCreateContext( sal_Int32 nElement, const Att return AxisContextBase::onCreateContext( nElement, rAttribs ); } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx index 1fd55d4afc23..a5b2d5542160 100644 --- a/oox/source/drawingml/chart/axismodel.cxx +++ b/oox/source/drawingml/chart/axismodel.cxx @@ -57,6 +57,6 @@ AxisModel::~AxisModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx index 410a1ad9d39c..5423c52b3d35 100644 --- a/oox/source/drawingml/chart/chartcontextbase.cxx +++ b/oox/source/drawingml/chart/chartcontextbase.cxx @@ -102,6 +102,6 @@ ContextHandlerRef LayoutContext::onCreateContext( sal_Int32 nElement, const Attr return nullptr; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index fa78d0f22166..e75b1c09c866 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -152,6 +152,6 @@ Reference< XDataSequence > ChartConverter::createDataSequence( return nullptr; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx index add6faa0912a..af20cd292368 100644 --- a/oox/source/drawingml/chart/chartdrawingfragment.cxx +++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx @@ -228,6 +228,6 @@ void ChartDrawingFragment::onEndElement() } } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index d9376064f804..ade046ef08e8 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -290,6 +290,6 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern } } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index 129dbd7cff9c..4d5d9158567f 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -119,6 +119,6 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const return nullptr; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx index afdaf41dd19d..3aa7366ff82e 100644 --- a/oox/source/drawingml/chart/chartspacemodel.cxx +++ b/oox/source/drawingml/chart/chartspacemodel.cxx @@ -36,6 +36,6 @@ ChartSpaceModel::~ChartSpaceModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index c79578b62411..9c69b723ec8c 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -299,6 +299,6 @@ ContextHandlerRef DataSourceContext::onCreateContext( sal_Int32 nElement, const return nullptr; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx index 0f72da69a9c5..72399426538d 100644 --- a/oox/source/drawingml/chart/datasourceconverter.cxx +++ b/oox/source/drawingml/chart/datasourceconverter.cxx @@ -97,6 +97,6 @@ Reference< XDataSequence > DataSourceConverter::createDataSequence( const OUStri return xDataSeq; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/datasourcemodel.cxx b/oox/source/drawingml/chart/datasourcemodel.cxx index 92409d432df5..e83b6b3558a5 100644 --- a/oox/source/drawingml/chart/datasourcemodel.cxx +++ b/oox/source/drawingml/chart/datasourcemodel.cxx @@ -39,6 +39,6 @@ DataSourceModel::~DataSourceModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx index 0e959403929a..feb5b9aed251 100644 --- a/oox/source/drawingml/chart/modelbase.cxx +++ b/oox/source/drawingml/chart/modelbase.cxx @@ -53,6 +53,6 @@ LayoutModel::~LayoutModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx index bbda258abfe3..f4a9dc9d4102 100644 --- a/oox/source/drawingml/chart/plotareacontext.cxx +++ b/oox/source/drawingml/chart/plotareacontext.cxx @@ -201,6 +201,6 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At return nullptr; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/plotareamodel.cxx b/oox/source/drawingml/chart/plotareamodel.cxx index cff935bca3d0..72abacc20570 100644 --- a/oox/source/drawingml/chart/plotareamodel.cxx +++ b/oox/source/drawingml/chart/plotareamodel.cxx @@ -59,6 +59,6 @@ PlotAreaModel::~PlotAreaModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx index 3a9f3f64c412..563e0e48e3bf 100644 --- a/oox/source/drawingml/chart/seriesmodel.cxx +++ b/oox/source/drawingml/chart/seriesmodel.cxx @@ -124,6 +124,6 @@ SeriesModel::~SeriesModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx index 36bf48c8d375..955fc2ac50be 100644 --- a/oox/source/drawingml/chart/titlecontext.cxx +++ b/oox/source/drawingml/chart/titlecontext.cxx @@ -175,6 +175,6 @@ ContextHandlerRef LegendContext::onCreateContext( sal_Int32 nElement, const Attr return nullptr; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 115589105584..a6623aa1ed49 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -342,6 +342,6 @@ void LegendConverter::legendEntriesFormatting(const Reference<XDiagram>& rxDiagr } } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx index 73709db0ac37..ff1891d02f8d 100644 --- a/oox/source/drawingml/chart/titlemodel.cxx +++ b/oox/source/drawingml/chart/titlemodel.cxx @@ -60,6 +60,6 @@ LegendModel::~LegendModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx index 9bea7540e234..b41169229451 100644 --- a/oox/source/drawingml/chart/typegroupcontext.cxx +++ b/oox/source/drawingml/chart/typegroupcontext.cxx @@ -367,6 +367,6 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement, return nullptr; } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx index 2fdd3c488680..e109d89b913d 100644 --- a/oox/source/drawingml/chart/typegroupmodel.cxx +++ b/oox/source/drawingml/chart/typegroupmodel.cxx @@ -63,6 +63,6 @@ TypeGroupModel::~TypeGroupModel() { } -} // namespace oox +} // namespace oox::drawingml::chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index 6d08c7b18963..0a4c627833ee 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -148,6 +148,6 @@ ColorContext::ColorContext( ContextHandler2Helper const & rParent, Color& rColor return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/datamodel.cxx b/oox/source/drawingml/diagram/datamodel.cxx index 90e10010b897..c6f20ae9fa53 100644 --- a/oox/source/drawingml/diagram/datamodel.cxx +++ b/oox/source/drawingml/diagram/datamodel.cxx @@ -57,7 +57,7 @@ void Point::dump() const << msModelId << ", type " << mnType); } -} // dgm namespace +} // oox::drawingml::dgm namespace DiagramData::DiagramData() : mpFillProperties( std::make_shared<FillProperties>() ) diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index be9c3832fa64..a6c8b66efba2 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -397,6 +397,6 @@ IndexRange GetIndexRange( const Reference< XFastAttributeList >& xAttributes ) return range; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx index ff50919646c6..2ca45bae05a8 100644 --- a/oox/source/drawingml/effectproperties.cxx +++ b/oox/source/drawingml/effectproperties.cxx @@ -91,6 +91,6 @@ css::beans::PropertyValue Effect::getEffect() return aRet; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx index f85202afcaa8..0b81825086c8 100644 --- a/oox/source/drawingml/graphicshapecontext.cxx +++ b/oox/source/drawingml/graphicshapecontext.cxx @@ -311,6 +311,6 @@ ContextHandlerRef ChartGraphicDataContext::onCreateContext( ::sal_Int32 nElement return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index 9e5631eb7b38..c58e8fb9b7e5 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -163,6 +163,6 @@ ContextHandlerRef HyperLinkContext::onCreateContext( return this; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx index b54cda58a329..7ee6d25911f3 100644 --- a/oox/source/drawingml/misccontexts.cxx +++ b/oox/source/drawingml/misccontexts.cxx @@ -378,6 +378,6 @@ ContextHandlerRef ArtisticEffectContext::onCreateContext( return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx index 3cecae3f9e9b..b018aa41828f 100644 --- a/oox/source/drawingml/shapepropertymap.cxx +++ b/oox/source/drawingml/shapepropertymap.cxx @@ -230,6 +230,6 @@ bool ShapePropertyMap::setFillBitmapName(const Any& rValue) return false; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx index 309077f09689..77dc4267757d 100644 --- a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx +++ b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx @@ -58,6 +58,6 @@ ContextHandlerRef TableStyleListFragmentHandler::onCreateContext( return this; } -} // namespace oox +} // namespace oox::drawingml::table /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx index 7aff131cd0fb..97f6a5eee74f 100644 --- a/oox/source/drawingml/textbodyproperties.cxx +++ b/oox/source/drawingml/textbodyproperties.cxx @@ -95,6 +95,6 @@ void TextBodyProperties::pushRotationAdjustments() } } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 3bfff3377e9a..e9d2f2e7b900 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -208,6 +208,6 @@ float TextCharacterProperties::getCharHeightPoints( float fDefault ) const return moHeight.has() ? GetFontHeight( moHeight.get() ) : fDefault; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/textfont.cxx b/oox/source/drawingml/textfont.cxx index 374d564d1282..41dd0716a69a 100644 --- a/oox/source/drawingml/textfont.cxx +++ b/oox/source/drawingml/textfont.cxx @@ -91,6 +91,6 @@ bool TextFont::implGetFontData( OUString& rFontName, sal_Int16& rnFontPitch, sal return !rFontName.isEmpty(); } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx index db3124fa9f67..ca26f389904e 100644 --- a/oox/source/drawingml/theme.cxx +++ b/oox/source/drawingml/theme.cxx @@ -105,6 +105,6 @@ const TextFont* Theme::resolveFont( const OUString& rName ) const return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx index 8f9968784c61..ed25b451f12d 100644 --- a/oox/source/drawingml/themeelementscontext.cxx +++ b/oox/source/drawingml/themeelementscontext.cxx @@ -234,6 +234,6 @@ ContextHandlerRef ThemeElementsContext::onCreateContext( sal_Int32 nElement, con return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx index 6b31383cb0f9..0f46fb380e07 100644 --- a/oox/source/drawingml/themefragmenthandler.cxx +++ b/oox/source/drawingml/themefragmenthandler.cxx @@ -70,6 +70,6 @@ ContextHandlerRef ThemeFragmentHandler::onCreateContext( sal_Int32 nElement, con return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index bdc567d6c7b9..2a324b15c23d 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -112,6 +112,6 @@ ContextHandlerRef Transform2DContext::onCreateContext( sal_Int32 aElementToken, return nullptr; } -} // namespace oox +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index 1da86eda6c06..0eeebfce394f 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -220,7 +220,7 @@ sal_uInt16 DffStreamObject::dumpDffOptPropHeader() return dumpHex< sal_uInt16 >( "id", "DFFOPT-PROPERTY-ID" ); } -} // namespace oox +} // namespace oox::dump #endif diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx index f63792ad850f..e3c9dce330af 100644 --- a/oox/source/dump/pptxdumper.cxx +++ b/oox/source/dump/pptxdumper.cxx @@ -122,7 +122,7 @@ void Dumper::implDump() RootStorageObject( *this ).dump(); } -} // namespace oox +} // namespace oox::dump::pptx #endif diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index c26d1eea3bb5..5b3d71a6d422 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -174,6 +174,6 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropert return uno::Any(); } -} // namespace xmloff +} // namespace oox::drawingml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx index b3651f510a48..07e5b437a68f 100644 --- a/oox/source/helper/progressbar.cxx +++ b/oox/source/helper/progressbar.cxx @@ -130,7 +130,7 @@ ISegmentProgressBarRef SubSegment::createSegment( double fLength ) return xSegment; } -} // namespace prv +} // namespace oox::prv SegmentProgressBar::SegmentProgressBar( const Reference< XStatusIndicator >& rxIndicator, const OUString& rText ) : maProgress( rxIndicator, rText ), diff --git a/oox/source/mathml/import.cxx b/oox/source/mathml/import.cxx index 557f34016148..84056b027a98 100644 --- a/oox/source/mathml/import.cxx +++ b/oox/source/mathml/import.cxx @@ -102,7 +102,7 @@ void SAL_CALL LazyMathBufferingContext::characters(OUString const& rChars) } } -} // namespace formulaimport +} // namespace oox::formulaimport rtl::Reference<core::ContextHandler> CreateLazyMathBufferingContext( core::ContextHandler const& rParent, drawingml::TextParagraph & rPara) diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx index 0b34d410bdb3..6467e51bc00d 100644 --- a/oox/source/ole/axbinaryreader.cxx +++ b/oox/source/ole/axbinaryreader.cxx @@ -286,6 +286,6 @@ bool AxBinaryPropertyReader::startNextProperty() return ensureValid() && bHasProp; } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx index 9fee02620002..7e08d0992fae 100644 --- a/oox/source/ole/axbinarywriter.cxx +++ b/oox/source/ole/axbinarywriter.cxx @@ -198,6 +198,6 @@ void AxBinaryPropertyWriter::startNextProperty( bool bSkip ) mnNextProp <<= 1; } -} // namespace ole +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx index 3e1f5c363126..c08ce2f21e9d 100644 --- a/oox/source/ole/axcontrolfragment.cxx +++ b/oox/source/ole/axcontrolfragment.cxx @@ -162,6 +162,6 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const return nullptr; } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx index 2ebedd0cbdf5..2505168bcf14 100644 --- a/oox/source/ole/axfontdata.cxx +++ b/oox/source/ole/axfontdata.cxx @@ -112,6 +112,6 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm ) return false; } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index b7377d073e5d..8a0ca5a7c9b4 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -173,6 +173,6 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf return bRet; } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index 39482fef013f..f9fd84a8c44e 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -377,6 +377,6 @@ void OleStorage::implCommit() const } } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx index 477405ecf35d..dd523ea9d5ee 100644 --- a/oox/source/ole/vbahelper.cxx +++ b/oox/source/ole/vbahelper.cxx @@ -54,6 +54,6 @@ bool VbaHelper::extractKeyValue( OUString& rKey, OUString& rValue, const OUStrin return false; } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx index ae2ba98fa983..fc795d30de37 100644 --- a/oox/source/ole/vbainputstream.cxx +++ b/oox/source/ole/vbainputstream.cxx @@ -203,6 +203,6 @@ bool VbaInputStream::updateChunk() return !mbEof; } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index b96e6f444a0a..d0d05a35cd08 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -334,6 +334,6 @@ void VbaModule::createModule( const OUString& rVBASourceCode, } } -} // namespace oox +} // namespace oox::ole /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/ppt/presPropsfragmenthandler.cxx b/oox/source/ppt/presPropsfragmenthandler.cxx index 48d0dbc2d891..fe4ffdfc2fc6 100644 --- a/oox/source/ppt/presPropsfragmenthandler.cxx +++ b/oox/source/ppt/presPropsfragmenthandler.cxx @@ -47,6 +47,6 @@ core::ContextHandlerRef PresPropsFragmentHandler::onCreateContext(sal_Int32 aEle } return this; } -} // namespace oox +} // namespace oox::ppt /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 53c1e6aeed42..f9c36cda758c 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -339,6 +339,6 @@ void Drawing::notifyXShapeInserted( const Reference< XShape >& /*rxShape*/, { } -} // namespave oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx index d56177ffdda6..cb7936bafb39 100644 --- a/oox/source/vml/vmldrawingfragment.cxx +++ b/oox/source/vml/vmldrawingfragment.cxx @@ -77,6 +77,6 @@ void DrawingFragment::finalizeImport() mrDrawing.finalizeFragmentImport(); } -} // namespace oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 2b8b97ca6ff7..dd05b90c81a1 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -391,6 +391,6 @@ OString InputStream::readToElementEnd() return aText; } -} // namespave oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx index d1a155465be3..beaac27ea153 100644 --- a/oox/source/vml/vmlshapecontainer.cxx +++ b/oox/source/vml/vmlshapecontainer.cxx @@ -128,6 +128,6 @@ void ShapeContainer::convertAndInsert( const Reference< XShapes >& rxShapes, con shape->convertAndInsert( rxShapes, pParentAnchor ); } -} // namespace oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx index 7713f2cdebaf..c4e66bc8f4a5 100644 --- a/oox/source/vml/vmltextbox.cxx +++ b/oox/source/vml/vmltextbox.cxx @@ -199,6 +199,6 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const } } -} // namespace oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index 57f611c9eea6..2b90adb14995 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -284,6 +284,6 @@ void TextBoxContext::onEndElement() } } -} // namespace oox +} // namespace oox::vml /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index 459adefbd019..1e943e3c0206 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -145,6 +145,6 @@ void AutoFilterContext::onStartRecord( SequenceInputStream& rStrm ) mrAutoFilter.importAutoFilter( rStrm, getSheetIndex() ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 06e0ebe06ee0..ec9b3acbe2a8 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -104,6 +104,6 @@ union DecodedDouble return aString; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 1047edfd49b0..10fde32051e0 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -169,6 +169,6 @@ void ChartsheetFragment::importDrawing( SequenceInputStream& rStrm ) setDrawingPath( getFragmentPathFromRelId( BiffHelper::readString( rStrm ) ) ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 359cddc6cad4..60737f46ba36 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -242,6 +242,6 @@ void CommentsBuffer::finalizeImport() pModel->setLock(bWasLocked); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index b1442e51e9a8..fd4a4e34050c 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -139,6 +139,6 @@ void CommentsFragment::importComment( SequenceInputStream& rStrm ) mxComment->importComment( rStrm ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index bc03c9b2a92f..5b7e624aa18a 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -259,6 +259,6 @@ void CondFormatContext::onEndRecord() } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 73de83ac000f..1959f6ea155c 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -310,6 +310,6 @@ void ConnectionsBuffer::insertConnectionToMap( const ConnectionRef& rxConnection } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 1619747763de..3fafefd1dd3b 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -156,6 +156,6 @@ void ConnectionsFragment::finalizeImport() getConnections().finalizeImport(); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 1042510f5cf0..3f7e5c7609b8 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -401,6 +401,6 @@ DefinedNameRef DefinedNamesBuffer::createDefinedName() return xDefName; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 9b840048f8ef..29ef7d4b53c4 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -287,6 +287,6 @@ EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const return aEmuPoint; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index 220b12952be0..d0802f773d7a 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -119,6 +119,6 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence( return xDataSeq; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index aeb8507fac87..17d5325e52af 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -245,7 +245,7 @@ OUString ExcelFilter::getImplementationName() return "com.sun.star.comp.oox.xls.ExcelFilter"; } -} // namespace oox +} // namespace oox::xls extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index e22c30e49f4d..1e594b3ca4d6 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -38,6 +38,6 @@ WorksheetFragmentBase::WorksheetFragmentBase( { } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 100c8ccddfda..df1557620832 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -119,6 +119,6 @@ void ExcelVbaProject::prepareImport() } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index 0a1474df6428..bcc51246c265 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -330,6 +330,6 @@ const RecordInfo* ExternalLinkFragment::getRecordInfos() const return spRecInfos; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index cd64197c01d8..06aa3d836120 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -363,6 +363,6 @@ ContextHandlerRef ExtLstGlobalWorkbookContext::onCreateContext( sal_Int32 nEleme return this; } -} //namespace xls +} //namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 85470a6049d0..0a7c0d5243e0 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -160,7 +160,7 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula( throw RuntimeException(); } -} // namespace oox +} // namespace oox::xls extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index a72219962427..c60a383ab9fa 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -320,6 +320,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index 6c5d479dd839..76d2abdcde36 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -275,6 +275,6 @@ const RecordInfo* PivotTableFragment::getRecordInfos() const return spRecInfos; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index cd3a415815b2..3764266b9330 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -278,6 +278,6 @@ void QueryTableBuffer::finalizeImport() maQueryTables.forEachMem( &QueryTable::finalizeImport ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index 789e469953f2..a41bda46a18c 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -67,6 +67,6 @@ const RecordInfo* QueryTableFragment::getRecordInfos() const return spRecInfos; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index a27c0ff12ce6..848ac6917c25 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -482,6 +482,6 @@ void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionM } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index 98da03bc1602..36cd1a165dea 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -86,6 +86,6 @@ void RichStringContext::onCharacters( const OUString& rChars ) } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index c8496622cad2..e52423ce6e01 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -207,6 +207,6 @@ void ScenarioBuffer::finalizeImport() maSheetScenarios.forEachMem( &SheetScenarios::finalizeImport ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx index 23c5a99828d2..2e192d4a3d67 100644 --- a/sc/source/filter/oox/scenariocontext.cxx +++ b/sc/source/filter/oox/scenariocontext.cxx @@ -107,6 +107,6 @@ void ScenariosContext::onStartRecord( SequenceInputStream& rStrm ) mrSheetScenarios.importScenarios( rStrm ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/sharedstringsbuffer.cxx b/sc/source/filter/oox/sharedstringsbuffer.cxx index 72d40c6d1bcc..2f1287d7342f 100644 --- a/sc/source/filter/oox/sharedstringsbuffer.cxx +++ b/sc/source/filter/oox/sharedstringsbuffer.cxx @@ -43,6 +43,6 @@ RichStringRef SharedStringsBuffer::getString( sal_Int32 nStringId ) const return maStrings.get( nStringId ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 13735126290b..a1f10664595d 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -83,6 +83,6 @@ void SharedStringsFragment::finalizeImport() getSharedStrings().finalizeImport(); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index 8d0a583ff88f..a6188072b4d8 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -312,6 +312,6 @@ void StylesFragment::finalizeImport() getStyles().finalizeImport(); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 97e1ae35f187..df5df5b090a5 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -205,6 +205,6 @@ void TableBuffer::insertTableToMaps( const TableRef& rxTable ) } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/tablecolumnsbuffer.cxx b/sc/source/filter/oox/tablecolumnsbuffer.cxx index 318befdaa951..57552204c62b 100644 --- a/sc/source/filter/oox/tablecolumnsbuffer.cxx +++ b/sc/source/filter/oox/tablecolumnsbuffer.cxx @@ -123,6 +123,6 @@ TableColumns* TableColumnsBuffer::getActiveTableColumns() return maTableColumnsVector.empty() ? nullptr : maTableColumnsVector.back().get(); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/tablecolumnscontext.cxx b/sc/source/filter/oox/tablecolumnscontext.cxx index 74003a08446c..270f544bd503 100644 --- a/sc/source/filter/oox/tablecolumnscontext.cxx +++ b/sc/source/filter/oox/tablecolumnscontext.cxx @@ -87,6 +87,6 @@ void TableColumnsContext::onStartRecord( SequenceInputStream& rStrm ) mrTableColumns.importTableColumns( rStrm ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index f86491d9e83c..99f3ede7a0d8 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -92,6 +92,6 @@ const RecordInfo* TableFragment::getRecordInfos() const return spRecInfos; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx index 303ff7f2cfae..3c82a31610fd 100644 --- a/sc/source/filter/oox/themebuffer.cxx +++ b/sc/source/filter/oox/themebuffer.cxx @@ -49,6 +49,6 @@ ThemeBuffer::~ThemeBuffer() return getClrScheme().getColorByIndex(nIndex, nColor) ? nColor : API_RGB_TRANSPARENT; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index 911a01785b35..c5036267e420 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -235,6 +235,6 @@ double UnitConverter::getCoefficient( Unit eUnit ) const return maCoeffs[ eUnit ]; } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index 180e643b8231..5f83e42f1a24 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -286,6 +286,6 @@ void WorkbookSettings::setDateMode( bool bDateMode1904, bool bDateCompatibility getUnitConverter().finalizeNullDate( getNullDate() ); } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 04cf5c41fb88..b165d5bea723 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -240,6 +240,6 @@ void WorksheetBuffer::finalizeImport( sal_Int16 nActiveSheet ) } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 719b2904301b..08899e4e641a 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -288,6 +288,6 @@ void WorksheetSettings::finalizeImport() } } -} // namespace oox +} // namespace oox::xls /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 5915b50f52df..6a6d7c74d9f6 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -275,6 +275,6 @@ IMPL_LINK(CellBorderStylePopup, TB4SelectHdl, const OString&, rId, void) maToolButton.set_inactive(); } -} // end of namespace svx::sidebar +} // end of namespace sc::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index ab828aa8e1ac..7a545963aff7 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -219,6 +219,6 @@ void CellLineStylePopup::SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_u mxCellLineStyleValueSet->Invalidate(); } -} // end of namespace svx::sidebar +} // end of namespace sc::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index 70f8c649fb8d..dac0df57380f 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -166,6 +166,6 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } -} // end of namespace svx::sidebar +} // end of namespace sc::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 4258e1cddcb5..f251517cf415 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -394,6 +394,6 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj ) return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : nullptr; } -} // namespace ooo +} // namespace ooo::vba::excel /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 43448ce4cb4f..22a31a15e4c7 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -1144,7 +1144,7 @@ SdrObject* ScDrawView::ApplyGraphicToObject( // Own derivation of ObjectContact to allow on-demand calculation of // GridOffset for non-linear ViewToDevice transformation (calc) namespace sdr::contact - { +{ namespace { class ObjectContactOfScDrawView final : public ObjectContactOfPageView @@ -1224,7 +1224,7 @@ namespace sdr::contact rTarget); } } - } +} // Create own derivation of ObjectContact for calc sdr::contact::ObjectContact* ScDrawView::createViewSpecificObjectContact( diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index fd93894b6e94..6ca32cd43955 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -95,6 +95,6 @@ sal_Bool MasterScriptProviderFactory::supportsService( return cppu::supportsService(this, serviceName); } -} // namespace browsenodefactory +} // namespace func_provider /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index e6daf55f28db..25ea60dbb4cc 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -2685,7 +2685,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = }; -} // namespace dlgprov +} // namespace stringresource // component exports diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 12fbca7ae85f..05a64f0e01f1 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -209,7 +209,7 @@ struct TransitionEffect bool mbLoopSoundAmbiguous; }; -} // namespace sd +} // namespace sd::impl // Local Helper Functions namespace diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index cda0c5ac2447..373a648a5fd3 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -133,6 +133,6 @@ IMPL_LINK_NOARG(ClientBoxEntry, FocusHdl, weld::Widget&, void) m_xContainer->set_highlight_background(); } -} //namespace dp_gui +} //namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 7e6773064c83..741e2607eee8 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -180,6 +180,6 @@ void ChangeRequestQueueProcessor::Clear() maQueue.swap(aEmpty); } -} // end of namespace sd::framework::configuration +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 68e0bb9addfd..d8f8207aaf69 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -302,6 +302,6 @@ void SelectionManager::SetInsertionPosition (const sal_Int32 nInsertionPosition) mnInsertionPosition = nInsertionPosition; } -} // end of namespace ::sd::slidesorter +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx index 76895b68d96d..f407456b35ef 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.cxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx @@ -200,6 +200,6 @@ void AnimationAudioNode::checkPlayingStatus() } } // namespace internal -} // namespace presentation +} // namespace slideshow /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index b3686acd9e22..f9480ef51403 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -422,6 +422,6 @@ void ShapeManagerImpl::notifyIntrinsicAnimationsDisabled() } // namespace internal -} // namespace presentation +} // namespace slideshow /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/CompilerTest_compilerplugins_clang.mk b/solenv/CompilerTest_compilerplugins_clang.mk index 999d838ee36c..dab7501be1a6 100644 --- a/solenv/CompilerTest_compilerplugins_clang.mk +++ b/solenv/CompilerTest_compilerplugins_clang.mk @@ -48,6 +48,7 @@ $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \ compilerplugins/clang/test/loopvartoosmall \ compilerplugins/clang/test/mapindex \ compilerplugins/clang/test/makeshared \ + compilerplugins/clang/test/namespaceindentation \ compilerplugins/clang/test/noexceptmove \ compilerplugins/clang/test/nullptr \ compilerplugins/clang/test/oncevar \ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index f5b6f62db424..c359063ec310 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -1786,6 +1786,7 @@ compilerplugins/clang/test/finalprotected.cxx compilerplugins/clang/test/flatten.cxx compilerplugins/clang/test/indentation.cxx compilerplugins/clang/test/loopvartoosmall.cxx +compilerplugins/clang/test/namespaceindentation.cxx compilerplugins/clang/test/oncevar.cxx compilerplugins/clang/test/oslendian-1.cxx compilerplugins/clang/test/oslendian-2.cxx diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index b51ddc2ca71a..b5c35bef6271 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -38,7 +38,8 @@ #include <osl/file.hxx> #include <unotools/pathoptions.hxx> -namespace svx::DocRecovery{ +namespace svx::DocRecovery +{ using namespace ::osl; @@ -1087,6 +1088,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() } } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 21eea0663987..68d52462025e 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -27,7 +27,8 @@ using namespace ::com::sun::star; using namespace editeng; -namespace svx::frame { +namespace svx::frame +{ // Classes void Style::implEnsureImplStyle() diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index 918e207b6e7d..9d170160d24f 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -31,7 +31,7 @@ namespace drawinglayer::processor3d - { +{ namespace { class MinimalDephInViewExtractor : public BaseProcessor3D @@ -136,7 +136,7 @@ namespace drawinglayer::processor3d } } } - } // end of namespace drawinglayer +} // end of namespace // changed to create values using VCs, Primitive3DContainer and ViewInformation3D to allow diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index 68746d908aac..25d80b04d2bd 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -28,7 +28,7 @@ namespace sdr::animation - { +{ double PrimitiveAnimation::getSmallestNextTime(double fCurrentTime) { double fRetval(0.0); @@ -130,6 +130,7 @@ namespace sdr::animation // re-setup prepareNextEvent(); } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx index 378b3e993069..4e4c4d72cc59 100644 --- a/svx/source/sdr/animation/objectanimator.cxx +++ b/svx/source/sdr/animation/objectanimator.cxx @@ -22,7 +22,7 @@ namespace sdr::animation - { +{ primitiveAnimator::primitiveAnimator() : Scheduler() { @@ -31,6 +31,7 @@ namespace sdr::animation primitiveAnimator::~primitiveAnimator() { } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 0efac9e6fac0..1994dcc0b1eb 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -26,7 +26,7 @@ // event class namespace sdr::animation - { +{ Event::Event() : mnTime(0) { } @@ -165,6 +165,7 @@ namespace sdr::animation checkTimeout(); } } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx index 36587b8761a8..cc954881d9c3 100644 --- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx +++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx @@ -30,7 +30,7 @@ ////////////////////////////////////////////////////////////////////////////// namespace drawinglayer::attribute - { +{ void SdrAllFillAttributesHelper::createPrimitive2DSequence( const basegfx::B2DRange& rPaintRange, const basegfx::B2DRange& rDefineRange) @@ -253,6 +253,7 @@ namespace drawinglayer::attribute // color fill return false; } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index 2660ed795b27..4cad7e636244 100644 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx @@ -22,7 +22,7 @@ namespace drawinglayer::attribute - { +{ SdrFillTextAttribute::SdrFillTextAttribute( const SdrFillAttribute& rFill, const FillGradientAttribute& rFillFloatTransGradient, @@ -62,6 +62,7 @@ namespace drawinglayer::attribute && getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient() && getText() == rCandidate.getText()); } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 487affa5e60e..85b902949c46 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -141,7 +141,7 @@ namespace namespace drawinglayer::attribute - { +{ class ImpSdrFormTextAttribute { public: @@ -369,6 +369,7 @@ namespace drawinglayer::attribute { return mpSdrFormTextAttribute->getFormTextOutline(); } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx index 416d746325a9..a8079ffee2a3 100644 --- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx @@ -25,7 +25,7 @@ namespace drawinglayer::attribute - { +{ class ImpSdrFormTextOutlineAttribute { public: @@ -135,6 +135,7 @@ namespace drawinglayer::attribute { return mpSdrFormTextOutlineAttribute->getTransparence(); } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx index ed359ba9bdef..d65afc97b4d4 100644 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx @@ -22,7 +22,7 @@ namespace drawinglayer::attribute - { +{ SdrLineFillShadowTextAttribute::SdrLineFillShadowTextAttribute( const SdrLineAttribute& rLine, const SdrFillAttribute& rFill, @@ -72,6 +72,7 @@ namespace drawinglayer::attribute && getFill() == rCandidate.getFill() && getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient()); } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx index df964b32e367..421d79857188 100644 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx @@ -22,7 +22,7 @@ namespace drawinglayer::attribute - { +{ SdrLineShadowTextAttribute::SdrLineShadowTextAttribute( const SdrLineAttribute& rLine, const SdrLineStartEndAttribute& rLineStartEnd, @@ -70,6 +70,7 @@ namespace drawinglayer::attribute && getLine() == rCandidate.getLine() && getLineStartEnd() == rCandidate.getLineStartEnd()); } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx index 16947d8b6436..690938bd8331 100644 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx @@ -22,7 +22,7 @@ namespace drawinglayer::attribute - { +{ SdrShadowTextAttribute::SdrShadowTextAttribute( const SdrShadowAttribute& rShadow, const SdrTextAttribute& rTextAttribute) @@ -62,6 +62,7 @@ namespace drawinglayer::attribute return (getShadow() == rCandidate.getShadow() && getText() == rCandidate.getText()); } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index fb0826b4ebe5..50ae63e5ea06 100644 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx @@ -29,7 +29,7 @@ namespace drawinglayer::attribute - { +{ class ImpSdrTextAttribute { public: @@ -418,6 +418,7 @@ namespace drawinglayer::attribute getSdrText().GetObject().impGetScrollTextTiming(rAnimList, fFrameLength, fTextLength); } } - } // end of namespace drawinglayer + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index aba8fcffebf9..d837c8c1e3b6 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -21,7 +21,7 @@ namespace sdr::contact - { +{ DisplayInfo::DisplayInfo() : maProcessLayers(true), // init layer info with all bits set to draw everything on default maRedrawArea(), @@ -83,6 +83,6 @@ namespace sdr::contact } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index a1b72feb6b87..12918e3f85a0 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; namespace sdr::contact - { +{ // internal access to SdrPage of SdrPageView SdrPage* ObjectContactOfPageView::GetSdrPage() const { @@ -436,6 +436,7 @@ namespace sdr::contact } } } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx index 885fc5ef243d..bc315b10fa5c 100644 --- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx @@ -28,7 +28,7 @@ namespace sdr::contact - { +{ ViewContactOfE3dCube::ViewContactOfE3dCube(E3dCubeObj& rCubeObj) : ViewContactOfE3d(rCubeObj) { @@ -83,6 +83,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx index c51651414e00..e4a5df993579 100644 --- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx @@ -28,7 +28,7 @@ namespace sdr::contact - { +{ ViewContactOfE3dExtrude::ViewContactOfE3dExtrude(E3dExtrudeObj& rExtrude) : ViewContactOfE3d(rExtrude) { @@ -78,6 +78,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx index 95242e9428ed..d3d8f59f2934 100644 --- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx @@ -28,7 +28,7 @@ namespace sdr::contact - { +{ ViewContactOfE3dLathe::ViewContactOfE3dLathe(E3dLatheObj& rLathe) : ViewContactOfE3d(rLathe) { @@ -91,6 +91,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx index 6191af22b993..eb9b2c261faa 100644 --- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx @@ -29,7 +29,7 @@ namespace sdr::contact - { +{ ViewContactOfE3dPolygon::ViewContactOfE3dPolygon(E3dPolygonObj& rPolygon) : ViewContactOfE3d(rPolygon) { @@ -164,6 +164,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx index 1a1dc1564d6a..dbec97e884fc 100644 --- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx @@ -27,7 +27,7 @@ namespace sdr::contact - { +{ ViewContactOfE3dSphere::ViewContactOfE3dSphere(E3dSphereObj& rSphere) : ViewContactOfE3d(rSphere) { @@ -75,6 +75,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index de4c0c9e4114..4af15e3a7ea9 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -54,7 +54,7 @@ #include <bitmaps.hlst> namespace sdr::contact - { +{ // Create an Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. ViewObjectContact& ViewContactOfGraphic::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) @@ -410,6 +410,6 @@ namespace sdr::contact return GraphicType::NONE == rGraphicObject.GetType() || GraphicType::Default == rGraphicObject.GetType(); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index ad2fc2195a93..b1b113375c5c 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -32,7 +32,7 @@ namespace sdr::contact - { +{ // Create an Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. ViewObjectContact& ViewContactOfGroup::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) @@ -82,6 +82,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index c275b184e846..760378f07179 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -38,7 +38,7 @@ namespace sdr::contact - { +{ ViewObjectContact& ViewContactOfMasterPageDescriptor::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) { return *(new ViewObjectContactOfMasterPageDescriptor(rObjectContact, *this)); @@ -103,6 +103,7 @@ namespace sdr::contact { return &(GetMasterPageDescriptor().GetOwnerPage().GetViewContact()); } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 082ed9d760f5..a8e57620bef9 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star; namespace sdr::contact - { +{ ViewContactOfSdrCaptionObj::ViewContactOfSdrCaptionObj(SdrCaptionObj& rCaptionObj) : ViewContactOfSdrRectObj(rCaptionObj) { @@ -190,6 +190,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index b76448c4a6d9..675dc1fe973b 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -29,7 +29,7 @@ namespace sdr::contact - { +{ ViewContactOfSdrCircObj::ViewContactOfSdrCircObj(SdrCircObj& rCircObj) : ViewContactOfSdrRectObj(rCircObj) { @@ -96,6 +96,7 @@ namespace sdr::contact return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index f8a7819d6e14..85af9e68e515 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -26,7 +26,7 @@ namespace sdr::contact - { +{ ViewContactOfSdrEdgeObj::ViewContactOfSdrEdgeObj(SdrEdgeObj& rEdgeObj) : ViewContactOfTextObj(rEdgeObj) { @@ -60,6 +60,7 @@ namespace sdr::contact return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index 9452127278bb..69303bba9758 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -31,7 +31,7 @@ namespace sdr::contact - { +{ ViewContactOfSdrMeasureObj::ViewContactOfSdrMeasureObj(SdrMeasureObj& rMeasureObj) : ViewContactOfTextObj(rMeasureObj) { @@ -122,6 +122,6 @@ namespace sdr::contact return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 0443be3193c1..3097e5f14c4c 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -34,7 +34,7 @@ namespace sdr::contact - { +{ ViewContactOfSdrObjCustomShape::ViewContactOfSdrObjCustomShape(SdrObjCustomShape& rCustomShape) : ViewContactOfTextObj(rCustomShape) { @@ -249,6 +249,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index 6879f226fd3e..bda673d35a9e 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -31,7 +31,7 @@ #include <vcl/canvastools.hxx> namespace sdr::contact - { +{ ViewContactOfSdrPathObj::ViewContactOfSdrPathObj(SdrPathObj& rPathObj) : ViewContactOfTextObj(rPathObj) { @@ -200,6 +200,7 @@ namespace sdr::contact return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 88fe38ca3c01..8e0dcd474ae8 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -26,7 +26,7 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> namespace sdr::contact - { +{ ViewObjectContactOfE3d::ViewObjectContactOfE3d(ObjectContact& rObjectContact, ViewContact& rViewContact) : ViewObjectContactOfSdrObj(rObjectContact, rViewContact) { @@ -83,6 +83,7 @@ namespace sdr::contact // return current Primitive2DContainer return mxPrimitive3DContainer; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index aa7eb9058c05..a6c9aaa96052 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -53,7 +53,7 @@ namespace namespace sdr::contact - { +{ ViewObjectContactOfE3dScene::ViewObjectContactOfE3dScene(ObjectContact& rObjectContact, ViewContact& rViewContact) : ViewObjectContactOfSdrObj(rObjectContact, rViewContact) { @@ -135,6 +135,7 @@ namespace sdr::contact // call parent return ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo); } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 800c92042002..4e215825557e 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -25,7 +25,7 @@ #include <svx/svdpage.hxx> namespace sdr::contact - { +{ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfGraphic::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { // get return value by calling parent @@ -59,6 +59,7 @@ namespace sdr::contact ViewObjectContactOfGraphic::~ViewObjectContactOfGraphic() { } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 5f3ad6ee594d..fa67da29c0db 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; namespace sdr::contact - { +{ ViewObjectContactOfGroup::ViewObjectContactOfGroup(ObjectContact& rObjectContact, ViewContact& rViewContact) : ViewObjectContactOfSdrObj(rObjectContact, rViewContact) { @@ -104,6 +104,7 @@ namespace sdr::contact aObjectLayers &= aLayers; return !aObjectLayers.IsEmpty(); } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 38e598d8b41b..90218bcf1293 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -31,7 +31,7 @@ namespace sdr::contact - { +{ ViewObjectContactOfMasterPageDescriptor::ViewObjectContactOfMasterPageDescriptor(ObjectContact& rObjectContact, ViewContact& rViewContact) : ViewObjectContact(rObjectContact, rViewContact) { @@ -128,6 +128,6 @@ namespace sdr::contact // return grouped primitive return xRetval; } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 3bd86110785a..5f2091251e8f 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -25,7 +25,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayAnimatedBitmapEx::createOverlayObjectPrimitive2DSequence() { if(mbOverlayState) @@ -109,6 +109,7 @@ namespace sdr::overlay objectChange(); } } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index 675aa0a242aa..6e969a1359d3 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -25,7 +25,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayBitmapEx::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DReference aReference( @@ -68,6 +68,7 @@ namespace sdr::overlay OverlayBitmapEx::~OverlayBitmapEx() { } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index f2d8ac1414ab..4709fa5c7066 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -24,7 +24,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayCrosshairStriped::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DContainer aRetval; @@ -62,6 +62,7 @@ namespace sdr::overlay OverlayCrosshairStriped::~OverlayCrosshairStriped() { } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index b009b3882f3a..4d1543360557 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -25,7 +25,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayHelplineStriped::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DContainer aRetval; @@ -71,6 +71,6 @@ namespace sdr::overlay OverlayHelplineStriped::~OverlayHelplineStriped() { } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 7c3e6b1c60a7..e6c40ea76a76 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -28,7 +28,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayLineStriped::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DContainer aRetval; @@ -73,6 +73,6 @@ namespace sdr::overlay OverlayLineStriped::~OverlayLineStriped() { } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 8ab62835fd97..9e1251ea4b38 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star; namespace sdr::overlay - { +{ void OverlayManager::ImpDrawMembers(const basegfx::B2DRange& rRange, OutputDevice& rDestinationDevice) const { const sal_uInt32 nSize(maOverlayObjects.size()); @@ -345,6 +345,6 @@ namespace sdr::overlay } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index ae6eaf3fa9d6..0a54ebb7100b 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -31,7 +31,7 @@ namespace sdr::overlay - { +{ void OverlayManagerBuffered::ImpPrepareBufferDevice() { // compare size of mpBufferDevice with size of visible area @@ -439,6 +439,6 @@ namespace sdr::overlay } } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 6ad51df18b50..499480f808c9 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -31,7 +31,7 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> namespace sdr::overlay - { +{ void OverlayObject::objectChange() { const basegfx::B2DRange aPreviousRange(maBaseRange); @@ -206,11 +206,8 @@ namespace sdr::overlay { // default does not need to do anything } - } // end of namespace sdr -namespace sdr::overlay - { OverlayObjectWithBasePosition::OverlayObjectWithBasePosition(const basegfx::B2DPoint& rBasePos, Color aBaseColor) : OverlayObject(aBaseColor), maBasePosition(rBasePos) @@ -232,6 +229,7 @@ namespace sdr::overlay objectChange(); } } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index 14187d74b793..5b0d2b520e3f 100644 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx @@ -31,7 +31,7 @@ using namespace ::basegfx; namespace sdr::overlay - { +{ OverlayObjectCell::OverlayObjectCell( const Color& rColor, const RangeVector& rRects ) : OverlayObject( rColor ), maRectangles( rRects ) @@ -78,6 +78,7 @@ namespace sdr::overlay return aRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 3d89d04524f3..f01dfb7f0848 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -31,7 +31,7 @@ #define DEFAULT_VALUE_FOR_HITTEST_TWIP (30) namespace sdr::overlay - { +{ OverlayObjectList::~OverlayObjectList() { clear(); @@ -140,6 +140,7 @@ namespace sdr::overlay return aRetval; } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index cc109ab9496c..2ba58f366e43 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -26,7 +26,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayPolyPolygonStripedAndFilled::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DContainer aRetval; @@ -79,6 +79,7 @@ namespace sdr::overlay OverlayPolyPolygonStripedAndFilled::~OverlayPolyPolygonStripedAndFilled() { } - } // end of namespace sdr + +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index 87e599566f54..b429507fb2fb 100644 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx @@ -24,7 +24,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayPrimitive2DSequenceObject::createOverlayObjectPrimitive2DSequence() { return maSequence; @@ -39,6 +39,6 @@ namespace sdr::overlay OverlayPrimitive2DSequenceObject::~OverlayPrimitive2DSequenceObject() { } - } // end of namespace sdr +} // end of namespace sdr::overlay /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 39977a620eb6..56439f37276d 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -30,7 +30,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayRectangle::createOverlayObjectPrimitive2DSequence() { const basegfx::B2DRange aHatchRange(getBasePosition(), maSecondPosition); @@ -112,7 +112,7 @@ namespace sdr::overlay objectChange(); } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index 6ac840e1e539..56fdaeec7d58 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -28,7 +28,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayRollingRectangleStriped::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DContainer aRetval; @@ -114,6 +114,6 @@ namespace sdr::overlay objectChange(); } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 2afd382c00f0..c915ed7ea395 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -32,7 +32,7 @@ namespace sdr::overlay - { +{ // combine rages geometrically to a single, ORed polygon static basegfx::B2DPolyPolygon impCombineRangesToPolyPolygon(const std::vector< basegfx::B2DRange >& rRanges) { @@ -217,6 +217,6 @@ namespace sdr::overlay objectChange(); } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index a44feb9bc2be..0bfd2d8177b5 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -119,10 +119,8 @@ bool OverlayStaticRectanglePrimitive::operator==(const BasePrimitive2D& rPrimiti ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE) -} // end of namespace drawinglayer::primitive2d -namespace drawinglayer::primitive2d - { + OverlayBitmapExPrimitive::OverlayBitmapExPrimitive( const BitmapEx& rBitmapEx, const basegfx::B2DPoint& rBasePosition, @@ -201,11 +199,8 @@ namespace drawinglayer::primitive2d ImplPrimitive2DIDBlock(OverlayBitmapExPrimitive, PRIMITIVE2D_ID_OVERLAYBITMAPEXPRIMITIVE) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { OverlayCrosshairPrimitive::OverlayCrosshairPrimitive( const basegfx::B2DPoint& rBasePosition, const basegfx::BColor& rRGBColorA, @@ -266,11 +261,8 @@ namespace drawinglayer::primitive2d ImplPrimitive2DIDBlock(OverlayCrosshairPrimitive, PRIMITIVE2D_ID_OVERLAYCROSSHAIRPRIMITIVE) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { OverlayRectanglePrimitive::OverlayRectanglePrimitive( const basegfx::B2DRange& rObjectRange, const basegfx::BColor& rColor, @@ -396,11 +388,8 @@ namespace drawinglayer::primitive2d ImplPrimitive2DIDBlock(OverlayRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { OverlayHelplineStripedPrimitive::OverlayHelplineStripedPrimitive( const basegfx::B2DPoint& rBasePosition, HelplineStyle eStyle, @@ -504,11 +493,8 @@ namespace drawinglayer::primitive2d ImplPrimitive2DIDBlock(OverlayHelplineStripedPrimitive, PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { OverlayRollingRectanglePrimitive::OverlayRollingRectanglePrimitive( const basegfx::B2DRange& aRollingRectangle, const basegfx::BColor& rRGBColorA, @@ -592,6 +578,6 @@ namespace drawinglayer::primitive2d ImplPrimitive2DIDBlock(OverlayRollingRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index 50536b139818..4722dbc593db 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -29,7 +29,7 @@ namespace sdr::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayTriangle::createOverlayObjectPrimitive2DSequence() { basegfx::B2DPolygon aPolygon; @@ -62,6 +62,6 @@ namespace sdr::overlay { } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 48aad6c480e4..875f052b23cf 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -217,7 +217,7 @@ namespace drawinglayer namespace drawinglayer::primitive2d - { +{ attribute::SdrLineAttribute createNewSdrLineAttribute(const SfxItemSet& rSet) { const css::drawing::LineStyle eStyle(rSet.Get(XATTR_LINESTYLE).GetValue()); @@ -1090,6 +1090,6 @@ namespace drawinglayer::primitive2d return attribute::SdrFillTextAttribute(); } - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index f9959c17c1fb..1a07c0d652f2 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ void SdrCaptionPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval; @@ -162,6 +162,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrCaptionPrimitive2D, PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 5a3e8ed40a72..6a51d7cb75c9 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ void SdrConnectorPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval; @@ -101,6 +101,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrConnectorPrimitive2D, PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index a9281abfa02e..0946cd3428c7 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ void SdrCustomShapePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval(getSubPrimitives()); @@ -107,6 +107,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrCustomShapePrimitive2D, PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index adcecf39fa56..db6e0b1bc38c 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ class TransparencePrimitive2D; @@ -516,6 +516,6 @@ namespace drawinglayer::primitive2d return rContent; } } - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 76b5aa716330..baa8bad642f9 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ void SdrEllipsePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval; @@ -135,11 +135,8 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrEllipsePrimitive2D, PRIMITIVE2D_ID_SDRELLIPSEPRIMITIVE2D) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { void SdrEllipseSegmentPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval; @@ -261,6 +258,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrEllipseSegmentPrimitive2D, PRIMITIVE2D_ID_SDRELLIPSESEGMENTPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx index 6bee840ace8f..5c002c1347d8 100644 --- a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx @@ -643,7 +643,7 @@ namespace } namespace drawinglayer::primitive2d - { +{ SdrFrameBorderData::SdrConnectStyleData::SdrConnectStyleData( const svx::frame::Style& rStyle, const basegfx::B2DVector& rNormalizedPerpendicular, @@ -746,10 +746,10 @@ namespace drawinglayer::primitive2d return fRetval; } - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { + + + void SdrFrameBorderPrimitive2D::create2DDecomposition( Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const @@ -920,6 +920,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrFrameBorderPrimitive2D, PRIMITIVE2D_ID_SDRFRAMEBORDERTPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index 4de23bd5c780..517daf35e121 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -29,7 +29,7 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> namespace drawinglayer::primitive2d - { +{ void SdrGrafPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval; @@ -165,6 +165,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrGrafPrimitive2D, PRIMITIVE2D_ID_SDRGRAFPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 2768161d7c75..88a1556b810c 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ Primitive2DReference SdrMeasurePrimitive2D::impCreatePart( const attribute::SdrLineAttribute& rLineAttribute, const basegfx::B2DHomMatrix& rObjectMatrix, @@ -493,6 +493,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrMeasurePrimitive2D, PRIMITIVE2D_ID_SDRMEASUREPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 2aa33542338a..da099c1e395b 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ SdrOle2Primitive2D::SdrOle2Primitive2D( const Primitive2DContainer& rOLEContent, const basegfx::B2DHomMatrix& rTransform, @@ -169,6 +169,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrOle2Primitive2D, PRIMITIVE2D_ID_SDROLE2PRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 9e6b2bbeeb6f..8d12cb83876e 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -30,7 +30,7 @@ namespace drawinglayer::primitive2d - { +{ void SdrOleContentPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { const SdrOle2Obj* pSource = mpSdrOle2Obj.get(); @@ -172,6 +172,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrOleContentPrimitive2D, PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 5554b6db495a..1e1c46aada61 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ void SdrPathPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval; @@ -151,6 +151,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrPathPrimitive2D, PRIMITIVE2D_ID_SDRPATHPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index 722b15f3a3e4..7e0b22a3f743 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -26,7 +26,7 @@ // helper methods namespace drawinglayer::primitive2d - { +{ BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor) { static vcl::DeleteOnDeinit< BitmapEx > aRetVal(nullptr); @@ -59,6 +59,6 @@ namespace drawinglayer::primitive2d return aRetVal.get() ? *aRetVal.get() : BitmapEx(); } - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index 46dfd599dcb9..d7e491c7ba14 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ void SdrRectanglePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { Primitive2DContainer aRetval; @@ -146,6 +146,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrRectanglePrimitive2D, PRIMITIVE2D_ID_SDRRECTANGLEPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index fe8e701d3d12..1b4d0d9b650b 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -84,7 +84,7 @@ namespace namespace drawinglayer::primitive2d - { +{ // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments // for slideshow. This uses TextHierarchyBlockPrimitive2D to mark a text block. // ATM there is only one text block per SdrObject, this may get more in the future @@ -236,11 +236,10 @@ namespace drawinglayer::primitive2d // call parent BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor, rViewInformation); } - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { + + void SdrContourTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const { Primitive2DContainer aRetval; @@ -285,11 +284,8 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrContourTextPrimitive2D, PRIMITIVE2D_ID_SDRCONTOURTEXTPRIMITIVE2D) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { void SdrPathTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const { Primitive2DContainer aRetval; @@ -337,11 +333,8 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrPathTextPrimitive2D, PRIMITIVE2D_ID_SDRPATHTEXTPRIMITIVE2D) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { void SdrBlockTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const { Primitive2DContainer aRetval; @@ -410,11 +403,8 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrBlockTextPrimitive2D, PRIMITIVE2D_ID_SDRBLOCKTEXTPRIMITIVE2D) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { void SdrAutoFitTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const { Primitive2DContainer aRetval; @@ -455,10 +445,8 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrAutoFitTextPrimitive2D, PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D) - } // end of namespace drawinglayer -namespace drawinglayer::primitive2d - { + SdrChainedTextPrimitive2D::SdrChainedTextPrimitive2D( const SdrText* pSdrText, @@ -495,11 +483,8 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrChainedTextPrimitive2D, PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D) - } // end of namespace drawinglayer - namespace drawinglayer::primitive2d - { void SdrStretchTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const { Primitive2DContainer aRetval; @@ -544,6 +529,6 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrStretchTextPrimitive2D, PRIMITIVE2D_ID_SDRSTRETCHTEXTPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 416a27830148..c6721a152617 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -30,7 +30,7 @@ namespace drawinglayer::primitive2d - { +{ attribute::Sdr3DObjectAttribute* createNewSdr3DObjectAttribute(const SfxItemSet& rSet) { // get NormalsKind @@ -140,6 +140,6 @@ namespace drawinglayer::primitive2d aTextureKind, aTextureMode, aMaterial, bInvertNormals, bDoubleSided, bShadow3D, bTextureFilter, bReducedLineGeometry); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 7e53de8a8850..3783406dbeeb 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -45,7 +45,7 @@ #include <svx/svdpage.hxx> namespace sdr::properties - { +{ void AttributeProperties::ImpSetParentAtSfxItemSet(bool bDontRemoveHardAttr) { if(HasSfxItemSet() && mpStyleSheet) @@ -528,6 +528,6 @@ namespace sdr::properties } return false; } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 012a9008dd1c..0afd70af5234 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -28,7 +28,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> CaptionProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -94,6 +94,6 @@ namespace sdr::properties // reset to default mpItemSet->ClearItem(XATTR_LINESTYLE); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index acd076cd4d9e..895029ca7939 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -30,7 +30,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> CircleProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -118,6 +118,6 @@ namespace sdr::properties // SdrCircKindItem RectangleProperties::ForceDefaultAttributes(); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index fcc0a59f32b3..29a2b7edeb5f 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -28,7 +28,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> ConnectorProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -82,6 +82,6 @@ namespace sdr::properties SdrEdgeObj& rObj = static_cast<SdrEdgeObj&>(GetSdrObject()); rObj.ImpSetAttrToEdgeInfo(); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 3c3ea1d58b38..631fa8989fe5 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -30,7 +30,7 @@ namespace sdr::properties - { +{ void CustomShapeProperties::UpdateTextFrameStatus(bool bInvalidateRenderGeometry) { SdrObjCustomShape& rObj = static_cast< SdrObjCustomShape& >(GetSdrObject()); @@ -223,6 +223,6 @@ namespace sdr::properties // update bTextFrame and RenderGeometry UpdateTextFrameStatus(bRemoveRenderGeometry); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index f90a1d064286..0b0e34b31203 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -34,7 +34,7 @@ #include <svx/svdtrans.hxx> namespace sdr::properties - { +{ std::unique_ptr<SfxItemSet> DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { // Basic implementation; Basic object has NO attributes @@ -235,6 +235,6 @@ namespace sdr::properties mpItemSet->dumpAsXml(pWriter); xmlTextWriterEndElement(pWriter); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index 5a3443bc8079..8d023d033c64 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -24,7 +24,7 @@ namespace sdr::properties - { +{ E3dCompoundProperties::E3dCompoundProperties(SdrObject& rObj) : E3dProperties(rObj) { @@ -139,6 +139,6 @@ namespace sdr::properties } } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index 552060005bac..bf7275ac9304 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -23,7 +23,7 @@ namespace sdr::properties - { +{ E3dExtrudeProperties::E3dExtrudeProperties(SdrObject& rObj) : E3dCompoundProperties(rObj) { @@ -70,6 +70,6 @@ namespace sdr::properties } } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 6b99ddcfddcb..d0114cbf9515 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -23,7 +23,7 @@ namespace sdr::properties - { +{ E3dLatheProperties::E3dLatheProperties(SdrObject& rObj) : E3dCompoundProperties(rObj) { @@ -80,6 +80,6 @@ namespace sdr::properties } } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 3bdf1c7c8168..0f435fd99c7f 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -26,7 +26,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> E3dProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -70,6 +70,6 @@ namespace sdr::properties // local changes rObj.StructureChanged(); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index e37b8f6925eb..8c7aa2d50d5a 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -27,7 +27,7 @@ namespace sdr::properties - { +{ E3dSceneProperties::E3dSceneProperties(SdrObject& rObj) : E3dProperties(rObj) { @@ -288,6 +288,6 @@ namespace sdr::properties // FocalLength mpItemSet->Put(makeSvx3DFocalLengthItem(static_cast<sal_uInt32>((aSceneCam.GetFocalLength() * 100.0) + 0.5))); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index d10b35ea5251..a1ae2ec67756 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -23,7 +23,7 @@ namespace sdr::properties - { +{ E3dSphereProperties::E3dSphereProperties(SdrObject& rObj) : E3dCompoundProperties(rObj) { @@ -65,6 +65,6 @@ namespace sdr::properties } } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index bf9760f26f59..0cdd72c17afb 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -28,7 +28,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> EmptyProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -116,6 +116,6 @@ namespace sdr::properties assert(!"EmptyProperties::GetStyleSheet() should never be called"); return nullptr; } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 114b707793c6..3d976bbc757e 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -37,7 +37,7 @@ #include <svx/xlineit0.hxx> namespace sdr::properties - { +{ void GraphicProperties::applyDefaultStyleSheetFromSdrModel() { SfxStyleSheet* pStyleSheet(GetSdrObject().getSdrModelFromSdrObject().GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj()); @@ -141,6 +141,6 @@ namespace sdr::properties mpItemSet->Put( SdrGrafModeItem( GraphicDrawMode::Standard ) ); mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) ); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 560adc8c4d2f..0cf5fa2ba76d 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -30,7 +30,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> GroupProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -260,6 +260,6 @@ namespace sdr::properties pSub->GetObj(a)->GetProperties().ForceStyleToHardAttributes(); } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index a691212f4aab..f16b1019c3dc 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -29,7 +29,7 @@ // class to remember broadcast start positions namespace sdr::properties - { +{ ItemChangeBroadcaster::ItemChangeBroadcaster(const SdrObject& rObj) { if (const SdrObjGroup* pGroupObj = dynamic_cast<const SdrObjGroup*>(&rObj)) @@ -52,11 +52,8 @@ namespace sdr::properties maRectangles.push_back(rObj.GetLastBoundRect()); } } - } // end of namespace sdr -namespace sdr::properties - { void ScaleItemSet(SfxItemSet& rSet, const Fraction& rScale) { sal_Int32 nMul(rScale.GetNumerator()); @@ -85,6 +82,6 @@ namespace sdr::properties nWhich = aIter.NextWhich(); } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index f0ac9df3112c..5519930e3dda 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -36,7 +36,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> MeasureProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -123,6 +123,6 @@ namespace sdr::properties mpItemSet->Put(XLineEndWidthItem(200)); mpItemSet->Put(XLineStyleItem(css::drawing::LineStyle_SOLID)); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index a8f05a3b7c5a..1fdb10397c9f 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -25,7 +25,7 @@ #include <svx/svdmodel.hxx> namespace sdr::properties - { +{ void OleProperties::applyDefaultStyleSheetFromSdrModel() { SfxStyleSheet* pStyleSheet(GetSdrObject().getSdrModelFromSdrObject().GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj()); @@ -69,6 +69,6 @@ namespace sdr::properties // force ItemSet GetObjectItemSet(); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 7b21f30bf1be..708f9d861044 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -29,7 +29,7 @@ namespace sdr::properties - { +{ // create a new itemset std::unique_ptr<SfxItemSet> PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { @@ -96,6 +96,6 @@ namespace sdr::properties { // simply ignore item clearing on page objects } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index cb8c5c22e15d..37bee7916aaf 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star; namespace sdr::properties - { +{ BaseProperties::BaseProperties(SdrObject& rObj) : mrObject(rObj) { @@ -188,6 +188,6 @@ namespace sdr::properties } } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx index 66a5b4c9a548..84b4fc17e23e 100644 --- a/svx/source/sdr/properties/rectangleproperties.cxx +++ b/svx/source/sdr/properties/rectangleproperties.cxx @@ -22,7 +22,7 @@ namespace sdr::properties - { +{ RectangleProperties::RectangleProperties(SdrObject& rObj) : TextProperties(rObj) { @@ -63,6 +63,6 @@ namespace sdr::properties SdrRectObj& rObj = static_cast<SdrRectObj&>(GetSdrObject()); rObj.SetXPolyDirty(); } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 364f0f1618f5..988ce6499126 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; namespace sdr::properties - { +{ std::unique_ptr<SfxItemSet> TextProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { return std::make_unique<SfxItemSet>(rPool, @@ -607,6 +607,6 @@ namespace sdr::properties { return maVersion; } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 8bba220e0952..bb92e6f3d45e 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -156,6 +156,6 @@ void DefaultShapesPanel::populateShapes() } } -} // end of namespace sd::sidebar +} // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 86a60dc3c717..daaf45c8832c 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -312,6 +312,6 @@ void TableBorderHdl::CreateB2dIAObject() } -} // end of namespace sdr +} // end of namespace sdr::table /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 24efdd8d3663..ba06383b6860 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -51,7 +51,7 @@ using namespace com::sun::star; namespace drawinglayer::primitive2d - { +{ namespace { class SdrCellPrimitive2D : public BufferedDecompositionPrimitive2D @@ -144,10 +144,10 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SdrCellPrimitive2D, PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace namespace sdr::contact - { +{ static svx::frame::Style impGetLineStyle( const sdr::table::TableLayouter& rLayouter, sal_Int32 nX, @@ -416,6 +416,6 @@ namespace sdr::contact ViewContactOfTableObj::~ViewContactOfTableObj() { } - } // end of namespace sdr +} // end of namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index ad0bfa55cc7f..c09c0215e3db 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -403,6 +403,6 @@ const SwFrame* SwAccessibleChild::GetParent( const bool bInPagePreview ) const return pParent; } -} // eof of namespace sw::access +} // namespace sw::access /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx b/sw/source/core/crsr/overlayrangesoutline.cxx index 7c105698c854..0a433b350313 100644 --- a/sw/source/core/crsr/overlayrangesoutline.cxx +++ b/sw/source/core/crsr/overlayrangesoutline.cxx @@ -51,7 +51,7 @@ namespace } namespace sw::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayRangesOutline::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DContainer aRetval; @@ -99,6 +99,6 @@ namespace sw::overlay objectChange(); } } - } // end of namespace sdr +} // end of namespace sw::overlay /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 581d9c3f7dc8..1b78c24aa0dc 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1989,7 +1989,7 @@ void SwDrawContact::GetAnchoredObjs(std::vector<SwAnchoredObject*>& o_rAnchoredO // not possible since we have no OutputDevice, but define the geometry itself. namespace sdr::contact - { +{ namespace { class VOCOfDrawVirtObj : public ViewObjectContactOfSdrObj @@ -2037,10 +2037,10 @@ namespace sdr::contact }; } - } // end of namespace sdr +} // end of namespace sdr::contact namespace sdr::contact - { +{ /// recursively collect primitive data from given VOC with given offset static void impAddPrimitivesFromGroup(const ViewObjectContact& rVOC, const basegfx::B2DHomMatrix& rOffsetMatrix, const DisplayInfo& rDisplayInfo, drawinglayer::primitive2d::Primitive2DContainer& rxTarget) { @@ -2145,7 +2145,7 @@ namespace sdr::contact return *(new VOCOfDrawVirtObj(rObjectContact, *this)); } - } // end of namespace sdr +} // end of namespace sdr::contact /// implementation of class <SwDrawVirtObj> std::unique_ptr<sdr::contact::ViewContact> SwDrawVirtObj::CreateObjectSpecificViewContact() diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 2ff59ec47287..282fc1a91119 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -72,7 +72,7 @@ static bool bInResize = false; namespace sdr::contact - { +{ namespace { /** @@ -108,7 +108,7 @@ namespace sdr::contact return drawinglayer::primitive2d::Primitive2DContainer(); } - } // end of namespace sdr +} // end of namespace sdr::contact std::unique_ptr<sdr::properties::BaseProperties> SwFlyDrawObj::CreateObjectSpecificProperties() { @@ -146,7 +146,7 @@ sal_uInt16 SwFlyDrawObj::GetObjIdentifier() const // TODO: Need own primitive to get the FlyFrame paint working namespace drawinglayer::primitive2d - { +{ namespace { class SwVirtFlyDrawObjPrimitive : public BufferedDecompositionPrimitive2D @@ -185,10 +185,10 @@ namespace drawinglayer::primitive2d }; } - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d namespace drawinglayer::primitive2d - { +{ void SwVirtFlyDrawObjPrimitive::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { if(!getOuterRange().isEmpty()) @@ -240,7 +240,7 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SwVirtFlyDrawObjPrimitive, PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d // AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed // since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj. @@ -248,7 +248,7 @@ namespace drawinglayer::primitive2d // not possible since we have no OutputDevice, but define the geometry itself. namespace sdr::contact - { +{ namespace { class VCOfSwVirtFlyDrawObj : public ViewContactOfVirtObj @@ -275,10 +275,10 @@ namespace sdr::contact }; } - } // end of namespace sdr +} // end of namespace sdr::contact namespace sdr::contact - { +{ drawinglayer::primitive2d::Primitive2DContainer VCOfSwVirtFlyDrawObj::createViewIndependentPrimitive2DSequence() const { drawinglayer::primitive2d::Primitive2DContainer xRetval; @@ -304,7 +304,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr +} // end of namespace sdr::contact basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const { diff --git a/sw/source/core/layout/legacyitem.cxx b/sw/source/core/layout/legacyitem.cxx index 02be381eb9b4..932afa918550 100644 --- a/sw/source/core/layout/legacyitem.cxx +++ b/sw/source/core/layout/legacyitem.cxx @@ -23,7 +23,7 @@ #include <fmtornt.hxx> namespace legacy::SwFormatVert - { +{ sal_uInt16 GetVersion(sal_uInt16) { return 0; @@ -74,6 +74,6 @@ namespace legacy::SwFormatVert rStrm.WriteInt16(rItem.GetVertOrient()).WriteInt16(rItem.GetRelationOrient()); return rStrm; } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 54da14443856..b0763d99f6d4 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4516,7 +4516,7 @@ void SwFrame::PaintBorderLine( const SwRect& rRect, } namespace drawinglayer::primitive2d - { +{ namespace { class SwBorderRectanglePrimitive2D : public BufferedDecompositionPrimitive2D @@ -4759,7 +4759,7 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SwBorderRectanglePrimitive2D, PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d namespace { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index eaa7e9d957ae..f135c70eeba2 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6555,7 +6555,7 @@ bool SwWW8ImplReader::InEqualApo(int nLvl) const } namespace sw::hack - { +{ Position::Position(const SwPosition &rPos) : maPtNode(rPos.nNode), mnPtContent(rPos.nContent.GetIndex()) { @@ -6567,7 +6567,7 @@ namespace sw::hack aRet.nContent.Assign(maPtNode.GetNode().GetContentNode(), mnPtContent); return aRet; } - } +} SwMacroInfo::SwMacroInfo() : SdrObjUserData( SdrInventor::ScOrSwDraw, SW_UD_IMAPDATA ) diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index f6b3de150c8c..b5a216330587 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -377,6 +377,6 @@ void AnchorOverlayObject::SetAnchorState( const AnchorState aState) } } -} // end of namespace sw::annotation +} // end of namespace sw::sidebarwindows /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx index 9f7f7968f8d7..4a347e4d8972 100644 --- a/sw/source/uibase/docvw/OverlayRanges.cxx +++ b/sw/source/uibase/docvw/OverlayRanges.cxx @@ -56,7 +56,7 @@ namespace } namespace sw::overlay - { +{ drawinglayer::primitive2d::Primitive2DContainer OverlayRanges::createOverlayObjectPrimitive2DSequence() { const sal_uInt32 nCount(getRanges().size()); @@ -172,6 +172,6 @@ namespace sw::overlay } } - } // end of namespace sdr +} // end of namespace sw::overlay /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx index f52177742148..17da0beee4f8 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx @@ -167,6 +167,6 @@ void SwFrameSidebarWinContainer::getAll( const SwFrame& rFrame, } } -} // eof of namespace sw::sidebarwindows:: +} // eof of namespace sw::sidebarwindows /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 33290f276be6..1daedb1e09d3 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -1193,6 +1193,7 @@ void ListsManager::CreateNumberingRules( ) } } -} } +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index bec04a949ac7..dbf002e1a664 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -881,6 +881,7 @@ OOXMLDocumentFactory::createDocument return new OOXMLDocumentImpl(pStream, xStatusIndicator, mbSkipImages, rDescriptor); } -}} +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |