[API CHANGE] Make css::drawing::framework::AnchorBindingMode sd-internal

The unpublished UNO enum
com::sun::star::drawing::framework::AnchorBindingMode
is only used inside sd and not relevant for any other UNO API.

Make it sd-internal, by removing the idl file and instead
defining an sd::framework::AnchorBindingMode enum class
in an sd-internal header.

Change-Id: Ic8b58d5eca0cb4f59f695630d15c2f361d2def4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209358
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

offapi/UnoApi_offapi.mk

@@ -2351,9 +2351,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing,\
 	XSlideSorterSelectionSupplier \
 	XUniversalShapeDescriptor \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\
-	AnchorBindingMode \
-))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/embed,\
 	Actions \
 	Aspects \

ridljar/source/libreoffice/module-info.java

@@ -42,7 +42,6 @@ module org.libreoffice.uno
     exports com.sun.star.deployment.ui;
     exports com.sun.star.document;
     exports com.sun.star.drawing;
-    exports com.sun.star.drawing.framework;
     exports com.sun.star.embed;
     exports com.sun.star.form;
     exports com.sun.star.form.binding;

sd/inc/AnchorBindingMode.hxx

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -17,20 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-module com { module sun { module star { module drawing { module framework {
+#pragma once
 
-/** This enum specifies how a resource is bound to an anchor.  This can be
-    direct or indirect.
-    <p>Example: Let r:a1:a2 denote a resource r which is bound to
+#include <sal/config.h>
+
+namespace sd::framework
+{
+/** This enum specifies how a resource is bound to an anchor.
+    This can be direct or indirect.
+
+    Example: Let r:a1:a2 denote a resource r which is bound to
     anchor a1:a2 which itself is a resource a1 bound to anchor a2.
-    Then r:a1:a2 is bound directly to a1:a2 and indirectly to a2.</p>
+    Then r:a1:a2 is bound directly to a1:a2 and indirectly to a2.
 */
-enum AnchorBindingMode
+enum class AnchorBindingMode
 {
     DIRECT,
     INDIRECT
 };
+}
 
-}; }; }; }; }; // ::com::sun::star::drawing::framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

sd/inc/ResourceId.hxx

@@ -20,9 +20,9 @@
 #pragma once
 
 #include <sal/config.h>
+#include "AnchorBindingMode.hxx"
 #include "sddllapi.h"
 #include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/drawing/framework/AnchorBindingMode.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 #include <vector>
@@ -159,7 +159,7 @@ public:
     bool
         isBoundTo (
             const rtl::Reference<ResourceId>& rxResourceId,
-            css::drawing::framework::AnchorBindingMode eMode) const;
+            sd::framework::AnchorBindingMode eMode) const;
 
     /** Return whether the anchor of the called resource id object
         represents the same resource as the given anchor URL. This is a
@@ -177,7 +177,7 @@ public:
     bool
         isBoundToURL (
             const OUString& rsAnchorURL,
-            css::drawing::framework::AnchorBindingMode eMode) const;
+            sd::framework::AnchorBindingMode eMode) const;
 
 private:
     /** The set of URLs that consist of the resource URL at index 0 and the
@@ -207,7 +207,7 @@ private:
     */
     bool IsBoundToAnchor (
         const OUString* psFirstAnchorURL,
-        css::drawing::framework::AnchorBindingMode eMode) const;
+        sd::framework::AnchorBindingMode eMode) const;
 
     /** Return whether the called ResourceId object is bound to the anchor
         consisting of the URLs in rResourceURLs.
@@ -220,7 +220,7 @@ private:
     */
     bool IsBoundToAnchor (
         const ::std::vector<OUString>& rResourceURLs,
-        css::drawing::framework::AnchorBindingMode eMode) const;
+        sd::framework::AnchorBindingMode eMode) const;
 
     void ParseResourceURL();
 };

sd/source/console/PresenterAccessibility.cxx

@@ -53,7 +53,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/console/PresenterController.cxx

