summaryrefslogtreecommitdiff
path: root/sd/source/ui/presenter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-09 15:54:06 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-09 20:02:29 +0200
commit00d170213a112922980db67df62b8ee324ff2631 (patch)
treea277feaf79a3014a777f25e87730a013da919c2d /sd/source/ui/presenter
parent32ff26f771a90050f524968dfd5381818274f673 (diff)
compact namespace in sd
Change-Id: Ifa8b9cb2a6c06e0365245790cfd1c4775bd87d15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93861 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/presenter')
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.hxx10
-rw-r--r--sd/source/ui/presenter/PresenterHelper.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterTextView.hxx4
-rw-r--r--sd/source/ui/presenter/SlideRenderer.hxx6
6 files changed, 19 insertions, 19 deletions
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index 653e991f8fc1..97da675fb858 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -24,11 +24,11 @@
#include <tools/link.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace rendering { class XSpriteCanvas; } } } }
+namespace com::sun::star::rendering { class XSpriteCanvas; }
struct ImplSVEvent;
-namespace sd { namespace presenter {
+namespace sd::presenter {
/** Each UpdateRequester handles update requests (calls to
XCanvas::updateScreen()) for one shared canvas (a canvas that has one or
@@ -64,7 +64,7 @@ private:
DECL_LINK(Callback, void*, void);
};
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
#endif
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index 557d65cbe6f0..3aaa7ff2402b 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -29,11 +29,11 @@
#include <cppuhelper/compbase.hxx>
#include <memory>
-namespace sd { namespace presenter { class CanvasUpdateRequester; } }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace geometry { struct AffineMatrix2D; } } } }
+namespace sd::presenter { class CanvasUpdateRequester; }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::geometry { struct AffineMatrix2D; }
-namespace sd { namespace presenter {
+namespace sd::presenter {
typedef ::cppu::WeakComponentImplHelper <
css::rendering::XSpriteCanvas,
@@ -318,7 +318,7 @@ private:
void ThrowIfDisposed();
};
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
#endif
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index 837c04abdb42..2dbc74014cef 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -25,9 +25,9 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
-namespace sd { namespace presenter {
+namespace sd::presenter {
typedef ::cppu::WeakComponentImplHelper<
css::lang::XInitialization,
@@ -91,7 +91,7 @@ private:
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
};
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
#endif
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 3388d4ac3382..2a10a8d2628b 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -27,9 +27,9 @@
#include <cppuhelper/basemutex.hxx>
#include <memory>
-namespace sd { namespace slidesorter { namespace cache { class PageCache; } } }
+namespace sd::slidesorter::cache { class PageCache; }
-namespace sd { namespace presenter {
+namespace sd::presenter {
typedef ::cppu::WeakComponentImplHelper<
css::lang::XInitialization,
@@ -95,7 +95,7 @@ private:
void ThrowIfDisposed();
};
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
#endif
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 9773807c829f..8f0eb5167805 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/implbase.hxx>
#include <memory>
-namespace sd { namespace presenter {
+namespace sd::presenter {
typedef ::cppu::ImplInheritanceHelper <
tools::PropertySet,
@@ -67,7 +67,7 @@ private:
void ThrowIfDisposed();
};
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
#endif
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index fcb42fd8f166..98afe72b7e41 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -28,9 +28,9 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com::sun::star::drawing { class XDrawPage; }
-namespace sd { namespace presenter {
+namespace sd::presenter {
typedef ::cppu::WeakComponentImplHelper <
css::drawing::XSlideRenderer,
@@ -93,7 +93,7 @@ private:
void ThrowIfDisposed();
};
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
#endif