[Libreoffice-commits] core.git: 2 commits - svtools/inc svtools/source svx/inc svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun May 10 05:54:34 UTC 2020
svtools/inc/table/defaultinputhandler.hxx | 4 ++--
svtools/inc/table/gridtablerenderer.hxx | 4 ++--
svtools/inc/table/tablecontrol.hxx | 4 ++--
svtools/inc/table/tablecontrolinterface.hxx | 4 ++--
svtools/inc/table/tableinputhandler.hxx | 4 ++--
svtools/inc/table/tablemodel.hxx | 6 +++---
svtools/inc/table/tablerenderer.hxx | 4 ++--
svtools/inc/table/tablesort.hxx | 4 ++--
svtools/inc/table/tabletypes.hxx | 4 ++--
svtools/source/inc/unoiface.hxx | 4 ++--
svtools/source/table/mousefunction.hxx | 4 ++--
svtools/source/table/tablecontrol_impl.hxx | 4 ++--
svtools/source/table/tabledatawindow.hxx | 4 ++--
svtools/source/table/tablegeometry.hxx | 4 ++--
svtools/source/uno/fpicker.hxx | 4 ++--
svtools/source/uno/svtxgridcontrol.hxx | 4 ++--
svtools/source/uno/unocontroltablemodel.hxx | 4 ++--
svtools/source/uno/unogridcolumnfacade.hxx | 4 ++--
svtools/source/uno/wizard/wizardpagecontroller.hxx | 4 ++--
svtools/source/uno/wizard/wizardshell.hxx | 4 ++--
svx/inc/AccessibleTableShape.hxx | 4 +---
svx/inc/GalleryControl.hxx | 4 ++--
svx/inc/dbcharsethelper.hxx | 4 +---
svx/inc/galbrws2.hxx | 2 +-
svx/inc/sdr/attribute/sdrformtextattribute.hxx | 4 ++--
svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx | 4 ++--
svx/inc/sdr/attribute/sdrtextattribute.hxx | 15 +++------------
svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx | 4 ++--
svx/inc/sdr/contact/viewcontactofe3d.hxx | 9 +++------
svx/inc/sdr/contact/viewcontactofgraphic.hxx | 2 +-
svx/inc/sdr/contact/viewcontactofpageobj.hxx | 4 ++--
svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx | 4 ++--
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 4 ++--
svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx | 4 ++--
svx/inc/sdr/contact/viewcontactoftextobj.hxx | 4 ++--
svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 8 ++++----
svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 4 ++--
svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx | 4 ++--
svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx | 4 ++--
svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 8 ++++----
svx/inc/sdr/overlay/overlayhandle.hxx | 4 ++--
svx/inc/sdr/overlay/overlaytools.hxx | 4 ++--
svx/inc/sdr/primitive2d/sdrattributecreator.hxx | 4 ++--
svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx | 4 ++--
svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx | 8 ++++----
svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx | 4 ++--
svx/source/gallery2/galbrws1.hxx | 2 +-
svx/source/inc/DefaultShapesPanel.hxx | 4 ++--
svx/source/inc/GraphCtlAccessibleContext.hxx | 5 ++---
svx/source/inc/ShapesUtil.hxx | 5 +++--
svx/source/inc/cell.hxx | 9 +++------
svx/source/inc/celltypes.hxx | 4 ++--
svx/source/inc/fmcontrolbordermanager.hxx | 4 +---
svx/source/inc/fmservs.hxx | 4 +---
svx/source/inc/fmvwimp.hxx | 4 ++--
svx/source/inc/sqlparserclient.hxx | 14 +++++++-------
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 4 ++--
svx/source/inc/svxrectctaccessiblecontext.hxx | 5 ++---
svx/source/inc/tablemodel.hxx | 4 ++--
svx/source/inc/xmlxtexp.hxx | 6 +++---
svx/source/inc/xmlxtimp.hxx | 5 ++---
svx/source/sdr/contact/sdrmediawindow.hxx | 4 ++--
svx/source/sidebar/EmptyPanel.hxx | 4 ++--
svx/source/sidebar/area/AreaPropertyPanel.hxx | 4 ++--
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 4 ++--
svx/source/sidebar/line/LineWidthValueSet.hxx | 4 ++--
svx/source/sidebar/media/MediaPlaybackPanel.hxx | 4 ++--
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 4 ++--
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 4 ++--
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 4 ++--
svx/source/sidebar/styles/StylesPropertyPanel.hxx | 4 ++--
svx/source/sidebar/text/TextPropertyPanel.hxx | 4 ++--
svx/source/table/cellcursor.hxx | 4 ++--
svx/source/table/cellrange.hxx | 4 ++--
svx/source/table/propertyset.hxx | 4 ++--
svx/source/table/tablecolumn.hxx | 4 ++--
svx/source/table/tablecolumns.hxx | 4 ++--
svx/source/table/tablehandles.hxx | 6 +++---
svx/source/table/tablelayouter.hxx | 4 ++--
svx/source/table/tablerow.hxx | 4 ++--
svx/source/table/tablerows.hxx | 4 ++--
svx/source/table/tableundo.hxx | 8 ++++----
svx/source/unodraw/gluepts.hxx | 4 +---
83 files changed, 178 insertions(+), 205 deletions(-)
New commits:
commit ccc73667e0e3bc5ca37a2837c543c944cf924f20
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat May 9 20:08:43 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun May 10 07:54:02 2020 +0200
compact namespace in svx
Change-Id: I9229775999aa70c2b37c0527ba1c332143f9f2cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93877
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 85e8ac8f5d73..45138030eec6 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
-namespace sdr { namespace table {
- class SvxTableController;
-} }
+namespace sdr::table { class SvxTableController; }
namespace accessibility
{
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 7a8d6d040c0f..5b40f4bc83be 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -31,7 +31,7 @@ class GalleryBrowser2;
class FmFormModel;
class Splitter;
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) GalleryControl final : public PanelLayout
@@ -50,7 +50,7 @@ private:
virtual void dispose() override;
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif
diff --git a/svx/inc/dbcharsethelper.hxx b/svx/inc/dbcharsethelper.hxx
index 218d2b85af87..207d89fb25d6 100644
--- a/svx/inc/dbcharsethelper.hxx
+++ b/svx/inc/dbcharsethelper.hxx
@@ -23,7 +23,7 @@
#include <vector>
-namespace svxform { namespace charset_helper
+namespace svxform::charset_helper
{
/** enumerates all supported charsets
@@ -32,7 +32,5 @@ namespace svxform { namespace charset_helper
sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 4c6ce49ed5f1..d77f4a785d21 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -65,7 +65,7 @@ class Menu;
class SgaObject;
struct DispatchInfo;
-namespace svx { namespace sidebar { class GalleryControl; } }
+namespace svx::sidebar { class GalleryControl; }
class GalleryBrowser2 : public SfxListener
{
diff --git a/svx/inc/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/sdr/attribute/sdrformtextattribute.hxx
index 9b7f7a72fbd4..06b0fd363741 100644
--- a/svx/inc/sdr/attribute/sdrformtextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrformtextattribute.hxx
@@ -28,10 +28,10 @@
class SfxItemSet;
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrFormTextAttribute;
class SdrFormTextOutlineAttribute;
-}}
+}
namespace drawinglayer
diff --git a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
index dee94cd72aca..826475ed98a8 100644
--- a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
@@ -25,11 +25,11 @@
// predefines
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrFormTextOutlineAttribute;
class LineAttribute;
class StrokeAttribute;
-}}
+}
namespace drawinglayer
diff --git a/svx/inc/sdr/attribute/sdrtextattribute.hxx b/svx/inc/sdr/attribute/sdrtextattribute.hxx
index d3fb22e140ed..5cb40ebb0714 100644
--- a/svx/inc/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrtextattribute.hxx
@@ -28,18 +28,9 @@
// predefines
class SdrText;
-
-namespace drawinglayer { namespace animation {
- class AnimationEntryList;
-}}
-
-namespace drawinglayer { namespace attribute {
- class SdrFormTextAttribute;
-}}
-
-namespace drawinglayer { namespace attribute {
- class ImpSdrTextAttribute;
-}}
+namespace drawinglayer::animation { class AnimationEntryList; }
+namespace drawinglayer::attribute { class SdrFormTextAttribute; }
+namespace drawinglayer::attribute { class ImpSdrTextAttribute; }
namespace drawinglayer
diff --git a/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx
index 772ec070294a..724855d8be3e 100644
--- a/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -28,7 +28,7 @@
class SdrPage;
class SdrObject;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) ObjectContactPainter : public ObjectContact
{
@@ -107,7 +107,7 @@ public:
virtual OutputDevice* TryToGetOutputDevice() const override;
};
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3d.hxx b/svx/inc/sdr/contact/viewcontactofe3d.hxx
index 7151071c5c59..982d28752984 100644
--- a/svx/inc/sdr/contact/viewcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3d.hxx
@@ -23,16 +23,13 @@
#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
-namespace drawinglayer { namespace attribute {
- class SdrLineAttribute;
-}}
-
+namespace drawinglayer::attribute { class SdrLineAttribute; }
namespace basegfx {
class BColor;
class B3DHomMatrix;
}
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewContactOfE3dScene;
@@ -89,7 +86,7 @@ public:
drawinglayer::primitive3d::Primitive3DContainer getViewIndependentPrimitive3DContainer() const;
};
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
index 4d16d91940f8..fa7447cec7f6 100644
--- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx
@@ -23,7 +23,7 @@
#include <sdr/contact/viewcontactoftextobj.hxx>
#include <svx/svdograf.hxx>
-namespace drawinglayer { namespace attribute { class SdrLineFillShadowTextAttribute; }}
+namespace drawinglayer::attribute { class SdrLineFillShadowTextAttribute; }
class GraphicAttr;
namespace sdr
diff --git a/svx/inc/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/sdr/contact/viewcontactofpageobj.hxx
index bfb2d8f1c908..e1cb66a8b42a 100644
--- a/svx/inc/sdr/contact/viewcontactofpageobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofpageobj.hxx
@@ -25,7 +25,7 @@
class SdrPage;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewContactOfPageObj final : public ViewContactOfSdrObj
{
@@ -50,7 +50,7 @@ public:
}
};
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
index cbab385fb3c7..7a79e3ee4f12 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -26,7 +26,7 @@
class Graphic;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewContactOfSdrOle2Obj final : public ViewContactOfSdrRectObj
{
@@ -69,7 +69,7 @@ private:
virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
};
-}}
+}
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index cec8c0cbb2f6..4168d1aa718a 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -25,7 +25,7 @@
class SdrPage;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewContactOfSdrPage;
@@ -198,7 +198,7 @@ protected:
virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
};
-}}
+}
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
diff --git a/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx
index 5fe37f7cbfad..b1de079e3177 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx
@@ -22,7 +22,7 @@
#include <sdr/contact/viewcontactoftextobj.hxx>
#include <svx/svdorect.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewContactOfSdrRectObj : public ViewContactOfTextObj
{
@@ -44,6 +44,6 @@ protected:
virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
};
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/sdr/contact/viewcontactoftextobj.hxx
index ca6a6b30fc8a..132744d0019e 100644
--- a/svx/inc/sdr/contact/viewcontactoftextobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactoftextobj.hxx
@@ -23,7 +23,7 @@
class SdrTextObj;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewContactOfTextObj : public ViewContactOfSdrObj
{
@@ -33,6 +33,6 @@ public:
virtual ~ViewContactOfTextObj() override;
};
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index 2c498ccd6241..824051543250 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -26,15 +26,15 @@
class OutputDevice;
namespace vcl { class Window; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt {
class XControl;
class XControlContainer;
}
-} } }
+}
-namespace sdr { namespace contact {
+namespace sdr::contact {
//= ViewContactOfUnoControl
@@ -71,7 +71,7 @@ namespace sdr { namespace contact {
};
-} } // namespace sdr::contact
+} // namespace sdr::contact
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
index aa8ba3b475fd..321bc4f8cabb 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
@@ -23,9 +23,9 @@
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewObjectContactOfE3dScene;
-}}
+}
namespace sdr
{
diff --git a/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx
index 64851fe8ec9d..c0f67e83ed53 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx
@@ -24,7 +24,7 @@
class SdrPage;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class PagePrimitiveExtractor;
@@ -44,7 +44,7 @@ public:
virtual ~ViewObjectContactOfPageObj() override;
};
-}}
+}
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index c88d8b98bf16..4d227a9c20e5 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx
@@ -24,7 +24,7 @@
class SdrOle2Obj;
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewObjectContactOfSdrOle2Obj final : public ViewObjectContactOfSdrObj
{
@@ -36,7 +36,7 @@ public:
virtual ~ViewObjectContactOfSdrOle2Obj() override;
};
-}}
+}
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index da4f0e0741fb..2c708ec733c7 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -28,15 +28,15 @@
class OutputDevice;
namespace vcl { class Window; }
class SdrUnoObj;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt {
class XControl;
class XControlContainer;
}
-} } }
+}
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewContactOfUnoControl;
@@ -117,7 +117,7 @@ namespace sdr { namespace contact {
};
-} } // namespace sdr::contact
+} // namespace sdr::contact
#endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
diff --git a/svx/inc/sdr/overlay/overlayhandle.hxx b/svx/inc/sdr/overlay/overlayhandle.hxx
index fea09902bbc9..882fb702cbc0 100644
--- a/svx/inc/sdr/overlay/overlayhandle.hxx
+++ b/svx/inc/sdr/overlay/overlayhandle.hxx
@@ -14,7 +14,7 @@
#include <svx/sdr/overlay/overlayobject.hxx>
#include <basegfx/vector/b2dsize.hxx>
-namespace sdr { namespace overlay {
+namespace sdr::overlay {
class OverlayHandle final : public OverlayObjectWithBasePosition
@@ -34,7 +34,7 @@ public:
virtual ~OverlayHandle() override;
};
-}} // end of namespace sdr::overlay
+} // end of namespace sdr::overlay
#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHANDLE_HXX
diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx
index 8649e866d7dd..c5df8fe09d10 100644
--- a/svx/inc/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/sdr/overlay/overlaytools.hxx
@@ -24,7 +24,7 @@
#include <vcl/bitmapex.hxx>
#include <basegfx/vector/b2dsize.hxx>
-namespace drawinglayer { namespace primitive2d {
+namespace drawinglayer::primitive2d {
class OverlayStaticRectanglePrimitive final : public DiscreteMetricDependentPrimitive2D
{
@@ -57,7 +57,7 @@ public:
virtual sal_uInt32 getPrimitive2DID() const override;
};
-}} // end of namespace drawinglayer::primitive2d
+} // end of namespace drawinglayer::primitive2d
// Overlay helper class which holds a BotmapEx which is to be visualized
// at the given logic position with the Bitmap's pixel size, unscaled and
diff --git a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
index da0242eed3a5..10d105fd1c45 100644
--- a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
@@ -27,7 +27,7 @@
class SfxItemSet;
class SdrText;
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class SdrLineAttribute;
class SdrLineStartEndAttribute;
class SdrShadowAttribute;
@@ -43,7 +43,7 @@ namespace drawinglayer { namespace attribute {
class SdrSceneAttribute;
class SdrLightingAttribute;
class SdrFillTextAttribute;
-}}
+}
namespace basegfx {
class B2DRange;
diff --git a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
index 574bd3e0bfa9..63af09222a6d 100644
--- a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -31,14 +31,14 @@ namespace basegfx {
class B2DHomMatrix;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class SdrFillAttribute;
class SdrLineAttribute;
class FillGradientAttribute;
class SdrShadowAttribute;
class SdrLineStartEndAttribute;
class SdrTextAttribute;
-}}
+}
namespace drawinglayer
diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index f4a3b5dc0290..34145b00eb17 100644
--- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -26,7 +26,7 @@
// predefines
-namespace drawinglayer { namespace primitive2d {
+namespace drawinglayer::primitive2d {
enum MeasureTextPosition
{
MEASURETEXTPOSITION_AUTOMATIC,
@@ -34,11 +34,11 @@ namespace drawinglayer { namespace primitive2d {
MEASURETEXTPOSITION_CENTERED,
MEASURETEXTPOSITION_POSITIVE
};
-}}
+}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class SdrLineAttribute;
-}}
+}
namespace drawinglayer
diff --git a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
index a96e2d5beced..89f8f5d12a00 100644
--- a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx
@@ -24,9 +24,9 @@
// predefines
class SfxItemSet;
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class Sdr3DObjectAttribute;
-}}
+}
namespace basegfx {
class B2DRange;
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 128ef5accb1a..91524f2022d3 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -34,7 +34,7 @@ class VclAbstractDialog;
struct ExchangeData;
class SfxItemSet;
-namespace svx { namespace sidebar { class GalleryControl; } }
+namespace svx::sidebar { class GalleryControl; }
class GalleryBrowser1 final : public SfxListener
{
diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx
index c60876ba8a0b..6067c05b5312 100644
--- a/svx/source/inc/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -29,7 +29,7 @@ using namespace css;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
/** This panel provides buttons for inserting shapes into a document.
*/
@@ -76,7 +76,7 @@ private:
DECL_LINK( ShapeSelectHdl, ValueSet*, void );
};
-} } // end of namespace sd::sidebar
+} // end of namespace sd::sidebar
#endif
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 9f76359398c5..f476f5e1409f 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -39,13 +39,12 @@
#include <svx/IAccessibleViewForwarder.hxx>
#include <svx/AccessibleShape.hxx>
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
struct Point;
struct Rectangle;
struct Size;
class XFocusListener;
-} } } }
-
+}
namespace tools { class Rectangle; }
class GraphCtrl;
class SdrObject;
diff --git a/svx/source/inc/ShapesUtil.hxx b/svx/source/inc/ShapesUtil.hxx
index 45b246cc1881..72d6e63dc731 100644
--- a/svx/source/inc/ShapesUtil.hxx
+++ b/svx/source/inc/ShapesUtil.hxx
@@ -21,7 +21,7 @@
#include <map>
#include <rtl/ustring.hxx>
-namespace svx{ namespace sidebar {
+namespace svx::sidebar {
class SvxShapeCommandsMap
{
@@ -32,7 +32,8 @@ public:
mpBlockArrowShapes, mpFlowchartShapes,
mpCalloutShapes, mpStarShapes, mp3DShapes;
};
-}}
+
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index 96381b7de3cf..0d68864f2339 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -36,13 +36,10 @@
class SfxItemSet;
class OutlinerParaObject;
class SdrObject;
+namespace sdr::properties { class TextProperties; }
-namespace sdr { namespace properties {
- class TextProperties;
-} }
-
-namespace sdr { namespace table {
+namespace sdr::table {
class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Cell : public SdrText,
@@ -217,7 +214,7 @@ private:
};
-} }
+}
#endif
diff --git a/svx/source/inc/celltypes.hxx b/svx/source/inc/celltypes.hxx
index 6296ac42d7da..7f8a9d87fc4c 100644
--- a/svx/source/inc/celltypes.hxx
+++ b/svx/source/inc/celltypes.hxx
@@ -23,7 +23,7 @@
#include <rtl/ref.hxx>
#include <vector>
-namespace sdr { namespace table {
+namespace sdr::table {
class Cell;
class TableModel;
@@ -90,7 +90,7 @@ private:
T maIter;
};
-} }
+}
#endif
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 5b12dbc4d50f..8c281112da8d 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -29,9 +29,7 @@
#include <set>
-namespace com { namespace sun { namespace star { namespace form { namespace validation {
- class XValidatableFormComponent;
-} } } } }
+namespace com::sun::star::form::validation { class XValidatableFormComponent; }
enum class ControlStatus {
NONE = 0x00,
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 8c2947e538c4..d575f86528a0 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -24,9 +24,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <svx/svxdllapi.h>
-namespace com { namespace sun { namespace star { namespace lang {
- class XMultiServiceFactory;
-} } } }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
#define FM_COMPONENT_EDIT "stardiv.one.form.component.Edit"
#define FM_COMPONENT_TEXTFIELD "stardiv.one.form.component.TextField"
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index f833279a42bb..e90fcd217386 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -57,7 +57,7 @@ class SdrUnoObj;
struct ImplSVEvent;
enum class SdrInventor : sal_uInt32;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt {
class XControl;
class XWindow;
@@ -68,7 +68,7 @@ namespace com { namespace sun { namespace star {
namespace util {
class XNumberFormats;
}
-}}}
+}
class FmXFormView;
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index a0fef7fa1d5e..a14ea367115f 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -27,14 +27,14 @@
#include <memory>
-namespace com { namespace sun { namespace star {
-namespace util {
- class XNumberFormatter;
+namespace com::sun::star {
+ namespace util {
+ class XNumberFormatter;
+ }
+ namespace beans {
+ class XPropertySet;
+ }
}
-namespace beans {
- class XPropertySet;
-} } } }
-
namespace connectivity {
class OSQLParser;
class OSQLParseNode;
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 7610c1407bba..cdc767348e9e 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -29,12 +29,12 @@
#include <tools/gen.hxx>
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
struct Point;
struct Rectangle;
struct Size;
class XFocusListener;
-} } } };
+}
class SvxPixelCtl;
class SvxPixelCtlAccessible;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 9ec7f00d48ac..291835b5eeec 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -33,13 +33,12 @@
#include <tools/gen.hxx>
#include <vector>
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
struct Point;
struct Rectangle;
struct Size;
class XFocusListener;
-} } } }
-
+}
namespace tools { class Rectangle; }
class SvxRectCtl;
class SvxRectCtlChildAccessibleContext;
diff --git a/svx/source/inc/tablemodel.hxx b/svx/source/inc/tablemodel.hxx
index d203bb9719df..c97b15be3e6c 100644
--- a/svx/source/inc/tablemodel.hxx
+++ b/svx/source/inc/tablemodel.hxx
@@ -30,7 +30,7 @@
struct _xmlTextWriter;
typedef struct _xmlTextWriter* xmlTextWriterPtr;
-namespace sdr { namespace table {
+namespace sdr::table {
class SdrTableObj;
@@ -202,7 +202,7 @@ private:
css::uno::Reference< css::util::XBroadcaster > mxBroadcaster;
};
-} }
+}
#endif
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index fe8cb0e98351..51435e5fbb80 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -22,14 +22,14 @@
#include <xmloff/xmlexp.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace frame { class XModel; }
namespace uno { template<class X> class Reference; }
namespace uno { class XInterface; }
namespace container { class XNameContainer; }
namespace document { class XGraphicStorageHandler; }
- namespace xml { namespace sax { class XDocumentHandler; } }
-} } }
+ namespace xml::sax { class XDocumentHandler; }
+}
class SvxXMLXTableExportComponent : public SvXMLExport
{
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index e52e8b0178f3..99d5b4135d9a 100644
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
@@ -22,13 +22,12 @@
#include <xmloff/xmlimp.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno { template<class X> class Reference; }
namespace uno { class XInterface; }
namespace document { class XGraphicStorageHandler; }
namespace container { class XNameContainer; }
-
-} } }
+}
class SvxXMLXTableImport : public SvXMLImport
{
diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index 4fc9d6e175b6..fb3cda6fcbc3 100644
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
@@ -22,7 +22,7 @@
#include <avmedia/mediawindow.hxx>
-namespace sdr { namespace contact {
+namespace sdr::contact {
class ViewObjectContactOfSdrMediaObj;
@@ -53,7 +53,7 @@ private:
ViewObjectContactOfSdrMediaObj& mrViewObjectContactOfSdrMediaObj;
};
-} }
+}
#endif // INCLUDED_SVX_SOURCE_SDR_CONTACT_SDRMEDIAWINDOW_HXX
diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx
index 91eee1209696..a2465fc9a7cc 100644
--- a/svx/source/sidebar/EmptyPanel.hxx
+++ b/svx/source/sidebar/EmptyPanel.hxx
@@ -21,7 +21,7 @@
#include <sfx2/sidebar/PanelLayout.hxx>
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
/** Display a panel that tells the user that the current deck is
@@ -38,7 +38,7 @@ private:
std::unique_ptr<weld::Label> mxMessageControl;
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index c22fbc7534f0..fb97c00b3691 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -36,7 +36,7 @@ class XFillColorItem;
class XFillHatchItem;
class XFillBitmapItem;
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class AreaTransparencyGradientControl;
@@ -85,7 +85,7 @@ private:
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index c9bb0d0597c4..bb724d4c4663 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -23,7 +23,7 @@
#include <sfx2/sidebar/PanelLayout.hxx>
#include <vcl/weld.hxx>
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class GraphicPropertyPanel
: public PanelLayout,
@@ -92,7 +92,7 @@ private:
void Initialize();
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif
diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx
index 91000ba5b794..225e706a6d6e 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.hxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.hxx
@@ -23,7 +23,7 @@
#include <vcl/image.hxx>
#include <array>
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class LineWidthValueSet final : public ValueSet
{
@@ -48,7 +48,7 @@ private:
bool bCusEnable;
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif // INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEWIDTHVALUESET_HXX
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx
index ed434b8da80e..69c6d08af6ef 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx
@@ -32,7 +32,7 @@ using namespace css;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
/** This panel provides media playback control in document
*/
@@ -79,7 +79,7 @@ private:
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 52c5176710e7..5ea5cc842242 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -33,7 +33,7 @@
class ToolbarUnoDispatcher;
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class ParaPropertyPanel
: public PanelLayout,
@@ -133,7 +133,7 @@ private:
void limitMetricWidths();
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 99213bac6dff..8abd1e0c86bb 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -38,7 +38,7 @@ namespace svx {
class DialControl;
};
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class PosSizePropertyPanel
: public PanelLayout,
@@ -189,7 +189,7 @@ private:
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif // INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index 5af32f088056..89260581d4e1 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -15,7 +15,7 @@
class ColorListBox;
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class ShadowPropertyPanel
: public PanelLayout,
@@ -84,7 +84,7 @@ private:
DECL_LINK(ModifyShadowDistanceHdl, weld::MetricSpinButton&, void);
DECL_LINK(ModifyShadowTransSliderHdl, weld::Scale&, void);
};
-}
+
}
#endif
diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx
index 51001aa12e77..058c594249aa 100644
--- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx
+++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx
@@ -4,7 +4,7 @@
#include <sfx2/sidebar/PanelLayout.hxx>
#include <sfx2/weldutils.hxx>
-namespace svx { namespace sidebar{
+namespace svx::sidebar{
class StylesPropertyPanel:
public PanelLayout
@@ -32,6 +32,6 @@ public:
const css::uno::Reference<css::frame::XFrame>& rxFrame);
};
-} } //end of namespace svx::sidebar
+} //end of namespace svx::sidebar
#endif
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 343822451e1f..baea3468f9de 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -24,7 +24,7 @@
#include <vcl/EnumContext.hxx>
#include <sfx2/sidebar/PanelLayout.hxx>
-namespace svx { namespace sidebar {
+namespace svx::sidebar {
class TextPropertyPanel
: public PanelLayout,
@@ -70,7 +70,7 @@ private:
vcl::EnumContext maContext;
};
-} } // end of namespace svx::sidebar
+} // end of namespace svx::sidebar
#endif
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index c5286623a2bf..e6756c926d4a 100644
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
@@ -26,7 +26,7 @@
#include "cellrange.hxx"
-namespace sdr { namespace table {
+namespace sdr::table {
struct CellPos;
@@ -64,7 +64,7 @@ private:
void split_vertical( sal_Int32 nRows );
};
-} }
+}
#endif
diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx
index 43ced6fc8756..b4802eff0fbd 100644
--- a/svx/source/table/cellrange.hxx
+++ b/svx/source/table/cellrange.hxx
@@ -26,7 +26,7 @@
#include <tablemodel.hxx>
-namespace sdr { namespace table {
+namespace sdr::table {
class CellRange : public ::cppu::WeakAggImplHelper1< css::table::XCellRange >, public ICellRange
{
@@ -54,7 +54,7 @@ protected:
sal_Int32 mnBottom;
};
-} }
+}
#endif
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index 539beff0775a..69500afe06c4 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -30,7 +30,7 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase3.hxx>
-namespace sdr { namespace table {
+namespace sdr::table {
typedef std::vector< css::beans::Property > PropertyVector;
typedef std::unordered_map< OUString, ::sal_uInt32 > PropertyMap;
@@ -89,7 +89,7 @@ private:
rtl::Reference< FastPropertySetInfo > mxInfo;
};
-}}
+}
#endif
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 2a1441379eac..0d1dbb802f9b 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -28,7 +28,7 @@
#include <celltypes.hxx>
-namespace sdr { namespace table {
+namespace sdr::table {
typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableColumnBase;
@@ -76,7 +76,7 @@ private:
OUString maName;
};
-} }
+}
#endif
diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx
index 8780adf84a36..696463aac2ef 100644
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
@@ -26,7 +26,7 @@
#include <celltypes.hxx>
-namespace sdr { namespace table {
+namespace sdr::table {
class TableColumns : public ::cppu::WeakAggImplHelper1< css::table::XTableColumns >
{
@@ -54,7 +54,7 @@ private:
TableModelRef mxTableModel;
};
-} }
+}
#endif
diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx
index 89cec32e239d..f7106c125136 100644
--- a/svx/source/table/tablehandles.hxx
+++ b/svx/source/table/tablehandles.hxx
@@ -23,7 +23,7 @@
#include <svx/svdhdl.hxx>
-namespace sdr { namespace table {
+namespace sdr::table {
enum TableEdgeState { Empty, Invisible, Visible };
@@ -83,8 +83,8 @@ private:
bool mbAnimate : 1;
};
-} // end of namespace table
-} // end of namespace sdr
+} // end of namespace sdr::table
+
#endif
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 7978f6913619..e40b7a5862e0 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -35,7 +35,7 @@ namespace editeng {
class SvxBorderLine;
}
-namespace sdr { namespace table {
+namespace sdr::table {
/** returns true if the cell(nMergedCol,nMergedRow) is merged with other cells.
the returned cell( rOriginCol, rOriginRow ) is the origin( top left cell ) of the merge.
@@ -164,7 +164,7 @@ private:
BorderLineMap maVerticalBorders;
};
-} }
+}
#endif
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index bc4608f07013..9548e317f64d 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -28,7 +28,7 @@
#include <celltypes.hxx>
-namespace sdr { namespace table {
+namespace sdr::table {
typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableRowBase;
@@ -77,7 +77,7 @@ private:
OUString maName;
};
-} }
+}
#endif
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index 12ac433742eb..154cbeb87dab 100644
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
@@ -26,7 +26,7 @@
#include <celltypes.hxx>
-namespace sdr { namespace table {
+namespace sdr::table {
class TableRows : public ::cppu::WeakAggImplHelper1< css::table::XTableRows >
{
@@ -54,7 +54,7 @@ private:
TableModelRef mxTableModel;
};
-} }
+}
#endif
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 5e9b870d5814..2e1bc12c7ecd 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -29,14 +29,14 @@
#include <celltypes.hxx>
-namespace sdr { namespace properties {
+namespace sdr::properties {
class TextProperties;
-} }
+}
class OutlinerParaObject;
-namespace sdr { namespace table {
+namespace sdr::table {
class CellUndo : public SdrUndoAction, public sdr::ObjectUser
{
@@ -252,7 +252,7 @@ private:
bool mbHasRedoData;
};
-} }
+}
#endif
diff --git a/svx/source/unodraw/gluepts.hxx b/svx/source/unodraw/gluepts.hxx
index 1f0f02b489b4..9747a454fea2 100644
--- a/svx/source/unodraw/gluepts.hxx
+++ b/svx/source/unodraw/gluepts.hxx
@@ -24,9 +24,7 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
- class XInterface;
-} } } }
+namespace com::sun::star::uno { class XInterface; }
class SdrObject;
css::uno::Reference<css::uno::XInterface>
commit e44ca108d47d9eec9e109a325dd9352b94e913b0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat May 9 20:08:33 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun May 10 07:53:55 2020 +0200
compact namespace in svtools
Change-Id: I281e162e4aafaf27fa4956b33a45883de163cca9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93876
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx
index 6bcf4ecd731f..c09328c50e66 100644
--- a/svtools/inc/table/defaultinputhandler.hxx
+++ b/svtools/inc/table/defaultinputhandler.hxx
@@ -24,7 +24,7 @@
#include <memory>
-namespace svt { namespace table
+namespace svt::table
{
@@ -51,7 +51,7 @@ namespace svt { namespace table
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index 21e354e767ab..e372de3241e5 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -25,7 +25,7 @@
#include <memory>
-namespace svt { namespace table
+namespace svt::table
{
@@ -109,7 +109,7 @@ namespace svt { namespace table
);
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 62f1261069b3..fb6868f3d5b0 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -28,7 +28,7 @@
#include <memory>
-namespace svt { namespace table
+namespace svt::table
{
class TableControl_Impl;
@@ -167,7 +167,7 @@ namespace svt { namespace table
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx
index 214b1610db93..69670d2bdaa6 100644
--- a/svtools/inc/table/tablecontrolinterface.hxx
+++ b/svtools/inc/table/tablecontrolinterface.hxx
@@ -26,7 +26,7 @@
#include <table/tablemodel.hxx>
-namespace svt { namespace table
+namespace svt::table
{
@@ -236,7 +236,7 @@ namespace svt { namespace table
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/inc/table/tableinputhandler.hxx b/svtools/inc/table/tableinputhandler.hxx
index fec472eeb2a5..9d11df38db3d 100644
--- a/svtools/inc/table/tableinputhandler.hxx
+++ b/svtools/inc/table/tableinputhandler.hxx
@@ -25,7 +25,7 @@ class MouseEvent;
class KeyEvent;
-namespace svt { namespace table
+namespace svt::table
{
@@ -57,7 +57,7 @@ namespace svt { namespace table
typedef std::shared_ptr< ITableInputHandler > PTableInputHandler;
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tablemodel.hxx b/svtools/inc/table/tablemodel.hxx
index b2913615b201..b3bcc36e9f8c 100644
--- a/svtools/inc/table/tablemodel.hxx
+++ b/svtools/inc/table/tablemodel.hxx
@@ -34,7 +34,7 @@
#include <vector>
#include <o3tl/typed_flags_set.hxx>
-namespace svt { namespace table { class ITableDataSort; } }
+namespace svt::table { class ITableDataSort; }
class Color;
@@ -54,7 +54,7 @@ namespace o3tl
}
-namespace svt { namespace table
+namespace svt::table
{
//= ScrollbarVisibility
enum ScrollbarVisibility
@@ -448,7 +448,7 @@ namespace svt { namespace table
typedef std::shared_ptr< ITableModel > PTableModel;
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tablerenderer.hxx b/svtools/inc/table/tablerenderer.hxx
index 564250155621..c43bac81875d 100644
--- a/svtools/inc/table/tablerenderer.hxx
+++ b/svtools/inc/table/tablerenderer.hxx
@@ -36,7 +36,7 @@ namespace vcl {
};
-namespace svt { namespace table
+namespace svt::table
{
@@ -243,7 +243,7 @@ namespace svt { namespace table
typedef std::shared_ptr< ITableRenderer > PTableRenderer;
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tablesort.hxx b/svtools/inc/table/tablesort.hxx
index c92011cb0d5f..699086352c9c 100644
--- a/svtools/inc/table/tablesort.hxx
+++ b/svtools/inc/table/tablesort.hxx
@@ -22,7 +22,7 @@
#include <table/tabletypes.hxx>
-namespace svt { namespace table
+namespace svt::table
{
@@ -74,7 +74,7 @@ namespace svt { namespace table
};
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/table/tabletypes.hxx b/svtools/inc/table/tabletypes.hxx
index 1e18786f7ff0..8fdb18a830d8 100644
--- a/svtools/inc/table/tabletypes.hxx
+++ b/svtools/inc/table/tabletypes.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
-namespace svt { namespace table
+namespace svt::table
{
/// a value denoting the size of a table
@@ -46,7 +46,7 @@ namespace svt { namespace table
#define ROW_INVALID (::svt::table::RowPos(-2))
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 069e62d0ccd8..7813b9ffe59c 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -28,9 +28,9 @@
#include <com/sun/star/awt/XTextLayoutConstrains.hpp>
#include <tools/lineend.hxx>
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
class XNumberFormatsSupplier;
-} } } }
+}
class SvNumberFormatsSupplierObj;
diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx
index 933c1f4b3277..beadbcf59206 100644
--- a/svtools/source/table/mousefunction.hxx
+++ b/svtools/source/table/mousefunction.hxx
@@ -26,7 +26,7 @@
class MouseEvent;
-namespace svt { namespace table
+namespace svt::table
{
@@ -125,7 +125,7 @@ namespace svt { namespace table
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 7b756e1ed59e..9e512e99a1e7 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -32,7 +32,7 @@
class ScrollBar;
class ScrollBarBox;
-namespace svt { namespace table
+namespace svt::table
{
struct MutableColumnMetrics : public ColumnMetrics
{
@@ -472,7 +472,7 @@ namespace svt { namespace table
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 8a584dc6e8db..e42a054939db 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -22,7 +22,7 @@
#include <vcl/window.hxx>
-namespace svt { namespace table
+namespace svt::table
{
class TableControl_Impl;
class TableFunctionSet;
@@ -59,7 +59,7 @@ namespace svt { namespace table
static void impl_hideTipWindow();
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 09374d8b112d..9fb6d03f0d68 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -24,7 +24,7 @@
#include <tools/gen.hxx>
-namespace svt { namespace table
+namespace svt::table
{
@@ -151,7 +151,7 @@ namespace svt { namespace table
};
-} } // namespace svt::table
+} // namespace svt::table
diff --git a/svtools/source/uno/fpicker.hxx b/svtools/source/uno/fpicker.hxx
index 76a7d078fa61..9fcbacd548a7 100644
--- a/svtools/source/uno/fpicker.hxx
+++ b/svtools/source/uno/fpicker.hxx
@@ -26,10 +26,10 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang { class XMultiServiceFactory; }
namespace uno { class XInterface; }
-} } }
+}
css::uno::Reference<css::uno::XInterface> FilePicker_CreateInstance(
css::uno::Reference< css::uno::XComponentContext > const & context);
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index a89c31113cb4..9e4fd85fee89 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -32,9 +32,9 @@
#include <toolkit/helper/listenermultiplexer.hxx>
-namespace svt { namespace table {
+namespace svt::table {
class TableControl;
-} }
+}
typedef ::cppu::ImplInheritanceHelper < VCLXWindow
, css::awt::grid::XGridControl
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index cbaae6b151bb..53aa832657a8 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -31,7 +31,7 @@
#include <memory>
-namespace svt { namespace table
+namespace svt::table
{
@@ -148,7 +148,7 @@ namespace svt { namespace table
};
-} } // svt::table
+} // svt::table
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index 0651a44ee24a..672397276b90 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -27,7 +27,7 @@
#include <rtl/ref.hxx>
-namespace svt { namespace table
+namespace svt::table
{
@@ -82,7 +82,7 @@ namespace svt { namespace table
};
-} } // svt::table
+} // svt::table
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index 12cd900b49e2..68d724591fe0 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -22,7 +22,7 @@
#include <vcl/wizardmachine.hxx>
#include <com/sun/star/ui/dialogs/XWizardController.hpp>
-namespace svt { namespace uno
+namespace svt::uno
{
@@ -55,7 +55,7 @@ namespace svt { namespace uno
};
-} } // namespace svt::uno
+} // namespace svt::uno
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index 29a7e9b3853b..21e3130e477b 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -28,7 +28,7 @@
using vcl::WizardTypes::WizardState;
using vcl::WizardTypes::CommitPageReason;
-namespace svt { namespace uno
+namespace svt::uno
{
@@ -123,7 +123,7 @@ namespace svt { namespace uno
};
-} } // namespace svt::uno
+} // namespace svt::uno
More information about the Libreoffice-commits
mailing list