From ccc73667e0e3bc5ca37a2837c543c944cf924f20 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 9 May 2020 20:08:43 +0200 Subject: compact namespace in svx Change-Id: I9229775999aa70c2b37c0527ba1c332143f9f2cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93877 Tested-by: Jenkins Reviewed-by: Noel Grandin --- 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 ++-- 26 files changed, 56 insertions(+), 72 deletions(-) (limited to 'svx/inc') 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 #include -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 -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 #include -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 #include -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 #include -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 #include -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 #include -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 #include -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; -- cgit