[Libreoffice-commits] core.git: svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jan 15 08:31:44 UTC 2020
svx/source/accessibility/AccessibleFrameSelector.cxx | 4
svx/source/dialog/ClassificationCommon.cxx | 5 -
svx/source/dialog/docrecovery.cxx | 4
svx/source/dialog/framelink.cxx | 4
svx/source/dialog/framelinkarray.cxx | 4
svx/source/engine3d/helperminimaldepth3d.cxx | 7 -
svx/source/form/dbcharsethelper.cxx | 3
svx/source/gallery2/GalleryControl.cxx | 4
svx/source/sdr/animation/animationstate.cxx | 7 -
svx/source/sdr/animation/objectanimator.cxx | 7 -
svx/source/sdr/animation/scheduler.cxx | 7 -
svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 7 -
svx/source/sdr/attribute/sdrfilltextattribute.cxx | 7 -
svx/source/sdr/attribute/sdrformtextattribute.cxx | 7 -
svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx | 7 -
svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx | 7 -
svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx | 7 -
svx/source/sdr/attribute/sdrshadowtextattribute.cxx | 7 -
svx/source/sdr/attribute/sdrtextattribute.cxx | 7 -
svx/source/sdr/contact/displayinfo.cxx | 7 -
svx/source/sdr/contact/objectcontact.cxx | 4
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 4
svx/source/sdr/contact/objectcontactofpageview.cxx | 7 -
svx/source/sdr/contact/sdrmediawindow.cxx | 4
svx/source/sdr/contact/viewcontact.cxx | 4
svx/source/sdr/contact/viewcontactofe3d.cxx | 4
svx/source/sdr/contact/viewcontactofe3dcube.cxx | 7 -
svx/source/sdr/contact/viewcontactofe3dextrude.cxx | 7 -
svx/source/sdr/contact/viewcontactofe3dlathe.cxx | 7 -
svx/source/sdr/contact/viewcontactofe3dpolygon.cxx | 7 -
svx/source/sdr/contact/viewcontactofe3dscene.cxx | 4
svx/source/sdr/contact/viewcontactofe3dsphere.cxx | 7 -
svx/source/sdr/contact/viewcontactofgraphic.cxx | 7 -
svx/source/sdr/contact/viewcontactofgroup.cxx | 7 -
svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx | 7 -
svx/source/sdr/contact/viewcontactofpageobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx | 7 -
svx/source/sdr/contact/viewcontactofsdrcircobj.cxx | 7 -
svx/source/sdr/contact/viewcontactofsdredgeobj.cxx | 7 -
svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx | 7 -
svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx | 7 -
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 4
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 7 -
svx/source/sdr/contact/viewcontactofsdrrectobj.cxx | 4
svx/source/sdr/contact/viewcontactoftextobj.cxx | 4
svx/source/sdr/contact/viewcontactofunocontrol.cxx | 4
svx/source/sdr/contact/viewcontactofvirtobj.cxx | 4
svx/source/sdr/contact/viewobjectcontact.cxx | 4
svx/source/sdr/contact/viewobjectcontactofe3d.cxx | 7 -
svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx | 7 -
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 7 -
svx/source/sdr/contact/viewobjectcontactofgroup.cxx | 7 -
svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx | 7 -
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 4
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 4
svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx | 4
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 4
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx | 4
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 4
svx/source/sdr/contact/viewobjectcontactredirector.cxx | 4
svx/source/sdr/event/eventhandler.cxx | 7 -
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 7 -
svx/source/sdr/overlay/overlaybitmapex.cxx | 7 -
svx/source/sdr/overlay/overlaycrosshair.cxx | 7 -
svx/source/sdr/overlay/overlayhandle.cxx | 4
svx/source/sdr/overlay/overlayhelpline.cxx | 7 -
svx/source/sdr/overlay/overlayline.cxx | 7 -
svx/source/sdr/overlay/overlaymanager.cxx | 7 -
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 7 -
svx/source/sdr/overlay/overlayobject.cxx | 14 --
svx/source/sdr/overlay/overlayobjectcell.cxx | 7 -
svx/source/sdr/overlay/overlayobjectlist.cxx | 7 -
svx/source/sdr/overlay/overlaypolypolygon.cxx | 7 -
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx | 7 -
svx/source/sdr/overlay/overlayrectangle.cxx | 7 -
svx/source/sdr/overlay/overlayrollingrectangle.cxx | 7 -
svx/source/sdr/overlay/overlayselection.cxx | 7 -
svx/source/sdr/overlay/overlaytools.cxx | 41 ++------
svx/source/sdr/overlay/overlaytriangle.cxx | 7 -
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 7 -
svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 7 -
svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx | 14 --
svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx | 14 --
svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrole2primitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 7 -
svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx | 7 -
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 49 ++--------
svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 7 -
svx/source/sdr/properties/attributeproperties.cxx | 7 -
svx/source/sdr/properties/captionproperties.cxx | 7 -
svx/source/sdr/properties/circleproperties.cxx | 7 -
svx/source/sdr/properties/connectorproperties.cxx | 7 -
svx/source/sdr/properties/customshapeproperties.cxx | 7 -
svx/source/sdr/properties/defaultproperties.cxx | 7 -
svx/source/sdr/properties/e3dcompoundproperties.cxx | 7 -
svx/source/sdr/properties/e3dextrudeproperties.cxx | 7 -
svx/source/sdr/properties/e3dlatheproperties.cxx | 7 -
svx/source/sdr/properties/e3dproperties.cxx | 7 -
svx/source/sdr/properties/e3dsceneproperties.cxx | 7 -
svx/source/sdr/properties/e3dsphereproperties.cxx | 7 -
svx/source/sdr/properties/emptyproperties.cxx | 7 -
svx/source/sdr/properties/graphicproperties.cxx | 7 -
svx/source/sdr/properties/groupproperties.cxx | 7 -
svx/source/sdr/properties/itemsettools.cxx | 14 --
svx/source/sdr/properties/measureproperties.cxx | 7 -
svx/source/sdr/properties/oleproperties.cxx | 7 -
svx/source/sdr/properties/pageproperties.cxx | 7 -
svx/source/sdr/properties/properties.cxx | 7 -
svx/source/sdr/properties/rectangleproperties.cxx | 7 -
svx/source/sdr/properties/textproperties.cxx | 7 -
svx/source/sidebar/EmptyPanel.cxx | 4
svx/source/sidebar/SelectionAnalyzer.cxx | 4
svx/source/sidebar/SelectionChangeHandler.cxx | 4
svx/source/sidebar/area/AreaPropertyPanel.cxx | 4
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 4
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 4
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 4
svx/source/sidebar/line/LinePropertyPanel.cxx | 4
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 4
svx/source/sidebar/line/LineWidthPopup.cxx | 4
svx/source/sidebar/line/LineWidthValueSet.cxx | 4
svx/source/sidebar/lists/ListsPropertyPanel.cxx | 5 -
svx/source/sidebar/media/MediaPlaybackPanel.cxx | 4
svx/source/sidebar/nbdtmg.cxx | 4
svx/source/sidebar/nbdtmgfact.cxx | 4
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 4
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 4
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 4
svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 4
svx/source/sidebar/shapes/ShapesUtil.cxx | 4
svx/source/sidebar/styles/StylesPropertyPanel.cxx | 4
svx/source/sidebar/text/TextPropertyPanel.cxx | 4
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 4
svx/source/table/cell.cxx | 11 --
svx/source/table/cellcursor.cxx | 4
svx/source/table/cellrange.cxx | 4
svx/source/table/propertyset.cxx | 4
svx/source/table/svdotable.cxx | 4
svx/source/table/tablecolumn.cxx | 4
svx/source/table/tablecolumns.cxx | 4
svx/source/table/tablecontroller.cxx | 4
svx/source/table/tabledesign.cxx | 4
svx/source/table/tablehandles.cxx | 3
svx/source/table/tablelayouter.cxx | 4
svx/source/table/tablemodel.cxx | 4
svx/source/table/tablerow.cxx | 4
svx/source/table/tablerows.cxx | 4
svx/source/table/tablertfexporter.cxx | 4
svx/source/table/tablertfimporter.cxx | 4
svx/source/table/tableundo.cxx | 4
svx/source/table/viewcontactoftableobj.cxx | 14 --
svx/source/xml/xmlgrhlp.cxx | 2
162 files changed, 346 insertions(+), 688 deletions(-)
New commits:
commit 16d26d178785bead496af0850604d7816f0e453a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 15 08:47:39 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 15 09:31:07 2020 +0100
clang-tidy modernize-concat-nested-namespace in svx
Change-Id: I8a00f2823aa956afb995ee68c9f995bf08ad5239
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86824
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index cb8d1346b4fa..2f4885297b97 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -38,8 +38,7 @@
#include <svx/strings.hrc>
#include <frmsel.hrc>
-namespace svx {
-namespace a11y {
+namespace svx::a11y {
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::UNO_QUERY;
@@ -392,7 +391,6 @@ void AccFrameSelectorChild::Invalidate()
mpFrameSel = nullptr;
}
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/ClassificationCommon.cxx b/svx/source/dialog/ClassificationCommon.cxx
index 7c609b4d70fe..d34b3a501c53 100644
--- a/svx/source/dialog/ClassificationCommon.cxx
+++ b/svx/source/dialog/ClassificationCommon.cxx
@@ -17,9 +17,7 @@
using namespace css;
-namespace svx
-{
-namespace classification
+namespace svx::classification
{
OUString convertClassificationResultToString(std::vector<svx::ClassificationResult> const& rResults)
{
@@ -121,7 +119,6 @@ void insertCreationOrigin(uno::Reference<beans::XPropertyContainer> const& rxPro
: OUString("MANUAL");
addOrInsertDocumentProperty(rxPropertyContainer, rKeyCreator.makeCreationOriginKey(), sValue);
}
-}
} // end svx::classification namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 75b9f3b87042..456a1fdfef03 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -54,8 +54,7 @@
#include <unotools/pathoptions.hxx>
#include <officecfg/Office/Recovery.hxx>
-namespace svx{
- namespace DocRecovery{
+namespace svx::DocRecovery{
using namespace ::osl;
@@ -1105,6 +1104,5 @@ 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 b4548c6ebed9..69cb10704817 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -34,8 +34,7 @@
using namespace ::com::sun::star;
using namespace editeng;
-namespace svx {
-namespace frame {
+namespace svx::frame {
// Classes
void Style::implEnsureImplStyle()
@@ -316,6 +315,5 @@ bool Style::operator<( const Style& rOther) const
return false;
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index d93e50e1c21c..40ec9b91968a 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -30,8 +30,7 @@
#include <svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace svx {
-namespace frame {
+namespace svx::frame {
namespace {
@@ -1288,7 +1287,6 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveArray()
#undef DBG_FRAME_CHECK_COL
#undef DBG_FRAME_CHECK
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx
index 298174047fbd..918e207b6e7d 100644
--- a/svx/source/engine3d/helperminimaldepth3d.cxx
+++ b/svx/source/engine3d/helperminimaldepth3d.cxx
@@ -30,9 +30,7 @@
#include <svx/scene3d.hxx>
-namespace drawinglayer
-{
- namespace processor3d
+namespace drawinglayer::processor3d
{
namespace {
@@ -138,8 +136,7 @@ namespace drawinglayer
}
}
}
- } // end of namespace processor3d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
// changed to create values using VCs, Primitive3DContainer and ViewInformation3D to allow
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index cee4cc927f1c..fb5f6f9bdb08 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -24,7 +24,7 @@
using namespace ::dbtools;
-namespace svxform { namespace charset_helper
+namespace svxform::charset_helper
{
sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs )
@@ -44,7 +44,6 @@ namespace svxform { namespace charset_helper
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index 83979938b00d..c3fc9a1cbcef 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -28,7 +28,7 @@
#include <vcl/settings.hxx>
#include <sfx2/sidebar/Theme.hxx>
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
static const sal_Int32 gnInitialVerticalSplitPosition (150);
@@ -239,6 +239,6 @@ IMPL_LINK_NOARG( GalleryControl, SplitHdl, Splitter*, void )
}
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 4b3b5f2fa08e..68746d908aac 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -27,9 +27,7 @@
#include <comphelper/lok.hxx>
-namespace sdr
-{
- namespace animation
+namespace sdr::animation
{
double PrimitiveAnimation::getSmallestNextTime(double fCurrentTime)
{
@@ -132,7 +130,6 @@ namespace sdr
// re-setup
prepareNextEvent();
}
- } // end of namespace animation
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx
index 830056fa0993..378b3e993069 100644
--- a/svx/source/sdr/animation/objectanimator.cxx
+++ b/svx/source/sdr/animation/objectanimator.cxx
@@ -21,9 +21,7 @@
#include <svx/sdr/animation/animationstate.hxx>
-namespace sdr
-{
- namespace animation
+namespace sdr::animation
{
primitiveAnimator::primitiveAnimator()
: Scheduler()
@@ -33,7 +31,6 @@ namespace sdr
primitiveAnimator::~primitiveAnimator()
{
}
- } // end of namespace animation
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 4f32f101f999..a9e93d01ce45 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -25,9 +25,7 @@
// event class
-namespace sdr
-{
- namespace animation
+namespace sdr::animation
{
Event::Event() : mnTime(0)
{
@@ -167,7 +165,6 @@ namespace sdr
checkTimeout();
}
}
- } // end of namespace animation
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
index 696f94c1df87..7fe63399e16c 100644
--- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
+++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
@@ -29,9 +29,7 @@
//////////////////////////////////////////////////////////////////////////////
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
void SdrAllFillAttributesHelper::createPrimitive2DSequence(
const basegfx::B2DRange& rPaintRange,
@@ -253,7 +251,6 @@ namespace drawinglayer
// color fill
return false;
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
index 7d53ec205d3b..2660ed795b27 100644
--- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
@@ -21,9 +21,7 @@
#include <sdr/attribute/sdrfilltextattribute.hxx>
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
SdrFillTextAttribute::SdrFillTextAttribute(
const SdrFillAttribute& rFill,
@@ -64,7 +62,6 @@ namespace drawinglayer
&& getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient()
&& getText() == rCandidate.getText());
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 74bf9926622c..487affa5e60e 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -140,9 +140,7 @@ namespace
} // end of anonymous namespace
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
class ImpSdrFormTextAttribute
{
@@ -371,7 +369,6 @@ namespace drawinglayer
{
return mpSdrFormTextAttribute->getFormTextOutline();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
index 72529a3c0652..416d746325a9 100644
--- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
@@ -24,9 +24,7 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
class ImpSdrFormTextOutlineAttribute
{
@@ -137,7 +135,6 @@ namespace drawinglayer
{
return mpSdrFormTextOutlineAttribute->getTransparence();
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx
index 22022e8f432c..ed359ba9bdef 100644
--- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx
@@ -21,9 +21,7 @@
#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
SdrLineFillShadowTextAttribute::SdrLineFillShadowTextAttribute(
const SdrLineAttribute& rLine,
@@ -74,7 +72,6 @@ namespace drawinglayer
&& getFill() == rCandidate.getFill()
&& getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient());
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx
index fb232e3c677a..df964b32e367 100644
--- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx
@@ -21,9 +21,7 @@
#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
SdrLineShadowTextAttribute::SdrLineShadowTextAttribute(
const SdrLineAttribute& rLine,
@@ -72,7 +70,6 @@ namespace drawinglayer
&& getLine() == rCandidate.getLine()
&& getLineStartEnd() == rCandidate.getLineStartEnd());
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
index fd4f12ff3293..16947d8b6436 100644
--- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
@@ -21,9 +21,7 @@
#include <svx/sdr/attribute/sdrshadowtextattribute.hxx>
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
SdrShadowTextAttribute::SdrShadowTextAttribute(
const SdrShadowAttribute& rShadow,
@@ -64,7 +62,6 @@ namespace drawinglayer
return (getShadow() == rCandidate.getShadow()
&& getText() == rCandidate.getText());
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 81889f5cc52a..cb0c88d845a4 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -28,9 +28,7 @@
#include <rtl/instance.hxx>
-namespace drawinglayer
-{
- namespace attribute
+namespace drawinglayer::attribute
{
class ImpSdrTextAttribute
{
@@ -420,7 +418,6 @@ namespace drawinglayer
getSdrText().GetObject().impGetScrollTextTiming(rAnimList, fFrameLength, fTextLength);
}
}
- } // end of namespace attribute
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx
index e3fc6b91664a..aba8fcffebf9 100644
--- a/svx/source/sdr/contact/displayinfo.cxx
+++ b/svx/source/sdr/contact/displayinfo.cxx
@@ -20,9 +20,7 @@
#include <svx/sdr/contact/displayinfo.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
DisplayInfo::DisplayInfo()
: maProcessLayers(true), // init layer info with all bits set to draw everything on default
@@ -85,7 +83,6 @@ namespace sdr
}
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index a8ee40706d99..41d6226c5e95 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -27,7 +27,7 @@
using namespace com::sun::star;
-namespace sdr { namespace contact {
+namespace sdr::contact {
bool ObjectContact::supportsGridOffsets() const
{
@@ -213,6 +213,6 @@ void ObjectContact::resetAllGridOffsets()
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 2626d5340676..0f4a01623432 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -32,7 +32,7 @@
#include <vcl/gdimtf.hxx>
#include <memory>
-namespace sdr { namespace contact {
+namespace sdr::contact {
ObjectContactPainter::ObjectContactPainter()
{
@@ -185,6 +185,6 @@ OutputDevice* ObjectContactOfPagePainter::TryToGetOutputDevice() const
return mrOriginalObjectContact.TryToGetOutputDevice();
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 2718c491732f..9a1acfc71b88 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -44,9 +44,7 @@
using namespace com::sun::star;
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
// internal access to SdrPage of SdrPageView
SdrPage* ObjectContactOfPageView::GetSdrPage() const
@@ -441,7 +439,6 @@ namespace sdr
}
}
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index a804a1423ac1..086e12cee0c4 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -26,7 +26,7 @@
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) :
@@ -169,6 +169,6 @@ void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index c591e6ca9df9..c3b08c1fcc0e 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -28,7 +28,7 @@
#include <svx/sdr/contact/objectcontactofpageview.hxx>
#include <tools/debug.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something. Default is to create
@@ -285,6 +285,6 @@ void ViewContact::flushViewObjectContacts(bool bWithHierarchy)
deleteAllVOCs();
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx
index c9bb60423e56..3d5770ffe856 100644
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.cxx
@@ -65,7 +65,7 @@ const sdr::contact::ViewContactOfE3dScene* tryToFindVCOfE3DScene(
} // end of anonymous namespace
-namespace sdr { namespace contact {
+namespace sdr::contact {
drawinglayer::primitive2d::Primitive2DContainer ViewContactOfE3d::impCreateWithGivenPrimitive3DContainer(
const drawinglayer::primitive3d::Primitive3DContainer& rxContent3D) const
@@ -191,6 +191,6 @@ ViewObjectContact& ViewContactOfE3d::CreateObjectSpecificViewObjectContact(Objec
return *pRetval;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
index d68778029a5f..885fc5ef243d 100644
--- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
@@ -27,9 +27,7 @@
#include <memory>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfE3dCube::ViewContactOfE3dCube(E3dCubeObj& rCubeObj)
: ViewContactOfE3d(rCubeObj)
@@ -85,7 +83,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
index fa2d7645991c..c51651414e00 100644
--- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
@@ -27,9 +27,7 @@
#include <memory>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfE3dExtrude::ViewContactOfE3dExtrude(E3dExtrudeObj& rExtrude)
: ViewContactOfE3d(rExtrude)
@@ -80,7 +78,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
index aee851a80bc6..95242e9428ed 100644
--- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
@@ -27,9 +27,7 @@
#include <memory>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfE3dLathe::ViewContactOfE3dLathe(E3dLatheObj& rLathe)
: ViewContactOfE3d(rLathe)
@@ -93,7 +91,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index 67ce76105e7d..6191af22b993 100644
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
@@ -28,9 +28,7 @@
#include <memory>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfE3dPolygon::ViewContactOfE3dPolygon(E3dPolygonObj& rPolygon)
: ViewContactOfE3d(rPolygon)
@@ -166,7 +164,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 87401bef06c4..e2b4a636bbc6 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -132,7 +132,7 @@ void createSubPrimitive3DVector(
}
-namespace sdr { namespace contact {
+namespace sdr::contact {
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
@@ -453,6 +453,6 @@ basegfx::B3DRange ViewContactOfE3dScene::getAllContentRange3D() const
return aAllContentRange3D;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
index 18a818dbf0a2..1a1dc1564d6a 100644
--- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
@@ -26,9 +26,7 @@
#include <memory>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfE3dSphere::ViewContactOfE3dSphere(E3dSphereObj& rSphere)
: ViewContactOfE3d(rSphere)
@@ -77,7 +75,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 3951159be56b..de4c0c9e4114 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -53,9 +53,7 @@
#include <bitmaps.hlst>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
@@ -412,7 +410,6 @@ namespace sdr
return GraphicType::NONE == rGraphicObject.GetType() || GraphicType::Default == rGraphicObject.GetType();
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx
index 2e2ad8a50eca..ad2fc2195a93 100644
--- a/svx/source/sdr/contact/viewcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewcontactofgroup.cxx
@@ -31,9 +31,7 @@
#include <vcl/canvastools.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
@@ -84,7 +82,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index fa79f10b7354..c275b184e846 100644
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
@@ -37,9 +37,7 @@
#include <drawinglayer/attribute/fillgradientattribute.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewObjectContact& ViewContactOfMasterPageDescriptor::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact)
{
@@ -105,7 +103,6 @@ namespace sdr
{
return &(GetMasterPageDescriptor().GetOwnerPage().GetViewContact());
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx
index 3032bfdb95a1..a14572e9c686 100644
--- a/svx/source/sdr/contact/viewcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx
@@ -30,7 +30,7 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewObjectContact& ViewContactOfPageObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact)
{
@@ -79,6 +79,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageObj::createView
return drawinglayer::primitive2d::Primitive2DContainer { xReference };
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index f9c9041904b4..082ed9d760f5 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -43,9 +43,7 @@
using namespace com::sun::star;
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfSdrCaptionObj::ViewContactOfSdrCaptionObj(SdrCaptionObj& rCaptionObj)
: ViewContactOfSdrRectObj(rCaptionObj)
@@ -192,7 +190,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index 6b1253d57ee0..b76448c4a6d9 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -28,9 +28,7 @@
#include <vcl/canvastools.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfSdrCircObj::ViewContactOfSdrCircObj(SdrCircObj& rCircObj)
: ViewContactOfSdrRectObj(rCircObj)
@@ -98,7 +96,6 @@ namespace sdr
return drawinglayer::primitive2d::Primitive2DContainer { xReference };
}
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
index 37eb5267cd5f..f8a7819d6e14 100644
--- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
@@ -25,9 +25,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfSdrEdgeObj::ViewContactOfSdrEdgeObj(SdrEdgeObj& rEdgeObj)
: ViewContactOfTextObj(rEdgeObj)
@@ -62,7 +60,6 @@ namespace sdr
return drawinglayer::primitive2d::Primitive2DContainer { xReference };
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
index cdaed5a5b5e5..9452127278bb 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
@@ -30,9 +30,7 @@
#include <svx/sxmtpitm.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfSdrMeasureObj::ViewContactOfSdrMeasureObj(SdrMeasureObj& rMeasureObj)
: ViewContactOfTextObj(rMeasureObj)
@@ -124,7 +122,6 @@ namespace sdr
return drawinglayer::primitive2d::Primitive2DContainer { xReference };
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index 80373d8df122..3351cfd5eddb 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -25,7 +25,7 @@
#include <avmedia/mediawindow.hxx>
#include <vcl/canvastools.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewContactOfSdrMediaObj::ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ) :
ViewContactOfSdrObj( rMediaObj )
@@ -125,6 +125,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrMediaObj::create
return drawinglayer::primitive2d::Primitive2DContainer { xRetval };
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 91e09e73e7c0..cf5bd082f74e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -35,7 +35,7 @@
#include <svx/sdrpaintwindow.hxx>
#include <svx/svdhdl.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
@@ -194,6 +194,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrObj::embedToObje
return aSource;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 8630b6dd1923..0443be3193c1 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -33,9 +33,7 @@
#include <sal/log.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfSdrObjCustomShape::ViewContactOfSdrObjCustomShape(SdrObjCustomShape& rCustomShape)
: ViewContactOfTextObj(rCustomShape)
@@ -251,7 +249,6 @@ namespace sdr
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index a492585bebc1..04191602e075 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -38,7 +38,7 @@
#include <svx/charthelper.hxx>
#include <svtools/embedhlp.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
@@ -208,6 +208,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrOle2Obj::createV
return createPrimitive2DSequenceWithParameters();
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index e446851fee08..defe3962e222 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -41,7 +41,7 @@
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <bitmaps.hlst>
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewContactOfPageSubObject::ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage)
: mrParentViewContactOfSdrPage(rParentViewContactOfSdrPage)
@@ -620,6 +620,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrPage::createView
return xRetval;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 393676f9b4c7..6879f226fd3e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -30,9 +30,7 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <vcl/canvastools.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewContactOfSdrPathObj::ViewContactOfSdrPathObj(SdrPathObj& rPathObj)
: ViewContactOfTextObj(rPathObj)
@@ -202,7 +200,6 @@ namespace sdr
return drawinglayer::primitive2d::Primitive2DContainer { xReference };
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index 91a64b02ae84..75c3c097d7e3 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -28,7 +28,7 @@
#include <vcl/canvastools.hxx>
#include <svx/sdmetitm.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewContactOfSdrRectObj::ViewContactOfSdrRectObj(SdrRectObj& rRectObj)
: ViewContactOfTextObj(rRectObj)
@@ -84,6 +84,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrRectObj::createV
return drawinglayer::primitive2d::Primitive2DContainer{ xReference };
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx
index 89c503987ee0..265b594b9a03 100644
--- a/svx/source/sdr/contact/viewcontactoftextobj.cxx
+++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx
@@ -20,7 +20,7 @@
#include <svx/sdr/contact/viewcontactoftextobj.hxx>
#include <svx/svdotext.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewContactOfTextObj::ViewContactOfTextObj(SdrTextObj& rTextObj)
: ViewContactOfSdrObj(rTextObj)
@@ -31,6 +31,6 @@ ViewContactOfTextObj::~ViewContactOfTextObj()
{
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 2c34c56a7c07..31838118f3b1 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -37,7 +37,7 @@
#include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
using ::com::sun::star::awt::XControl;
@@ -130,7 +130,7 @@ namespace sdr { namespace contact {
}
-} } // namespace sdr::contact
+} // namespace sdr::contact
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
index 4efb3d65797d..2726f122b93b 100644
--- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
@@ -25,7 +25,7 @@
#include <vcl/outdev.hxx>
#include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewContactOfVirtObj::ViewContactOfVirtObj(SdrVirtObj& rObj)
: ViewContactOfSdrObj(rObj)
@@ -96,7 +96,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfVirtObj::createView
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 9d52001d9bde..4a7adf2c61b0 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -150,7 +150,7 @@ void AnimatedExtractingProcessor2D::processBasePrimitive2D(const drawinglayer::p
} // end of anonymous namespace
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewObjectContact::ViewObjectContact(ObjectContact& rObjectContact, ViewContact& rViewContact)
: mrObjectContact(rObjectContact),
@@ -478,6 +478,6 @@ void ViewObjectContact::resetGridOffset()
mxPrimitive2DSequence.clear();
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
index 38d092c311ee..64ba2bbd0631 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
@@ -25,9 +25,7 @@
#include <drawinglayer/primitive2d/embedded3dprimitive2d.hxx>
#include <svx/sdr/contact/viewcontactofe3dscene.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewObjectContactOfE3d::ViewObjectContactOfE3d(ObjectContact& rObjectContact, ViewContact& rViewContact)
: ViewObjectContactOfSdrObj(rObjectContact, rViewContact)
@@ -85,7 +83,6 @@ namespace sdr
// return current Primitive2DContainer
return mxPrimitive3DContainer;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
index a46f0216a9cd..72a8043e70bc 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
@@ -52,9 +52,7 @@ namespace
} // end of anonymous namespace
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewObjectContactOfE3dScene::ViewObjectContactOfE3dScene(ObjectContact& rObjectContact, ViewContact& rViewContact)
: ViewObjectContactOfSdrObj(rObjectContact, rViewContact)
@@ -137,7 +135,6 @@ namespace sdr
// call parent
return ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo);
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 30440f6127fc..800c92042002 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -24,9 +24,7 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfGraphic::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
{
@@ -61,7 +59,6 @@ namespace sdr
ViewObjectContactOfGraphic::~ViewObjectContactOfGraphic()
{
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 0aa5178fd70e..5f3ad6ee594d 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
@@ -32,9 +32,7 @@
using namespace com::sun::star;
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewObjectContactOfGroup::ViewObjectContactOfGroup(ObjectContact& rObjectContact, ViewContact& rViewContact)
: ViewObjectContactOfSdrObj(rObjectContact, rViewContact)
@@ -106,7 +104,6 @@ namespace sdr
aObjectLayers &= aLayers;
return !aObjectLayers.IsEmpty();
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
index 712c23498e7f..38e598d8b41b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
@@ -30,9 +30,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
-namespace sdr
-{
- namespace contact
+namespace sdr::contact
{
ViewObjectContactOfMasterPageDescriptor::ViewObjectContactOfMasterPageDescriptor(ObjectContact& rObjectContact, ViewContact& rViewContact)
: ViewObjectContact(rObjectContact, rViewContact)
@@ -130,7 +128,6 @@ namespace sdr
// return grouped primitive
return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index ef2247a746e0..5da45eabed5c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -36,7 +36,7 @@
using namespace com::sun::star;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class PagePrimitiveExtractor : public ObjectContactOfPagePainter, public Idle
{
@@ -314,6 +314,6 @@ ViewObjectContactOfPageObj::~ViewObjectContactOfPageObj()
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 23684f55901c..0326256de89a 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -30,7 +30,7 @@
#include <avmedia/mediaitem.hxx>
#include "sdrmediawindow.hxx"
-namespace sdr { namespace contact {
+namespace sdr::contact {
ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& rObjectContact,
ViewContact& rViewContact,
@@ -138,6 +138,6 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte
}
-}} // end of namespace sdr::contact
+} // end of namespace sdr::contact
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index d21fddcb14b6..6fc561a67d3c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -35,7 +35,7 @@
#include <fmobj.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
const SdrObject& ViewObjectContactOfSdrObj::getSdrObject() const
{
@@ -189,6 +189,6 @@ const OutputDevice* ViewObjectContactOfSdrObj::getPageViewOutputDevice() const
return nullptr;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index 134643b55e41..37c162229566 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -35,7 +35,7 @@
using namespace com::sun::star;
-namespace sdr { namespace contact {
+namespace sdr::contact {
drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence(
const DisplayInfo& /*rDisplayInfo*/) const
@@ -145,6 +145,6 @@ ViewObjectContactOfSdrOle2Obj::~ViewObjectContactOfSdrOle2Obj()
{
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 5ef073a414b6..1e6102f114dc 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -35,7 +35,7 @@
using namespace com::sun::star;
-namespace sdr { namespace contact {
+namespace sdr::contact {
const SdrPage& ViewObjectContactOfPageSubObject::getPage() const
{
@@ -628,6 +628,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfSdrPage::getP
return xRetval;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index f4703d348adb..54c5f857fedf 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -98,7 +98,7 @@ form control artifacts when scrolling a text fast
*/
-namespace sdr { namespace contact {
+namespace sdr::contact {
using namespace ::com::sun::star::awt::InvalidateStyle;
@@ -1783,7 +1783,7 @@ namespace sdr { namespace contact {
}
-} } // namespace sdr::contact
+} // namespace sdr::contact
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
index 53265cf3b252..ad37059f4561 100644
--- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
@@ -21,7 +21,7 @@
#include <svx/sdr/contact/viewobjectcontact.hxx>
#include <svx/sdr/contact/viewcontact.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
// basic constructor.
ViewObjectContactRedirector::ViewObjectContactRedirector()
@@ -40,6 +40,6 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactRedirector::cre
return rOriginal.createPrimitive2DSequence(rDisplayInfo);
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index f8fcdb10ac3f..b45b5a12c42f 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -22,11 +22,4 @@
#include <algorithm>
#include <tools/debug.hxx>
-namespace sdr
-{
- namespace event
- {
- } // end of namespace mixer
-} // end of namespace sdr
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index e358b1b01216..3bd86110785a 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -24,9 +24,7 @@
#include <sdr/overlay/overlaytools.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayAnimatedBitmapEx::createOverlayObjectPrimitive2DSequence()
{
@@ -111,7 +109,6 @@ namespace sdr
objectChange();
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index 647522204a03..675aa0a242aa 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -24,9 +24,7 @@
#include <sdr/overlay/overlaytools.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayBitmapEx::createOverlayObjectPrimitive2DSequence()
{
@@ -70,7 +68,6 @@ namespace sdr
OverlayBitmapEx::~OverlayBitmapEx()
{
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx
index edeb97c67ec2..f2d8ac1414ab 100644
--- a/svx/source/sdr/overlay/overlaycrosshair.cxx
+++ b/svx/source/sdr/overlay/overlaycrosshair.cxx
@@ -23,9 +23,7 @@
#include <svx/sdr/overlay/overlaymanager.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayCrosshairStriped::createOverlayObjectPrimitive2DSequence()
{
@@ -64,7 +62,6 @@ namespace sdr
OverlayCrosshairStriped::~OverlayCrosshairStriped()
{
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayhandle.cxx b/svx/source/sdr/overlay/overlayhandle.cxx
index 450a11d9c1bb..f2aaa111205e 100644
--- a/svx/source/sdr/overlay/overlayhandle.cxx
+++ b/svx/source/sdr/overlay/overlayhandle.cxx
@@ -28,7 +28,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-namespace sdr { namespace overlay {
+namespace sdr::overlay {
using namespace drawinglayer;
using namespace basegfx;
@@ -58,6 +58,6 @@ OverlayHandle::~OverlayHandle()
{
}
-}} // end of namespace sdr::overlay
+} // end of namespace sdr::overlay
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx
index a6f644ba6220..b009b3882f3a 100644
--- a/svx/source/sdr/overlay/overlayhelpline.cxx
+++ b/svx/source/sdr/overlay/overlayhelpline.cxx
@@ -24,9 +24,7 @@
#include <svx/sdr/overlay/overlaymanager.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayHelplineStriped::createOverlayObjectPrimitive2DSequence()
{
@@ -73,7 +71,6 @@ namespace sdr
OverlayHelplineStriped::~OverlayHelplineStriped()
{
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx
index de5cf042ba1e..7c3e6b1c60a7 100644
--- a/svx/source/sdr/overlay/overlayline.cxx
+++ b/svx/source/sdr/overlay/overlayline.cxx
@@ -27,9 +27,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayLineStriped::createOverlayObjectPrimitive2DSequence()
{
@@ -75,7 +73,6 @@ namespace sdr
OverlayLineStriped::~OverlayLineStriped()
{
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 26671f8fb1e2..8ab62835fd97 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -34,9 +34,7 @@
using namespace com::sun::star;
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
void OverlayManager::ImpDrawMembers(const basegfx::B2DRange& rRange, OutputDevice& rDestinationDevice) const
{
@@ -347,7 +345,6 @@ namespace sdr
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 6aa571b3486d..9025147d161f 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -30,9 +30,7 @@
#include <vcl/dibtools.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
void OverlayManagerBuffered::ImpPrepareBufferDevice()
{
@@ -441,7 +439,6 @@ namespace sdr
}
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index d480007d4852..6ad51df18b50 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -30,9 +30,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
void OverlayObject::objectChange()
{
@@ -208,13 +206,10 @@ namespace sdr
{
// default does not need to do anything
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
OverlayObjectWithBasePosition::OverlayObjectWithBasePosition(const basegfx::B2DPoint& rBasePos, Color aBaseColor)
: OverlayObject(aBaseColor),
@@ -237,7 +232,6 @@ namespace sdr
objectChange();
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx
index 2508c19dbd81..14187d74b793 100644
--- a/svx/source/sdr/overlay/overlayobjectcell.cxx
+++ b/svx/source/sdr/overlay/overlayobjectcell.cxx
@@ -30,9 +30,7 @@
using namespace ::basegfx;
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
OverlayObjectCell::OverlayObjectCell( const Color& rColor, const RangeVector& rRects )
: OverlayObject( rColor ),
@@ -80,7 +78,6 @@ namespace sdr
return aRetval;
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 182acf22e38b..3d89d04524f3 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -30,9 +30,7 @@
#define DEFAULT_VALUE_FOR_HITTEST_PIXEL (2)
#define DEFAULT_VALUE_FOR_HITTEST_TWIP (30)
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
OverlayObjectList::~OverlayObjectList()
{
@@ -142,7 +140,6 @@ namespace sdr
return aRetval;
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx
index dda687298a31..cc109ab9496c 100644
--- a/svx/source/sdr/overlay/overlaypolypolygon.cxx
+++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx
@@ -25,9 +25,7 @@
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayPolyPolygonStripedAndFilled::createOverlayObjectPrimitive2DSequence()
{
@@ -81,7 +79,6 @@ namespace sdr
OverlayPolyPolygonStripedAndFilled::~OverlayPolyPolygonStripedAndFilled()
{
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
index 16a3429fb003..87e599566f54 100644
--- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
+++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
@@ -23,9 +23,7 @@
#include <svx/sdr/overlay/overlaymanager.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayPrimitive2DSequenceObject::createOverlayObjectPrimitive2DSequence()
{
@@ -41,7 +39,6 @@ namespace sdr
OverlayPrimitive2DSequenceObject::~OverlayPrimitive2DSequenceObject()
{
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx
index 8b117072f054..39977a620eb6 100644
--- a/svx/source/sdr/overlay/overlayrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrectangle.cxx
@@ -29,9 +29,7 @@
#include <vcl/settings.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayRectangle::createOverlayObjectPrimitive2DSequence()
{
@@ -114,8 +112,7 @@ namespace sdr
objectChange();
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index a0022b08fed0..6ac840e1e539 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -27,9 +27,7 @@
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayRollingRectangleStriped::createOverlayObjectPrimitive2DSequence()
{
@@ -116,7 +114,6 @@ namespace sdr
objectChange();
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index 14f49046893e..2afd382c00f0 100644
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
@@ -31,9 +31,7 @@
#include <svx/sdr/overlay/overlaymanager.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
// combine rages geometrically to a single, ORed polygon
static basegfx::B2DPolyPolygon impCombineRangesToPolyPolygon(const std::vector< basegfx::B2DRange >& rRanges)
@@ -219,7 +217,6 @@ namespace sdr
objectChange();
}
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx
index a511bd045276..a44feb9bc2be 100644
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@@ -33,9 +33,7 @@
#include <vcl/settings.hxx>
-namespace drawinglayer
-{
-namespace primitive2d
+namespace drawinglayer::primitive2d
{
OverlayStaticRectanglePrimitive::OverlayStaticRectanglePrimitive(
@@ -121,11 +119,9 @@ bool OverlayStaticRectanglePrimitive::operator==(const BasePrimitive2D& rPrimiti
ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE)
-}} // end of namespace drawinglayer::primitive2d
+} // end of namespace drawinglayer::primitive2d
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
OverlayBitmapExPrimitive::OverlayBitmapExPrimitive(
const BitmapEx& rBitmapEx,
@@ -205,13 +201,10 @@ namespace drawinglayer
ImplPrimitive2DIDBlock(OverlayBitmapExPrimitive, PRIMITIVE2D_ID_OVERLAYBITMAPEXPRIMITIVE)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
OverlayCrosshairPrimitive::OverlayCrosshairPrimitive(
const basegfx::B2DPoint& rBasePosition,
@@ -273,13 +266,10 @@ namespace drawinglayer
ImplPrimitive2DIDBlock(OverlayCrosshairPrimitive, PRIMITIVE2D_ID_OVERLAYCROSSHAIRPRIMITIVE)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
OverlayRectanglePrimitive::OverlayRectanglePrimitive(
const basegfx::B2DRange& rObjectRange,
@@ -406,13 +396,10 @@ namespace drawinglayer
ImplPrimitive2DIDBlock(OverlayRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
OverlayHelplineStripedPrimitive::OverlayHelplineStripedPrimitive(
const basegfx::B2DPoint& rBasePosition,
@@ -517,13 +504,10 @@ namespace drawinglayer
ImplPrimitive2DIDBlock(OverlayHelplineStripedPrimitive, PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
OverlayRollingRectanglePrimitive::OverlayRollingRectanglePrimitive(
const basegfx::B2DRange& aRollingRectangle,
@@ -608,7 +592,6 @@ namespace drawinglayer
ImplPrimitive2DIDBlock(OverlayRollingRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index 0938b50aa184..50536b139818 100644
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
@@ -28,9 +28,7 @@
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-namespace sdr
-{
- namespace overlay
+namespace sdr::overlay
{
drawinglayer::primitive2d::Primitive2DContainer OverlayTriangle::createOverlayObjectPrimitive2DSequence()
{
@@ -64,7 +62,6 @@ namespace sdr
{
}
- } // end of namespace overlay
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index cb9c2f50c909..48aad6c480e4 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -216,9 +216,7 @@ namespace drawinglayer
} // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
attribute::SdrLineAttribute createNewSdrLineAttribute(const SfxItemSet& rSet)
{
@@ -1092,7 +1090,6 @@ namespace drawinglayer
return attribute::SdrFillTextAttribute();
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 6b9d6d50fb41..f9959c17c1fb 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
@@ -29,9 +29,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrCaptionPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -164,7 +162,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrCaptionPrimitive2D, PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index 88f64cf92bb2..5a3e8ed40a72 100644
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
@@ -29,9 +29,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrConnectorPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -103,7 +101,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrConnectorPrimitive2D, PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index fb3018f7ff88..a9281abfa02e 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -30,9 +30,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrCustomShapePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -109,7 +107,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrCustomShapePrimitive2D, PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 6787e0d5a322..adcecf39fa56 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -49,9 +49,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
class TransparencePrimitive2D;
@@ -518,7 +516,6 @@ namespace drawinglayer
return rContent;
}
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index 21c41439a90d..d09c03dff575 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -32,9 +32,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrEllipsePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -137,13 +135,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrEllipsePrimitive2D, PRIMITIVE2D_ID_SDRELLIPSEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrEllipseSegmentPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -266,7 +261,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrEllipseSegmentPrimitive2D, PRIMITIVE2D_ID_SDRELLIPSESEGMENTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
index 903a75ea2fe0..6bee840ace8f 100644
--- a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
@@ -642,9 +642,7 @@ namespace
}
}
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
SdrFrameBorderData::SdrConnectStyleData::SdrConnectStyleData(
const svx::frame::Style& rStyle,
@@ -748,12 +746,9 @@ namespace drawinglayer
return fRetval;
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrFrameBorderPrimitive2D::create2DDecomposition(
Primitive2DContainer& rContainer,
@@ -925,7 +920,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrFrameBorderPrimitive2D, PRIMITIVE2D_ID_SDRFRAMEBORDERTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index fa8c554fa0be..837df2f3bc13 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -28,9 +28,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrGrafPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -167,7 +165,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrGrafPrimitive2D, PRIMITIVE2D_ID_SDRGRAFPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index f9bcc0290bc4..2768161d7c75 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -34,9 +34,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
Primitive2DReference SdrMeasurePrimitive2D::impCreatePart(
const attribute::SdrLineAttribute& rLineAttribute,
@@ -495,7 +493,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrMeasurePrimitive2D, PRIMITIVE2D_ID_SDRMEASUREPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 68c264dd039e..2aa33542338a 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -29,9 +29,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
SdrOle2Primitive2D::SdrOle2Primitive2D(
const Primitive2DContainer& rOLEContent,
@@ -171,7 +169,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrOle2Primitive2D, PRIMITIVE2D_ID_SDROLE2PRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index a22b9172dbfb..9e6b2bbeeb6f 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -29,9 +29,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrOleContentPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -174,7 +172,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrOleContentPrimitive2D, PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index 804cccf67e80..5554b6db495a 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
@@ -28,9 +28,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrPathPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -153,7 +151,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrPathPrimitive2D, PRIMITIVE2D_ID_SDRPATHPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index e71fe38fd6dc..722b15f3a3e4 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -25,9 +25,7 @@
// helper methods
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor)
{
@@ -61,7 +59,6 @@ namespace drawinglayer
return aRetVal.get() ? *aRetVal.get() : BitmapEx();
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index b8acf2355687..46dfd599dcb9 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
@@ -30,9 +30,7 @@
using namespace com::sun::star;
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrRectanglePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const
{
@@ -148,7 +146,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrRectanglePrimitive2D, PRIMITIVE2D_ID_SDRRECTANGLEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 00a5aa89c17c..fe8e701d3d12 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -83,9 +83,7 @@ namespace
} // end of anonymous namespace
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
// support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments
// for slideshow. This uses TextHierarchyBlockPrimitive2D to mark a text block.
@@ -238,13 +236,10 @@ namespace drawinglayer
// call parent
BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor, rViewInformation);
}
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrContourTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const
{
@@ -290,13 +285,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrContourTextPrimitive2D, PRIMITIVE2D_ID_SDRCONTOURTEXTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrPathTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const
{
@@ -345,13 +337,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrPathTextPrimitive2D, PRIMITIVE2D_ID_SDRPATHTEXTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrBlockTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const
{
@@ -421,13 +410,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrBlockTextPrimitive2D, PRIMITIVE2D_ID_SDRBLOCKTEXTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
void SdrAutoFitTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const
{
@@ -469,12 +455,9 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrAutoFitTextPrimitive2D, PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D)
- } // end of namespace primitive2d
- } // end of namespace drawinglayer
+ } // end of namespace drawinglayer
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
SdrChainedTextPrimitive2D::SdrChainedTextPrimitive2D(
@@ -512,13 +495,10 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrChainedTextPrimitive2D, PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
- namespace drawinglayer
- {
- namespace primitive2d
+ namespace drawinglayer::primitive2d
{
void SdrStretchTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const
{
@@ -564,7 +544,6 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(SdrStretchTextPrimitive2D, PRIMITIVE2D_ID_SDRSTRETCHTEXTPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+ } // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
index 5fe17f59dbad..416a27830148 100644
--- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
+++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
@@ -29,9 +29,7 @@
#include <drawinglayer/attribute/sdrobjectattribute3d.hxx>
-namespace drawinglayer
-{
- namespace primitive2d
+namespace drawinglayer::primitive2d
{
attribute::Sdr3DObjectAttribute* createNewSdr3DObjectAttribute(const SfxItemSet& rSet)
{
@@ -142,7 +140,6 @@ namespace drawinglayer
aTextureKind, aTextureMode, aMaterial,
bInvertNormals, bDoubleSided, bShadow3D, bTextureFilter, bReducedLineGeometry);
}
- } // end of namespace primitive2d
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 7e9d500d8719..7e53de8a8850 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -44,9 +44,7 @@
#include <svx/svdtrans.hxx>
#include <svx/svdpage.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
void AttributeProperties::ImpSetParentAtSfxItemSet(bool bDontRemoveHardAttr)
{
@@ -530,7 +528,6 @@ namespace sdr
}
return false;
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 431f9a39bd16..012a9008dd1c 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -27,9 +27,7 @@
#include <svx/svdocapt.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> CaptionProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -96,7 +94,6 @@ namespace sdr
// reset to default
mpItemSet->ClearItem(XATTR_LINESTYLE);
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 0ce76a2371f9..acd076cd4d9e 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -29,9 +29,7 @@
#include <svx/sxciaitm.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> CircleProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -120,7 +118,6 @@ namespace sdr
// SdrCircKindItem
RectangleProperties::ForceDefaultAttributes();
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index 12629b001482..fcc0a59f32b3 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -27,9 +27,7 @@
#include <svx/svdoedge.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> ConnectorProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -84,7 +82,6 @@ namespace sdr
SdrEdgeObj& rObj = static_cast<SdrEdgeObj&>(GetSdrObject());
rObj.ImpSetAttrToEdgeInfo();
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 9252cee5f581..3c3ea1d58b38 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -29,9 +29,7 @@
#include <svl/hint.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
void CustomShapeProperties::UpdateTextFrameStatus(bool bInvalidateRenderGeometry)
{
@@ -225,7 +223,6 @@ namespace sdr
// update bTextFrame and RenderGeometry
UpdateTextFrameStatus(bRemoveRenderGeometry);
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index f9461f796b53..f90a1d064286 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -33,9 +33,7 @@
#include <svx/svdmodel.hxx>
#include <svx/svdtrans.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
std::unique_ptr<SfxItemSet> DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
@@ -237,7 +235,6 @@ namespace sdr
mpItemSet->dumpAsXml(pWriter);
xmlTextWriterEndElement(pWriter);
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index a7e4395665b7..5a3443bc8079 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -23,9 +23,7 @@
#include <svx/scene3d.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
E3dCompoundProperties::E3dCompoundProperties(SdrObject& rObj)
: E3dProperties(rObj)
@@ -141,7 +139,6 @@ namespace sdr
}
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx
index 9755e2d623a1..552060005bac 100644
--- a/svx/source/sdr/properties/e3dextrudeproperties.cxx
+++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx
@@ -22,9 +22,7 @@
#include <svx/extrud3d.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
E3dExtrudeProperties::E3dExtrudeProperties(SdrObject& rObj)
: E3dCompoundProperties(rObj)
@@ -72,7 +70,6 @@ namespace sdr
}
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx
index a12270f07dd6..6b99ddcfddcb 100644
--- a/svx/source/sdr/properties/e3dlatheproperties.cxx
+++ b/svx/source/sdr/properties/e3dlatheproperties.cxx
@@ -22,9 +22,7 @@
#include <svx/lathe3d.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
E3dLatheProperties::E3dLatheProperties(SdrObject& rObj)
: E3dCompoundProperties(rObj)
@@ -82,7 +80,6 @@ namespace sdr
}
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index 21737a40b58f..3bdf1c7c8168 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -25,9 +25,7 @@
#include <svx/obj3d.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> E3dProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -72,7 +70,6 @@ namespace sdr
// local changes
rObj.StructureChanged();
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 065bd5bba5de..e37b8f6925eb 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -26,9 +26,7 @@
#include <memory>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
E3dSceneProperties::E3dSceneProperties(SdrObject& rObj)
: E3dProperties(rObj)
@@ -290,7 +288,6 @@ namespace sdr
// FocalLength
mpItemSet->Put(makeSvx3DFocalLengthItem(static_cast<sal_uInt32>((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx
index 0fefba58697c..d10b35ea5251 100644
--- a/svx/source/sdr/properties/e3dsphereproperties.cxx
+++ b/svx/source/sdr/properties/e3dsphereproperties.cxx
@@ -22,9 +22,7 @@
#include <svx/sphere3d.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
E3dSphereProperties::E3dSphereProperties(SdrObject& rObj)
: E3dCompoundProperties(rObj)
@@ -67,7 +65,6 @@ namespace sdr
}
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index 8c32d6c97dcf..bf9760f26f59 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -27,9 +27,7 @@
#include <vcl/outdev.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> EmptyProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -118,7 +116,6 @@ namespace sdr
assert(!"EmptyProperties::GetStyleSheet() should never be called");
return nullptr;
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index a558a83428b6..114b707793c6 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -36,9 +36,7 @@
#include <svx/xfillit0.hxx>
#include <svx/xlineit0.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
void GraphicProperties::applyDefaultStyleSheetFromSdrModel()
{
@@ -143,7 +141,6 @@ namespace sdr
mpItemSet->Put( SdrGrafModeItem( GraphicDrawMode::Standard ) );
mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index b5be536ede5b..560adc8c4d2f 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -29,9 +29,7 @@
#include <svx/svdpage.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> GroupProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -262,7 +260,6 @@ namespace sdr
pSub->GetObj(a)->GetProperties().ForceStyleToHardAttributes();
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index a47e22dcd091..a691212f4aab 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -28,9 +28,7 @@
// class to remember broadcast start positions
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
ItemChangeBroadcaster::ItemChangeBroadcaster(const SdrObject& rObj)
{
@@ -54,13 +52,10 @@ namespace sdr
maRectangles.push_back(rObj.GetLastBoundRect());
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
void ScaleItemSet(SfxItemSet& rSet, const Fraction& rScale)
{
@@ -90,7 +85,6 @@ namespace sdr
nWhich = aIter.NextWhich();
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 845a744249ee..f0ac9df3112c 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -35,9 +35,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> MeasureProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -125,7 +123,6 @@ namespace sdr
mpItemSet->Put(XLineEndWidthItem(200));
mpItemSet->Put(XLineStyleItem(css::drawing::LineStyle_SOLID));
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx
index a2a8773987ea..a8f05a3b7c5a 100644
--- a/svx/source/sdr/properties/oleproperties.cxx
+++ b/svx/source/sdr/properties/oleproperties.cxx
@@ -24,9 +24,7 @@
#include <svx/svdobj.hxx>
#include <svx/svdmodel.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
void OleProperties::applyDefaultStyleSheetFromSdrModel()
{
@@ -71,7 +69,6 @@ namespace sdr
// force ItemSet
GetObjectItemSet();
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 7f5e92e4b377..7b21f30bf1be 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -28,9 +28,7 @@
#include <tools/debug.hxx>
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
// create a new itemset
std::unique_ptr<SfxItemSet> PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
@@ -98,7 +96,6 @@ namespace sdr
{
// simply ignore item clearing on page objects
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index c76ecba49c8a..cb8c5c22e15d 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -31,9 +31,7 @@
using namespace com::sun::star;
-namespace sdr
-{
- namespace properties
+namespace sdr::properties
{
BaseProperties::BaseProperties(SdrObject& rObj)
: mrObject(rObj)
@@ -190,7 +188,6 @@ namespace sdr
}
}
- } // end of namespace properties
-} // end of namespace sdr
+ } // end of namespace sdr
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx
index cff115198b62..66a5b4c9a548 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list