sd/source/console/PresenterController.cxx |
29 ++-----
sd/source/console/PresenterFrameworkObserver.cxx |
3
sd/source/ui/app/sdmod1.cxx |
6 -
sd/source/ui/framework/configuration/ConfigurationController.cxx |
5 -
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx |
21 +----
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx |
15 ---
sd/source/ui/framework/factories/BasicPaneFactory.cxx |
9 --
sd/source/ui/framework/factories/BasicViewFactory.cxx |
4 -
sd/source/ui/framework/factories/PresentationFactory.cxx |
15 ---
sd/source/ui/framework/module/CenterViewFocusModule.cxx |
8 --
sd/source/ui/framework/module/ImpressModule.cxx |
2
sd/source/ui/framework/module/NotesPaneModule.cxx |
26 ++----
sd/source/ui/framework/module/ShellStackGuard.cxx |
3
sd/source/ui/framework/module/SlideSorterModule.cxx |
38 +++------
sd/source/ui/framework/module/ToolBarModule.cxx |
32 ++------
sd/source/ui/framework/module/ViewTabBarModule.cxx |
36 +++------
sd/source/ui/framework/tools/FrameworkHelper.cxx |
39 +---------
sd/source/ui/inc/framework/ConfigurationChangeEvent.hxx |
4 -
sd/source/ui/inc/framework/ConfigurationController.hxx |
3
sd/source/ui/inc/framework/FrameworkHelper.hxx |
21 -----
sd/source/ui/inc/framework/PresentationFactory.hxx |
13 ---
sd/source/ui/slideshow/SlideShowRestarter.cxx |
2
sd/source/ui/tools/EventMultiplexer.cxx |
27 ++----
sd/source/ui/view/ViewShellBase.cxx |
4 -
sd/source/ui/view/ViewTabBar.cxx |
3
25 files changed, 101 insertions(+), 267 deletions(-)
New commits:
commit 18f8c2c4695ff93117e5cc9bbd1f7fb4f753f4db
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jun 29 13:17:43 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Jun 30 10:43:23 2025 +0200
inline FrameWorkHelper::CreateResource
it is just calling the constructor of ResourceId, rather do
that directly
Change-Id: I7fdcb6d0ffae4156d3d63dddf9521bf3e4ab3034
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187153
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 22d497ebf6ad..13290c7d7e58 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -311,9 +311,9 @@ bool SdModule::OutlineToImpress(SfxRequest const & rRequest)
FrameworkHelper::msCenterPaneURL);
pHelper->RunOnResourceActivation(
- FrameworkHelper::CreateResourceId(
- FrameworkHelper::msOutlineViewURL,
- FrameworkHelper::msCenterPaneURL),
+ new ::sd::framework::ResourceId(
+ FrameworkHelper::msOutlineViewURL,
+ FrameworkHelper::msCenterPaneURL),
OutlineToImpressFinalizer(*pBase, *pDoc, pBytes));
}
}
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx
b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 72a5cc267dd1..17070d4ef609 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -399,9 +399,9 @@ bool BasicViewFactory::IsCacheable (const
std::shared_ptr<ViewDescriptor>& rpDes
FrameworkHelper::Instance(*mpBase);
// The slide sorter and the task panel are cacheable and
relocatable.
- tmp.push_back(FrameworkHelper::CreateResourceId(
+ tmp.push_back(new ::sd::framework::ResourceId(
FrameworkHelper::msSlideSorterURL,
FrameworkHelper::msLeftDrawPaneURL));
- tmp.push_back(FrameworkHelper::CreateResourceId(
+ tmp.push_back(new ::sd::framework::ResourceId(
FrameworkHelper::msSlideSorterURL,
FrameworkHelper::msLeftImpressPaneURL));
return tmp;
}();
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index a086a584cc0d..211f07f9e995 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -112,7 +112,7 @@ void CenterViewFocusModule::HandleNewView (
// controller to obtain a ViewShell pointer.
std::vector<rtl::Reference<ResourceId> > xViewIds
(rxConfiguration->getResources(
- FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+ new ::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
FrameworkHelper::msViewURLPrefix,
AnchorBindingMode_DIRECT));
rtl::Reference<AbstractView> xView;
diff --git a/sd/source/ui/framework/module/ImpressModule.cxx
b/sd/source/ui/framework/module/ImpressModule.cxx
index 6879513950a9..e5fc6be76973 100644
--- a/sd/source/ui/framework/module/ImpressModule.cxx
+++ b/sd/source/ui/framework/module/ImpressModule.cxx
@@ -37,7 +37,7 @@ void ImpressModule::Initialize
(rtl::Reference<sd::DrawController> const & rxCon
new CenterViewFocusModule(rxController);
new ViewTabBarModule(
rxController,
- FrameworkHelper::CreateResourceId(
+ new ::sd::framework::ResourceId(
FrameworkHelper::msViewTabBarURL,
FrameworkHelper::msCenterPaneURL));
new SlideSorterModule(
diff --git a/sd/source/ui/framework/module/NotesPaneModule.cxx
b/sd/source/ui/framework/module/NotesPaneModule.cxx
index 828c4eadd2fc..ecc4d27ff091 100644
--- a/sd/source/ui/framework/module/NotesPaneModule.cxx
+++ b/sd/source/ui/framework/module/NotesPaneModule.cxx
@@ -31,9 +31,9 @@ using namespace ::com::sun::star::drawing::framework;
namespace sd::framework
{
NotesPaneModule::NotesPaneModule(const rtl::Reference<::sd::DrawController>&
rxController)
- : mxBottomImpressPaneId(FrameworkHelper::CreateResourceId(
+ : mxBottomImpressPaneId(new ::sd::framework::ResourceId(
FrameworkHelper::msNotesPanelViewURL,
FrameworkHelper::msBottomImpressPaneURL))
- ,
mxMainViewAnchorId(FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL))
+ , mxMainViewAnchorId(new
::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL))
{
if (!rxController.is())
return;
@@ -233,7 +233,7 @@ void NotesPaneModule::onResourceRequest(
bool bActivation, const rtl::Reference<sd::framework::Configuration>&
rxConfiguration)
{
std::vector<rtl::Reference<ResourceId>> aCenterViews =
rxConfiguration->getResources(
- FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+ new ::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
FrameworkHelper::msViewURLPrefix, AnchorBindingMode_DIRECT);
if (aCenterViews.size() != 1)
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 9c7032b6e9ef..397d11d013b1 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -45,9 +45,9 @@ namespace sd::framework {
SlideSorterModule::SlideSorterModule (
const rtl::Reference<::sd::DrawController>& rxController,
const OUString& rsLeftPaneURL)
- :
mxResourceId(FrameworkHelper::CreateResourceId(FrameworkHelper::msSlideSorterURL,
rsLeftPaneURL)),
-
mxMainViewAnchorId(FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL)),
- mxViewTabBarId(FrameworkHelper::CreateResourceId(
+ : mxResourceId(new
::sd::framework::ResourceId(FrameworkHelper::msSlideSorterURL, rsLeftPaneURL)),
+ mxMainViewAnchorId(new
::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL)),
+ mxViewTabBarId(new ::sd::framework::ResourceId(
FrameworkHelper::msViewTabBarURL,
FrameworkHelper::msCenterPaneURL)),
mxControllerManager(rxController)
@@ -122,7 +122,7 @@ void SlideSorterModule::notifyConfigurationChange (
else if (rEvent.ResourceId->getResourceTypePrefix() ==
FrameworkHelper::msViewURLPrefix
&& rEvent.ResourceId->isBoundTo(
-
FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+ new
::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
AnchorBindingMode_DIRECT))
{
// Update the view tab bar because the view in the center pane
@@ -199,13 +199,13 @@ void SlideSorterModule::UpdateViewTabBar (const
rtl::Reference<ViewTabBar>& rxTa
return;
TabBarButton aButtonA;
- aButtonA.ResourceId = FrameworkHelper::CreateResourceId(
+ aButtonA.ResourceId = new ::sd::framework::ResourceId(
FrameworkHelper::msSlideSorterURL,
FrameworkHelper::msCenterPaneURL);
aButtonA.ButtonLabel = SdResId(STR_SLIDE_SORTER_MODE);
TabBarButton aButtonB;
- aButtonB.ResourceId = FrameworkHelper::CreateResourceId(
+ aButtonB.ResourceId = new ::sd::framework::ResourceId(
FrameworkHelper::msHandoutViewURL,
FrameworkHelper::msCenterPaneURL);
@@ -271,7 +271,7 @@ void SlideSorterModule::HandleResourceRequest(
const rtl::Reference<Configuration>& rxConfiguration)
{
std::vector<rtl::Reference<ResourceId> > aCenterViews =
rxConfiguration->getResources(
- FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+ new ::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
FrameworkHelper::msViewURLPrefix,
AnchorBindingMode_DIRECT);
if (aCenterViews.size() == 1)
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx
b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index b52cdfcedab2..d3e015459bd4 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -141,7 +141,7 @@ void ViewTabBarModule::UpdateViewTabBar (const
rtl::Reference<sd::ViewTabBar>& r
rtl::Reference<ResourceId> xAnchor (mxViewTabBarId->getAnchor());
TabBarButton aImpressViewButton;
- aImpressViewButton.ResourceId = FrameworkHelper::CreateResourceId(
+ aImpressViewButton.ResourceId = new ::sd::framework::ResourceId(
FrameworkHelper::msImpressViewURL,
xAnchor);
aImpressViewButton.ButtonLabel = SdResId(STR_NORMAL_MODE);
@@ -149,7 +149,7 @@ void ViewTabBarModule::UpdateViewTabBar (const
rtl::Reference<sd::ViewTabBar>& r
xBar->addTabBarButtonAfter(aImpressViewButton, aEmptyButton);
TabBarButton aOutlineViewButton;
- aOutlineViewButton.ResourceId = FrameworkHelper::CreateResourceId(
+ aOutlineViewButton.ResourceId = new ::sd::framework::ResourceId(
FrameworkHelper::msOutlineViewURL,
xAnchor);
aOutlineViewButton.ButtonLabel = SdResId(STR_OUTLINE_MODE);
@@ -157,7 +157,7 @@ void ViewTabBarModule::UpdateViewTabBar (const
rtl::Reference<sd::ViewTabBar>& r
xBar->addTabBarButtonAfter(aOutlineViewButton, aImpressViewButton);
TabBarButton aNotesViewButton;
- aNotesViewButton.ResourceId = FrameworkHelper::CreateResourceId(
+ aNotesViewButton.ResourceId = new ::sd::framework::ResourceId(
FrameworkHelper::msNotesViewURL,
xAnchor);
aNotesViewButton.ButtonLabel = SdResId(STR_NOTES_MODE);
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 889e95573f46..af5392dfb9a7 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -350,7 +350,7 @@ bool FrameworkHelper::IsValid() const
if ( !mxConfigurationController.is() )
return ::std::shared_ptr<ViewShell>();
- rtl::Reference<ResourceId> xPaneId( CreateResourceId( rsPaneURL ) );
+ rtl::Reference<ResourceId> xPaneId( new ::sd::framework::ResourceId(
rsPaneURL ) );
return lcl_getViewShell( lcl_getFirstViewInPane(
mxConfigurationController, xPaneId ) );
}
@@ -399,9 +399,9 @@ rtl::Reference<ResourceId> FrameworkHelper::RequestView (
if (mxConfigurationController.is())
{
mxConfigurationController->requestResourceActivation(
- CreateResourceId(rsAnchorURL),
+ new ::sd::framework::ResourceId(rsAnchorURL),
ResourceActivationMode::ADD);
- xViewId = CreateResourceId(rsResourceURL, rsAnchorURL);
+ xViewId = new ::sd::framework::ResourceId(rsResourceURL,
rsAnchorURL);
mxConfigurationController->requestResourceActivation(
xViewId,
ResourceActivationMode::REPLACE);
@@ -487,7 +487,7 @@ void updateEditMode(const rtl::Reference<AbstractView>
&xView, const EditMode eE
void asyncUpdateEditMode(FrameworkHelper* const pHelper, const EditMode eEMode)
{
rtl::Reference<ResourceId> xPaneId (
-
FrameworkHelper::CreateResourceId(framework::FrameworkHelper::msCenterPaneURL));
+ new
::sd::framework::ResourceId(framework::FrameworkHelper::msCenterPaneURL));
rtl::Reference<AbstractView> xView (pHelper->GetView(xPaneId));
updateEditMode(xView, eEMode, true);
}
@@ -526,7 +526,7 @@ void FrameworkHelper::HandleModeChangeSlot (
throw RuntimeException();
rtl::Reference<ResourceId> xPaneId (
- CreateResourceId(framework::FrameworkHelper::msCenterPaneURL));
+ new
::sd::framework::ResourceId(framework::FrameworkHelper::msCenterPaneURL));
rtl::Reference<AbstractView> xView (GetView(xPaneId));
// Compute requested view
@@ -570,7 +570,7 @@ void FrameworkHelper::HandleModeChangeSlot (
if (!(xView.is() && xView->getResourceId()->getResourceURL() ==
sRequestedView))
{
- const auto xId = CreateResourceId(sRequestedView, msCenterPaneURL);
+ rtl::Reference<::sd::framework::ResourceId> xId = new
::sd::framework::ResourceId(sRequestedView, msCenterPaneURL);
mxConfigurationController->requestResourceActivation(
xId,
ResourceActivationMode::REPLACE);
@@ -716,31 +716,6 @@ OUString FrameworkHelper::ResourceIdToString (const
rtl::Reference<ResourceId>&
return sString.makeStringAndClear();
}
-rtl::Reference<ResourceId> FrameworkHelper::CreateResourceId (const OUString&
rsResourceURL)
-{
- return new ::sd::framework::ResourceId(rsResourceURL);
-}
-
-rtl::Reference<ResourceId> FrameworkHelper::CreateResourceId (
- const OUString& rsResourceURL,
- const OUString& rsAnchorURL)
-{
- return new ::sd::framework::ResourceId(rsResourceURL, rsAnchorURL);
-}
-
-rtl::Reference<ResourceId> FrameworkHelper::CreateResourceId (
- const OUString& rsResourceURL,
- const rtl::Reference<ResourceId>& rxAnchorId)
-{
- if (rxAnchorId.is())
- return new ::sd::framework::ResourceId(
- rsResourceURL,
- rxAnchorId->getResourceURL(),
- rxAnchorId->getAnchorURLs());
- else
- return new ::sd::framework::ResourceId(rsResourceURL);
-}
-
//----- FrameworkHelper::DisposeListener --------------------------------------
FrameworkHelper::DisposeListener::DisposeListener (
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx
b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 503e3894c403..c459ef00b881 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -245,27 +245,6 @@ public:
static OUString ResourceIdToString (
const rtl::Reference<ResourceId>& rxResourceId);
- /** Create a new ResourceId object for the given resource URL.
- */
- static rtl::Reference<ResourceId>
- CreateResourceId (
- const OUString& rsResourceURL);
-
- /** Create a new ResourceId object for the given resource URL and a
- single anchor URL.
- */
- static rtl::Reference<ResourceId>
- CreateResourceId (
- const OUString& rsResourceURL,
- const OUString& rsAnchorURL);
-
- /** Create a new ResourceId object for the given resource URL.
- */
- static rtl::Reference<ResourceId>
- CreateResourceId (
- const OUString& rsResourceURL,
- const rtl::Reference<ResourceId>& rxAnchor);
-
const rtl::Reference<ConfigurationController>&
GetConfigurationController() const { return mxConfigurationController;}
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx
b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 765fe6b195a3..3cfa3ebfc70e 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -112,7 +112,7 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation, void*,
void)
::std::shared_ptr<FrameworkHelper> pHelper(
FrameworkHelper::Instance(*mpViewShellBase));
if (pHelper->GetConfigurationController()->getResource(
-
FrameworkHelper::CreateResourceId(FrameworkHelper::msFullScreenPaneURL)).is())
+ new
::sd::framework::ResourceId(FrameworkHelper::msFullScreenPaneURL)).is())
{
::sd::framework::ConfigurationController::Lock aLock (
pHelper->GetConfigurationController());
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index b2a9f993cf05..93273630d8f5 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -329,9 +329,9 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
// Create the resource ids for the center pane and view.
const rtl::Reference<framework::ResourceId> xCenterPaneId (
-
FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL));
+ new
::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL));
const rtl::Reference<framework::ResourceId> xCenterViewId (
- FrameworkHelper::CreateResourceId(sView, xCenterPaneId));
+ new ::sd::framework::ResourceId(sView, xCenterPaneId));
// Request center pane and view.
xConfigurationController->requestResourceActivation(xCenterPaneId,
framework::ResourceActivationMode::ADD);
commit f72d275d162a7c9ea8bc1722c7f439d233f43953
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jun 29 13:06:03 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Jun 30 10:43:15 2025 +0200
Listener in PresentationFactory is unused
Change-Id: I432572a68001c700e2532ff41045831b26e2b9d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187152
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/console/PresenterController.cxx
b/sd/source/console/PresenterController.cxx
index 6d80be9b8e89..d1d5475dd65f 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -61,12 +61,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::drawing::framework;
-namespace {
- const sal_Int32 ResourceActivationEventType = 0;
- const sal_Int32 ResourceDeactivationEventType = 1;
- const sal_Int32 ConfigurationUpdateEndEventType = 2;
-}
-
namespace sdext::presenter {
IPresentationTime::~IPresentationTime()
@@ -119,16 +113,13 @@ PresenterController::PresenterController (
{
mxConfigurationController->addConfigurationChangeListener(
this,
- sd::framework::ConfigurationChangeEventType::ResourceActivation,
- Any(ResourceActivationEventType));
+ sd::framework::ConfigurationChangeEventType::ResourceActivation);
mxConfigurationController->addConfigurationChangeListener(
this,
- sd::framework::ConfigurationChangeEventType::ResourceDeactivation,
- Any(ResourceDeactivationEventType));
+ sd::framework::ConfigurationChangeEventType::ResourceDeactivation);
mxConfigurationController->addConfigurationChangeListener(
this,
-
sd::framework::ConfigurationChangeEventType::ConfigurationUpdateEnd,
- Any(ConfigurationUpdateEndEventType));
+
sd::framework::ConfigurationChangeEventType::ConfigurationUpdateEnd);
}
// Listen for the frame being activated.
@@ -665,13 +656,9 @@ void PresenterController::notifyConfigurationChange (
throwIfDisposed(l);
}
- sal_Int32 nType (0);
- if ( ! (rEvent.UserData >>= nType))
- return;
-
- switch (nType)
+ switch (rEvent.Type)
{
- case ResourceActivationEventType:
+ case sd::framework::ConfigurationChangeEventType::ResourceActivation:
if (rEvent.ResourceId->compareTo(mxMainPaneId) == 0)
{
InitializeMainPane(dynamic_cast<sd::framework::Pane*>(rEvent.ResourceObject.get()));
@@ -700,7 +687,7 @@ void PresenterController::notifyConfigurationChange (
}
break;
- case ResourceDeactivationEventType:
+ case sd::framework::ConfigurationChangeEventType::ResourceDeactivation:
if
(rEvent.ResourceId->isBoundTo(mxMainPaneId,AnchorBindingMode_INDIRECT))
{
// If this is a view then remove it from the pane container.
@@ -721,11 +708,13 @@ void PresenterController::notifyConfigurationChange (
}
break;
- case ConfigurationUpdateEndEventType:
+ case
sd::framework::ConfigurationChangeEventType::ConfigurationUpdateEnd:
if (mpAccessibleObject.is())
mpAccessibleObject->UpdateAccessibilityHierarchy();
UpdateCurrentSlide(0);
break;
+
+ default: break;
}
}
diff --git a/sd/source/console/PresenterFrameworkObserver.cxx
b/sd/source/console/PresenterFrameworkObserver.cxx
index f8ba3e49342c..d33ddfc2e151 100644
--- a/sd/source/console/PresenterFrameworkObserver.cxx
+++ b/sd/source/console/PresenterFrameworkObserver.cxx
@@ -43,8 +43,7 @@ PresenterFrameworkObserver::PresenterFrameworkObserver (
{
mxConfigurationController->addConfigurationChangeListener(
this,
-
sd::framework::ConfigurationChangeEventType::ConfigurationUpdateEnd,
- Any());
+
sd::framework::ConfigurationChangeEventType::ConfigurationUpdateEnd);
}
else
{
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 4bd789b79d1d..51b78e1fabd9 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -169,14 +169,13 @@ void ConfigurationController::RequestSynchronousUpdate()
void ConfigurationController::addConfigurationChangeListener (
const rtl::Reference<ConfigurationChangeListener>& rxListener,
- ConfigurationChangeEventType rsEventType,
- const Any& rUserData)
+ ConfigurationChangeEventType rsEventType)
{
::osl::MutexGuard aGuard (m_aMutex);
ThrowIfDisposed();
OSL_ASSERT(mpImplementation != nullptr);
- mpImplementation->mpBroadcaster->AddListener(rxListener, rsEventType,
rUserData);
+ mpImplementation->mpBroadcaster->AddListener(rxListener, rsEventType);
}
void ConfigurationController::removeConfigurationChangeListener (
diff --git
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index 047c882883e3..5a3f84649f76 100644
---
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -40,8 +40,7 @@
ConfigurationControllerBroadcaster::ConfigurationControllerBroadcaster (
void ConfigurationControllerBroadcaster::AddListener(
const rtl::Reference<ConfigurationChangeListener>& rxListener,
- ConfigurationChangeEventType rsEventType,
- const Any& rUserData)
+ ConfigurationChangeEventType rsEventType)
{
if ( ! rxListener.is())
throw lang::IllegalArgumentException(u"invalid listener"_ustr,
@@ -50,10 +49,7 @@ void ConfigurationControllerBroadcaster::AddListener(
maListenerMap.try_emplace(rsEventType);
- ListenerDescriptor aDescriptor;
- aDescriptor.mxListener = rxListener;
- aDescriptor.maUserData = rUserData;
- maListenerMap[rsEventType].push_back(aDescriptor);
+ maListenerMap[rsEventType].push_back(rxListener);
}
void ConfigurationControllerBroadcaster::RemoveListener(
@@ -67,8 +63,7 @@ void ConfigurationControllerBroadcaster::RemoveListener(
ListenerList::iterator iList;
for (auto& rMap : maListenerMap)
{
- iList = std::find_if(rMap.second.begin(), rMap.second.end(),
- [&rxListener](const ListenerDescriptor& rList) { return
rList.mxListener == rxListener; });
+ iList = std::find(rMap.second.begin(), rMap.second.end(), rxListener);
if (iList != rMap.second.end())
rMap.second.erase(iList);
}
@@ -86,15 +81,14 @@ void ConfigurationControllerBroadcaster::NotifyListeners (
{
try
{
- aEvent.UserData = rListener.maUserData;
- rListener.mxListener->notifyConfigurationChange(aEvent);
+ rListener->notifyConfigurationChange(aEvent);
}
catch (const lang::DisposedException& rException)
{
// When the exception comes from the listener itself then
// unregister it.
- if (rException.Context ==
cppu::getXWeak(rListener.mxListener.get()))
- RemoveListener(rListener.mxListener);
+ if (rException.Context == cppu::getXWeak(rListener.get()))
+ RemoveListener(rListener);
}
catch (const RuntimeException&)
{
@@ -152,8 +146,7 @@ void ConfigurationControllerBroadcaster::DisposeAndClear()
}
else
{
- rtl::Reference<ConfigurationChangeListener> xListener (
- iMap->second.front().mxListener );
+ rtl::Reference<ConfigurationChangeListener> xListener (
iMap->second.front() );
if (xListener.is())
{
// Tell the listener that the configuration controller is
diff --git
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
index 304b5d4bb94c..4fbd1b3e3dc6 100644
---
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
+++
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx
@@ -58,18 +58,13 @@ public:
The type of event that the listener will be called for. The
empty string is a special value in that the listener will be
called for all event types.
- @param rUserData
- This object is passed to the listener whenever it is called for
- the specified event type. For different event types different
- user data objects can be provided.
@throws IllegalArgumentException
when an empty listener reference is given.
*/
void AddListener(
const rtl::Reference<
sd::framework::ConfigurationChangeListener>& rxListener,
- ConfigurationChangeEventType rsEventType,
- const css::uno::Any& rUserData);
+ ConfigurationChangeEventType rsEventType);
/** Remove all references to the given listener. When one listener has
been registered for more than one type of event then it is removed
@@ -109,13 +104,7 @@ public:
private:
rtl::Reference<ConfigurationController> mxConfigurationController;
- class ListenerDescriptor
- {
- public:
- rtl::Reference<sd::framework::ConfigurationChangeListener> mxListener;
- css::uno::Any maUserData;
- };
- typedef std::vector<ListenerDescriptor> ListenerList;
+ typedef
std::vector<rtl::Reference<sd::framework::ConfigurationChangeListener>>
ListenerList;
typedef std::unordered_map
<ConfigurationChangeEventType,
ListenerList> ListenerMap;
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 2331b4f25ecc..a220f25cca9f 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -52,9 +52,6 @@ namespace {
BottomImpressPaneId,
LeftDrawPaneId
};
-
- const sal_Int32 gnConfigurationUpdateStartEvent(0);
- const sal_Int32 gnConfigurationUpdateEndEvent(1);
}
namespace sd::framework {
@@ -129,12 +126,10 @@ BasicPaneFactory::BasicPaneFactory(
{
xCC->addConfigurationChangeListener(
mxListener,
- ConfigurationChangeEventType::ConfigurationUpdateStart,
- Any(gnConfigurationUpdateStartEvent));
+ ConfigurationChangeEventType::ConfigurationUpdateStart);
xCC->addConfigurationChangeListener(
mxListener,
- ConfigurationChangeEventType::ConfigurationUpdateEnd,
- Any(gnConfigurationUpdateEndEvent));
+ ConfigurationChangeEventType::ConfigurationUpdateEnd);
}
}
catch (RuntimeException&)
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx
b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 27e3c9fe5190..afdb35b66475 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -69,8 +69,7 @@ constexpr OUString gsPresentationViewURL =
u"private:resource/view/Presentation"
PresentationFactory::PresentationFactory (
const rtl::Reference<::sd::DrawController>& rxController)
- : mxController(rxController),
- mxListener(new Listener)
+ : mxController(rxController)
{
}
@@ -111,18 +110,6 @@ void PresentationFactory::releaseResource (
}
}
-//===== ConfigurationChangeListener ==========================================
-
-void PresentationFactory::Listener::notifyConfigurationChange (
- const ConfigurationChangeEvent&)
-{}
-
-//===== lang::XEventListener ==================================================
-
-void SAL_CALL PresentationFactory::Listener::disposing (
- const lang::EventObject&)
-{}
-
void PresentationFactory::install(const rtl::Reference<::sd::DrawController>&
rxController)
{
try
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index 2c2705112467..a086a584cc0d 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -63,12 +63,10 @@ CenterViewFocusModule::CenterViewFocusModule
(rtl::Reference<sd::DrawController>
{
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ConfigurationUpdateEnd,
- Any());
+ ConfigurationChangeEventType::ConfigurationUpdateEnd);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceActivation,
- Any());
+ ConfigurationChangeEventType::ResourceActivation);
}
}
diff --git a/sd/source/ui/framework/module/NotesPaneModule.cxx
b/sd/source/ui/framework/module/NotesPaneModule.cxx
index c479162021a3..828c4eadd2fc 100644
--- a/sd/source/ui/framework/module/NotesPaneModule.cxx
+++ b/sd/source/ui/framework/module/NotesPaneModule.cxx
@@ -28,12 +28,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace
-{
-const sal_Int32 ResourceActivationRequestEvent = 0;
-const sal_Int32 ResourceDeactivationRequestEvent = 1;
-}
-
namespace sd::framework
{
NotesPaneModule::NotesPaneModule(const rtl::Reference<::sd::DrawController>&
rxController)
@@ -51,11 +45,9 @@ NotesPaneModule::NotesPaneModule(const
rtl::Reference<::sd::DrawController>& rxC
return;
mxConfigurationController->addConfigurationChangeListener(
- this, ConfigurationChangeEventType::ResourceActivationRequest,
- Any(ResourceActivationRequestEvent));
+ this, ConfigurationChangeEventType::ResourceActivationRequest);
mxConfigurationController->addConfigurationChangeListener(
- this, ConfigurationChangeEventType::ResourceDeactivationRequest,
- Any(ResourceDeactivationRequestEvent));
+ this, ConfigurationChangeEventType::ResourceDeactivationRequest);
if
(officecfg::Office::Impress::MultiPaneGUI::NotesPane::Visible::ImpressView::get().value_or(
false))
@@ -151,11 +143,9 @@ void NotesPaneModule::notifyConfigurationChange(const
ConfigurationChangeEvent&
mbListeningEventMultiplexer = true;
}
- sal_Int32 nEventType = 0;
- rEvent.UserData >>= nEventType;
- switch (nEventType)
+ switch (rEvent.Type)
{
- case ResourceActivationRequestEvent:
+ case ConfigurationChangeEventType::ResourceActivationRequest:
if
(rEvent.ResourceId->isBoundToURL(FrameworkHelper::msCenterPaneURL,
AnchorBindingMode_DIRECT))
{
@@ -170,7 +160,7 @@ void NotesPaneModule::notifyConfigurationChange(const
ConfigurationChangeEvent&
}
break;
- case ResourceDeactivationRequestEvent:
+ case ConfigurationChangeEventType::ResourceDeactivationRequest:
if (rEvent.ResourceId->compareTo(mxMainViewAnchorId) == 0)
{
onMainViewSwitch(OUString(), false);
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx
b/sd/source/ui/framework/module/ShellStackGuard.cxx
index f171cfbf79fb..a4ad18d25a79 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -56,8 +56,7 @@ ShellStackGuard::ShellStackGuard
(rtl::Reference<sd::DrawController> const & rxC
// prevented in case of a printing printer.
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ConfigurationUpdateStart,
- Any());
+ ConfigurationChangeEventType::ConfigurationUpdateStart);
// Prepare the printer polling.
maPrinterPollingIdle.SetInvokeHandler(LINK(this,ShellStackGuard,TimeoutHandler));
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index e72ad05aa7d1..9c7032b6e9ef 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -38,11 +38,6 @@ using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
-namespace {
- const sal_Int32 ResourceActivationRequestEvent = 0;
- const sal_Int32 ResourceDeactivationRequestEvent = 1;
-}
-
namespace sd::framework {
//===== SlideSorterModule ==================================================
@@ -66,12 +61,10 @@ SlideSorterModule::SlideSorterModule (
mxConfigurationController->addEventListener(this);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceActivationRequest,
- Any(ResourceActivationRequestEvent));
+ ConfigurationChangeEventType::ResourceActivationRequest);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceDeactivationRequest,
- Any(ResourceDeactivationRequestEvent));
+ ConfigurationChangeEventType::ResourceDeactivationRequest);
}
}
if (!mxConfigurationController.is())
@@ -96,8 +89,7 @@ SlideSorterModule::SlideSorterModule (
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceActivation,
- Any());
+ ConfigurationChangeEventType::ResourceActivation);
}
SlideSorterModule::~SlideSorterModule()
@@ -141,11 +133,9 @@ void SlideSorterModule::notifyConfigurationChange (
}
OSL_ASSERT(rEvent.ResourceId.is());
- sal_Int32 nEventType = 0;
- rEvent.UserData >>= nEventType;
- switch (nEventType)
+ switch (rEvent.Type)
{
- case ResourceActivationRequestEvent:
+ case ConfigurationChangeEventType::ResourceActivationRequest:
if (rEvent.ResourceId->isBoundToURL(
FrameworkHelper::msCenterPaneURL,
AnchorBindingMode_DIRECT))
@@ -171,7 +161,7 @@ void SlideSorterModule::notifyConfigurationChange (
}
break;
- case ResourceDeactivationRequestEvent:
+ case ConfigurationChangeEventType::ResourceDeactivationRequest:
if (rEvent.ResourceId->compareTo(mxMainViewAnchorId) == 0)
{
HandleMainViewSwitch(
@@ -186,6 +176,8 @@ void SlideSorterModule::notifyConfigurationChange (
HandleResourceRequest(false, rEvent.Configuration);
}
break;
+
+ default: break;
}
}
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx
b/sd/source/ui/framework/module/ToolBarModule.cxx
index 6bc0041886eb..1f12099ac51d 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -39,13 +39,6 @@ using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
-namespace {
- const sal_Int32 gnConfigurationUpdateStartEvent(0);
- const sal_Int32 gnConfigurationUpdateEndEvent(1);
- const sal_Int32 gnResourceActivationRequestEvent(2);
- const sal_Int32 gnResourceDeactivationRequestEvent(3);
-}
-
namespace sd::framework {
//===== ToolBarModule =========================================================
@@ -68,20 +61,16 @@ ToolBarModule::ToolBarModule (
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ConfigurationUpdateStart,
- Any(gnConfigurationUpdateStartEvent));
+ ConfigurationChangeEventType::ConfigurationUpdateStart);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ConfigurationUpdateEnd,
- Any(gnConfigurationUpdateEndEvent));
+ ConfigurationChangeEventType::ConfigurationUpdateEnd);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceActivationRequest,
- Any(gnResourceActivationRequestEvent));
+ ConfigurationChangeEventType::ResourceActivationRequest);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceDeactivationRequest,
- Any(gnResourceDeactivationRequestEvent));
+ ConfigurationChangeEventType::ResourceDeactivationRequest);
}
ToolBarModule::~ToolBarModule()
@@ -116,20 +105,18 @@ void ToolBarModule::notifyConfigurationChange (
}
- sal_Int32 nEventType = 0;
- rEvent.UserData >>= nEventType;
- switch (nEventType)
+ switch (rEvent.Type)
{
- case gnConfigurationUpdateStartEvent:
+ case ConfigurationChangeEventType::ConfigurationUpdateStart:
HandleUpdateStart();
break;
- case gnConfigurationUpdateEndEvent:
+ case ConfigurationChangeEventType::ConfigurationUpdateEnd:
HandleUpdateEnd();
break;
- case gnResourceActivationRequestEvent:
- case gnResourceDeactivationRequestEvent:
+ case ConfigurationChangeEventType::ResourceActivationRequest:
+ case ConfigurationChangeEventType::ResourceDeactivationRequest:
// Remember the request for the activation or deactivation
// of the center pane view. When that happens then on end
// of the next configuration update the set of visible tool
@@ -143,6 +130,7 @@ void ToolBarModule::notifyConfigurationChange (
mbMainViewSwitchUpdatePending = true;
}
break;
+ default: break;
}
}
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx
b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index e3762c4bc3d3..b52cdfcedab2 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -35,14 +35,6 @@ using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
-namespace {
-
-const sal_Int32 ResourceActivationRequestEvent = 0;
-const sal_Int32 ResourceDeactivationRequestEvent = 1;
-const sal_Int32 ResourceActivationEvent = 2;
-
-}
-
namespace sd::framework {
//===== ViewTabBarModule ==================================================
@@ -61,18 +53,15 @@ ViewTabBarModule::ViewTabBarModule (
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceActivationRequest,
- Any(ResourceActivationRequestEvent));
+ ConfigurationChangeEventType::ResourceActivationRequest);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceDeactivationRequest,
- Any(ResourceDeactivationRequestEvent));
+ ConfigurationChangeEventType::ResourceDeactivationRequest);
UpdateViewTabBar(nullptr);
mxConfigurationController->addConfigurationChangeListener(
this,
- ConfigurationChangeEventType::ResourceActivation,
- Any(ResourceActivationEvent));
+ ConfigurationChangeEventType::ResourceActivation);
}
ViewTabBarModule::~ViewTabBarModule()
@@ -94,11 +83,9 @@ void ViewTabBarModule::notifyConfigurationChange (
if (!mxConfigurationController.is())
return;
- sal_Int32 nEventType = 0;
- rEvent.UserData >>= nEventType;
- switch (nEventType)
+ switch (rEvent.Type)
{
- case ResourceActivationRequestEvent:
+ case ConfigurationChangeEventType::ResourceActivationRequest:
if (mxViewTabBarId->isBoundTo(rEvent.ResourceId,
AnchorBindingMode_DIRECT))
{
mxConfigurationController->requestResourceActivation(
@@ -107,18 +94,21 @@ void ViewTabBarModule::notifyConfigurationChange (
}
break;
- case ResourceDeactivationRequestEvent:
+ case ConfigurationChangeEventType::ResourceDeactivationRequest:
if (mxViewTabBarId->isBoundTo(rEvent.ResourceId,
AnchorBindingMode_DIRECT))
{
mxConfigurationController->requestResourceDeactivation(mxViewTabBarId);
}
break;
- case ResourceActivationEvent:
+ case ConfigurationChangeEventType::ResourceActivation:
if (rEvent.ResourceId->compareTo(mxViewTabBarId) == 0)
{
UpdateViewTabBar(dynamic_cast<sd::ViewTabBar*>(rEvent.ResourceObject.get()));
}
+ break;
+
+ default: break;
}
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 303d82f29ce3..889e95573f46 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -797,7 +797,7 @@ CallbackCaller::CallbackCaller (
if (mxConfigurationController.is())
{
if (mxConfigurationController->hasPendingRequests())
-
mxConfigurationController->addConfigurationChangeListener(this,mnEventType,Any());
+
mxConfigurationController->addConfigurationChangeListener(this,mnEventType);
else
{
// There are no requests waiting to be processed. Therefore
diff --git a/sd/source/ui/inc/framework/ConfigurationChangeEvent.hxx
b/sd/source/ui/inc/framework/ConfigurationChangeEvent.hxx
index 72cca4fdc35c..308b8912ce95 100644
--- a/sd/source/ui/inc/framework/ConfigurationChangeEvent.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationChangeEvent.hxx
@@ -68,10 +68,6 @@ struct ConfigurationChangeEvent final : public
::css::lang::EventObject
be an empty reference.
*/
rtl::Reference<sd::framework::AbstractResource> ResourceObject;
- /** Each listener is called with exactly the #UserData
- that was given when the listener was registered.
- */
- ::css::uno::Any UserData;
};
} // end of namespace sd::framework
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx
b/sd/source/ui/inc/framework/ConfigurationController.hxx
index cb9a48d88598..ec976e5ef327 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -117,8 +117,7 @@ public:
void addConfigurationChangeListener (
const rtl::Reference<
sd::framework::ConfigurationChangeListener>& rxListener,
- ConfigurationChangeEventType rsEventType,
- const css::uno::Any& rUserData);
+ ConfigurationChangeEventType rsEventType);
void removeConfigurationChangeListener (
const rtl::Reference<
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx
b/sd/source/ui/inc/framework/PresentationFactory.hxx
index f31d3879dae3..c740c4680e79 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -51,21 +51,8 @@ public:
const rtl::Reference<sd::framework::AbstractResource>& xView) override;
private:
- class Listener : public sd::framework::ConfigurationChangeListener
- {
- using WeakComponentImplHelperBase::disposing;
-
- // ConfigurationChangeListener
- virtual void notifyConfigurationChange (
- const sd::framework::ConfigurationChangeEvent& rEvent) override;
-
- // lang::XEventListener
- virtual void SAL_CALL disposing (
- const css::lang::EventObject& rEventObject) override;
- };
rtl::Reference<::sd::DrawController> mxController;
- rtl::Reference<Listener> mxListener;
};
} // end of namespace sd::framework
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx
b/sd/source/ui/tools/EventMultiplexer.cxx
index c0dc2642a564..ee530df15394 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -46,12 +46,6 @@ using ::sd::framework::FrameworkHelper;
class SdDrawDocument;
-namespace {
-const sal_Int32 ResourceActivationEvent = 0;
-const sal_Int32 ResourceDeactivationEvent = 1;
-const sal_Int32 ConfigurationUpdateEvent = 2;
-}
-
namespace sd::tools {
typedef cppu::ImplInheritanceHelper<
@@ -226,16 +220,13 @@ EventMultiplexer::Implementation::Implementation
(ViewShellBase& rBase)
xConfigurationController->addConfigurationChangeListener(
this,
- framework::ConfigurationChangeEventType::ResourceActivation,
- Any(ResourceActivationEvent));
+ framework::ConfigurationChangeEventType::ResourceActivation);
xConfigurationController->addConfigurationChangeListener(
this,
- framework::ConfigurationChangeEventType::ResourceDeactivation,
- Any(ResourceDeactivationEvent));
+ framework::ConfigurationChangeEventType::ResourceDeactivation);
xConfigurationController->addConfigurationChangeListener(
this,
- framework::ConfigurationChangeEventType::ConfigurationUpdateEnd,
- Any(ConfigurationUpdateEvent));
+ framework::ConfigurationChangeEventType::ConfigurationUpdateEnd);
}
EventMultiplexer::Implementation::~Implementation()
@@ -497,11 +488,9 @@ void SAL_CALL
EventMultiplexer::Implementation::selectionChanged (
void EventMultiplexer::Implementation::notifyConfigurationChange (
const sd::framework::ConfigurationChangeEvent& rEvent)
{
- sal_Int32 nEventType = 0;
- rEvent.UserData >>= nEventType;
- switch (nEventType)
+ switch (rEvent.Type)
{
- case ResourceActivationEvent:
+ case framework::ConfigurationChangeEventType::ResourceActivation:
if
(rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
{
CallListeners (EventMultiplexerEventId::ViewAdded);
@@ -528,7 +517,7 @@ void
EventMultiplexer::Implementation::notifyConfigurationChange (
}
break;
- case ResourceDeactivationEvent:
+ case framework::ConfigurationChangeEventType::ResourceDeactivation:
if
(rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
{
if (rEvent.ResourceId->isBoundToURL(
@@ -554,9 +543,11 @@ void
EventMultiplexer::Implementation::notifyConfigurationChange (
}
break;
- case ConfigurationUpdateEvent:
+ case framework::ConfigurationChangeEventType::ConfigurationUpdateEnd:
CallListeners (EventMultiplexerEventId::ConfigurationUpdated);
break;
+
+ default: break;
}
}
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 7d6210b1e410..21ea4832e1f3 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -85,8 +85,7 @@ ViewTabBar::ViewTabBar (
{
mxConfigurationController->addConfigurationChangeListener(
mxListener,
-
framework::ConfigurationChangeEventType::ResourceActivation,
- Any());
+
framework::ConfigurationChangeEventType::ResourceActivation);
}
}
