summaryrefslogtreecommitdiff
path: root/sd/source/ui/framework/module
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/framework/module')
-rw-r--r--sd/source/ui/framework/module/CenterViewFocusModule.cxx4
-rw-r--r--sd/source/ui/framework/module/CenterViewFocusModule.hxx4
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx10
-rw-r--r--sd/source/ui/framework/module/ResourceManager.cxx10
-rw-r--r--sd/source/ui/framework/module/ResourceManager.hxx8
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.cxx6
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.hxx6
-rw-r--r--sd/source/ui/framework/module/SlideSorterModule.cxx4
-rw-r--r--sd/source/ui/framework/module/SlideSorterModule.hxx4
-rw-r--r--sd/source/ui/framework/module/ToolBarModule.cxx8
-rw-r--r--sd/source/ui/framework/module/ToolBarModule.hxx8
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.cxx4
-rw-r--r--sd/source/ui/framework/module/ToolPanelModule.hxx4
-rw-r--r--sd/source/ui/framework/module/ViewTabBarModule.cxx4
-rw-r--r--sd/source/ui/framework/module/ViewTabBarModule.hxx4
15 files changed, 44 insertions, 44 deletions
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index a84ded03f401..a0f2c54f1e9f 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -86,11 +86,11 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC
}
}
-CenterViewFocusModule::~CenterViewFocusModule (void)
+CenterViewFocusModule::~CenterViewFocusModule()
{
}
-void SAL_CALL CenterViewFocusModule::disposing (void)
+void SAL_CALL CenterViewFocusModule::disposing()
{
if (mxConfigurationController.is())
mxConfigurationController->removeConfigurationChangeListener(this);
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index d1ff8eba52e2..af911dbef097 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -56,9 +56,9 @@ class CenterViewFocusModule
public:
CenterViewFocusModule (
::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController);
- virtual ~CenterViewFocusModule (void);
+ virtual ~CenterViewFocusModule();
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XConfigurationChangeListener
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 4cce9529c557..8b86fca69008 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -45,7 +45,7 @@ class ModuleController::ResourceToFactoryMap
OUStringHash>
{
public:
- ResourceToFactoryMap (void) {}
+ ResourceToFactoryMap() {}
};
class ModuleController::LoadedFactoryContainer
@@ -55,7 +55,7 @@ class ModuleController::LoadedFactoryContainer
OUStringHash>
{
public:
- LoadedFactoryContainer (void) {}
+ LoadedFactoryContainer() {}
};
//===== ModuleController ======================================================
@@ -76,11 +76,11 @@ ModuleController::ModuleController (const Reference<XComponentContext>& rxContex
LoadFactories(rxContext);
}
-ModuleController::~ModuleController (void) throw()
+ModuleController::~ModuleController() throw()
{
}
-void SAL_CALL ModuleController::disposing (void)
+void SAL_CALL ModuleController::disposing()
{
// Break the cyclic reference back to DrawController object
mpLoadedFactories.reset();
@@ -142,7 +142,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
}
}
-void ModuleController::InstantiateStartupServices (void)
+void ModuleController::InstantiateStartupServices()
{
try
{
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 14901db3044e..a3255c9fd763 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -42,7 +42,7 @@ class ResourceManager::MainViewContainer
: public ::std::set<OUString>
{
public:
- MainViewContainer (void) {}
+ MainViewContainer() {}
};
//===== ResourceManager =======================================================
@@ -80,7 +80,7 @@ ResourceManager::ResourceManager (
}
}
-ResourceManager::~ResourceManager (void)
+ResourceManager::~ResourceManager()
{
}
@@ -96,11 +96,11 @@ bool ResourceManager::IsResourceActive (
return (mpActiveMainViewContainer->find(rsMainViewURL) != mpActiveMainViewContainer->end());
}
-void ResourceManager::SaveResourceState (void)
+void ResourceManager::SaveResourceState()
{
}
-void SAL_CALL ResourceManager::disposing (void)
+void SAL_CALL ResourceManager::disposing()
{
if (mxConfigurationController.is())
{
@@ -165,7 +165,7 @@ void SAL_CALL ResourceManager::notifyConfigurationChange (
}
}
-void ResourceManager::UpdateForMainViewShell (void)
+void ResourceManager::UpdateForMainViewShell()
{
if (mxConfigurationController.is())
{
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index 1ce16db74410..e2d31dd49c1a 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -53,16 +53,16 @@ public:
::com::sun::star::frame::XController>& rxController,
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::framework::XResourceId>& rxResourceId);
- virtual ~ResourceManager (void);
+ virtual ~ResourceManager();
/** Remember the given URL as one of a center pane view for which to
activate the resource managed by the called object.
*/
void AddActiveMainView (const OUString& rsMainViewURL);
bool IsResourceActive (const OUString& rsMainViewURL);
- virtual void SaveResourceState (void);
+ virtual void SaveResourceState();
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XConfigurationChangeListener
@@ -101,7 +101,7 @@ private:
bool bActivation,
const ::com::sun::star::uno::Reference<
com::sun::star::drawing::framework::XConfiguration>& rxConfiguration);
- void UpdateForMainViewShell (void);
+ void UpdateForMainViewShell();
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index 7f2f172d9cef..3e9ef23a51b1 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -76,11 +76,11 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController)
}
}
-ShellStackGuard::~ShellStackGuard (void)
+ShellStackGuard::~ShellStackGuard()
{
}
-void SAL_CALL ShellStackGuard::disposing (void)
+void SAL_CALL ShellStackGuard::disposing()
{
if (mxConfigurationController.is())
mxConfigurationController->removeConfigurationChangeListener(this);
@@ -142,7 +142,7 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
return 0;
}
-bool ShellStackGuard::IsPrinting (void) const
+bool ShellStackGuard::IsPrinting() const
{
if (mpBase != NULL)
{
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 56796f423d09..851687490d1b 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -65,9 +65,9 @@ class ShellStackGuard
{
public:
ShellStackGuard (css::uno::Reference<css::frame::XController>& rxController);
- virtual ~ShellStackGuard (void);
+ virtual ~ShellStackGuard();
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XConfigurationChangeListener
@@ -93,7 +93,7 @@ private:
the printer is not printing, or there is no printer, or something
else went wrong.
*/
- bool IsPrinting (void) const;
+ bool IsPrinting() const;
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index b4a3c430b995..32dc1e79dba5 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -71,11 +71,11 @@ SlideSorterModule::SlideSorterModule (
}
}
-SlideSorterModule::~SlideSorterModule (void)
+SlideSorterModule::~SlideSorterModule()
{
}
-void SlideSorterModule::SaveResourceState (void)
+void SlideSorterModule::SaveResourceState()
{
SvtSlideSorterBarOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL));
SvtSlideSorterBarOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL));
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index 906a8ec1b556..349d2f18cadc 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -37,9 +37,9 @@ public:
SlideSorterModule (
const css::uno::Reference<css::frame::XController>& rxController,
const OUString& rsLeftPaneURL);
- virtual ~SlideSorterModule (void);
+ virtual ~SlideSorterModule();
- virtual void SaveResourceState (void) SAL_OVERRIDE;
+ virtual void SaveResourceState() SAL_OVERRIDE;
// XConfigurationChangeListener
virtual void SAL_CALL notifyConfigurationChange (
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index a7b88bd06a13..51e4b6ba6254 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -84,11 +84,11 @@ ToolBarModule::ToolBarModule (
}
}
-ToolBarModule::~ToolBarModule (void)
+ToolBarModule::~ToolBarModule()
{
}
-void SAL_CALL ToolBarModule::disposing (void)
+void SAL_CALL ToolBarModule::disposing()
{
if (mxConfigurationController.is())
mxConfigurationController->removeConfigurationChangeListener(this);
@@ -133,7 +133,7 @@ void SAL_CALL ToolBarModule::notifyConfigurationChange (
}
}
-void ToolBarModule::HandleUpdateStart (void)
+void ToolBarModule::HandleUpdateStart()
{
// Lock the ToolBarManager and tell it to lock the ViewShellManager as
// well. This way the ToolBarManager can optimize the releasing of
@@ -147,7 +147,7 @@ void ToolBarModule::HandleUpdateStart (void)
}
}
-void ToolBarModule::HandleUpdateEnd (void)
+void ToolBarModule::HandleUpdateEnd()
{
if (mbMainViewSwitchUpdatePending)
{
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index 1a309ac66630..36ba62be7144 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -56,9 +56,9 @@ public:
*/
ToolBarModule (
const css::uno::Reference<css::frame::XController>& rxController);
- virtual ~ToolBarModule (void);
+ virtual ~ToolBarModule();
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XConfigurationChangeListener
@@ -79,8 +79,8 @@ private:
::boost::scoped_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
bool mbMainViewSwitchUpdatePending;
- void HandleUpdateStart (void);
- void HandleUpdateEnd (void);
+ void HandleUpdateStart();
+ void HandleUpdateEnd();
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index 942e83c5a5aa..617a293862e6 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -64,11 +64,11 @@ ToolPanelModule::ToolPanelModule (
}
}
-ToolPanelModule::~ToolPanelModule (void)
+ToolPanelModule::~ToolPanelModule()
{
}
-void ToolPanelModule::SaveResourceState (void)
+void ToolPanelModule::SaveResourceState()
{
SvtToolPanelOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL));
SvtToolPanelOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL));
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index 3f22e6efe39a..bbf4ee7c638a 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -36,9 +36,9 @@ public:
ToolPanelModule (
const css::uno::Reference<css::frame::XController>& rxController,
const OUString& rsRightPaneURL);
- virtual ~ToolPanelModule (void);
+ virtual ~ToolPanelModule();
- virtual void SaveResourceState (void) SAL_OVERRIDE;
+ virtual void SaveResourceState() SAL_OVERRIDE;
// XConfigurationChangeListener
virtual void SAL_CALL notifyConfigurationChange (
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index bc02e08151f0..ccf08fbabe47 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -77,11 +77,11 @@ ViewTabBarModule::ViewTabBarModule (
}
}
-ViewTabBarModule::~ViewTabBarModule (void)
+ViewTabBarModule::~ViewTabBarModule()
{
}
-void SAL_CALL ViewTabBarModule::disposing (void)
+void SAL_CALL ViewTabBarModule::disposing()
{
if (mxConfigurationController.is())
mxConfigurationController->removeConfigurationChangeListener(this);
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index b07eef9b0d5e..b8bd19bc4a2d 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -59,9 +59,9 @@ public:
const css::uno::Reference<css::frame::XController>& rxController,
const css::uno::Reference<
css::drawing::framework::XResourceId>& rxViewTabBarId);
- virtual ~ViewTabBarModule (void);
+ virtual ~ViewTabBarModule();
- virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
// XConfigurationChangeListener