@@ -59,7 +59,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::presentation;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 
@@ -663,7 +662,7 @@ void PresenterController::notifyConfigurationChange (
             {
                 InitializeMainPane(dynamic_cast<sd::framework::Pane*>(rEvent.ResourceObject.get()));
             }
-            else if (rEvent.ResourceId->isBoundTo(mxMainPaneId,AnchorBindingMode_DIRECT))
+            else if (rEvent.ResourceId->isBoundTo(mxMainPaneId, sd::framework::AnchorBindingMode::DIRECT))
             {
                 // A pane bound to the main pane has been created and is
                 // stored in the pane container.
@@ -673,7 +672,7 @@ void PresenterController::notifyConfigurationChange (
                     mpPaneContainer->FindPaneId(xPane->getResourceId());
                 }
             }
-            else if (rEvent.ResourceId->isBoundTo(mxMainPaneId,AnchorBindingMode_INDIRECT))
+            else if (rEvent.ResourceId->isBoundTo(mxMainPaneId, sd::framework::AnchorBindingMode::INDIRECT))
             {
                 // A view bound to one of the panes has been created and is
                 // stored in the pane container along with its pane.
@@ -688,7 +687,7 @@ void PresenterController::notifyConfigurationChange (
             break;
 
         case sd::framework::ConfigurationChangeEventType::ResourceDeactivation:
-            if (rEvent.ResourceId->isBoundTo(mxMainPaneId,AnchorBindingMode_INDIRECT))
+            if (rEvent.ResourceId->isBoundTo(mxMainPaneId, sd::framework::AnchorBindingMode::INDIRECT))
             {
                 // If this is a view then remove it from the pane container.
                 rtl::Reference<sd::framework::AbstractView> xView = dynamic_cast<sd::framework::AbstractView*>(rEvent.ResourceObject.get());

sd/source/console/PresenterFrameworkObserver.cxx

@@ -25,7 +25,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 
 namespace sdext::presenter {

sd/source/console/PresenterHelpView.cxx

@@ -38,7 +38,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using ::std::vector;
 
 namespace sdext::presenter {

sd/source/console/PresenterNotesView.cxx

@@ -42,7 +42,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 const sal_Int32 gnSpaceBelowSeparator (10);
 const sal_Int32 gnSpaceAboveSeparator (10);

sd/source/console/PresenterPaneBase.cxx

@@ -29,7 +29,6 @@
 
 using namespace css;
 using namespace css::uno;
-using namespace css::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/console/PresenterPaneContainer.cxx

@@ -22,7 +22,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/console/PresenterPaneFactory.cxx

@@ -31,7 +31,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/console/PresenterProtocolHandler.cxx

@@ -31,7 +31,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/console/PresenterScreen.cxx

@@ -46,7 +46,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::presentation;
-using namespace ::com::sun::star::drawing::framework;
 
 constexpr OUString FULL_SCREEN_PANE_URL = u"private:resource/pane/FullScreenPane"_ustr;
 

sd/source/console/PresenterSlidePreview.cxx

@@ -27,7 +27,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace
 {

sd/source/console/PresenterSlideShowView.cxx

@@ -45,7 +45,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace {
 /** Return the slide show controller of a running presentation that has

sd/source/console/PresenterSlideSorter.cxx

@@ -39,7 +39,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace {
     const sal_Int32 gnVerticalGap (10);

sd/source/console/PresenterToolBar.cxx

@@ -44,7 +44,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/console/PresenterViewFactory.cxx

@@ -31,7 +31,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/console/PresenterWindowManager.cxx

@@ -42,7 +42,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sdext::presenter {
 

sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx

@@ -31,7 +31,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace {
 

sd/source/ui/framework/configuration/Configuration.cxx

@@ -31,7 +31,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
 
 namespace {
@@ -145,8 +144,8 @@ std::vector<rtl::Reference<ResourceId> > Configuration::getResources (
             // Apply the given resource prefix as filter.
 
             // Make sure that the resource is bound directly to the anchor.
-            if (eMode != AnchorBindingMode_DIRECT
-                && ! rxResource->isBoundTo(rxAnchorId, AnchorBindingMode_DIRECT))
+            if (eMode != AnchorBindingMode::DIRECT
+                && ! rxResource->isBoundTo(rxAnchorId, AnchorBindingMode::DIRECT))
             {
                 continue;
             }
@@ -261,10 +260,10 @@ bool AreConfigurationsEquivalent (
     // Get the lists of resources from the two given configurations.
     const std::vector<rtl::Reference<ResourceId> > aResources1(
         rxConfiguration1->getResources(
-            nullptr, u"", AnchorBindingMode_INDIRECT));
+            nullptr, u"", AnchorBindingMode::INDIRECT));
     const std::vector<rtl::Reference<ResourceId> > aResources2(
         rxConfiguration2->getResources(
-            nullptr, u"", AnchorBindingMode_INDIRECT));
+            nullptr, u"", AnchorBindingMode::INDIRECT));
 
     // When the number of resources differ then the configurations can not
     // be equivalent.

sd/source/ui/framework/configuration/ConfigurationClassifier.cxx

@@ -26,7 +26,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 
@@ -44,8 +43,8 @@ bool ConfigurationClassifier::Partition()
     maC2minusC1.clear();
 
     PartitionResources(
-        mxConfiguration1->getResources(nullptr, u"", AnchorBindingMode_DIRECT),
-        mxConfiguration2->getResources(nullptr, u"", AnchorBindingMode_DIRECT));
+        mxConfiguration1->getResources(nullptr, u"", AnchorBindingMode::DIRECT),
+        mxConfiguration2->getResources(nullptr, u"", AnchorBindingMode::DIRECT));
 
     return !maC1minusC2.empty() || !maC2minusC1.empty();
 }
@@ -76,8 +75,8 @@ void ConfigurationClassifier::PartitionResources (
     for (const auto& rxResource : aC1andC2)
     {
         PartitionResources(
-            mxConfiguration1->getResources(rxResource, u"", AnchorBindingMode_DIRECT),
-            mxConfiguration2->getResources(rxResource, u"", AnchorBindingMode_DIRECT));
+            mxConfiguration1->getResources(rxResource, u"", AnchorBindingMode::DIRECT),
+            mxConfiguration2->getResources(rxResource, u"", AnchorBindingMode::DIRECT));
     }
 }
 
@@ -128,7 +127,7 @@ void ConfigurationClassifier::CopyResources (
             rxConfiguration->getResources(
                 rxResource,
                 u"",
-                AnchorBindingMode_INDIRECT));
+                AnchorBindingMode::INDIRECT));
         const sal_Int32 nL (aBoundResources.size());
 
         rTarget.reserve(rTarget.size() + 1 + nL);

sd/source/ui/framework/configuration/ConfigurationController.cxx

@@ -41,7 +41,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
 
 namespace sd::framework {
@@ -256,7 +255,7 @@ void ConfigurationController::requestResourceActivation (
             mpImplementation->mxRequestedConfiguration->getResources(
                 rxResourceId->getAnchor(),
                 rxResourceId->getResourceTypePrefix(),
-                AnchorBindingMode_DIRECT));
+                AnchorBindingMode::DIRECT));
 
         for (const auto& rResource : aResourceList)
         {
@@ -297,7 +296,7 @@ void ConfigurationController::requestResourceDeactivation (
         mpImplementation->mxRequestedConfiguration->getResources(
             rxResourceId,
             u"",
-            AnchorBindingMode_DIRECT));
+            AnchorBindingMode::DIRECT));
     for (const auto& rLinkedResource : aLinkedResources)
     {
         // We do not add deactivation requests directly but call this

sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx

@@ -28,7 +28,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 

sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx

@@ -32,7 +32,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 

sd/source/ui/framework/configuration/ConfigurationTracer.cxx

@@ -24,7 +24,6 @@
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 
@@ -56,7 +55,7 @@ void ConfigurationTracer::TraceBoundResources (
     const int nIndentation)
 {
     const std::vector<rtl::Reference<ResourceId> > aResourceList (
-        rxConfiguration->getResources(rxResourceId, u"", AnchorBindingMode_DIRECT));
+        rxConfiguration->getResources(rxResourceId, u"", AnchorBindingMode::DIRECT));
     static constexpr OUStringLiteral sIndentation (u"    ");
     for (rtl::Reference<ResourceId> const & resourceId : aResourceList)
     {

sd/source/ui/framework/configuration/ConfigurationUpdater.cxx

@@ -37,7 +37,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
 using ::std::vector;
 
@@ -280,7 +279,7 @@ void ConfigurationUpdater::CheckPureAnchors (
     // Get a list of all resources in the configuration.
     std::vector<rtl::Reference<ResourceId> > aResources(
         rxConfiguration->getResources(
-            nullptr, u"", AnchorBindingMode_INDIRECT));
+            nullptr, u"", AnchorBindingMode::INDIRECT));
     sal_Int32 nCount (aResources.size());
 
     // Prepare the list of pure anchors that have to be deactivated.
@@ -312,7 +311,7 @@ void ConfigurationUpdater::CheckPureAnchors (
             {
                 const rtl::Reference<ResourceId>& xPrevResourceId (aResources[nIndex+1]);
                 if ( ! xPrevResourceId.is()
-                    || ! xPrevResourceId->isBoundTo(xResourceId, AnchorBindingMode_DIRECT))
+                    || ! xPrevResourceId->isBoundTo(xResourceId, AnchorBindingMode::DIRECT))
                 {
                     // The previous resource (id) does not exist or is not bound to
                     // the current anchor.

sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx

@@ -28,7 +28,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 

sd/source/ui/framework/configuration/ResourceId.cxx

@@ -32,7 +32,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 
@@ -259,7 +258,7 @@ bool ResourceId::IsBoundToAnchor (
 
     // Check the lengths.
     if (nLocalAnchorURLCount<nAnchorURLCount ||
-        (eMode==AnchorBindingMode_DIRECT && nLocalAnchorURLCount!=nAnchorURLCount))
+        (eMode == AnchorBindingMode::DIRECT && nLocalAnchorURLCount != nAnchorURLCount))
     {
         return false;
     }
@@ -284,7 +283,7 @@ bool ResourceId::IsBoundToAnchor (
 
     // Check the lengths.
     if (nLocalAnchorURLCount<nAnchorURLCount ||
-        (eMode==AnchorBindingMode_DIRECT && nLocalAnchorURLCount!=nAnchorURLCount))
+        (eMode == AnchorBindingMode::DIRECT && nLocalAnchorURLCount != nAnchorURLCount))
     {
         return false;
     }

sd/source/ui/framework/configuration/UpdateRequest.cxx

@@ -21,7 +21,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework
 {

sd/source/ui/framework/factories/BasicPaneFactory.cxx

@@ -40,7 +40,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 

sd/source/ui/framework/factories/BasicToolBarFactory.cxx

@@ -33,7 +33,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 

sd/source/ui/framework/factories/BasicViewFactory.cxx

@@ -47,7 +47,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 
@@ -136,7 +135,7 @@ rtl::Reference<AbstractResource> BasicViewFactory::createResource (
     const rtl::Reference<ResourceId>& rxViewId)
 {
     const bool bIsCenterPane (
-        rxViewId->isBoundToURL(FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT));
+        rxViewId->isBoundToURL(FrameworkHelper::msCenterPaneURL, AnchorBindingMode::DIRECT));
 
     // Get the pane for the anchor URL.
     rtl::Reference<AbstractPane> xPane;
@@ -202,7 +201,7 @@ void BasicViewFactory::releaseResource (const rtl::Reference<AbstractResource>&
     std::shared_ptr<ViewShell> pViewShell ((*iViewShell)->mpViewShell);
 
     if ((*iViewShell)->mxViewId->isBoundToURL(
-        FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+        FrameworkHelper::msCenterPaneURL, AnchorBindingMode::DIRECT))
     {
         // Obtain a pointer to and connect to the frame view of the
         // view.  The next view, that is created, will be

sd/source/ui/framework/factories/FullScreenPane.cxx

@@ -34,7 +34,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 

sd/source/ui/framework/factories/PresentationFactory.cxx

@@ -32,7 +32,6 @@ namespace com::sun::star::uno { class XComponentContext; }
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::drawing::framework;
 
 
 namespace sd::framework {

sd/source/ui/framework/module/CenterViewFocusModule.cxx

@@ -31,7 +31,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 
@@ -114,7 +113,7 @@ void CenterViewFocusModule::HandleNewView (
     std::vector<rtl::Reference<ResourceId> > xViewIds (rxConfiguration->getResources(
         new ::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
         FrameworkHelper::msViewURLPrefix,
-        AnchorBindingMode_DIRECT));
+        AnchorBindingMode::DIRECT));
     rtl::Reference<AbstractView> xView;
     if (!xViewIds.empty())
         xView = dynamic_cast<AbstractView*>( mxConfigurationController->getResource(xViewIds[0]).get() );

sd/source/ui/framework/module/NotesPaneModule.cxx

@@ -26,7 +26,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework
 {
@@ -146,7 +145,7 @@ void NotesPaneModule::notifyConfigurationChange(const ConfigurationChangeEvent&
     {
         case ConfigurationChangeEventType::ResourceActivationRequest:
             if (rEvent.ResourceId->isBoundToURL(FrameworkHelper::msCenterPaneURL,
-                                                AnchorBindingMode_DIRECT))
+                                                AnchorBindingMode::DIRECT))
             {
                 if (rEvent.ResourceId->getResourceTypePrefix() == FrameworkHelper::msViewURLPrefix)
                 {
@@ -233,7 +232,7 @@ void NotesPaneModule::onResourceRequest(
 {
     std::vector<rtl::Reference<ResourceId>> aCenterViews = rxConfiguration->getResources(
         new ::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
-        FrameworkHelper::msViewURLPrefix, AnchorBindingMode_DIRECT);
+        FrameworkHelper::msViewURLPrefix, AnchorBindingMode::DIRECT);
 
     if (aCenterViews.size() != 1)
         return;

sd/source/ui/framework/module/ShellStackGuard.cxx

@@ -30,7 +30,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 

sd/source/ui/framework/module/SlideSorterModule.cxx

@@ -34,7 +34,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 
@@ -123,7 +122,7 @@ void SlideSorterModule::notifyConfigurationChange (
                      FrameworkHelper::msViewURLPrefix
                  && rEvent.ResourceId->isBoundTo(
                         new ::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
-                        AnchorBindingMode_DIRECT))
+                        AnchorBindingMode::DIRECT))
         {
             // Update the view tab bar because the view in the center pane
             // has changed.
@@ -138,7 +137,7 @@ void SlideSorterModule::notifyConfigurationChange (
         case ConfigurationChangeEventType::ResourceActivationRequest:
             if (rEvent.ResourceId->isBoundToURL(
                 FrameworkHelper::msCenterPaneURL,
-                AnchorBindingMode_DIRECT))
+                AnchorBindingMode::DIRECT))
             {
                 // A resource directly bound to the center pane has been
                 // requested.
@@ -273,7 +272,7 @@ void SlideSorterModule::HandleResourceRequest(
     std::vector<rtl::Reference<ResourceId> > aCenterViews = rxConfiguration->getResources(
         new ::sd::framework::ResourceId(FrameworkHelper::msCenterPaneURL),
         FrameworkHelper::msViewURLPrefix,
-        AnchorBindingMode_DIRECT);
+        AnchorBindingMode::DIRECT);
     if (aCenterViews.size() == 1)
     {
         if (bActivation)

sd/source/ui/framework/module/ToolBarModule.cxx

@@ -35,7 +35,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 
@@ -125,7 +124,7 @@ void ToolBarModule::notifyConfigurationChange (
                 if (rEvent.ResourceId->getResourceURL().match(
                     FrameworkHelper::msViewURLPrefix)
                     && rEvent.ResourceId->isBoundToURL(
-                        FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+                        FrameworkHelper::msCenterPaneURL, AnchorBindingMode::DIRECT))
                 {
                     mbMainViewSwitchUpdatePending = true;
                 }

sd/source/ui/framework/module/ViewTabBarModule.cxx

@@ -31,7 +31,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 
@@ -86,7 +85,7 @@ void ViewTabBarModule::notifyConfigurationChange (
     switch (rEvent.Type)
     {
         case ConfigurationChangeEventType::ResourceActivationRequest:
-            if (mxViewTabBarId->isBoundTo(rEvent.ResourceId, AnchorBindingMode_DIRECT))
+            if (mxViewTabBarId->isBoundTo(rEvent.ResourceId, AnchorBindingMode::DIRECT))
             {
                 mxConfigurationController->requestResourceActivation(
                     mxViewTabBarId,
@@ -95,7 +94,7 @@ void ViewTabBarModule::notifyConfigurationChange (
             break;
 
         case ConfigurationChangeEventType::ResourceDeactivationRequest:
-            if (mxViewTabBarId->isBoundTo(rEvent.ResourceId, AnchorBindingMode_DIRECT))
+            if (mxViewTabBarId->isBoundTo(rEvent.ResourceId, AnchorBindingMode::DIRECT))
             {
                 mxConfigurationController->requestResourceDeactivation(mxViewTabBarId);
             }

sd/source/ui/framework/tools/FrameworkHelper.cxx

@@ -46,7 +46,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 namespace sd::framework {
 
@@ -219,7 +218,7 @@ namespace
         {
             rtl::Reference< sd::framework::Configuration > xConfiguration( i_rConfigController->getRequestedConfiguration() );
             std::vector< rtl::Reference< ResourceId > > aViewIds( xConfiguration->getResources(
-                i_rPaneId, FrameworkHelper::msViewURLPrefix, AnchorBindingMode_DIRECT ) );
+                i_rPaneId, FrameworkHelper::msViewURLPrefix, AnchorBindingMode::DIRECT));
             if ( !aViewIds.empty() )
                 return i_rConfigController->getResource( aViewIds[0] );
         }

sd/source/ui/inc/framework/Configuration.hxx

@@ -19,9 +19,10 @@
 
 #pragma once
 
+#include <AnchorBindingMode.hxx>
+
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/drawing/framework/AnchorBindingMode.hpp>
 #include <comphelper/compbase.hxx>
 #include <rtl/ref.hxx>
 #include <memory>
@@ -139,7 +140,7 @@ public:
     std::vector< rtl::Reference<sd::framework::ResourceId> > getResources (
         const rtl::Reference<sd::framework::ResourceId>& rxAnchorId,
         std::u16string_view rsResourceURLPrefix,
-        css::drawing::framework::AnchorBindingMode eMode);
+        sd::framework::AnchorBindingMode eMode);
 
     /** <p>Returns whether the specified resource is part of the
         configuration.</p>

sd/source/ui/sidebar/LayoutMenu.cxx

@@ -69,7 +69,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using namespace ::sd::slidesorter;
 using ::sd::framework::FrameworkHelper;
 

sd/source/ui/slideshow/PaneHider.cxx

@@ -34,7 +34,6 @@
 #include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
 using ::com::sun::star::lang::DisposedException;
 
@@ -63,7 +62,7 @@ PaneHider::PaneHider(const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
                 const std::vector<rtl::Reference<framework::ResourceId>> aResources(
                     mxConfiguration->getResources(nullptr,
                                                   framework::FrameworkHelper::msPaneURLPrefix,
-                                                  AnchorBindingMode_DIRECT));
+                                                  framework::AnchorBindingMode::DIRECT));
                 for (const rtl::Reference<framework::ResourceId>& xPaneId : aResources)
                 {
                     if (xPaneId->getResourceURL() != FrameworkHelper::msCenterPaneURL)

sd/source/ui/tools/EventMultiplexer.cxx

@@ -40,7 +40,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 
 using ::sd::framework::FrameworkHelper;
 
@@ -496,7 +495,7 @@ void EventMultiplexer::Implementation::notifyConfigurationChange (
                 CallListeners (EventMultiplexerEventId::ViewAdded);
 
                 if (rEvent.ResourceId->isBoundToURL(
-                    FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+                    FrameworkHelper::msCenterPaneURL, sd::framework::AnchorBindingMode::DIRECT))
                 {
                     CallListeners (EventMultiplexerEventId::MainViewAdded);
                 }
@@ -521,7 +520,7 @@ void EventMultiplexer::Implementation::notifyConfigurationChange (
             if (rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
             {
                 if (rEvent.ResourceId->isBoundToURL(
-                    FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+                    FrameworkHelper::msCenterPaneURL, sd::framework::AnchorBindingMode::DIRECT))
                 {
                     CallListeners (EventMultiplexerEventId::MainViewRemoved);
                 }

sd/source/ui/unoidl/DrawController.cxx

@@ -53,7 +53,6 @@
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using vcl::EnumContext;
 
 namespace sd {
@@ -584,7 +583,7 @@ Any SAL_CALL DrawController::getSlideSorterSelection()
     // * traverse Impress resources to find slide preview pane, grab selection from there
     const std::vector<rtl::Reference<framework::ResourceId>> aResIds(
         mxConfigurationController->getCurrentConfiguration()->getResources(
-            {}, u"", drawing::framework::AnchorBindingMode_INDIRECT));
+            {}, u"", sd::framework::AnchorBindingMode::INDIRECT));
 
     for (const rtl::Reference<framework::ResourceId>& rResId : aResIds)
     {

sd/source/ui/view/ViewShellBase.cxx

@@ -94,7 +94,6 @@ using ::sd::framework::FrameworkHelper;
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
-using namespace com::sun::star::drawing::framework;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 

sd/source/ui/view/ViewTabBar.cxx

@@ -46,7 +46,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
 
 namespace sd {
@@ -96,7 +95,7 @@ ViewTabBar::ViewTabBar (
 
     if (mpViewShellBase != nullptr
         && rxViewTabBarId->isBoundToURL(
-            FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+            FrameworkHelper::msCenterPaneURL, sd::framework::AnchorBindingMode::DIRECT))
     {
         mpViewShellBase->SetViewTabBar(this);
     }
@@ -112,7 +111,7 @@ void ViewTabBar::disposing(std::unique_lock<std::mutex>&)
 {
     if (mpViewShellBase != nullptr
         && mxViewTabBarId->isBoundToURL(
-            FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+            FrameworkHelper::msCenterPaneURL, sd::framework::AnchorBindingMode::DIRECT))
     {
         mpViewShellBase->SetViewTabBar(nullptr);
     }
@@ -155,7 +154,7 @@ vcl::Window* ViewTabBar::GetAnchorWindow(
     // The ViewTabBar supports at the moment only the center pane.
     if (rxViewTabBarId.is()
         && rxViewTabBarId->isBoundToURL(
-            FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+            FrameworkHelper::msCenterPaneURL, sd::framework::AnchorBindingMode::DIRECT))
     {
         if (pBase != nullptr)
             pWindow = &pBase->GetViewFrame().GetWindow();
@@ -197,7 +196,8 @@ void ViewTabBar::Listener::notifyConfigurationChange (
 {
     if (rEvent.Type == framework::ConfigurationChangeEventType::ResourceActivation
         && rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix)
-        && rEvent.ResourceId->isBoundTo(mrParent.mxViewTabBarId->getAnchor(), AnchorBindingMode_DIRECT))
+        && rEvent.ResourceId->isBoundTo(mrParent.mxViewTabBarId->getAnchor(),
+                                        sd::framework::AnchorBindingMode::DIRECT))
     {
         mrParent.UpdateActiveButton();
     }

sd/source/ui/view/drviews3.cxx

@@ -85,7 +85,6 @@
 #include <oox/shape/ShapeFilterBase.hxx>
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
 using ::com::sun::star::frame::XFrame;
 using ::com::sun::star::frame::XController;
 

sd/source/ui/view/viewshel.cxx

@@ -441,7 +441,7 @@ void ViewShell::BroadcastContextForActivation(const bool bIsActivated)
             return {};
 
         auto aResIdsIndirect
-            = xConfiguration->getResources({}, u"", drawing::framework::AnchorBindingMode_INDIRECT);
+            = xConfiguration->getResources({}, u"", sd::framework::AnchorBindingMode::INDIRECT);
 
         for (const rtl::Reference<framework::ResourceId>& rResId : aResIdsIndirect)
         {