sd/qa/unit/import-tests.cxx | 4 ++-- sd/source/core/annotations/Annotation.cxx | 2 +- sd/source/core/drawdoc.cxx | 4 ++-- sd/source/core/drawdoc4.cxx | 2 +- sd/source/core/text/textapi.cxx | 2 +- sd/source/core/undoanim.cxx | 2 +- sd/source/filter/eppt/pptx-animations.cxx | 5 +---- sd/source/filter/eppt/pptx-epptooxml.cxx | 5 +---- sd/source/ui/animations/SlideTransitionPane.cxx | 5 +---- sd/source/ui/framework/configuration/ChangeRequestQueue.cxx | 4 ++-- sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 4 ++-- sd/source/ui/framework/configuration/Configuration.cxx | 4 ++-- sd/source/ui/framework/configuration/ConfigurationClassifier.cxx | 4 ++-- sd/source/ui/framework/configuration/ConfigurationController.cxx | 4 ++-- sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx | 4 ++-- sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 4 ++-- sd/source/ui/framework/configuration/ConfigurationTracer.cxx | 4 ++-- sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 4 ++-- sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx | 4 ++-- sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 4 ++-- sd/source/ui/framework/configuration/ResourceId.cxx | 4 ++-- sd/source/ui/framework/configuration/UpdateRequest.cxx | 4 ++-- sd/source/ui/framework/factories/BasicPaneFactory.cxx | 4 ++-- sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 4 ++-- sd/source/ui/framework/factories/BasicViewFactory.cxx | 4 ++-- sd/source/ui/framework/factories/ChildWindowPane.cxx | 4 ++-- sd/source/ui/framework/factories/FrameWindowPane.cxx | 4 ++-- sd/source/ui/framework/factories/FullScreenPane.cxx | 4 ++-- sd/source/ui/framework/factories/Pane.cxx | 4 ++-- sd/source/ui/framework/factories/PresentationFactory.cxx | 4 ++-- sd/source/ui/framework/factories/ViewShellWrapper.cxx | 4 ++-- sd/source/ui/framework/module/CenterViewFocusModule.cxx | 4 ++-- sd/source/ui/framework/module/DrawModule.cxx | 4 ++-- sd/source/ui/framework/module/ImpressModule.cxx | 4 ++-- sd/source/ui/framework/module/ModuleController.cxx | 4 ++-- sd/source/ui/framework/module/PresentationModule.cxx | 4 ++-- sd/source/ui/framework/module/ShellStackGuard.cxx | 4 ++-- sd/source/ui/framework/module/SlideSorterModule.cxx | 4 ++-- sd/source/ui/framework/module/ToolBarModule.cxx | 4 ++-- sd/source/ui/framework/module/ViewTabBarModule.cxx | 4 ++-- sd/source/ui/framework/tools/FrameworkHelper.cxx | 4 ++-- sd/source/ui/presenter/CanvasUpdateRequester.cxx | 4 ++-- sd/source/ui/presenter/PresenterCanvas.cxx | 4 ++-- sd/source/ui/presenter/PresenterHelper.cxx | 4 ++-- sd/source/ui/presenter/PresenterPreviewCache.cxx | 6 +++--- sd/source/ui/presenter/PresenterTextView.cxx | 4 ++-- sd/source/ui/presenter/SlideRenderer.cxx | 4 ++-- sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 4 ++-- sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 4 ++-- sd/source/ui/sidebar/CustomAnimationPanel.cxx | 4 ++-- sd/source/ui/sidebar/DocumentHelper.cxx | 4 ++-- sd/source/ui/sidebar/LayoutMenu.cxx | 4 ++-- sd/source/ui/sidebar/MasterPageContainer.cxx | 4 ++-- sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 4 ++-- sd/source/ui/sidebar/MasterPageContainerProviders.cxx | 4 ++-- sd/source/ui/sidebar/MasterPageContainerQueue.cxx | 4 ++-- sd/source/ui/sidebar/MasterPageDescriptor.cxx | 4 ++-- sd/source/ui/sidebar/MasterPagesSelector.cxx | 4 ++-- sd/source/ui/sidebar/NavigatorWrapper.cxx | 4 ++-- sd/source/ui/sidebar/PanelBase.cxx | 4 ++-- sd/source/ui/sidebar/PanelFactory.cxx | 4 ++-- sd/source/ui/sidebar/PreviewValueSet.cxx | 4 ++-- sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 4 ++-- sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 4 ++-- sd/source/ui/sidebar/SlideBackground.cxx | 4 ++-- sd/source/ui/sidebar/SlideTransitionPanel.cxx | 4 ++-- sd/source/ui/sidebar/TableDesignPanel.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 8 ++++---- sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsListener.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsProperties.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsTransferableData.cxx | 4 ++-- sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 4 ++-- sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 4 ++-- sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx | 4 ++-- sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 4 ++-- sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx | 4 ++-- sd/source/ui/slidesorter/model/SlsVisualState.cxx | 4 ++-- sd/source/ui/slidesorter/shell/SlideSorter.cxx | 4 ++-- sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 4 ++-- sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsLayouter.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsTheme.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsToolTip.cxx | 4 ++-- sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx | 4 ++-- sd/source/ui/table/tableobjectbar.cxx | 4 ++-- sd/source/ui/tools/AsynchronousCall.cxx | 4 ++-- sd/source/ui/tools/ConfigurationAccess.cxx | 4 ++-- sd/source/ui/tools/EventMultiplexer.cxx | 4 ++-- sd/source/ui/tools/IdleDetection.cxx | 4 ++-- sd/source/ui/tools/PropertySet.cxx | 4 ++-- sd/source/ui/tools/SlotStateListener.cxx | 4 ++-- sd/source/ui/tools/TimerBasedTaskExecution.cxx | 4 ++-- sd/source/ui/view/OutlinerIterator.cxx | 4 ++-- 124 files changed, 244 insertions(+), 253 deletions(-)
New commits: commit 4b40797585c5f68e2266586d33db4c4b6af498d5 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Tue Jan 14 20:54:10 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Jan 15 06:58:44 2020 +0100 clang-tidy modernize-concat-nested-namespace in sd Change-Id: I805cc225420de46d1fa7cbfcc22468e00cb5f5ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86805 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index b8f65a88aa9d..61c74879a6db 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -103,7 +103,7 @@ using namespace ::com::sun::star; -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { template<class T> static std::ostream& operator<<(std::ostream& rStrm, const uno::Reference<T>& xRef) @@ -112,7 +112,7 @@ static std::ostream& operator<<(std::ostream& rStrm, const uno::Reference<T>& xR return rStrm; } -} } } } +} /// Impress import filters tests. diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index 5edfaae9b317..b59158d1f64d 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -43,7 +43,7 @@ #include <sdpage.hxx> #include <textapi.hxx> -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 93074a90ce41..c793ef34df74 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -80,8 +80,8 @@ #include <vcl/svapp.hxx> #include <unokywds.hxx> -namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; } } } } -namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellChecker1; } } } } +namespace com::sun::star::linguistic2 { class XHyphenator; } +namespace com::sun::star::linguistic2 { class XSpellChecker1; } using namespace ::sd; using namespace ::com::sun::star; diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index b30359cf2d61..26f0142b6292 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -105,7 +105,7 @@ #include <app.hrc> #include <strings.hxx> -namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; } } } } +namespace com::sun::star::linguistic2 { class XHyphenator; } using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 89efeebaebd2..b7ed923fdf1e 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -33,7 +33,7 @@ #include <svx/svdpool.hxx> #include <svx/svdundo.hxx> -namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } } +namespace com::sun::star::container { class XNameContainer; } using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index e74ffe48711b..8ad89efcc159 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -28,7 +28,7 @@ #include <CustomAnimationEffect.hxx> #include <drawdoc.hxx> -namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } } +namespace com::sun::star::animations { class XAnimationNode; } using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Exception; diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx index f533534f1abb..f809b6222484 100644 --- a/sd/source/filter/eppt/pptx-animations.cxx +++ b/sd/source/filter/eppt/pptx-animations.cxx @@ -644,9 +644,7 @@ public: }; } -namespace oox -{ -namespace core +namespace oox::core { void WriteAnimations(const FSHelperPtr& pFS, const Reference<XDrawPage>& rXDrawPage, PowerPointExport& rExport) @@ -655,7 +653,6 @@ void WriteAnimations(const FSHelperPtr& pFS, const Reference<XDrawPage>& rXDrawP aAnimationExport.WriteAnimations(rXDrawPage); } } -} PPTXAnimationExport::PPTXAnimationExport(PowerPointExport& rExport, const FSHelperPtr& pFS) : mrPowerPointExport(rExport) diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 9d76dbe6ffe3..a3699f8fe81f 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -91,9 +91,7 @@ using namespace oox::core; void dump_pset(Reference< XPropertySet > const& rXPropSet); #endif -namespace oox -{ -namespace core +namespace oox::core { class PowerPointShapeExport : public ShapeExport @@ -130,7 +128,6 @@ void WriteSndAc(const FSHelperPtr& pFS, const OUString& sSoundRelId, const OUStr } } -} } namespace { diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index abe300766881..0cff7d5fc1ec 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -55,9 +55,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -namespace sd -{ -namespace impl +namespace sd::impl { struct TransitionEffect { @@ -210,7 +208,6 @@ struct TransitionEffect bool mbLoopSoundAmbiguous; }; -} // namespace impl } // namespace sd // Local Helper Functions diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx index f41f4e7417ff..8b74200eed74 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx @@ -19,12 +19,12 @@ #include "ChangeRequestQueue.hxx" -namespace sd { namespace framework { +namespace sd::framework { ChangeRequestQueue::ChangeRequestQueue() { } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 7934b5dd5e8b..7e6773064c83 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -48,7 +48,7 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest) } // end of anonymous namespace -namespace sd { namespace framework { +namespace sd::framework { ChangeRequestQueueProcessor::ChangeRequestQueueProcessor ( const std::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater) @@ -180,6 +180,6 @@ void ChangeRequestQueueProcessor::Clear() maQueue.swap(aEmpty); } -} } // end of namespace sd::framework::configuration +} // end of namespace sd::framework::configuration /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index c4a3be614970..138d7883078b 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -47,7 +47,7 @@ public: } // end of anonymous namespace -namespace sd { namespace framework { +namespace sd::framework { class Configuration::ResourceContainer : public ::std::set<Reference<XResourceId>, XResourceIdLess> @@ -300,7 +300,7 @@ bool AreConfigurationsEquivalent ( }); } -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index ab9ecddd7be0..443757793685 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { ConfigurationClassifier::ConfigurationClassifier ( const Reference<XConfiguration>& rxConfiguration1, @@ -164,6 +164,6 @@ void ConfigurationClassifier::TraceResourceIdVector ( #endif -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index acde0a0cc5f4..8151c6e0033c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -namespace sd { namespace framework { +namespace sd::framework { //----- ConfigurationController::Implementation ------------------------------- @@ -528,7 +528,7 @@ ConfigurationController::Implementation::Implementation ( mpQueueProcessor->SetConfiguration(mxRequestedConfiguration); } -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index afc535173f47..c3ff65ccb80e 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { ConfigurationControllerBroadcaster::ConfigurationControllerBroadcaster ( const Reference<XConfigurationController>& rxController) @@ -186,6 +186,6 @@ void ConfigurationControllerBroadcaster::DisposeAndClear() } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 15460fe15f7c..98842a1d8994 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { //===== ConfigurationControllerResourceManager ================================ @@ -298,6 +298,6 @@ bool ConfigurationControllerResourceManager::ResourceComparator::operator() ( return false; } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 7ddaa23ae906..4fb4a82165cb 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { void ConfigurationTracer::TraceConfiguration ( const Reference<XConfiguration>& rxConfiguration, @@ -68,6 +68,6 @@ void ConfigurationTracer::TraceBoundResources ( } #endif -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index c1b3d92e465b..b7eccd19c610 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -45,7 +45,7 @@ static const sal_Int32 snShortTimeoutCountThreshold (1); static const sal_Int32 snNormalTimeoutCountThreshold (5); } -namespace sd { namespace framework { +namespace sd::framework { //===== ConfigurationUpdaterLock ============================================== @@ -373,6 +373,6 @@ IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler, Timer *, void) } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 77b89df058e5..2500d945cc31 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( const Reference<XResourceId>& rxResourceId, @@ -72,6 +72,6 @@ void SAL_CALL GenericConfigurationChangeRequest::setName (const OUString&) // Ignored. } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index e0a98ad288d6..855cfc21509f 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::drawing::framework; #undef VERBOSE //#define VERBOSE 1 -namespace sd { namespace framework { +namespace sd::framework { ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManager>& rxManager) : maMutex(), @@ -196,6 +196,6 @@ Reference<XResourceFactory> ResourceFactoryManager::FindFactory (const OUString& return nullptr; } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 6ff8bb4f8139..bcc351b4a1b3 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::drawing::framework; */ #define USE_OPTIMIZATIONS -namespace sd { namespace framework { +namespace sd::framework { //===== ResourceId ============================================================ @@ -498,7 +498,7 @@ void ResourceId::ParseResourceURL() } } -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 328fb3862e55..7a8bb84bdf05 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { UpdateRequest::UpdateRequest() throw() @@ -51,6 +51,6 @@ void SAL_CALL UpdateRequest::setName (const OUString&) // Ignored. } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index e34b471f8b2a..cf23c8947e4c 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -52,7 +52,7 @@ namespace { static const sal_Int32 gnConfigurationUpdateEndEvent(1); } -namespace sd { namespace framework { +namespace sd::framework { /** Store URL, XPane reference and (local) PaneId for every pane factory that is registered at the PaneController. @@ -422,7 +422,7 @@ void BasicPaneFactory::ThrowIfDisposed() const } } -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index b0cb5f05a43c..c23053231e0a 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { //===== BasicToolBarFactory =================================================== @@ -151,7 +151,7 @@ void BasicToolBarFactory::ThrowIfDisposed() const } } -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_Draw_framework_BasicToolBarFactory_get_implementation(css::uno::XComponentContext*, diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index a60238eb9273..71e13694741f 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -namespace sd { namespace framework { +namespace sd::framework { //===== ViewDescriptor ======================================================== @@ -508,7 +508,7 @@ void BasicViewFactory::ActivateCenterView ( rpDescriptor->mpViewShell->CreateSubController()); } -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index fc5040b2c1b3..a50c88080dae 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { ChildWindowPane::ChildWindowPane ( const Reference<XResourceId>& rxPaneId, @@ -214,6 +214,6 @@ void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index ed63d7c30379..d5469dd126bb 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { FrameWindowPane::FrameWindowPane ( const Reference<XResourceId>& rxPaneId, @@ -41,6 +41,6 @@ sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly() return false; } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 46795e792187..03f8afb3b21a 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { FullScreenPane::FullScreenPane ( const Reference<XComponentContext>& rxComponentContext, @@ -222,6 +222,6 @@ void FullScreenPane::ExtractArguments ( } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 265eb5636952..e11b78730f96 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { Pane::Pane ( const Reference<XResourceId>& rxPaneId, @@ -183,6 +183,6 @@ void Pane::ThrowIfDisposed() const } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 7647a35e47f9..6b46e413fe2c 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -namespace sd { namespace framework { +namespace sd::framework { namespace { @@ -192,7 +192,7 @@ void SAL_CALL PresentationFactoryProvider::initialize( } // end of anonymous namespace. -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 37cce7586b4f..dc801bb90bf8 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::drawing::framework; using ::com::sun::star::awt::XWindow; -namespace sd { namespace framework { +namespace sd::framework { ViewShellWrapper::ViewShellWrapper ( const std::shared_ptr<ViewShell>& pViewShell, @@ -261,6 +261,6 @@ void SAL_CALL ViewShellWrapper::disposing (const lang::EventObject& rEvent) mxWindow = nullptr; } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 3db156d62ff8..44b6e75128dd 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -namespace sd { namespace framework { +namespace sd::framework { //===== CenterViewFocusModule ==================================================== @@ -148,6 +148,6 @@ void SAL_CALL CenterViewFocusModule::disposing ( } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/DrawModule.cxx b/sd/source/ui/framework/module/DrawModule.cxx index 6d270f25446b..1d5fb0ee231c 100644 --- a/sd/source/ui/framework/module/DrawModule.cxx +++ b/sd/source/ui/framework/module/DrawModule.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace framework { +namespace sd::framework { void DrawModule::Initialize (Reference<frame::XController> const & rxController) { @@ -38,6 +38,6 @@ void DrawModule::Initialize (Reference<frame::XController> const & rxController) new ToolBarModule(rxController); } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx index 3b62e17ae380..139b250fd002 100644 --- a/sd/source/ui/framework/module/ImpressModule.cxx +++ b/sd/source/ui/framework/module/ImpressModule.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace framework { +namespace sd::framework { void ImpressModule::Initialize (Reference<frame::XController> const & rxController) { @@ -46,6 +46,6 @@ void ImpressModule::Initialize (Reference<frame::XController> const & rxControll new ShellStackGuard(rxController); } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 3e8c90562590..bffbe4cd6f74 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::tools::ConfigurationAccess; -namespace sd { namespace framework { +namespace sd::framework { static const sal_uInt32 snFactoryPropertyCount (2); static const sal_uInt32 snStartupPropertyCount (1); @@ -253,7 +253,7 @@ void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) } } -} } // end of namespace sd::framework +} // end of namespace sd::framework extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx index 38d37766f5ba..453e5f1fa4c1 100644 --- a/sd/source/ui/framework/module/PresentationModule.cxx +++ b/sd/source/ui/framework/module/PresentationModule.cxx @@ -24,13 +24,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace framework { +namespace sd::framework { void PresentationModule::Initialize (Reference<frame::XController> const & rxController) { new sd::framework::CenterViewFocusModule(rxController); } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 0340b850f263..304636bbaf2c 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -namespace sd { namespace framework { +namespace sd::framework { //===== CenterViewFocusModule ==================================================== @@ -148,6 +148,6 @@ bool ShellStackGuard::IsPrinting() const return false; } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 009dde064d62..cefdc32a6251 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -40,7 +40,7 @@ namespace { static const sal_Int32 ResourceDeactivationRequestEvent = 1; } -namespace sd { namespace framework { +namespace sd::framework { //===== SlideSorterModule ================================================== @@ -306,6 +306,6 @@ void SAL_CALL SlideSorterModule::disposing ( } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index a14bac5206a5..75c1622b56d7 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -36,7 +36,7 @@ namespace { static const sal_Int32 gnResourceDeactivationRequestEvent(3); } -namespace sd { namespace framework { +namespace sd::framework { //===== ToolBarModule ========================================================= @@ -188,6 +188,6 @@ void SAL_CALL ToolBarModule::disposing (const lang::EventObject& rEvent) } } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 4a6f0f12f02f..0828cf46f5c2 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -40,7 +40,7 @@ static const sal_Int32 ResourceActivationEvent = 2; } -namespace sd { namespace framework { +namespace sd::framework { //===== ViewTabBarModule ================================================== @@ -175,6 +175,6 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton); } -} } // end of namespace sd::framework +} // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index e75508e344ac..eb870559f236 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -148,7 +148,7 @@ private: } // end of anonymous namespace -namespace sd { namespace framework { +namespace sd::framework { namespace { @@ -828,7 +828,7 @@ FrameworkHelperResourceIdFilter::FrameworkHelperResourceIdFilter ( { } -} } // end of namespace sd::framework +} // end of namespace sd::framework namespace { diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index c8ff74cd5166..2271ba78154e 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace presenter { +namespace sd::presenter { //===== CanvasUpdateRequester::Deleter ======================================== @@ -126,6 +126,6 @@ IMPL_LINK_NOARG(CanvasUpdateRequester, Callback, void*, void) m_pThis.reset(); // possibly delete "this" } -} } // end of namespace ::sd::presenter +} // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index c3164529864c..f1f2271a1098 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace presenter { +namespace sd::presenter { //===== PresenterCustomSprite ================================================= @@ -784,6 +784,6 @@ void PresenterCustomSprite::ThrowIfDisposed() } } -} } // end of namespace ::sd::presenter +} // end of namespace ::sd::presenter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 9e5e54cca907..84e7e047c6de 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace presenter { +namespace sd::presenter { //===== PresenterHelper ======================================================= @@ -439,7 +439,7 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative ( return awt::Rectangle(); } -} } // end of namespace ::sd::presenter +} // end of namespace ::sd::presenter extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index b62794a7e929..be89822e6f08 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -26,13 +26,13 @@ #include <cppcanvas/vclfactory.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::cache; -namespace sd { namespace presenter { +namespace sd::presenter { class PresenterPreviewCache::PresenterCacheContext : public CacheContext { @@ -349,7 +349,7 @@ void PresenterPreviewCache::PresenterCacheContext::CallListeners ( } } -} } // end of namespace ::sd::presenter +} // end of namespace ::sd::presenter extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 3cda6da436ea..9f4deae5315f 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -53,7 +53,7 @@ static const OUStringLiteral gsTopPropertyName("Top"); static const OUStringLiteral gsTopRelativePropertyName("RelativeTop"); static const OUStringLiteral gsTotalHeightPropertyName("TotalHeight"); -namespace sd { namespace presenter { +namespace sd::presenter { // PresenterTextView::Implementation class PresenterTextView::Implementation @@ -456,7 +456,7 @@ void PresenterTextView::Implementation::CheckTop() mnTop = 0; } -} } // end of namespace ::sd::presenter +} // end of namespace ::sd::presenter extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index b4fd445a0344..bb4a75209767 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace presenter { +namespace sd::presenter { //===== SlideRenderer ========================================================== @@ -193,7 +193,7 @@ void SlideRenderer::ThrowIfDisposed() } } -} } // end of namespace ::sd::presenter +} // end of namespace ::sd::presenter extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 725cc61a6dad..aa8a82167de1 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -65,7 +65,7 @@ public: } // end of anonymous namespace -namespace sd { namespace sidebar { +namespace sd::sidebar { class AllMasterPagesSelector::SortedMasterPageDescriptorList : public ::std::set<SharedMasterPageDescriptor,MasterPageDescriptorOrder> @@ -175,6 +175,6 @@ void AllMasterPagesSelector::UpdatePageSet (ItemList& rItemList) rItemList.push_back(rxDescriptor->maToken); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 013f84516ebe..ec018e9cf53c 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; -namespace sd { namespace sidebar { +namespace sd::sidebar { VclPtr<vcl::Window> CurrentMasterPagesSelector::Create ( vcl::Window* pParent, @@ -271,6 +271,6 @@ IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener, } } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index 5e9fc962adc1..bd253f2a52f9 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -22,7 +22,7 @@ #include <ViewShellBase.hxx> -namespace sd { namespace sidebar { +namespace sd::sidebar { CustomAnimationPanel::CustomAnimationPanel ( vcl::Window* pParentWindow, @@ -58,6 +58,6 @@ css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 /*n return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 5432d4bdb6c7..151cc510622e 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star; -namespace sd { namespace sidebar { +namespace sd::sidebar { SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( SdDrawDocument& rTargetDocument, @@ -528,6 +528,6 @@ SdPage* DocumentHelper::ProvideMasterPage ( return pMasterPageInDocument; } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 3ac6020987b6..bb1e479a9fe9 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::drawing::framework; using namespace ::sd::slidesorter; using ::sd::framework::FrameworkHelper; -namespace sd { namespace sidebar { +namespace sd::sidebar { namespace { @@ -759,6 +759,6 @@ void LayoutMenu::DataChanged (const DataChangedEvent& rEvent) SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground)); } -} } // end of namespace ::sd::sidebar +} // end of namespace ::sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 95f68f316ca6..60bc2ba3dd40 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -56,7 +56,7 @@ typedef ::std::vector<sd::sidebar::SharedMasterPageDescriptor> MasterPageContain } // end of anonymous namespace -namespace sd { namespace sidebar { +namespace sd::sidebar { /** Inner implementation class of the MasterPageContainer. */ @@ -969,6 +969,6 @@ void MasterPageContainer::Implementation::FillingDone() mpRequestQueue->ProcessAllRequests(); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx index 5dc90ac29491..f9bb76f4cf98 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace sidebar { +namespace sd::sidebar { MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapter) : mrContainerAdapter(rpAdapter), @@ -164,6 +164,6 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate() return SCAN_TEMPLATE; } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index f555a5bb3745..9bfbdcd0a470 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace sidebar { +namespace sd::sidebar { //===== PagePreviewProvider =================================================== @@ -202,6 +202,6 @@ int ExistingPageProvider::GetCostIndex() return 0; } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 811726dec8b7..49a88612f672 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -24,7 +24,7 @@ #include <set> -namespace sd { namespace sidebar { +namespace sd::sidebar { const sal_Int32 MasterPageContainerQueue::snDelayedCreationTimeout (15); const sal_Int32 MasterPageContainerQueue::snDelayedCreationTimeoutWhenNotIdle (100); @@ -258,6 +258,6 @@ void MasterPageContainerQueue::ProcessAllRequests() maDelayedPreviewCreationTimer.Start(); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 2d77511f067e..edd0dbb0811a 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -27,7 +27,7 @@ #include <tools/urlobj.hxx> #include <sal/log.hxx> -namespace sd { namespace sidebar { +namespace sd::sidebar { //===== MasterPageDescriptor ================================================== @@ -338,6 +338,6 @@ bool MasterPageDescriptor::AllComparator::operator() (const SharedMasterPageDesc } } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index f9992f141533..cf30e28c913f 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::text; -namespace sd { namespace sidebar { +namespace sd::sidebar { /** menu entry that is executed as default action when the left mouse button is clicked over a master page. @@ -648,6 +648,6 @@ css::ui::LayoutSize MasterPagesSelector::GetHeightForWidth (const sal_Int32 nWid return css::ui::LayoutSize(nHeight,nHeight,nHeight); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 271430323007..a9118a9250fb 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -24,7 +24,7 @@ #include <navigatr.hxx> -namespace sd { namespace sidebar { +namespace sd::sidebar { NavigatorWrapper::NavigatorWrapper ( vcl::Window* pParent, @@ -78,6 +78,6 @@ void NavigatorWrapper::GetFocus() Control::GetFocus(); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 23e397f710c7..061d4ea3f3bb 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -19,7 +19,7 @@ #include "PanelBase.hxx" -namespace sd { namespace sidebar { +namespace sd::sidebar { PanelBase::PanelBase ( vcl::Window* pParentWindow, @@ -80,6 +80,6 @@ IDisposable::~IDisposable() { } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index e3489acb97b4..bc1e3a0baed6 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -41,7 +41,7 @@ using namespace css; using namespace css::uno; using namespace ::sd::framework; -namespace sd { namespace sidebar { +namespace sd::sidebar { static Reference<lang::XEventListener> mxControllerDisposeListener; @@ -132,7 +132,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( aLayoutSize); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index f3b7f72f9a93..33a16004c856 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -20,7 +20,7 @@ #include "PreviewValueSet.hxx" #include <vcl/event.hxx> -namespace sd { namespace sidebar { +namespace sd::sidebar { static const int gnBorderWidth(3); static const int gnBorderHeight(3); @@ -117,6 +117,6 @@ sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth) return nRowCount * (nItemHeight + 2*gnBorderHeight); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 7a2568375f99..4d52bb96a566 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -26,7 +26,7 @@ #include <drawdoc.hxx> #include <helpids.h> -namespace sd { namespace sidebar { +namespace sd::sidebar { VclPtr<vcl::Window> RecentMasterPagesSelector::Create ( vcl::Window* pParent, @@ -146,6 +146,6 @@ void RecentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu) rMenu.EnableItem(nItemid, false); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index d1f4ab532d82..455ad7fed20e 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -50,7 +50,7 @@ OUString GetPathToSetNode() } // end of anonymous namespace -namespace sd { namespace sidebar { +namespace sd::sidebar { RecentlyUsedMasterPages* RecentlyUsedMasterPages::mpInstance = nullptr; @@ -363,6 +363,6 @@ void RecentlyUsedMasterPages::ResolveList() SendEvent(); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index b60cfccb63aa..df1afcb3c688 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -namespace sd { namespace sidebar { +namespace sd::sidebar { namespace { @@ -1239,6 +1239,6 @@ IMPL_LINK_NOARG( SlideBackground, ModifyMarginHdl, weld::ComboBox&, void ) } } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index d775e63c30dd..8727db823449 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -22,7 +22,7 @@ #include <ViewShellBase.hxx> -namespace sd { namespace sidebar { +namespace sd::sidebar { SlideTransitionPanel::SlideTransitionPanel ( vcl::Window* pParentWindow, @@ -56,6 +56,6 @@ css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*n return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index 69ae4d5b9bd7..f756c46e0107 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -22,7 +22,7 @@ #include <ViewShellBase.hxx> -namespace sd { namespace sidebar { +namespace sd::sidebar { TableDesignPanel::TableDesignPanel ( vcl::Window* pParentWindow, @@ -52,6 +52,6 @@ css::ui::LayoutSize TableDesignPanel::GetHeightForWidth (const sal_Int32 /*nWidt return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } -} } // end of namespace sd::sidebar +} // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 3dfa4204fd08..871bac3833ce 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -35,7 +35,7 @@ static const sal_Int32 MAXIMAL_CACHE_SIZE = 4*1024L*1024L; using namespace ::com::sun::star::uno; -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { class BitmapCache::CacheEntry { @@ -551,6 +551,6 @@ inline bool BitmapCache::CacheEntry::HasLosslessReplacement() const return mpReplacement != nullptr && mpCompressor != nullptr && mpCompressor->IsLossless(); } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index a117b33e0ecc..0e6042d92085 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -24,7 +24,7 @@ #include <vcl/pngread.hxx> #include <vcl/pngwrite.hxx> -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { //===== NoBitmapCompression =================================================== @@ -192,6 +192,6 @@ bool PngCompression::IsLossless() const return true; } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 1507d7c6835c..a9182c2a25e5 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -23,12 +23,12 @@ #include <sdpage.hxx> #include <vcl/bitmapex.hxx> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { class SlideSorterView; class PageObjectViewObjectContact; -} } } +} -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { BitmapFactory::BitmapFactory() : maRenderer(false) @@ -66,6 +66,6 @@ BitmapEx BitmapFactory::CreateBitmap ( return aPreview; } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index e9dd7bcbf4d9..c24fad226dee 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -77,7 +77,7 @@ private: } // end of anonymous namespace -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { ::std::unique_ptr<CacheCompactor> CacheCompactor::Create ( BitmapCache& rCache, @@ -148,7 +148,7 @@ IMPL_LINK_NOARG(CacheCompactor, CompactionCallback, Timer *, void) mbIsCompactionRunning = false; } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache namespace { diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index c6095d9d2033..f4f0a6c2e1c3 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { namespace { @@ -140,6 +140,6 @@ void CacheConfiguration::Shutdown() assert(mpWeakInstance.expired()); // ensure m_ReleaseTimer is destroyed } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 80f05bee7836..d2d0a241e507 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -26,7 +26,7 @@ #include <cache/SlsPageCacheManager.hxx> #include <tools/debug.hxx> -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { GenericPageCache::GenericPageCache ( const Size& rPreviewSize, @@ -275,6 +275,6 @@ void GenericPageCache::Resume() mpQueueProcessor->Resume(); } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 779d2ff790f9..82b1b8ae47bc 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { //===== PageCache ============================================================= @@ -104,6 +104,6 @@ void PageCache::Resume() mpImplementation->Resume(); } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index cfe121c64b9f..ee81849cb7d2 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -103,7 +103,7 @@ private: } // end of anonymous namespace -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { /** Container for the active caches. */ @@ -416,6 +416,6 @@ void PageCacheManager::PutRecentlyUsedCache( } } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 937782bef27f..ec0c2a3d22e2 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -24,7 +24,7 @@ #include <sdpage.hxx> #include <comphelper/profilezone.hxx> -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { //===== QueueProcessor ====================================================== @@ -177,6 +177,6 @@ void QueueProcessor::SetBitmapCache ( mpCache = rpCache; } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx index 365a7273989b..6fc6cabc910b 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx @@ -20,7 +20,7 @@ #include "SlsRequestFactory.hxx" #include "SlsRequestQueue.hxx" -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { void RequestFactory::operator()( RequestQueue& rRequestQueue, @@ -45,6 +45,6 @@ void RequestFactory::operator()( } } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index ddf609af0c62..afc418d92c35 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -25,7 +25,7 @@ #include <set> -namespace sd { namespace slidesorter { namespace cache { +namespace sd::slidesorter::cache { namespace { @@ -271,6 +271,6 @@ void RequestQueue::Clear() mnMaximumPriority = 1; } -} } } // end of namespace ::sd::slidesorter::cache +} // end of namespace ::sd::slidesorter::cache /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 0d1c019229e9..a03d20b5e600 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -78,7 +78,7 @@ using namespace ::sd::slidesorter::view; using namespace ::sd::slidesorter::controller; using namespace ::basegfx; -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), @@ -916,6 +916,6 @@ void SlideSorterController::ModelChangeLock::Release() } } -} } } // end of namespace ::sd::slidesorter +} // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx index dacf7ab911ee..46293b1b7981 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx @@ -19,7 +19,7 @@ #include <controller/SlsAnimationFunction.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { //===== AnimationBezierFunction =============================================== @@ -121,6 +121,6 @@ double AnimationParametricFunction::operator() (const double nX) return maY[nIndex0]*nU + maY[nIndex1]*(1-nU); } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index ce7d0533085e..044efe5ee461 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -20,7 +20,7 @@ #include <controller/SlsAnimator.hxx> #include <view/SlideSorterView.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { /** Handle one animation function by using a timer for frequent calls to the animations operator(). @@ -277,6 +277,6 @@ void Animator::Animation::Expire() } } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 133be4020ec7..872ee4c21dc5 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -65,7 +65,7 @@ #include <rtl/ustring.hxx> #include <vcl/svapp.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { namespace { /** Temporarily deactivate slide tracking of the VisibleAreaManager. @@ -917,6 +917,6 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( return nResult; } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index d3e21aff80bd..a45ece0aee84 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::model; -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), @@ -250,6 +250,6 @@ IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback, Timer *, void) } } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 9db562c480db..de9eabaa589a 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -31,7 +31,7 @@ #include <sdtreelb.hxx> #include <sdmod.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) : mpTargetSlideSorter(&rSlideSorter), @@ -115,6 +115,6 @@ void DragAndDropContext::SetTargetSlideSorter() mpTargetSlideSorter = nullptr; } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index d61784d28921..66f6b65574f7 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -31,7 +31,7 @@ #include <Window.hxx> #include <sdpage.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { FocusManager::FocusManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), @@ -237,6 +237,6 @@ FocusManager::FocusHider::~FocusHider() COVERITY_NOEXCEPT_FALSE mrManager.ShowFocus(); } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index 9d8b07812b80..e998c86cc4e2 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::datatransfer::dnd::DNDConstants; -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), @@ -239,6 +239,6 @@ InsertionIndicatorHandler::ForceShowContext::~ForceShowContext() COVERITY_NOEXCE mpHandler->ForceEnd(); } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 1fab61b99223..5c1d58d32390 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { Listener::Listener ( SlideSorter& rSlideSorter) @@ -601,6 +601,6 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 26498f913979..f3aa7ad19edd 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::sd::slidesorter::model; using namespace ::sd::slidesorter::view; -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { PageSelector::PageSelector (SlideSorter& rSlideSorter) : mrModel(rSlideSorter.GetModel()), @@ -382,6 +382,6 @@ PageSelector::BroadcastLock::~BroadcastLock() mrSelector.EnableBroadcasting(); } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index d635d44229af..0d89b205a09a 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -21,7 +21,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { Properties::Properties() : mbIsHighlightCurrentSlide(false), @@ -105,6 +105,6 @@ void Properties::SetUIReadOnly (const bool bIsUIReadOnly) mbIsUIReadOnly = bIsUIReadOnly; } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 2fbdfee47ea4..5014aebf9afc 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -32,7 +32,7 @@ #include <vcl/scrbar.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { static constexpr double gnHorizontalScrollFactor(0.15); static constexpr double gnVerticalScrollFactor(0.25); @@ -603,6 +603,6 @@ void ScrollBarManager::Scroll( SetTopLeft(aNewTopLeft); } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 162053697bf5..3702cb27ced7 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -86,7 +86,7 @@ static const sal_uInt32 MODIFIER_MASK (SHIFT_MODIFIER | CONTROL_MODIF case code|SHIFT_MODIFIER: \ case code|CONTROL_MODIFIER -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { //===== SelectionFunction::EventDescriptor ==================================== @@ -1484,6 +1484,6 @@ bool DragAndDropModeHandler::ProcessDragEvent (SelectionFunction::EventDescripto return true; } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index ca0cbad1bf51..18bb3dd0b936 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -50,7 +50,7 @@ using namespace ::sd::slidesorter::model; using namespace ::sd::slidesorter::view; using namespace ::sd::slidesorter::controller; -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { SelectionManager::SelectionManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), @@ -302,6 +302,6 @@ void SelectionManager::SetInsertionPosition (const sal_Int32 nInsertionPosition) mnInsertionPosition = nInsertionPosition; } -} } } // end of namespace ::sd::slidesorter +} // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index bacf5fdf0323..84c055106b2f 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -25,7 +25,7 @@ #include <controller/SlsFocusManager.hxx> #include <sdpage.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { SelectionObserver::Context::Context (SlideSorter const & rSlideSorter) : mpSelectionObserver( @@ -133,6 +133,6 @@ void SelectionObserver::EndObservation() } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index c49d9ddad355..e885802fd98a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -82,7 +82,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { namespace { @@ -1283,6 +1283,6 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet) } // end of anonymous namespace -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index 14762979466f..b340642553cc 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -21,7 +21,7 @@ #include <SlideSorterViewShell.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { SdTransferable* TransferableData::CreateTransferable ( SdDrawDocument* pSrcDoc, @@ -81,6 +81,6 @@ void TransferableData::Notify (SfxBroadcaster&, const SfxHint& rHint) } } -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index b495de5d03d6..52bc377f4e91 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -28,7 +28,7 @@ #include <SlideSorter.hxx> #include <view/SlideSorterView.hxx> -namespace sd { namespace slidesorter { namespace controller { +namespace sd::slidesorter::controller { namespace { class VisibleAreaScroller @@ -231,6 +231,6 @@ void VisibleAreaScroller::operator() (const double nTime) } // end of anonymous namespace -} } } // end of namespace ::sd::slidesorter::controller +} // end of namespace ::sd::slidesorter::controller /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index b659285241cf..dec496679efa 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace slidesorter { namespace model { +namespace sd::slidesorter::model { namespace { bool PrintModel (const SlideSorterModel& rModel) @@ -672,6 +672,6 @@ SdPage* SlideSorterModel::GetPage (const sal_Int32 nSdIndex) const return nullptr; } -} } } // end of namespace ::sd::slidesorter::model +} // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index b64233c5913a..c3e0356f5a73 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -namespace sd { namespace slidesorter { namespace model { +namespace sd::slidesorter::model { PageDescriptor::PageDescriptor ( const Reference<drawing::XDrawPage>& rxPage, @@ -222,6 +222,6 @@ void PageDescriptor::SetBoundingBox (const ::tools::Rectangle& rBoundingBox) maBoundingBox = rBoundingBox; } -} } } // end of namespace ::sd::slidesorter::model +} // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index 6e66c104b9bb..f434d8c5270d 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -69,7 +69,7 @@ private: } // end of anonymous namespace -namespace sd { namespace slidesorter { namespace model { +namespace sd::slidesorter::model { PageEnumeration PageEnumeration::Create ( const SlideSorterModel& rModel, @@ -123,7 +123,7 @@ void PageEnumeration::Rewind() return mpImpl->Rewind(); } -} } } // end of namespace ::sd::slidesorter::model +} // end of namespace ::sd::slidesorter::model namespace { diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx index 29fd7a1baa4f..800fa12db7fb 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx @@ -21,7 +21,7 @@ #include <model/SlsPageEnumeration.hxx> #include <model/SlsPageDescriptor.hxx> -namespace sd { namespace slidesorter { namespace model { +namespace sd::slidesorter::model { namespace { @@ -76,6 +76,6 @@ PageEnumeration PageEnumerationProvider::CreateVisiblePagesEnumeration ( VisiblePagesPredicate()); } -} } } // end of namespace ::sd::slidesorter::model +} // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index e8b7de083ed7..9662b5d32945 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -19,7 +19,7 @@ #include <model/SlsVisualState.hxx> -namespace sd { namespace slidesorter { namespace model { +namespace sd::slidesorter::model { VisualState::VisualState (const sal_Int32 nPageId) : mnPageId(nPageId), @@ -39,6 +39,6 @@ void VisualState::SetLocationOffset (const Point& rOffset) } } -} } } // end of namespace ::sd::slidesorter::model +} // end of namespace ::sd::slidesorter::model /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index b59e2a3d9512..f392780512cb 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -namespace sd { namespace slidesorter { +namespace sd::slidesorter { namespace { class ContentWindow : public ::sd::Window @@ -460,6 +460,6 @@ bool ContentWindow::EventNotify(NotifyEvent&) } // end of anonymous namespace -} } // end of namespace ::sd::slidesorter +} // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 8cf176fbb008..cd9b167d6eff 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::slidesorter::view::Layouter; -namespace sd { namespace slidesorter { +namespace sd::slidesorter { //===== SlideSorterService ========================================================== @@ -400,7 +400,7 @@ void SlideSorterService::ThrowIfDisposed() } } -} } // end of namespace ::sd::slidesorter +} // end of namespace ::sd::slidesorter extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 9e375bc8f6c3..44a04b7728fb 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; using ::vcl::EnumContext; -namespace sd { namespace slidesorter { +namespace sd::slidesorter { SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell) @@ -882,6 +882,6 @@ void SlideSorterViewShell::PostMoveSlidesActions(const std::shared_ptr<SlideSort } -} } // end of namespace ::sd::slidesorter +} // end of namespace ::sd::slidesorter /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 1772bf8c7f00..a8e6093961c1 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -57,7 +57,7 @@ using namespace std; using namespace ::sd::slidesorter::model; using namespace ::drawinglayer::primitive2d; -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { namespace { /** Wrapper around the SlideSorterView that supports the IPainter @@ -833,6 +833,6 @@ void SlideSorterView::DrawLock::Dispose() mpWindow.reset(); } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 501d7dc65f0e..26b9a53e445d 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -21,7 +21,7 @@ #include <vcl/outdev.hxx> #include <osl/diagnose.h> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { FramePainter::FramePainter (const BitmapEx& rShadowBitmap) : maTopLeft(rShadowBitmap,-1,-1), @@ -222,6 +222,6 @@ void FramePainter::OffsetBitmap::PaintCenter ( maBitmap); } -} } } // end of namespace sd::slidesorter::view +} // end of namespace sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index a3cc6a0c2ede..3e16b3bccfe4 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -29,7 +29,7 @@ #include <memory> #include <set> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { namespace { @@ -426,6 +426,6 @@ void PageObjectRun::operator () (const double nGlobalTime) mrAnimatorAccess.GetContentWindow()->Flush(); } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 6daac07ac0dd..01446d707ae8 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -52,7 +52,7 @@ sal_Int32 RoundToInt (const double nValue) { return sal_Int32(::rtl::math::round } // end of anonymous namespace -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { //===== InsertionIndicatorOverlay =========================================== @@ -355,6 +355,6 @@ Size InsertionIndicatorOverlay::GetSize() const maIcon.GetSizePixel().Height() + 10); } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 199d6ec1d26c..7a84a86aa1db 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -29,7 +29,7 @@ #include <functional> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { namespace { static const sal_Int32 gnMaximumLayerCount = 8; @@ -488,6 +488,6 @@ void Layer::Dispose() maPainters.clear(); } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index a4cf7fdf613f..c41f49a11acc 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -25,7 +25,7 @@ #include <Window.hxx> #include <osl/diagnose.h> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { class Layouter::Implementation { @@ -1222,6 +1222,6 @@ void InsertPosition::SetGeometricalPosition( maTrailingOffset = rTrailingOffset; } -} } } // end of namespace ::sd::slidesorter::namespace +} // end of namespace ::sd::slidesorter::namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 54453ed120a8..a3a5206914da 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -27,7 +27,7 @@ #include <bitmaps.hlst> #include <osl/diagnose.h> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { namespace { const static sal_Int32 gnLeftPageNumberOffset = 2; @@ -258,6 +258,6 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount) return aSize; } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 21d54e550829..0f294bd05508 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -35,7 +35,7 @@ using namespace ::drawinglayer::primitive2d; -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { //===== PageObjectPainter ===================================================== @@ -461,6 +461,6 @@ void PageObjectPainter::PaintBorder ( } } -} } } // end of namespace sd::slidesorter::view +} // end of namespace sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 93be422f9ce4..48d42d081d71 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -27,7 +27,7 @@ #include <osl/diagnose.h> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { const static Color Black(0x000000); const static Color White(0xffffff); @@ -237,6 +237,6 @@ void Theme::InitializeIcon(const IconType eType, const OUString& rResourceId) } } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 3e75638bd920..e5872b45bfc7 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -30,7 +30,7 @@ #include <vcl/settings.hxx> #include <vcl/help.hxx> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { ToolTip::ToolTip (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), @@ -155,6 +155,6 @@ IMPL_LINK_NOARG(ToolTip, DelayTrigger, Timer *, void) DoShow(); } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index 578a611a8f2c..96e0c4d57b40 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -30,7 +30,7 @@ #include <tools/IdleDetection.hxx> #include <svx/svdpage.hxx> -namespace sd { namespace slidesorter { namespace view { +namespace sd::slidesorter::view { ViewCacheContext::ViewCacheContext (SlideSorter& rSlideSorter) : mrModel(rSlideSorter.GetModel()), @@ -112,6 +112,6 @@ css::uno::Reference<css::uno::XInterface> ViewCacheContext::GetModel() return mrModel.GetDocument()->getUnoModel(); } -} } } // end of namespace ::sd::slidesorter::view +} // end of namespace ::sd::slidesorter::view /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 36397fa816e7..3c4c59ce2b3d 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -46,7 +46,7 @@ using namespace sd::ui::table; #define ShellClass_TableObjectBar #include <sdslots.hxx> -namespace sd { namespace ui { namespace table { +namespace sd::ui::table { /** creates a table object bar for the given ViewShell */ SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView ) @@ -216,6 +216,6 @@ void TableObjectBar::Execute( SfxRequest& rReq ) pBindings->Invalidate( SID_REDO ); } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 09be42094368..dcf8126eb587 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -20,7 +20,7 @@ #include <memory> #include <tools/AsynchronousCall.hxx> -namespace sd { namespace tools { +namespace sd::tools { AsynchronousCall::AsynchronousCall() : maTimer(), @@ -52,6 +52,6 @@ IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer,void) } } -} } // end of namespace ::sd::tools +} // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index 4883042ee94c..9b14a03a1768 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace tools { +namespace sd::tools { ConfigurationAccess::ConfigurationAccess ( const Reference<XComponentContext>& rxContext, @@ -170,6 +170,6 @@ void ConfigurationAccess::FillList( {} } -} } // end of namespace sd::tools +} // end of namespace sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index c098b7abcf7d..e5fe2d31f90c 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -51,7 +51,7 @@ static const sal_Int32 ResourceDeactivationEvent = 1; static const sal_Int32 ConfigurationUpdateEvent = 2; } -namespace sd { namespace tools { +namespace sd::tools { typedef cppu::WeakComponentImplHelper< css::beans::XPropertyChangeListener, @@ -656,6 +656,6 @@ EventMultiplexerEvent::EventMultiplexerEvent ( { } -} } // end of namespace ::sd::tools +} // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index e5ef96843682..988bd849bf0e 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; -namespace sd { namespace tools { +namespace sd::tools { IdleState IdleDetection::GetIdleState (const vcl::Window* pWindow) { @@ -98,6 +98,6 @@ IdleState IdleDetection::CheckWindowPainting (const vcl::Window& rWindow) return IdleState::Idle; } -} } // end of namespace ::sd::tools +} // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 980c15bf5b27..057b7dd96ce3 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace sd { namespace tools { +namespace sd::tools { PropertySet::PropertySet() : PropertySetInterfaceBase(m_aMutex), @@ -153,6 +153,6 @@ void PropertySet::ThrowIfDisposed() } } -} } // end of namespace ::sd::tools +} // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 4d1ff2852394..5fb078f14127 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; -namespace sd { namespace tools { +namespace sd::tools { SlotStateListener::SlotStateListener ( Link<const OUString&,void> const & rCallback, @@ -150,6 +150,6 @@ void SlotStateListener::ThrowIfDisposed() } } -} } // end of namespace ::sd::tools +} // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index fb9f42cb96c1..8ae7fddada92 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -24,7 +24,7 @@ #include <sal/log.hxx> #include <memory> -namespace sd { namespace tools { +namespace sd::tools { /** Used by the shared_ptr instead of the private destructor. */ @@ -127,6 +127,6 @@ IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback, Timer *, void) mpSelf.reset(); } -} } // end of namespace ::sd::tools +} // end of namespace ::sd::tools /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index b91e6de9640c..869350fa9571 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -27,7 +27,7 @@ #include <DrawViewShell.hxx> #include <sdpage.hxx> -namespace sd { namespace outliner { +namespace sd::outliner { //===== IteratorPosition ====================================================== @@ -794,6 +794,6 @@ void DocumentIteratorImpl::GotoNextText() SetPage (nPageCount); } -} } // end of namespace ::sd::outliner +} // end of namespace ::sd::outliner /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits