diff options
28 files changed, 85 insertions, 177 deletions
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 53d6a040c09c..03e7a5643655 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -29,17 +29,13 @@ #include <com/sun/star/beans/PropertyValues.hpp> #include <cppuhelper/compbase.hxx> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfigurationChangeRequest, css::container::XNamed > GenericConfigurationChangeRequestInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** This implementation of the XConfigurationChangeRequest interface represents a single explicit request for a configuration change. On its execution it may result in other, implicit, configuration changes. For diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index d92d6792a308..54c11b2878a9 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -26,17 +26,13 @@ #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <cppuhelper/compbase.hxx> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfigurationChangeRequest, css::container::XNamed > UpdateRequestInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** This update request is used to request configuration updates asynchronous when no other requests are being processed. When there are other requests then we can simply wait until the last one is executed: diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index fcac6c04dd85..5b8caf81fbf3 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -34,16 +34,6 @@ #include <memory> -namespace { - -typedef ::cppu::WeakComponentImplHelper < - css::lang::XInitialization, - css::drawing::framework::XResourceFactory, - css::drawing::framework::XConfigurationChangeListener - > BasicPaneFactoryInterfaceBase; - -} // end of anonymous namespace. - namespace sd { class ViewShellBase; @@ -51,6 +41,12 @@ class ViewShellBase; namespace sd { namespace framework { +typedef ::cppu::WeakComponentImplHelper < + css::lang::XInitialization, + css::drawing::framework::XResourceFactory, + css::drawing::framework::XConfigurationChangeListener + > BasicPaneFactoryInterfaceBase; + /** This factory provides the frequently used standard panes private:resource/pane/CenterPane private:resource/pane/FullScreenPane diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 55b449602eb1..cb471e2ca3f2 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -32,7 +32,11 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -namespace { +namespace sd { +class ViewShellBase; +} + +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XResourceFactory, @@ -40,14 +44,6 @@ typedef ::cppu::WeakComponentImplHelper < css::lang::XEventListener > BasicToolBarFactoryInterfaceBase; -} // end of anonymous namespace. - -namespace sd { -class ViewShellBase; -} - -namespace sd { namespace framework { - /** This factory provides some of the frequently used tool bars: private:resource/toolbar/ViewTabBar */ diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index eb1a4913031c..373b1f740f44 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -43,17 +43,13 @@ class FrameView; class SfxViewFrame; namespace vcl { class Window; } -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XResourceFactory, css::lang::XInitialization > BasicViewFactoryInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** Factory for the frequently used standard views of the drawing framework: private:resource/view/ private:resource/view/ImpressView diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index e072d772ec0e..db85c0296cfb 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -30,19 +30,15 @@ #include <comphelper/uno3.hxx> #include <memory> -namespace { +namespace sd { class ViewShellBase; } + +namespace sd { namespace framework { typedef ::cppu::ImplInheritanceHelper < ::sd::framework::Pane, css::lang::XEventListener > ChildWindowPaneInterfaceBase; -} // end of anonymous namespace. - -namespace sd { class ViewShellBase; } - -namespace sd { namespace framework { - /** The ChildWindowPane listens to the child window and disposes itself when the child window becomes inaccessible. This happens for instance when a document is made read-only and the task pane is turned off. diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index e8a8ebecf1eb..c86452e2d2ac 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -28,14 +28,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/compbase.hxx> -namespace { - -typedef ::cppu::WeakComponentImplHelper < - css::drawing::framework::XConfigurationChangeListener - > CenterViewFocusModuleInterfaceBase; - -} // end of anonymous namespace. - namespace sd { class ViewShellBase; @@ -44,6 +36,10 @@ class ViewShellBase; namespace sd { namespace framework { +typedef ::cppu::WeakComponentImplHelper < + css::drawing::framework::XConfigurationChangeListener + > CenterViewFocusModuleInterfaceBase; + /** This module waits for new views to be created for the center pane and then moves the center view to the top most place on the shell stack. As we are moving away from the shell stack this module may become obsolete diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 10bf23b4d9dd..ae88b746b933 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -27,16 +27,12 @@ #include <cppuhelper/compbase.hxx> #include <memory> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfigurationChangeListener > ResourceManagerInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** Manage the activation state of one resource depending on the view in the center pane. The ResourceManager remembers in which configuration to activate and in which to deactivate the resource. When the resource is diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 3dc138afaebc..c2281253286d 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -33,14 +33,6 @@ #include <cppuhelper/compbase.hxx> #include <memory> -namespace { - -typedef ::cppu::WeakComponentImplHelper < - css::drawing::framework::XConfigurationChangeListener - > ShellStackGuardInterfaceBase; - -} // end of anonymous namespace. - namespace sd { class ViewShellBase; @@ -49,6 +41,10 @@ class ViewShellBase; namespace sd { namespace framework { +typedef ::cppu::WeakComponentImplHelper < + css::drawing::framework::XConfigurationChangeListener + > ShellStackGuardInterfaceBase; + /** This module locks updates of the current configuration in situations when the shell stack must not be modified. diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index 4ffdc335dc3b..b8e9c6f81c02 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -36,11 +36,9 @@ class ViewShellBase; namespace sd { namespace framework { -namespace { - typedef ::cppu::WeakComponentImplHelper < - css::drawing::framework::XConfigurationChangeListener - > ToolBarModuleInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper < + css::drawing::framework::XConfigurationChangeListener + > ToolBarModuleInterfaceBase; /** This module is responsible for locking the ToolBarManager during configuration updates and for triggering ToolBarManager updates. diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index 87962f5b977f..fb6ba518a17d 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -29,16 +29,12 @@ #include <osl/mutex.hxx> #include <cppuhelper/compbase.hxx> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfigurationChangeListener > ViewTabBarModuleInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** This module is responsible for showing the ViewTabBar above the view in the center pane. */ diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 146ef5d470a2..ddc042103162 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -29,11 +29,9 @@ namespace sd { -namespace { - typedef ::cppu::WeakComponentImplHelper < - css::view::XRenderable - > DocumentRendererInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper < + css::view::XRenderable + > DocumentRendererInterfaceBase; class DocumentRenderer : protected ::cppu::BaseMutex, diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index a15e849e1bc6..f13eedef6053 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -39,17 +39,15 @@ namespace sd { class ViewShellBase; } -namespace { - typedef ::cppu::WeakComponentImplHelper < - css::drawing::framework::XToolBar, - css::drawing::framework::XTabBar, - css::drawing::framework::XConfigurationChangeListener, - css::lang::XUnoTunnel - > ViewTabBarInterfaceBase; -} - namespace sd { +typedef ::cppu::WeakComponentImplHelper < + css::drawing::framework::XToolBar, + css::drawing::framework::XTabBar, + css::drawing::framework::XConfigurationChangeListener, + css::lang::XUnoTunnel + > ViewTabBarInterfaceBase; + /** Tab control for switching between views in the center pane. */ class ViewTabBar diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 03b127239f5f..cf09438cbd91 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -30,7 +30,7 @@ #include <memory> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfiguration, @@ -38,10 +38,6 @@ typedef ::cppu::WeakComponentImplHelper < css::lang::XServiceInfo > ConfigurationInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** A configuration describes the resources of an application like panes, views, and tool bars and their relationships that are currently active or are requested to be activated. Resources are specified by URLs rather diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 1552c2937348..ee63880b1c6d 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -37,19 +37,15 @@ #include <memory> -namespace { +namespace sd { class ViewShellBase; } + +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfigurationController, css::lang::XInitialization > ConfigurationControllerInterfaceBase; -} // end of anonymous namespace. - -namespace sd { class ViewShellBase; } - -namespace sd { namespace framework { - /** The configuration controller is responsible for maintaining the current configuration. diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index f29450f38c74..35bff5e7f7dd 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -32,17 +32,13 @@ #include <memory> #include <set> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XModuleController, css::lang::XInitialization > ModuleControllerInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** The ModuleController has to tasks: 1. It reads the diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index d2d1233bab09..9a71c4d6de6d 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -32,8 +32,7 @@ namespace vcl { class Window; } - -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XPane, @@ -41,10 +40,6 @@ typedef ::cppu::WeakComponentImplHelper < css::lang::XUnoTunnel > PaneInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** A pane is a wrapper for a window and possibly for a tab bar (for view switching). Panes are unique resources. diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 32675d122d3c..2e8bed5f6335 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -33,17 +33,13 @@ #include <memory> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XResourceFactory, css::drawing::framework::XConfigurationChangeListener > PresentationFactoryInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** This factory creates a marker view whose existence in a configuration indicates that a slideshow is running (in another but associated application window). diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index fea9aa39f680..0558cdfb8609 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -31,7 +31,7 @@ #include <cppuhelper/implbase.hxx> #include <memory> -namespace { +namespace sd { namespace framework { typedef ::cppu::WeakImplHelper < css::drawing::framework::XResourceId, @@ -39,10 +39,6 @@ typedef ::cppu::WeakImplHelper < css::lang::XServiceInfo > ResourceIdInterfaceBase; -} // end of anonymous namespace. - -namespace sd { namespace framework { - /** Implementation of the css::drawing::framework::ResourceId service and the css::drawing::framework::XResourceId interface. diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 909f6fdd50ae..061d185c4dca 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -32,7 +32,10 @@ #include <memory> -namespace { +namespace sd { class ViewShell; } +namespace sd { namespace slidesorter { class SlideSorterViewShell; } } + +namespace sd { namespace framework { typedef ::cppu::WeakComponentImplHelper < css::lang::XUnoTunnel , css::awt::XWindowListener @@ -41,13 +44,6 @@ typedef ::cppu::WeakComponentImplHelper < css::lang::XUnoTunnel , css::drawing::framework::XView > ViewShellWrapperInterfaceBase; -} // end of anonymous namespace. - -namespace sd { class ViewShell; } -namespace sd { namespace slidesorter { class SlideSorterViewShell; } } - -namespace sd { namespace framework { - /** This class wraps ViewShell objects and makes them look like an XView. Most importantly it provides a tunnel to the ViewShell implementation. Then it forwards size changes of the pane window to the view shell. diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 912e2637d7c8..7ec5a6655724 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -28,11 +28,9 @@ namespace sd { namespace tools { -namespace { - typedef ::cppu::WeakComponentImplHelper < - css::beans::XPropertySet - > PropertySetInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper < + css::beans::XPropertySet +> PropertySetInterfaceBase; /** A very simple implementation of the XPropertySet interface. It does not support constrained properties and thus does not support vetoable diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index a31e899d0234..019903755d9f 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -38,13 +38,11 @@ namespace sd { namespace presenter { -namespace { - typedef ::cppu::WeakComponentImplHelper < - css::rendering::XSpriteCanvas, - css::rendering::XBitmap, - css::awt::XWindowListener - > PresenterCanvasInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper < + css::rendering::XSpriteCanvas, + css::rendering::XBitmap, + css::awt::XWindowListener +> PresenterCanvasInterfaceBase; /** Wrapper around a shared canvas that forwards most of its methods to the shared canvas. Most notable differences are: diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index be955fcfbc60..e5f0113f068b 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -28,12 +28,10 @@ namespace sd { namespace presenter { -namespace { - typedef ::cppu::WeakComponentImplHelper< - css::lang::XInitialization, - css::drawing::XPresenterHelper - > PresenterHelperInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper< + css::lang::XInitialization, + css::drawing::XPresenterHelper +> PresenterHelperInterfaceBase; /** Implementation of the XPresenterHelper interface: functionality that can not be implemented in an extension. diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 2e13d979c3d1..958f5b530997 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -30,12 +30,10 @@ namespace sd { namespace presenter { -namespace { - typedef ::cppu::WeakComponentImplHelper< - css::lang::XInitialization, - css::drawing::XSlidePreviewCache - > PresenterPreviewCacheInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper< + css::lang::XInitialization, + css::drawing::XSlidePreviewCache +> PresenterPreviewCacheInterfaceBase; /** Uno API wrapper around the slide preview cache. */ diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index f49ef4fa2453..164964860e9c 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -33,12 +33,10 @@ namespace com { namespace sun { namespace star { namespace uno { namespace sd { namespace presenter { -namespace { - typedef ::cppu::ImplInheritanceHelper < - tools::PropertySet, - css::lang::XInitialization - > PresenterTextViewInterfaceBase; -} +typedef ::cppu::ImplInheritanceHelper < + tools::PropertySet, + css::lang::XInitialization +> PresenterTextViewInterfaceBase; /** Render text into bitmaps. An edit engine is used to render the text. This service is used by the presenter screen to render the notes view. diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 128bc46a642f..6a136680614e 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -33,13 +33,11 @@ namespace sd { namespace presenter { -namespace { - typedef ::cppu::WeakComponentImplHelper < - css::drawing::XSlideRenderer, - css::lang::XInitialization, - css::lang::XServiceInfo - > SlideRendererInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper < + css::drawing::XSlideRenderer, + css::lang::XInitialization, + css::lang::XServiceInfo +> SlideRendererInterfaceBase; /** Render single slides into bitmaps. */ diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index a2bcf78d4569..de4a6ec9f2db 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -37,12 +37,9 @@ namespace sd { namespace sd { namespace sidebar { -namespace -{ - typedef ::cppu::WeakComponentImplHelper < - css::ui::XUIElementFactory - > PanelFactoryInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper < + css::ui::XUIElementFactory + > PanelFactoryInterfaceBase; class PanelFactory : private ::cppu::BaseMutex, diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 1ae33047158a..f6e4b1a0a37c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -35,13 +35,11 @@ namespace sd { namespace slidesorter { -namespace { - typedef ::cppu::WeakComponentImplHelper < - css::drawing::XSlideSorterBase, - css::lang::XInitialization, - css::awt::XWindowListener - > SlideSorterServiceInterfaceBase; -} +typedef ::cppu::WeakComponentImplHelper < + css::drawing::XSlideSorterBase, + css::lang::XInitialization, + css::awt::XWindowListener +> SlideSorterServiceInterfaceBase; /** Implementation of the com.sun.star.drawing.SlideSorter service. */ |