[Libreoffice-commits] core.git: 2 commits - cppcanvas/source cppuhelper/source cppu/qa cppu/source sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jan 15 05:58:43 UTC 2020
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 5 --
cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx | 5 --
cppcanvas/source/mtfrenderer/implrenderer.cxx | 5 --
cppcanvas/source/mtfrenderer/lineaction.cxx | 5 --
cppcanvas/source/mtfrenderer/mtftools.cxx | 5 --
cppcanvas/source/mtfrenderer/pointaction.cxx | 5 --
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 5 --
cppcanvas/source/mtfrenderer/textaction.cxx | 5 --
cppcanvas/source/mtfrenderer/textlineshelper.cxx | 5 --
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 5 --
cppcanvas/source/tools/canvasgraphichelper.cxx | 6 --
cppcanvas/source/tools/tools.cxx | 5 --
cppcanvas/source/wrapper/implbitmap.cxx | 6 --
cppcanvas/source/wrapper/implbitmapcanvas.cxx | 5 --
cppcanvas/source/wrapper/implcanvas.cxx | 5 --
cppcanvas/source/wrapper/implcustomsprite.cxx | 5 --
cppcanvas/source/wrapper/implpolypolygon.cxx | 5 --
cppcanvas/source/wrapper/implsprite.cxx | 5 --
cppcanvas/source/wrapper/implspritecanvas.cxx | 5 --
cppu/qa/cppumaker/test_cppumaker.cxx | 4 -
cppu/qa/test_unotype.cxx | 6 +-
cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 4 -
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx | 4 -
cppu/source/uno/loadmodule.cxx | 4 -
cppuhelper/source/compat.cxx | 4 -
cppuhelper/source/macro_expander.cxx | 8 +--
cppuhelper/source/weak.cxx | 14 -----
sw/source/core/crsr/annotationmark.cxx | 4 -
sw/source/core/crsr/bookmrk.cxx | 8 +--
sw/source/core/crsr/crossrefbookmark.cxx | 4 -
sw/source/core/crsr/overlayrangesoutline.cxx | 7 --
sw/source/core/doc/CntntIdxStore.cxx | 4 -
sw/source/core/doc/docbm.cxx | 4 -
sw/source/core/draw/dcontact.cxx | 14 +----
sw/source/core/draw/dflyobj.cxx | 35 ++++----------
sw/source/core/layout/legacyitem.cxx | 5 --
sw/source/core/layout/paintfrm.cxx | 7 --
sw/source/core/text/itrform2.cxx | 4 -
sw/source/filter/ww8/ww8par.cxx | 5 --
sw/source/ui/vba/wordvbahelper.cxx | 8 ---
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 4 -
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 4 -
sw/source/uibase/docvw/AnnotationWin.cxx | 4 -
sw/source/uibase/docvw/AnnotationWin2.cxx | 4 -
sw/source/uibase/docvw/OverlayRanges.cxx | 7 --
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 4 -
sw/source/uibase/docvw/SidebarScrollBar.cxx | 5 --
sw/source/uibase/docvw/SidebarTxtControl.cxx | 4 -
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 4 -
sw/source/uibase/docvw/SidebarWinAcc.cxx | 4 -
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 4 -
sw/source/uibase/sidebar/PageColumnControl.cxx | 4 -
sw/source/uibase/sidebar/PageFooterPanel.cxx | 4 -
sw/source/uibase/sidebar/PageFormatPanel.cxx | 4 -
sw/source/uibase/sidebar/PageHeaderPanel.cxx | 4 -
sw/source/uibase/sidebar/PageMarginControl.cxx | 4 -
sw/source/uibase/sidebar/PageOrientationControl.cxx | 4 -
sw/source/uibase/sidebar/PageSizeControl.cxx | 4 -
sw/source/uibase/sidebar/PageStylesPanel.cxx | 4 -
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 4 -
sw/source/uibase/sidebar/TableEditPanel.cxx | 5 --
sw/source/uibase/sidebar/ThemePanel.cxx | 4 -
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 4 -
sw/source/uibase/wrtsh/select.cxx | 4 -
64 files changed, 118 insertions(+), 237 deletions(-)
New commits:
commit 248ddbc4e9191c7f980fc8d6df6337fc535faab0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jan 14 16:26:23 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 15 06:58:12 2020 +0100
clang-tidy modernize-concat-nested-namespace in cppcanvas..cppuhelper
Change-Id: I0bb4ea91288a15fb590d077fb390c53be8b50400
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86801
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 84946014ef0b..b427142a874a 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -38,9 +38,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
namespace
{
@@ -217,6 +215,5 @@ namespace cppcanvas
rState );
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index 9100188271d5..afaa100dce8f 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
@@ -29,9 +29,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
CachedPrimitiveBase::CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
bool bOnlyRedrawWithSameTransform ) :
@@ -79,6 +77,5 @@ namespace cppcanvas
rTransformation );
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 7c4d91b1a8a2..ca5b531138c7 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -228,9 +228,7 @@ namespace
}
}
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
// state stack manipulators
@@ -3072,6 +3070,5 @@ namespace cppcanvas
}
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index e032432e6848..ba479ddc9e9e 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -36,9 +36,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
namespace
{
@@ -152,6 +150,5 @@ namespace cppcanvas
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 54ed0dbfaf3f..67e3fad6f720 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -36,9 +36,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace tools
+namespace cppcanvas::tools
{
void initRenderState( rendering::RenderState& renderState,
const ::cppcanvas::internal::OutDevState& outdevState )
@@ -669,6 +667,5 @@ namespace cppcanvas
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 38896151b52e..67e2af712cd4 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -37,9 +37,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
namespace
{
@@ -171,6 +169,5 @@ namespace cppcanvas
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 15fa4f5bc776..5f570d662bfc 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -38,9 +38,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
namespace
{
@@ -503,6 +501,5 @@ namespace cppcanvas
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 93e54c11dba5..c6acfb330a11 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -49,9 +49,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
namespace
{
@@ -2314,6 +2312,5 @@ namespace cppcanvas
return ret;
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textlineshelper.cxx b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
index db88e5cb5ee7..6bdc172e30ac 100644
--- a/cppcanvas/source/mtfrenderer/textlineshelper.cxx
+++ b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
@@ -28,9 +28,7 @@ void initLineStyleWaveline(sal_uInt32 nLineStyle, bool& bIsWaveline, bool& bIsBo
}
}
-namespace cppcanvas
-{
-namespace internal
+namespace cppcanvas::internal
{
TextLinesHelper::TextLinesHelper(const CanvasSharedPtr& rCanvas, const OutDevState& rState)
: mpCanvas(rCanvas)
@@ -123,5 +121,4 @@ void TextLinesHelper::render(const rendering::RenderState& rRenderState, bool bN
xCanvas->fillPolyPolygon(mxStrikeout, rViewState, rRenderState);
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 48be63ed8702..5636b7608109 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -56,9 +56,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
// free support functions
// ======================
@@ -474,6 +472,5 @@ namespace cppcanvas
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index d67efbe8e7ef..a233eda34453 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -31,10 +31,7 @@ using namespace ::com::sun::star;
/* Implementation of CanvasGraphicHelper class */
-namespace cppcanvas
-{
-
- namespace internal
+namespace cppcanvas::internal
{
CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) :
maClipPolyPolygon(),
@@ -87,6 +84,5 @@ namespace cppcanvas
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx
index de0e0d1c5169..5813851e0065 100644
--- a/cppcanvas/source/tools/tools.cxx
+++ b/cppcanvas/source/tools/tools.cxx
@@ -23,9 +23,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace tools
+namespace cppcanvas::tools
{
uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA aColor )
{
@@ -47,6 +45,5 @@ namespace cppcanvas
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 80d827de7105..e5e8b8734c85 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -26,10 +26,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
-
- namespace internal
+namespace cppcanvas::internal
{
ImplBitmap::ImplBitmap( const CanvasSharedPtr& rParentCanvas,
@@ -110,6 +107,5 @@ namespace cppcanvas
return mxBitmap;
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index 506af5d1f198..3cd4085ad526 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -28,9 +28,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
ImplBitmapCanvas::ImplBitmapCanvas( const uno::Reference< rendering::XBitmapCanvas >& rCanvas ) :
ImplCanvas( rCanvas ),
@@ -57,6 +55,5 @@ namespace cppcanvas
return BitmapCanvasSharedPtr( new ImplBitmapCanvas( *this ) );
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index c16e06375231..e5c936dab908 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -31,9 +31,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
ImplCanvas::ImplCanvas( const uno::Reference< rendering::XCanvas >& xCanvas ) :
@@ -114,6 +112,5 @@ namespace cppcanvas
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 5d19a9e9987b..999f312c3c2f 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.cxx
@@ -25,9 +25,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas,
const uno::Reference< rendering::XCustomSprite >& rSprite,
@@ -68,6 +66,5 @@ namespace cppcanvas
return mpLastCanvas;
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index d333d46a59d1..a7d1124e61fb 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -32,9 +32,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
ImplPolyPolygon::ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
const uno::Reference< rendering::XPolyPolygon2D >& rPolyPoly ) :
@@ -133,6 +131,5 @@ namespace cppcanvas
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index 12a4a13e3b88..432a393a82dc 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -27,9 +27,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas,
@@ -188,6 +186,5 @@ namespace cppcanvas
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 6d42cf70f76f..0166ccd82d0a 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -27,9 +27,7 @@
using namespace ::com::sun::star;
-namespace cppcanvas
-{
- namespace internal
+namespace cppcanvas::internal
{
ImplSpriteCanvas::TransformationArbiter::TransformationArbiter() :
maTransformation()
@@ -107,6 +105,5 @@ namespace cppcanvas
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index ca81355210bb..78097e26e854 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -365,7 +365,7 @@
#include <cstddef>
-namespace test { namespace codemaker { namespace cppumaker {
+namespace test::codemaker::cppumaker {
static bool operator ==(
test::codemaker::cppumaker::TestException1 const & e1,
@@ -376,7 +376,7 @@ static bool operator ==(
&& e1.m4.member1 == e2.m4.member1 && e1.m4.member2 == e2.m4.member2;
}
-} } }
+}
namespace {
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 910afec9db95..829676a14d74 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -38,11 +38,11 @@
#include <cppu/unotype.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class Any;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
namespace {
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index bb8af537c4b8..a0163939ffb5 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -510,13 +510,13 @@ bool Base::v_isValid(OUString * pReason)
return m_pEnterable->isValid(pReason);
}
-namespace cppu { namespace helper { namespace purpenv {
+namespace cppu::helper::purpenv {
void Environment_initWithEnterable(uno_Environment * pEnvironment, cppu::Enterable * pEnterable)
{
new Base(pEnvironment, pEnterable);
}
-}}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 6255b2f0b52a..f68a47390cdb 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -196,7 +196,7 @@ void Mapping::release()
}
-namespace cppu { namespace helper { namespace purpenv {
+namespace cppu::helper::purpenv {
void createMapping(uno_Mapping ** ppMapping,
uno_Environment * pFrom,
@@ -210,6 +210,6 @@ void createMapping(uno_Mapping ** ppMapping,
::uno_registerMapping(ppMapping, s_free, pFrom, pTo, nullptr);
}
-}}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index 359227b24206..f3ba0ba21616 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -32,7 +32,7 @@
#include "loadmodule.hxx"
-namespace cppu { namespace detail {
+namespace cppu::detail {
#ifndef DISABLE_DYNLOADING
@@ -71,6 +71,6 @@ bool loadModule(osl::Module& rModule, OUString const & name) {
#endif
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index 600cb369c2b5..f6572ea47ee0 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -26,7 +26,7 @@
#include <osl/module.h>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang {
class XMultiComponentFactory;
class XMultiServiceFactory;
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star {
class XComponentContext;
class XInterface;
}
-} } }
+}
// Stubs for removed functionality, to be killed when we bump cppuhelper SONAME
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 483ca5712766..e9a6cce3fd43 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -55,7 +55,7 @@ static Bootstrap const & get_unorc()
}
-namespace cppuhelper { namespace detail {
+namespace cppuhelper::detail {
OUString expandMacros(OUString const & text) {
OUString t(text);
@@ -64,7 +64,7 @@ OUString expandMacros(OUString const & text) {
return t;
}
-} }
+}
namespace
{
@@ -157,7 +157,7 @@ Reference< XInterface > service_create(
}
-namespace cppuhelper { namespace detail {
+namespace cppuhelper::detail {
Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_factory()
{
@@ -177,6 +177,6 @@ Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_facto
SAL_NO_ACQUIRE);
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index a7ef2410eeb8..a11e52bbbb78 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -325,16 +325,7 @@ void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator )
}
/** */ //for docpp
-namespace com
-{
-/** */ //for docpp
-namespace sun
-{
-/** */ //for docpp
-namespace star
-{
-/** */ //for docpp
-namespace uno
+namespace com::sun::star::uno
{
@@ -534,9 +525,6 @@ Reference< XInterface > WeakReferenceHelper::get() const
return Reference< XInterface >();
}
-}
-}
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 21160cd09c3b7399bb34005a916ed5cd2866e43b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jan 14 20:57:28 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 15 06:58:05 2020 +0100
clang-tidy modernize-concat-nested-namespace in sw
Change-Id: Ie7643f6a9f9df2591d9253b18259403c655e5bcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86806
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index ea11fad3d2cc..aa5f7fc25922 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -31,7 +31,7 @@
#include <ndtxt.hxx>
#include <txtfld.hxx>
-namespace sw { namespace mark
+namespace sw::mark
{
AnnotationMark::AnnotationMark(
const SwPaM& rPaM,
@@ -99,6 +99,6 @@ namespace sw { namespace mark
return pAnnotationFormatField;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index d6524a5f0072..6643e77f03e9 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -44,7 +44,7 @@ using namespace ::sw::mark;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sw { namespace mark
+namespace sw::mark
{
SwPosition FindFieldSep(IFieldmark const& rMark)
@@ -110,7 +110,7 @@ namespace sw { namespace mark
assert(ret); // must have found it
return *ret;
}
-} } // namespace sw::mark
+} // namespace sw::mark
namespace
{
@@ -240,7 +240,7 @@ namespace
};
}
-namespace sw { namespace mark
+namespace sw::mark
{
MarkBase::MarkBase(const SwPaM& aPaM,
const OUString& rName)
@@ -938,6 +938,6 @@ namespace sw { namespace mark
(*pParameters)[ODF_FORMDATE_CURRENTDATE] <<= OUString();
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 6fe2ce5bcc25..9fbba6de069a 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -30,7 +30,7 @@ namespace
const char CrossRefNumItemBookmark_NamePrefix[] = "__RefNumPara__";
}
-namespace sw { namespace mark
+namespace sw::mark
{
CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM,
const vcl::KeyCode& rCode,
@@ -88,6 +88,6 @@ namespace sw { namespace mark
{
return rName.match(CrossRefNumItemBookmark_NamePrefix);
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx b/sw/source/core/crsr/overlayrangesoutline.cxx
index 3671f209483f..7c105698c854 100644
--- a/sw/source/core/crsr/overlayrangesoutline.cxx
+++ b/sw/source/core/crsr/overlayrangesoutline.cxx
@@ -50,9 +50,7 @@ namespace
}
}
-namespace sw
-{
- namespace overlay
+namespace sw::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayRangesOutline::createOverlayObjectPrimitive2DSequence()
{
@@ -101,7 +99,6 @@ namespace sw
objectChange();
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 3c117ffab662..ef2f12608f29 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -462,10 +462,10 @@ void ContentIdxStoreImpl::RestoreShellCursors(updater_t const & rUpdater)
}
}
-namespace sw { namespace mark {
+namespace sw::mark {
std::shared_ptr<ContentIdxStore> ContentIdxStore::Create()
{
return std::make_shared<ContentIdxStoreImpl>();
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index f736348480a5..4144ad47a567 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -530,7 +530,7 @@ void IDocumentMarkAccess::DeleteFieldmarkCommand(::sw::mark::IFieldmark const& r
pam.GetDoc()->getIDocumentContentOperations().DeleteAndJoin(pam);
}
-namespace sw { namespace mark
+namespace sw::mark
{
MarkManager::MarkManager(SwDoc& rDoc)
: m_vAllMarks()
@@ -1611,7 +1611,7 @@ void MarkManager::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterEndElement(pWriter);
}
-}} // namespace ::sw::mark
+} // namespace ::sw::mark
namespace
{
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 1660dd8945d6..581d9c3f7dc8 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1988,9 +1988,7 @@ void SwDrawContact::GetAnchoredObjs(std::vector<SwAnchoredObject*>& o_rAnchoredO
// For paint, that offset is used by setting at the OutputDevice; for primitives this is
// not possible since we have no OutputDevice, but define the geometry itself.
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
namespace {
@@ -2039,12 +2037,9 @@ namespace sdr
};
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
-namespace sdr
-{
- namespace 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)
@@ -2150,8 +2145,7 @@ namespace sdr
return *(new VOCOfDrawVirtObj(rObjectContact, *this));
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/// 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 37778cfd9f86..2ff59ec47287 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -71,9 +71,7 @@ using namespace ::com::sun::star;
static bool bInResize = false;
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
namespace {
@@ -110,8 +108,7 @@ namespace sdr
return drawinglayer::primitive2d::Primitive2DContainer();
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
std::unique_ptr<sdr::properties::BaseProperties> SwFlyDrawObj::CreateObjectSpecificProperties()
{
@@ -148,9 +145,7 @@ sal_uInt16 SwFlyDrawObj::GetObjIdentifier() const
}
// TODO: Need own primitive to get the FlyFrame paint working
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
namespace {
@@ -190,12 +185,9 @@ namespace drawinglayer
};
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SwVirtFlyDrawObjPrimitive::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
@@ -248,17 +240,14 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SwVirtFlyDrawObjPrimitive, PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
// AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed
// since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj.
// For paint, that offset is used by setting at the OutputDevice; for primitives this is
// not possible since we have no OutputDevice, but define the geometry itself.
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
namespace {
@@ -286,12 +275,9 @@ namespace sdr
};
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
drawinglayer::primitive2d::Primitive2DContainer VCOfSwVirtFlyDrawObj::createViewIndependentPrimitive2DSequence() const
{
@@ -318,8 +304,7 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const
{
diff --git a/sw/source/core/layout/legacyitem.cxx b/sw/source/core/layout/legacyitem.cxx
index 9dea0dca8cf6..02be381eb9b4 100644
--- a/sw/source/core/layout/legacyitem.cxx
+++ b/sw/source/core/layout/legacyitem.cxx
@@ -22,9 +22,7 @@
#include <sal/log.hxx>
#include <fmtornt.hxx>
-namespace legacy
-{
- namespace SwFormatVert
+namespace legacy::SwFormatVert
{
sal_uInt16 GetVersion(sal_uInt16)
{
@@ -77,6 +75,5 @@ namespace legacy
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 8135fa1c3a63..72b65395cdf3 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4515,9 +4515,7 @@ void SwFrame::PaintBorderLine( const SwRect& rRect,
gProp.pSLines->AddLineRect( aOut, pColor, nStyle, pTab, nSubCol, gProp );
}
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
namespace {
@@ -4761,8 +4759,7 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SwBorderRectanglePrimitive2D, PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
namespace {
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 50b7dcd526be..e7d375299c26 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -832,7 +832,7 @@ void SwMetaPortion::Paint( const SwTextPaintInfo &rInf ) const
}
}
-namespace sw { namespace mark {
+namespace sw::mark {
OUString ExpandFieldmark(IFieldmark* pBM)
{
const IFieldmark::parameter_map_t* const pParameters = pBM->GetParameters();
@@ -853,7 +853,7 @@ namespace sw { namespace mark {
static const sal_Unicode vEnSpaces[ODF_FORMFIELD_DEFAULT_LENGTH] = {8194, 8194, 8194, 8194, 8194};
return OUString(vEnSpaces, ODF_FORMFIELD_DEFAULT_LENGTH);
}
-} }
+}
SwTextPortion *SwTextFormatter::WhichTextPor( SwTextFormatInfo &rInf ) const
{
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 12315b438d3e..c4cf552d3833 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6553,9 +6553,7 @@ bool SwWW8ImplReader::InEqualApo(int nLvl) const
return m_aApos[nLvl];
}
-namespace sw
-{
- namespace hack
+namespace sw::hack
{
Position::Position(const SwPosition &rPos)
: maPtNode(rPos.nNode), mnPtContent(rPos.nContent.GetIndex())
@@ -6569,7 +6567,6 @@ namespace sw
return aRet;
}
}
-}
SwMacroInfo::SwMacroInfo()
: SdrObjUserData( SdrInventor::ScOrSwDraw, SW_UD_IMAPDATA )
diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx
index b54fb6ef3103..add4b3ab778a 100644
--- a/sw/source/ui/vba/wordvbahelper.cxx
+++ b/sw/source/ui/vba/wordvbahelper.cxx
@@ -36,11 +36,7 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-namespace ooo
-{
-namespace vba
-{
-namespace word
+namespace ooo::vba::word
{
SwDocShell* getDocShell( const uno::Reference< frame::XModel>& xModel )
@@ -175,8 +171,6 @@ bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel )
return isObjectSelected;
}
-} // word
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index fa4d684c577c..f6b3de150c8c 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -31,7 +31,7 @@
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
namespace {
@@ -377,6 +377,6 @@ void AnchorOverlayObject::SetAnchorState( const AnchorState aState)
}
}
-} } // end of namespace sw::annotation
+} // end of namespace sw::annotation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index e321560d42fa..f56e745c1641 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -33,7 +33,7 @@
#include <AnnotationWin.hxx>
#include <swtypes.hxx>
-namespace sw { namespace annotation {
+namespace sw::annotation {
static Color ColorFromAlphaColor(const sal_uInt8 aTransparency, const Color& aFront, const Color& aBack)
{
@@ -200,6 +200,6 @@ void AnnotationMenuButton::KeyInput(const KeyEvent& rKeyEvt)
}
}
-}} // end of namespace sw::annotation
+} // end of namespace sw::annotation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index b2ff15aba3e7..da900ec54237 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -64,7 +64,7 @@
#include <memory>
-namespace sw { namespace annotation {
+namespace sw::annotation {
SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
SwPostItMgr& aMgr,
@@ -502,6 +502,6 @@ tools::Time SwAnnotationWin::GetTime() const
return mpField->GetTime();
}
-} } // end of namespace sw::annotation
+} // end of namespace sw::annotation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index f243bf503dc7..335cee087d0e 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -138,7 +138,7 @@ vcl::Window* lcl_getHitWindow(sw::annotation::SwAnnotationWin& rParent, const Mo
}
-namespace sw { namespace annotation {
+namespace sw::annotation {
#define METABUTTON_WIDTH 16
#define METABUTTON_HEIGHT 18
@@ -1573,6 +1573,6 @@ css::uno::Reference< css::accessibility::XAccessible > SwAnnotationWin::CreateAc
return xAcc;
}
-} } // eof of namespace sw::sidebarwindows
+} // eof 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 c7394b1bdc32..9f7f7968f8d7 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -55,9 +55,7 @@ namespace
}
}
-namespace sw
-{
- namespace overlay
+namespace sw::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayRanges::createOverlayObjectPrimitive2DSequence()
{
@@ -174,7 +172,6 @@ namespace sw
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index 584af296928b..dd47f70bb9d7 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -28,7 +28,7 @@
#include <drawinglayer/primitive2d/primitivetools2d.hxx>
#include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
// helper SwPostItShadowPrimitive
@@ -232,6 +232,6 @@ void ShadowOverlayObject::SetPosition( const basegfx::B2DPoint& rPoint1,
}
}
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarScrollBar.cxx b/sw/source/uibase/docvw/SidebarScrollBar.cxx
index 9b57616ba89f..e94a85b121f0 100644
--- a/sw/source/uibase/docvw/SidebarScrollBar.cxx
+++ b/sw/source/uibase/docvw/SidebarScrollBar.cxx
@@ -16,9 +16,7 @@
#include <edtwin.hxx>
#include <AnnotationWin.hxx>
-namespace sw
-{
-namespace sidebarwindows
+namespace sw::sidebarwindows
{
SidebarScrollBar::SidebarScrollBar(sw::annotation::SwAnnotationWin& rSidebarWin, WinBits nStyle, SwView& rView)
@@ -75,7 +73,6 @@ SidebarScrollBar::~SidebarScrollBar()
disposeOnce();
}
-}
} // end of namespace sw::sidebarwindows
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 79ece975ea50..544b3c6fc403 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -57,7 +57,7 @@
#include <redline.hxx>
#include <memory>
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
SidebarTextControl::SidebarTextControl( sw::annotation::SwAnnotationWin& rSidebarWin,
WinBits nBits,
@@ -442,6 +442,6 @@ css::uno::Reference< css::accessibility::XAccessible > SidebarTextControl::Creat
return xAcc;
}
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index afbd7b16c438..d3bec6ecae5b 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -35,7 +35,7 @@
#include <editeng/outliner.hxx>
#include <vcl/vclevent.hxx>
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
namespace {
@@ -266,6 +266,6 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SidebarTextControl
return xAcc;
}
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index bd51ff8cea36..010394dad277 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
namespace {
@@ -139,6 +139,6 @@ css::uno::Reference< css::accessibility::XAccessibleContext > SidebarWinAccessib
return xAcc;
}
-} } // end of namespace sw::sidebarwindows
+} // end of namespace sw::sidebarwindows
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
index f8abc3aa1329..f52177742148 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
@@ -58,7 +58,7 @@ namespace {
typedef std::map < FrameKey, SidebarWinContainer > FrameSidebarWinContainer_;
}
-namespace sw { namespace sidebarwindows {
+namespace sw::sidebarwindows {
class FrameSidebarWinContainer : public FrameSidebarWinContainer_
{
@@ -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/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index c8f5e3db2f11..1675867acd8d 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -29,7 +29,7 @@
#include <svl/intitem.hxx>
#include <svx/pageitem.hxx>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
PageColumnControl::PageColumnControl(PageColumnPopup* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pagecolumncontrol.ui", "PageColumnControl")
@@ -117,6 +117,6 @@ IMPL_LINK_NOARG( PageColumnControl, MoreButtonClickHdl_Impl, weld::Button&, void
m_xControl->EndPopupMode();
}
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index b9d60703b6ba..229174e78131 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
VclPtr<vcl::Window> PageFooterPanel::Create(
vcl::Window* pParent,
@@ -290,6 +290,6 @@ IMPL_LINK_NOARG( PageFooterPanel, FooterLayoutHdl, weld::ComboBox&, void )
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 8a237f049ced..2837937a2ca1 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -41,7 +41,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
VclPtr<vcl::Window> PageFormatPanel::Create(
vcl::Window* pParent,
@@ -427,6 +427,6 @@ void PageFormatPanel::UpdateMarginBox()
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index ffa0e2f07272..fe33e232ba70 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
VclPtr<vcl::Window> PageHeaderPanel::Create(
vcl::Window* pParent,
@@ -291,6 +291,6 @@ IMPL_LINK_NOARG( PageHeaderPanel, HeaderLayoutHdl, weld::ComboBox&, void )
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 0241e034989a..f825ed6eb5ff 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -92,7 +92,7 @@ namespace
}
}
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
PageMarginControl::PageMarginControl(PageMarginPopup* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pagemargincontrol.ui", "PageMarginControl")
@@ -580,6 +580,6 @@ void PageMarginControl::StoreUserCustomValues()
aWinOpt5.SetUserData( aSeq );
}
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index b52b789c1c15..d44dd3a5b2ca 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -47,7 +47,7 @@ namespace {
}
}
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
PageOrientationControl::PageOrientationControl(PageOrientationPopup* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pageorientationcontrol.ui", "PageOrientationControl")
@@ -189,6 +189,6 @@ IMPL_LINK(PageOrientationControl, ImplOrientationHdl, weld::Button&, rControl, v
m_xControl->EndPopupMode();
}
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 2bc18689dd4b..afb077d612b4 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -68,7 +68,7 @@ namespace
}
}
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
PageSizeControl::PageSizeControl(PageSizePopup* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "modules/swriter/ui/pagesizecontrol.ui", "PageSizeControl")
@@ -233,6 +233,6 @@ IMPL_LINK_NOARG(PageSizeControl, MoreButtonClickHdl_Impl, weld::Button&, void)
mxControl->EndPopupMode();
}
-} } // end of namespace sw::sidebar
+} // end of namespace sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 4ca5ba227d42..628bc6a880ca 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -34,7 +34,7 @@
using namespace ::com::sun::star;
-namespace sw { namespace sidebar{
+namespace sw::sidebar{
namespace {
@@ -599,6 +599,6 @@ IMPL_LINK_NOARG(PageStylesPanel, ModifyFillColorListHdl, ColorListBox&, void)
ModifyFillColor();
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index add7d794ccf7..33dbd3a9f93a 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -28,7 +28,7 @@
#include <sfx2/docfile.hxx>
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
namespace {
@@ -212,6 +212,6 @@ void StylePresetsPanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/,
{
}
-}} // end of namespace ::sw::sidebar
+} // end of namespace ::sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index a363fc6bddf3..4d09aa4c0794 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -21,9 +21,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-namespace sw
-{
-namespace sidebar
+namespace sw::sidebar
{
VclPtr<vcl::Window> TableEditPanel::Create(vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
@@ -229,7 +227,6 @@ IMPL_LINK_NOARG(TableEditPanel, ColumnWidthMofiyHdl, weld::MetricSpinButton&, vo
m_pBindings->GetDispatcher()->ExecuteList(SID_ATTR_TABLE_COLUMN_WIDTH, SfxCallMode::RECORD,
{ &aColumnWidth });
}
-}
} // end of namespace ::sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 88c8239ee7b6..b3f044d7ca36 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -397,7 +397,7 @@ BitmapEx GenerateColorPreview(const svx::ColorSet& rColorSet)
} // end anonymous namespace
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
VclPtr<vcl::Window> ThemePanel::Create (vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame)
@@ -501,6 +501,6 @@ void ThemePanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/,
{
}
-}} // end of namespace ::sw::sidebar
+} // end of namespace ::sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 5475806390e7..080946ff08dc 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -41,7 +41,7 @@ const char UNO_WRAPON[] = ".uno:WrapOn";
const char UNO_WRAPTHROUGH[] = ".uno:WrapThrough";
const char UNO_WRAPIDEAL[] = ".uno:WrapIdeal";
-namespace sw { namespace sidebar {
+namespace sw::sidebar {
VclPtr<vcl::Window> WrapPropertyPanel::Create (
vcl::Window* pParent,
@@ -363,6 +363,6 @@ void WrapPropertyPanel::NotifyItemUpdate(
}
}
-} } // end of namespace ::sw::sidebar
+} // end of namespace ::sw::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 90664ae098f5..898ea895c387 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -45,9 +45,9 @@
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
struct SearchOptions2;
-} } } }
+}
using namespace ::com::sun::star::util;
More information about the Libreoffice-commits
mailing list