offapi/UnoApi_offapi.mk | 2
offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl | 42 -------
offapi/com/sun/star/drawing/framework/TabBarButton.idl | 53
---------
sd/source/console/PresenterController.cxx | 5
sd/source/console/PresenterScreen.cxx | 3
sd/source/ui/framework/configuration/ConfigurationController.cxx | 4
sd/source/ui/framework/module/NotesPaneModule.cxx | 8 -
sd/source/ui/framework/module/SlideSorterModule.cxx | 5
sd/source/ui/framework/module/ViewTabBarModule.cxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 6 -
sd/source/ui/inc/ViewTabBar.hxx | 57
+++++++---
sd/source/ui/inc/framework/ConfigurationController.hxx | 21 +++
sd/source/ui/view/ViewShellBase.cxx | 8 -
sd/source/ui/view/ViewTabBar.cxx | 27 +---
14 files changed, 88 insertions(+), 155 deletions(-)
New commits:
commit 5b3b308e3b9ad32d886dd35b128c83f6f55f7913
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Jun 17 21:39:34 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Thu Jun 19 19:40:28 2025 +0200
[API CHANGE] move css::drawing::framework::TabBarButton inside sd
this is internal to sd, no need to use UNO here
Change-Id: I735e4ddbc91657659bbcd69fff44e53850f8bc90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186715
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index bcce5790939b..43e1718c3ee9 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2392,7 +2392,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing,\
$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\
AnchorBindingMode \
ConfigurationChangeEvent \
- TabBarButton \
XConfiguration \
XConfigurationChangeListener \
XConfigurationChangeRequest \
diff --git a/offapi/com/sun/star/drawing/framework/TabBarButton.idl
b/offapi/com/sun/star/drawing/framework/TabBarButton.idl
deleted file mode 100644
index 2122074852c1..000000000000
--- a/offapi/com/sun/star/drawing/framework/TabBarButton.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-module com { module sun { module star { module drawing { module framework {
-
-interface XResourceId;
-
-/** Descriptor of a tab bar button. Tab bar buttons are typically used to
- offer the user the choice between different views to be displayed in
- one pane.
- <p>For identification only the #ResourceId is used, so for
- some methods of the XTabBar interface only the
- #ResourceId member is evaluated.</p>
-*/
-struct TabBarButton
-{
- /** This label is displayed on the UI as button text.
- <p>The label is expected to be localized.</p>
- */
- string ButtonLabel;
-
- /** The localized help text that may be displayed in a tool tip.
- */
- string HelpText;
-
- /** XResourceId object of the resource that is requested to be
- displayed when the tab bar button is activated.
- <p>For some methods of the XTabBar interface only this
- member is evaluated. That is because only this member is used to
- identify a tab bar button.</p>
- */
- XResourceId ResourceId;
-};
-
-}; }; }; }; }; // ::com::sun::star::drawing::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 c2147643d16f..39d74b0995fe 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -26,7 +26,6 @@
#include <officecfg/Office/Impress.hxx>
#include <DrawController.hxx>
#include <ViewTabBar.hxx>
-#include <com/sun/star/drawing/framework/TabBarButton.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <strings.hrc>
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 5eaac48e3279..21b1a450f725 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <com/sun/star/drawing/framework/TabBarButton.hpp>
#include <com/sun/star/drawing/framework/XToolBar.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <comphelper/compbase.hxx>
@@ -56,6 +55,33 @@ private:
DECL_LINK(NotebookSizeAllocHdl, const Size&, void);
};
+/** Descriptor of a tab bar button. Tab bar buttons are typically used to
+ offer the user the choice between different views to be displayed in
+ one pane.
+ <p>For identification only the #ResourceId is used, so for
+ some methods of the XTabBar interface only the
+ #ResourceId member is evaluated.</p>
+*/
+struct TabBarButton
+{
+ /** This label is displayed on the UI as button text.
+ <p>The label is expected to be localized.</p>
+ */
+ OUString ButtonLabel;
+
+ /** The localized help text that may be displayed in a tool tip.
+ */
+ OUString HelpText;
+
+ /** XResourceId object of the resource that is requested to be
+ displayed when the tab bar button is activated.
+ <p>For some methods of the XTabBar interface only this
+ member is evaluated. That is because only this member is used to
+ identify a tab bar button.</p>
+ */
+ css::uno::Reference<css::drawing::framework::XResourceId> ResourceId;
+};
+
typedef comphelper::WeakComponentImplHelper <
css::drawing::framework::XToolBar,
css::drawing::framework::XConfigurationChangeListener
@@ -118,8 +144,8 @@ public:
*/
void
addTabBarButtonAfter (
- const css::drawing::framework::TabBarButton& rButton,
- const css::drawing::framework::TabBarButton& rAnchor);
+ const TabBarButton& rButton,
+ const TabBarButton& rAnchor);
/** Add a tab bar button at the right most position.
@param aButton
@@ -127,7 +153,7 @@ public:
*/
void
appendTabBarButton (
- const css::drawing::framework::TabBarButton& rButton);
+ const TabBarButton& rButton);
/** Remove a tab bar button.
@param aButton
@@ -136,7 +162,7 @@ public:
*/
void
removeTabBarButton (
- const css::drawing::framework::TabBarButton& rButton);
+ const TabBarButton& rButton);
/** Test whether the specified button exists in the tab bar.
@param aButton
@@ -146,7 +172,7 @@ public:
*/
bool
hasTabBarButton (
- const css::drawing::framework::TabBarButton& rButton);
+ const TabBarButton& rButton);
/** Return a sequence of all the tab bar buttons.
<p>Their order reflects the visible order in the tab bar.</p>
@@ -154,8 +180,7 @@ public:
addTabBarButtonAfter() does not provide enough
control as to where to insert a new button.</p>
*/
- css::uno::Sequence<css::drawing::framework::TabBarButton>
- getTabBarButtons();
+ const std::vector<TabBarButton>& getTabBarButtons() const;
//----- XResource ---------------------------------------------------------
@@ -178,29 +203,27 @@ public:
void UpdateActiveButton();
void AddTabBarButton (
- const css::drawing::framework::TabBarButton& rButton,
- const css::drawing::framework::TabBarButton& rAnchor);
+ const TabBarButton& rButton,
+ const TabBarButton& rAnchor);
void AddTabBarButton (
- const css::drawing::framework::TabBarButton& rButton);
+ const TabBarButton& rButton);
void RemoveTabBarButton (
- const css::drawing::framework::TabBarButton& rButton);
+ const TabBarButton& rButton);
bool HasTabBarButton (
- const css::drawing::framework::TabBarButton& rButton);
- css::uno::Sequence<css::drawing::framework::TabBarButton>
- GetTabBarButtons();
+ const TabBarButton& rButton);
private:
VclPtr<TabBarControl> mpTabControl;
rtl::Reference<::sd::DrawController> mxController;
rtl::Reference<::sd::framework::ConfigurationController>
mxConfigurationController;
- typedef ::std::vector<css::drawing::framework::TabBarButton>
TabBarButtonList;
+ typedef ::std::vector<TabBarButton> TabBarButtonList;
TabBarButtonList maTabBarButtons;
css::uno::Reference<css::drawing::framework::XResourceId> mxViewTabBarId;
ViewShellBase* mpViewShellBase;
int mnNoteBookWidthPadding;
void AddTabBarButton (
- const css::drawing::framework::TabBarButton& rButton,
+ const TabBarButton& rButton,
sal_Int32 nPosition);
void UpdateTabBarButtons();
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index fecff6d5438d..821a84311c94 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -236,12 +236,6 @@ bool ViewTabBar::hasTabBarButton (const TabBarButton&
rButton)
return HasTabBarButton(rButton);
}
-Sequence<TabBarButton> ViewTabBar::getTabBarButtons()
-{
- const SolarMutexGuard aSolarGuard;
- return GetTabBarButtons();
-}
-
//----- XResource -------------------------------------------------------------
Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId()
@@ -335,8 +329,8 @@ int ViewTabBar::GetHeight() const
}
void ViewTabBar::AddTabBarButton (
- const css::drawing::framework::TabBarButton& rButton,
- const css::drawing::framework::TabBarButton& rAnchor)
+ const TabBarButton& rButton,
+ const TabBarButton& rAnchor)
{
TabBarButtonList::size_type nIndex;
@@ -362,13 +356,13 @@ void ViewTabBar::AddTabBarButton (
}
void ViewTabBar::AddTabBarButton (
- const css::drawing::framework::TabBarButton& rButton)
+ const TabBarButton& rButton)
{
AddTabBarButton(rButton, maTabBarButtons.size());
}
void ViewTabBar::AddTabBarButton (
- const css::drawing::framework::TabBarButton& rButton,
+ const TabBarButton& rButton,
sal_Int32 nPosition)
{
if (nPosition >= 0 &&
@@ -382,7 +376,7 @@ void ViewTabBar::AddTabBarButton (
}
void ViewTabBar::RemoveTabBarButton (
- const css::drawing::framework::TabBarButton& rButton)
+ const TabBarButton& rButton)
{
for (TabBarButtonList::size_type nIndex=0; nIndex<maTabBarButtons.size();
++nIndex)
{
@@ -397,11 +391,11 @@ void ViewTabBar::RemoveTabBarButton (
}
bool ViewTabBar::HasTabBarButton (
- const css::drawing::framework::TabBarButton& rButton)
+ const TabBarButton& rButton)
{
bool bResult (false);
- for (const css::drawing::framework::TabBarButton & r : maTabBarButtons)
+ for (const TabBarButton & r : maTabBarButtons)
{
if (IsEqual(r, rButton))
{
@@ -413,10 +407,9 @@ bool ViewTabBar::HasTabBarButton (
return bResult;
}
-css::uno::Sequence<css::drawing::framework::TabBarButton>
- ViewTabBar::GetTabBarButtons()
+const std::vector<TabBarButton>& ViewTabBar::getTabBarButtons() const
{
- return comphelper::containerToSequence(maTabBarButtons);
+ return maTabBarButtons;
}
void ViewTabBar::UpdateActiveButton()
commit 982a78873b4034ca58c962eeb7e82f0c0839a822
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Jun 17 21:32:20 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Thu Jun 19 19:40:20 2025 +0200
[API CHANGE] move css::drawing::framework::ResourceActivationMode inside sd
this is internal to sd, no need to use UNO here
Change-Id: Id2476bb08bd37903fe2feb95835474b88bd4db0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186714
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c5a834b87993..bcce5790939b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2392,7 +2392,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing,\
$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\
AnchorBindingMode \
ConfigurationChangeEvent \
- ResourceActivationMode \
TabBarButton \
XConfiguration \
XConfigurationChangeListener \
diff --git a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
b/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
deleted file mode 100644
index 4e2dc381987f..000000000000
--- a/offapi/com/sun/star/drawing/framework/ResourceActivationMode.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-module com { module sun { module star { module drawing { module framework {
-
-/** The ResourceActivationMode specifies, for example for the
-
com::sun::star::drawing::framework::XConfigurationController::requestResourceActivation(),
- whether a requested resource is to replace an existing resource of the
- same class or is to be activated additionally.
-*/
-enum ResourceActivationMode
-{
- /** A resource is requested in addition to already existing ones. This
- is used for example for panes.
- */
- ADD,
-
- /** A resource is requested to replace an already existing one of the
- same class. This is used for example for views.
- */
- REPLACE
-};
-
-}; }; }; }; }; // ::com::sun::star::drawing::framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/console/PresenterController.cxx
b/sd/source/console/PresenterController.cxx
index 8cb9799ccdea..096527cd46af 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -42,7 +42,6 @@
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/drawing/XDrawView.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
#include <com/sun/star/drawing/framework/ResourceId.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -461,13 +460,13 @@ void PresenterController::ShowView (const OUString&
rsViewURL)
pDescriptor->mbIsActive = true;
mxConfigurationController->requestResourceActivation(
pDescriptor->mxPaneId,
- ResourceActivationMode_ADD);
+ sd::framework::ResourceActivationMode::ADD);
mxConfigurationController->requestResourceActivation(
ResourceId::createWithAnchor(
mxComponentContext,
rsViewURL,
pDescriptor->mxPaneId),
- ResourceActivationMode_REPLACE);
+ sd::framework::ResourceActivationMode::REPLACE);
}
void PresenterController::HideView (const OUString& rsViewURL)
diff --git a/sd/source/console/PresenterScreen.cxx
b/sd/source/console/PresenterScreen.cxx
index 2ee43f9cb047..f5c5fe6117cb 100644
--- a/sd/source/console/PresenterScreen.cxx
+++ b/sd/source/console/PresenterScreen.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/drawing/framework/ResourceId.hpp>
-#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
#include <com/sun/star/presentation/XPresentation2.hpp>
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
#include <com/sun/star/document/XEventBroadcaster.hpp>
@@ -387,7 +386,7 @@ void PresenterScreen::InitializePresenterScreen()
// panes and does not replace them.
xCC->requestResourceActivation(
xMainPaneId,
- ResourceActivationMode_ADD);
+ sd::framework::ResourceActivationMode::ADD);
SetupConfiguration(xContext, xMainPaneId);
mpPresenterController = new PresenterController(
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 49338bd0eea4..f5db8cac94dc 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -247,7 +247,7 @@ void ConfigurationController::requestResourceActivation (
if (!rxResourceId.is())
return;
- if (eMode == ResourceActivationMode_REPLACE)
+ if (eMode == ResourceActivationMode::REPLACE)
{
// Get a list of the matching resources and create deactivation
// requests for them.
@@ -432,7 +432,7 @@ void ConfigurationController::restoreConfiguration (
aClassifier.GetC1minusC2());
for (const auto& rxResource : rResourcesToActivate)
{
- requestResourceActivation(rxResource, ResourceActivationMode_ADD);
+ requestResourceActivation(rxResource, ResourceActivationMode::ADD);
}
pLock.reset();
diff --git a/sd/source/ui/framework/module/NotesPaneModule.cxx
b/sd/source/ui/framework/module/NotesPaneModule.cxx
index 504a2f15a364..073744b9b741 100644
--- a/sd/source/ui/framework/module/NotesPaneModule.cxx
+++ b/sd/source/ui/framework/module/NotesPaneModule.cxx
@@ -118,9 +118,9 @@ IMPL_LINK(NotesPaneModule, EventMultiplexerListener,
sd::tools::EventMultiplexer
if (IsResourceActive(msCurrentMainViewURL))
{
mxConfigurationController->requestResourceActivation(
- mxBottomImpressPaneId->getAnchor(),
ResourceActivationMode_ADD);
+ mxBottomImpressPaneId->getAnchor(),
ResourceActivationMode::ADD);
mxConfigurationController->requestResourceActivation(
- mxBottomImpressPaneId, ResourceActivationMode_REPLACE);
+ mxBottomImpressPaneId, ResourceActivationMode::REPLACE);
}
else
{
@@ -211,9 +211,9 @@ void NotesPaneModule::onMainViewSwitch(const OUString&
rsViewURL, const bool bIs
if (IsResourceActive(msCurrentMainViewURL) && !mbInMasterEditMode)
{
mxConfigurationController->requestResourceActivation(mxBottomImpressPaneId->getAnchor(),
-
ResourceActivationMode_ADD);
+
ResourceActivationMode::ADD);
mxConfigurationController->requestResourceActivation(mxBottomImpressPaneId,
-
ResourceActivationMode_REPLACE);
+
ResourceActivationMode::REPLACE);
}
else
{
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 0241d672d776..c2147643d16f 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -263,10 +263,10 @@ void SlideSorterModule::HandleMainViewSwitch (
// Activate resource.
mxConfigurationController->requestResourceActivation(
mxResourceId->getAnchor(),
- ResourceActivationMode_ADD);
+ ResourceActivationMode::ADD);
mxConfigurationController->requestResourceActivation(
mxResourceId,
- ResourceActivationMode_REPLACE);
+ ResourceActivationMode::REPLACE);
}
else
{
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx
b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 3a116b837603..90185db94ea2 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -102,7 +102,7 @@ void SAL_CALL ViewTabBarModule::notifyConfigurationChange (
{
mxConfigurationController->requestResourceActivation(
mxViewTabBarId,
- ResourceActivationMode_ADD);
+ ResourceActivationMode::ADD);
}
break;
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 7fccd28e1c67..8e565f029089 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -404,11 +404,11 @@ Reference<XResourceId> FrameworkHelper::RequestView (
{
mxConfigurationController->requestResourceActivation(
CreateResourceId(rsAnchorURL),
- ResourceActivationMode_ADD);
+ ResourceActivationMode::ADD);
xViewId = CreateResourceId(rsResourceURL, rsAnchorURL);
mxConfigurationController->requestResourceActivation(
xViewId,
- ResourceActivationMode_REPLACE);
+ ResourceActivationMode::REPLACE);
}
}
catch (lang::DisposedException&)
@@ -577,7 +577,7 @@ void FrameworkHelper::HandleModeChangeSlot (
const auto xId = CreateResourceId(sRequestedView, msCenterPaneURL);
mxConfigurationController->requestResourceActivation(
xId,
- ResourceActivationMode_REPLACE);
+ ResourceActivationMode::REPLACE);
RunOnResourceActivation(xId, std::bind(&asyncUpdateEditMode, this,
eEMode));
}
else
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx
b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 47a430eddd5e..5f5f7ebd9b2f 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <sddllapi.h>
-#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
@@ -36,6 +35,24 @@ namespace sd { class DrawController; }
namespace sd::framework {
+/** The ResourceActivationMode specifies, for example for the
+
com::sun::star::drawing::framework::XConfigurationController::requestResourceActivation(),
+ whether a requested resource is to replace an existing resource of the
+ same class or is to be activated additionally.
+*/
+enum class ResourceActivationMode
+{
+ /** A resource is requested in addition to already existing ones. This
+ is used for example for panes.
+ */
+ ADD,
+
+ /** A resource is requested to replace an already existing one of the
+ same class. This is used for example for views.
+ */
+ REPLACE
+};
+
/** The configuration controller is responsible for maintaining the current
configuration.
@@ -73,7 +90,7 @@ public:
void requestResourceActivation (
const css::uno::Reference<css::drawing::framework::XResourceId>&
rxResourceId,
- css::drawing::framework::ResourceActivationMode eMode);
+ ResourceActivationMode eMode);
void requestResourceDeactivation (
const css::uno::Reference<css::drawing::framework::XResourceId>&
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 14407e327d4f..cb8d84999b3f 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -332,8 +332,8 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
FrameworkHelper::CreateResourceId(sView, xCenterPaneId));
// Request center pane and view.
- xConfigurationController->requestResourceActivation(xCenterPaneId,
ResourceActivationMode_ADD);
- xConfigurationController->requestResourceActivation(xCenterViewId,
ResourceActivationMode_REPLACE);
+ xConfigurationController->requestResourceActivation(xCenterPaneId,
framework::ResourceActivationMode::ADD);
+ xConfigurationController->requestResourceActivation(xCenterViewId,
framework::ResourceActivationMode::REPLACE);
// Process configuration events synchronously until the center view
// has been created.
@@ -1348,10 +1348,10 @@ void ViewShellBase::Implementation::SetPaneVisibility (
{
xConfigurationController->requestResourceActivation(
xPaneId,
- ResourceActivationMode_ADD);
+ framework::ResourceActivationMode::ADD);
xConfigurationController->requestResourceActivation(
xViewId,
- ResourceActivationMode_REPLACE);
+ framework::ResourceActivationMode::REPLACE);
}
else
xConfigurationController->requestResourceDeactivation(
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 2a2b7f84d0ea..fecff6d5438d 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -284,7 +284,7 @@ bool ViewTabBar::ActivatePage(size_t nIndex)
{
xConfigurationController->requestResourceActivation(
maTabBarButtons[nIndex].ResourceId,
- ResourceActivationMode_REPLACE);
+ sd::framework::ResourceActivationMode::REPLACE);
}
return true;
