sfx2/inc/guisaveas.hxx | 6 --
sfx2/inc/notebookbar/NotebookbarTabControl.hxx | 4 -
sfx2/inc/preventduplicateinteraction.hxx | 4 -
sfx2/inc/sidebar/Accessible.hxx | 4 -
sfx2/inc/sidebar/AccessibleTitleBar.hxx | 4 -
sfx2/inc/sidebar/ContextChangeBroadcaster.hxx | 4 -
sfx2/inc/sidebar/ContextList.hxx | 4 -
sfx2/inc/sidebar/ControllerFactory.hxx | 4 -
sfx2/inc/sidebar/DeckDescriptor.hxx | 4 -
sfx2/inc/sidebar/DeckLayouter.hxx | 4 -
sfx2/inc/sidebar/DeckTitleBar.hxx | 4 -
sfx2/inc/sidebar/DrawHelper.hxx | 4 -
sfx2/inc/sidebar/MenuButton.hxx | 4 -
sfx2/inc/sidebar/Paint.hxx | 4 -
sfx2/inc/sidebar/PanelDescriptor.hxx | 4 -
sfx2/inc/sidebar/PanelTitleBar.hxx | 4 -
sfx2/inc/sidebar/TabItem.hxx | 4 -
sfx2/inc/sidebar/TitleBar.hxx | 4 -
sfx2/inc/sidebar/Tools.hxx | 4 -
sfx2/inc/sidebar/UnoDeck.hxx | 2
sfx2/inc/sidebar/UnoDecks.hxx | 2
sfx2/inc/sidebar/UnoPanel.hxx | 2
sfx2/inc/sidebar/UnoPanels.hxx | 2
sfx2/source/appl/newhelp.hxx | 6 +-
sfx2/source/inc/templdgi.hxx | 4 -
slideshow/source/engine/effectrewinder.hxx | 4 -
slideshow/source/engine/rehearsetimingsactivity.hxx | 2
slideshow/source/engine/shapes/appletshape.hxx | 5 --
slideshow/source/engine/shapes/backgroundshape.hxx | 5 --
slideshow/source/engine/shapes/mediashape.hxx | 5 --
slideshow/source/engine/shapes/viewappletshape.hxx | 21 ++++----
slideshow/source/engine/shapes/viewmediashape.hxx | 26 +++++------
slideshow/source/engine/slide/slideanimations.hxx | 5 --
slideshow/source/engine/transitions/transitionfactorytab.hxx | 4 -
slideshow/source/inc/eventmultiplexer.hxx | 5 --
slideshow/source/inc/framerate.hxx | 4 -
slideshow/source/inc/mouseeventhandler.hxx | 5 --
slideshow/source/inc/shapelistenereventhandler.hxx | 14 +++--
slideshow/source/inc/shapemanager.hxx | 4 -
slideshow/source/inc/shapemaps.hxx | 5 --
slideshow/source/inc/slide.hxx | 5 +-
slideshow/source/inc/slidebitmap.hxx | 5 --
slideshow/source/inc/slideshowcontext.hxx | 5 --
slideshow/source/inc/tools.hxx | 8 +--
slideshow/source/inc/unoview.hxx | 5 --
slideshow/source/inc/unoviewcontainer.hxx | 5 --
46 files changed, 103 insertions(+), 140 deletions(-)
New commits:
commit f2380399335121546512841c3f9f1b1f0cf8c866
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat May 9 20:08:21 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 10 07:54:20 2020 +0200
compact namespace in slideshow
Change-Id: Ic61e68312314cdfb30f89cafe9255ee8f0b0a081
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93875
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/slideshow/source/engine/effectrewinder.hxx
b/slideshow/source/engine/effectrewinder.hxx
index 57f7e2339cd8..69891172e3c9 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -29,7 +29,7 @@
#include <functional>
#include <memory>
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
class EventMultiplexer;
class EventQueue;
@@ -164,7 +164,7 @@ private:
const ::std::function<void ()>& rPreviousSlideFunctor);
};
-} } // end of namespace ::slideshow::internal
+} // end of namespace ::slideshow::internal
#endif
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx
b/slideshow/source/engine/rehearsetimingsactivity.hxx
index 9c7ebdc486bd..630f9c48fe61 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -33,7 +33,7 @@
#include <memory>
namespace vcl { class Font; }
-namespace canvas{ namespace tools{ class ElapsedTime; }}
+namespace canvas::tools{ class ElapsedTime; }
namespace cppcanvas{ class CustomSprite; }
namespace basegfx
{
diff --git a/slideshow/source/engine/shapes/appletshape.hxx
b/slideshow/source/engine/shapes/appletshape.hxx
index 84d5f07d1ac2..49bc81f822fa 100644
--- a/slideshow/source/engine/shapes/appletshape.hxx
+++ b/slideshow/source/engine/shapes/appletshape.hxx
@@ -23,10 +23,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing
-{
- class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
namespace slideshow
{
diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx
b/slideshow/source/engine/shapes/backgroundshape.hxx
index 0ded09bd8983..988dba08a22a 100644
--- a/slideshow/source/engine/shapes/backgroundshape.hxx
+++ b/slideshow/source/engine/shapes/backgroundshape.hxx
@@ -24,10 +24,7 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing
-{
- class XDrawPage;
-} } } }
+namespace com::sun::star::drawing { class XDrawPage; }
namespace slideshow
{
diff --git a/slideshow/source/engine/shapes/mediashape.hxx
b/slideshow/source/engine/shapes/mediashape.hxx
index 01f7b1ccf607..44667cd21018 100644
--- a/slideshow/source/engine/shapes/mediashape.hxx
+++ b/slideshow/source/engine/shapes/mediashape.hxx
@@ -24,10 +24,7 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing
-{
- class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
namespace slideshow
{
diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx
b/slideshow/source/engine/shapes/viewappletshape.hxx
index 102b8de8e70f..5d1b30743bef 100644
--- a/slideshow/source/engine/shapes/viewappletshape.hxx
+++ b/slideshow/source/engine/shapes/viewappletshape.hxx
@@ -27,17 +27,18 @@
#include <viewlayer.hxx>
-namespace com { namespace sun { namespace star {
-namespace frame {
- class XSynchronousFrameLoader;
- class XFrame2;
-}
-namespace uno {
- class XComponentContext;
+namespace com::sun::star {
+ namespace frame {
+ class XSynchronousFrameLoader;
+ class XFrame2;
+ }
+ namespace uno {
+ class XComponentContext;
+ }
+ namespace drawing {
+ class XShape;
+ }
}
-namespace drawing {
- class XShape;
-}}}}
namespace slideshow
{
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx
b/slideshow/source/engine/shapes/viewmediashape.hxx
index cc5386346448..549e3902228a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -32,19 +32,21 @@
class SystemChildWindow;
namespace vcl { class Window; }
-namespace com { namespace sun { namespace star { namespace drawing {
- class XShape;
-}
-namespace media {
- class XPlayer;
- class XPlayerWindow;
-}
-namespace uno {
- class XComponentContext;
+namespace com::sun::star {
+ namespace drawing {
+ class XShape;
+ }
+ namespace media {
+ class XPlayer;
+ class XPlayerWindow;
+ }
+ namespace uno {
+ class XComponentContext;
+ }
+ namespace beans{
+ class XPropertySet;
+ }
}
-namespace beans{
- class XPropertySet;
-} } } }
namespace slideshow
{
diff --git a/slideshow/source/engine/slide/slideanimations.hxx
b/slideshow/source/engine/slide/slideanimations.hxx
index 6d69d9593417..67bc6e036951 100644
--- a/slideshow/source/engine/slide/slideanimations.hxx
+++ b/slideshow/source/engine/slide/slideanimations.hxx
@@ -26,10 +26,7 @@
#include <slideshowcontext.hxx>
#include <animationnode.hxx>
-namespace com { namespace sun { namespace star { namespace animations
-{
- class XAnimationNode;
-} } } }
+namespace com::sun::star::animations { class XAnimationNode; }
/* Definition of SlideAnimations class */
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.hxx
b/slideshow/source/engine/transitions/transitionfactorytab.hxx
index 8670384fd52a..157dfec47e44 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.hxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.hxx
@@ -24,7 +24,7 @@
#include <sal/types.h>
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
struct TransitionInfo;
@@ -33,7 +33,7 @@ TransitionInfo const * getTransitionInfo(
TransitionInfo const * getRandomTransitionInfo();
-} }
+}
#endif
diff --git a/slideshow/source/inc/eventmultiplexer.hxx
b/slideshow/source/inc/eventmultiplexer.hxx
index 7756fe965d3b..9d84a97c9323 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -31,10 +31,7 @@
#include "unoview.hxx"
-namespace com { namespace sun { namespace star { namespace drawing
-{
- class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
namespace slideshow {
namespace internal {
diff --git a/slideshow/source/inc/framerate.hxx
b/slideshow/source/inc/framerate.hxx
index 224493a01191..af861dce60c8 100644
--- a/slideshow/source/inc/framerate.hxx
+++ b/slideshow/source/inc/framerate.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
/** Some frame rate related data.
*/
@@ -40,7 +40,7 @@ public:
static const sal_Int32 PreferredFramesPerSecond = 50;
};
-} } // end of namespace slideshow::internal
+} // end of namespace slideshow::internal
#endif
diff --git a/slideshow/source/inc/mouseeventhandler.hxx
b/slideshow/source/inc/mouseeventhandler.hxx
index 485cc34d3ff5..926a1acda820 100644
--- a/slideshow/source/inc/mouseeventhandler.hxx
+++ b/slideshow/source/inc/mouseeventhandler.hxx
@@ -24,10 +24,7 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace awt
-{
- struct MouseEvent;
-} } } }
+namespace com::sun::star::awt { struct MouseEvent; }
/* Definition of MouseEventHandler interface */
diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx
b/slideshow/source/inc/shapelistenereventhandler.hxx
index 81bd0c1f1b87..386671132e93 100644
--- a/slideshow/source/inc/shapelistenereventhandler.hxx
+++ b/slideshow/source/inc/shapelistenereventhandler.hxx
@@ -23,12 +23,14 @@
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing
-{
- class XShape;
-} namespace presentation {
- class XShapeEventListener;
-} } } }
+namespace com::sun::star {
+ namespace drawing {
+ class XShape;
+ }
+ namespace presentation {
+ class XShapeEventListener;
+ }
+}
/* Definition of ShapeListenerEventHandler interface */
diff --git a/slideshow/source/inc/shapemanager.hxx
b/slideshow/source/inc/shapemanager.hxx
index fee51cfb6afd..ef2e40de6466 100644
--- a/slideshow/source/inc/shapemanager.hxx
+++ b/slideshow/source/inc/shapemanager.hxx
@@ -24,9 +24,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace drawing {
- class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
/* Definition of ShapeManager interface */
diff --git a/slideshow/source/inc/shapemaps.hxx
b/slideshow/source/inc/shapemaps.hxx
index 83d665af7598..43476e05b81c 100644
--- a/slideshow/source/inc/shapemaps.hxx
+++ b/slideshow/source/inc/shapemaps.hxx
@@ -26,10 +26,7 @@
#include <memory>
#include <map>
-namespace com { namespace sun { namespace star { namespace drawing
-{
- class XShape;
-} } } }
+namespace com::sun::star::drawing { class XShape; }
/* Definition of two shape maps */
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index 8f7c6bb33725..8350751fa83f 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -26,7 +26,7 @@
#include <memory>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace drawing {
class XDrawPage;
class XDrawPagesSupplier;
@@ -36,7 +36,8 @@ namespace com { namespace sun { namespace star {
}
namespace animations {
class XAnimationNode;
-} } } }
+ }
+}
namespace basegfx
{
diff --git a/slideshow/source/inc/slidebitmap.hxx
b/slideshow/source/inc/slidebitmap.hxx
index f149138c4a7c..f5248a8061e3 100644
--- a/slideshow/source/inc/slidebitmap.hxx
+++ b/slideshow/source/inc/slidebitmap.hxx
@@ -29,10 +29,7 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace rendering
-{
- class XBitmap;
-} } } }
+namespace com::sun::star::rendering { class XBitmap; }
/* Definition of SlideBitmap class */
diff --git a/slideshow/source/inc/slideshowcontext.hxx
b/slideshow/source/inc/slideshowcontext.hxx
index 904b8965543e..6d14fb34b1b2 100644
--- a/slideshow/source/inc/slideshowcontext.hxx
+++ b/slideshow/source/inc/slideshowcontext.hxx
@@ -23,10 +23,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
-namespace com{ namespace sun{ namespace star{ namespace uno
-{
- class XComponentContext;
-}}}}
+namespace com::sun::star::uno { class XComponentContext; }
namespace slideshow
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 39ee1f8b83e7..632933feecd6 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -39,9 +39,7 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace beans {
- struct NamedValue;
-} } } }
+namespace com::sun::star::beans { struct NamedValue; }
namespace basegfx
{
class B2DRange;
@@ -84,7 +82,7 @@ namespace slideshow
}
}
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
template <typename T>
inline ::std::size_t hash_value(
@@ -96,7 +94,7 @@ namespace com { namespace sun { namespace star { namespace
uno {
return slideshow::internal::hash<void *>()(xRoot.get());
}
-} } } }
+}
namespace slideshow
{
diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx
index bf19e72e1868..e1ec82549354 100644
--- a/slideshow/source/inc/unoview.hxx
+++ b/slideshow/source/inc/unoview.hxx
@@ -25,10 +25,7 @@
#include <vector>
-namespace com { namespace sun { namespace star { namespace presentation
-{
- class XSlideShowView;
-} } } }
+namespace com::sun::star::presentation { class XSlideShowView; }
/* Definition of UnoView interface */
diff --git a/slideshow/source/inc/unoviewcontainer.hxx
b/slideshow/source/inc/unoviewcontainer.hxx
index 159fd0707dfa..90c081904cd8 100644
--- a/slideshow/source/inc/unoviewcontainer.hxx
+++ b/slideshow/source/inc/unoviewcontainer.hxx
@@ -25,10 +25,7 @@
#include "unoview.hxx"
-namespace com { namespace sun { namespace star { namespace presentation
-{
- class XSlideShowView;
-} } } }
+namespace com::sun::star::presentation { class XSlideShowView; }
/* Definition of UnoViewContainer class */
commit 71f995fb00a32546ef14522d1e6fa90db377b8bc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat May 9 20:07:54 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 10 07:54:11 2020 +0200
compact namespace in sfx2
Change-Id: I70e1002fc09f5a8d0352cdb0c120fe5ed79cf3e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93874
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index e8ccacfefeb9..9ccd33436f29 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -30,11 +30,7 @@
#include <sfx2/signaturestate.hxx>
-namespace com { namespace sun { namespace star {
- namespace document {
- class XDocumentProperties;
- }
-} } }
+namespace com::sun::star::document { class XDocumentProperties; }
namespace weld { class Window; }
class ModelData_Impl;
diff --git a/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
index f2f62a70bddb..c793480f51d1 100644
--- a/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
+++ b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
@@ -12,9 +12,7 @@
#include <sfx2/dllapi.h>
#include <vcl/tabctrl.hxx>
-namespace com { namespace sun { namespace star { namespace ui {
- class XUIConfigurationListener;
-} } } }
+namespace com::sun::star::ui { class XUIConfigurationListener; }
namespace com::sun::star::uno { class XComponentContext; }
class NotebookbarTabControl final : public NotebookbarTabControlBase
diff --git a/sfx2/inc/preventduplicateinteraction.hxx
b/sfx2/inc/preventduplicateinteraction.hxx
index a9db2c3b4ebe..edd503d0129e 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -35,9 +35,9 @@
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
-} } } }
+}
namespace sfx2 {
diff --git a/sfx2/inc/sidebar/Accessible.hxx b/sfx2/inc/sidebar/Accessible.hxx
index f216da980cf2..3f3d351ed8d8 100644
--- a/sfx2/inc/sidebar/Accessible.hxx
+++ b/sfx2/inc/sidebar/Accessible.hxx
@@ -29,7 +29,7 @@ typedef cppu::WeakComponentImplHelper <
css::accessibility::XAccessible
> AccessibleInterfaceBase;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
/** Simple implementation of the XAccessible interface.
@@ -55,6 +55,6 @@ private:
css::uno::Reference<css::accessibility::XAccessibleContext> mxContext;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/AccessibleTitleBar.hxx
b/sfx2/inc/sidebar/AccessibleTitleBar.hxx
index 58f70e3efd3b..f2105dabbd1d 100644
--- a/sfx2/inc/sidebar/AccessibleTitleBar.hxx
+++ b/sfx2/inc/sidebar/AccessibleTitleBar.hxx
@@ -22,7 +22,7 @@
namespace com::sun::star::accessibility { class XAccessible; }
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class TitleBar;
@@ -39,6 +39,6 @@ private:
virtual ~AccessibleTitleBar() override;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
index bf4d6d41847b..49770da76c10 100644
--- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/frame/XFrame.hpp>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
/** This class is a helper for broadcasting context changes that are
@@ -60,7 +60,7 @@ private:
};
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sd::sidebar
#endif
diff --git a/sfx2/inc/sidebar/ContextList.hxx b/sfx2/inc/sidebar/ContextList.hxx
index 2ca07d36d416..b3ecafa53ae2 100644
--- a/sfx2/inc/sidebar/ContextList.hxx
+++ b/sfx2/inc/sidebar/ContextList.hxx
@@ -23,7 +23,7 @@
#include <vector>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
/** Per context data for deck and panel descriptors.
*/
@@ -61,6 +61,6 @@ private:
::std::vector<Entry>::const_iterator FindBestMatch (const Context&
rContext) const;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/ControllerFactory.hxx
b/sfx2/inc/sidebar/ControllerFactory.hxx
index 5bfc138c8e70..116458443abc 100644
--- a/sfx2/inc/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sidebar/ControllerFactory.hxx
@@ -33,7 +33,7 @@ namespace weld {
class Toolbar;
}
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
/** Convenience class for the easy creation of toolbox controllers.
*/
@@ -65,6 +65,6 @@ private:
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DeckDescriptor.hxx
b/sfx2/inc/sidebar/DeckDescriptor.hxx
index 92a229f41c47..f1195cd0b324 100644
--- a/sfx2/inc/sidebar/DeckDescriptor.hxx
+++ b/sfx2/inc/sidebar/DeckDescriptor.hxx
@@ -22,7 +22,7 @@
#include <sfx2/sidebar/Deck.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class DeckDescriptor
{
@@ -48,6 +48,6 @@ public:
~DeckDescriptor();
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DeckLayouter.hxx
b/sfx2/inc/sidebar/DeckLayouter.hxx
index ed74e6261742..b84496cd6646 100644
--- a/sfx2/inc/sidebar/DeckLayouter.hxx
+++ b/sfx2/inc/sidebar/DeckLayouter.hxx
@@ -24,7 +24,7 @@ class ScrollBar;
namespace vcl { class Window; }
namespace tools { class Rectangle; }
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
/** Helper for layouting the direct and indirect children of a
deck like title bars, panels, and scroll bars.
@@ -43,6 +43,6 @@ namespace DeckLayouter
ScrollBar& pVerticalScrollBar);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx
b/sfx2/inc/sidebar/DeckTitleBar.hxx
index bc522d87a889..86a71c76a36e 100644
--- a/sfx2/inc/sidebar/DeckTitleBar.hxx
+++ b/sfx2/inc/sidebar/DeckTitleBar.hxx
@@ -20,7 +20,7 @@
#include <sidebar/TitleBar.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class DeckTitleBar final : public TitleBar
{
@@ -47,6 +47,6 @@ private:
bool mbIsCloserVisible;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/DrawHelper.hxx b/sfx2/inc/sidebar/DrawHelper.hxx
index 64e173ce317a..a657ac041aef 100644
--- a/sfx2/inc/sidebar/DrawHelper.hxx
+++ b/sfx2/inc/sidebar/DrawHelper.hxx
@@ -23,7 +23,7 @@
class Color;
class SvBorder;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class Paint;
@@ -42,6 +42,6 @@ public:
const Color& rBorderColor, const Paint&
rFillPaint);
};
-}} // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/MenuButton.hxx b/sfx2/inc/sidebar/MenuButton.hxx
index 36d18a0b836a..a244a3439738 100644
--- a/sfx2/inc/sidebar/MenuButton.hxx
+++ b/sfx2/inc/sidebar/MenuButton.hxx
@@ -20,7 +20,7 @@
#include <vcl/button.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class MenuButton final
: public CheckBox
@@ -40,6 +40,6 @@ private:
bool mbIsLeftButtonDown;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/Paint.hxx b/sfx2/inc/sidebar/Paint.hxx
index e93c6d28d829..ea2af1d5e0cf 100644
--- a/sfx2/inc/sidebar/Paint.hxx
+++ b/sfx2/inc/sidebar/Paint.hxx
@@ -23,7 +23,7 @@
#include <boost/variant.hpp>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
/** Abstraction of different ways to fill outlines.
Can be
@@ -68,6 +68,6 @@ private:
> maValue;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/PanelDescriptor.hxx
b/sfx2/inc/sidebar/PanelDescriptor.hxx
index 42dd7b8578c3..be85911ac36b 100644
--- a/sfx2/inc/sidebar/PanelDescriptor.hxx
+++ b/sfx2/inc/sidebar/PanelDescriptor.hxx
@@ -20,7 +20,7 @@
#include <sidebar/ContextList.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class PanelDescriptor
{
@@ -45,6 +45,6 @@ public:
~PanelDescriptor();
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/PanelTitleBar.hxx
b/sfx2/inc/sidebar/PanelTitleBar.hxx
index 1806f1bb133d..b060124b9e07 100644
--- a/sfx2/inc/sidebar/PanelTitleBar.hxx
+++ b/sfx2/inc/sidebar/PanelTitleBar.hxx
@@ -23,7 +23,7 @@
namespace com::sun::star::frame { class XController; }
namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class Panel;
@@ -57,6 +57,6 @@ private:
OUString msMoreOptionsCommand;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/TabItem.hxx b/sfx2/inc/sidebar/TabItem.hxx
index c80604b86b6f..44e5cf6b5141 100644
--- a/sfx2/inc/sidebar/TabItem.hxx
+++ b/sfx2/inc/sidebar/TabItem.hxx
@@ -22,7 +22,7 @@
namespace vcl { class Window; }
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
/** A single button in the tab bar.
*/
@@ -41,6 +41,6 @@ private:
bool mbIsLeftButtonDown;
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx
index 8a22303aabbf..69c182825b75 100644
--- a/sfx2/inc/sidebar/TitleBar.hxx
+++ b/sfx2/inc/sidebar/TitleBar.hxx
@@ -22,7 +22,7 @@
#include <sfx2/sidebar/SidebarToolBox.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class TitleBar : public vcl::Window
{
@@ -71,6 +71,6 @@ private:
DECL_LINK(SelectionHandler, ToolBox*, void);
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/Tools.hxx b/sfx2/inc/sidebar/Tools.hxx
index 74941f539510..97611a7a6b18 100644
--- a/sfx2/inc/sidebar/Tools.hxx
+++ b/sfx2/inc/sidebar/Tools.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star::frame { class XDispatch; }
namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class Tools
{
@@ -58,6 +58,6 @@ public:
};
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sidebar/UnoDeck.hxx b/sfx2/inc/sidebar/UnoDeck.hxx
index c2f10b36452e..88497c03ae3d 100644
--- a/sfx2/inc/sidebar/UnoDeck.hxx
+++ b/sfx2/inc/sidebar/UnoDeck.hxx
@@ -19,7 +19,7 @@
namespace com::sun::star::frame { class XFrame; }
namespace com::sun::star::ui { class XPanels; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
/** get the decks
*/
diff --git a/sfx2/inc/sidebar/UnoDecks.hxx b/sfx2/inc/sidebar/UnoDecks.hxx
index d0a5b710e05a..95ce0be62398 100644
--- a/sfx2/inc/sidebar/UnoDecks.hxx
+++ b/sfx2/inc/sidebar/UnoDecks.hxx
@@ -15,7 +15,7 @@
#include <cppuhelper/implbase.hxx>
namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
/** get the decks
*/
diff --git a/sfx2/inc/sidebar/UnoPanel.hxx b/sfx2/inc/sidebar/UnoPanel.hxx
index 07fa526907a1..50d9aba2c0fa 100644
--- a/sfx2/inc/sidebar/UnoPanel.hxx
+++ b/sfx2/inc/sidebar/UnoPanel.hxx
@@ -21,7 +21,7 @@
namespace com::sun::star::awt { class XWindow; }
namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
/** get the Panel
diff --git a/sfx2/inc/sidebar/UnoPanels.hxx b/sfx2/inc/sidebar/UnoPanels.hxx
index 598db749ee1f..487043dee3f3 100644
--- a/sfx2/inc/sidebar/UnoPanels.hxx
+++ b/sfx2/inc/sidebar/UnoPanels.hxx
@@ -14,7 +14,7 @@
#include <cppuhelper/implbase.hxx>
namespace com::sun::star::frame { class XFrame; }
-namespace sfx2 { namespace sidebar { class SidebarController; } }
+namespace sfx2::sidebar { class SidebarController; }
/** get the decks
*/
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 52c01790be81..66a39b5e17c1 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -41,9 +41,9 @@
#define MID_RENAME 2
#define MID_DELETE 3
-namespace com { namespace sun { namespace star { namespace awt { class
XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class
XBreakIterator; } } } }
-namespace com { namespace sun { namespace star { namespace text { class
XTextRange; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::i18n { class XBreakIterator; }
+namespace com::sun::star::text { class XTextRange; }
// ContentListBox_Impl ---------------------------------------------------
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 3647dce09d22..84c28cd8556d 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -49,9 +49,9 @@ class StyleTreeListBox_Impl;
class SfxTemplateDialog_Impl;
class SfxCommonTemplateDialog_Impl;
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
class XModuleManager2;
-}}}}
+}
enum class StyleFlags {
NONE=0, UpdateFamilyList=1, UpdateFamily=2
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
