offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/drawing/framework/XRelocatableResource.idl | 41
----------
sd/IwyuFilter_sd.yaml | 1
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 2
sd/source/ui/inc/framework/ViewShellWrapper.hxx | 13 ++-
5 files changed, 10 insertions(+), 48 deletions(-)
New commits:
commit 64ddd687f6b77461c69dd06adea017bd3cf0cb6b
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jun 15 15:41:53 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Jun 17 22:11:59 2025 +0200
Remove XRelocatableResource
which is an internal interface for sd
Change-Id: I8c28216161b7e8752250f990522a321b50b31819
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186587
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 0a454103f36c..329df09b6427 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2402,7 +2402,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\
XModuleController \
XPane \
XPane2 \
- XRelocatableResource \
XResource \
XResourceFactory \
XResourceFactoryManager \
diff --git a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
b/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
deleted file mode 100644
index aac34c7c70b2..000000000000
--- a/offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
+++ /dev/null
@@ -1,41 +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 XResource;
-
-/** An optional interface that is implemented by resources that are
- relocatable to different anchors.
-*/
-interface XRelocatableResource
-{
- /** Replace the current anchor of the called resource with the given
- one.
- @param xNewAnchor
- The new anchor.
- @return
- Returns `TRUE` when the relocation was successful.
- */
- boolean relocateToAnchor ([in] XResource xNewAnchor);
-};
-
-}; }; }; }; }; // ::com::sun::star::drawing::framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index c9254926878e..259fd5687519 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -255,7 +255,6 @@ excludelist:
sd/source/ui/inc/framework/ViewShellWrapper.hxx:
# base class has to be a complete type
- com/sun/star/awt/XWindowListener.hpp
- - com/sun/star/drawing/framework/XRelocatableResource.hpp
- com/sun/star/drawing/framework/XView.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/view/XSelectionSupplier.hpp
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 1225521893ec..7e3939a131ed 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -171,7 +171,7 @@ void SAL_CALL
ViewShellWrapper::removeSelectionChangeListener( const uno::Refere
//----- XRelocatableResource --------------------------------------------------
-sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor (
+bool ViewShellWrapper::relocateToAnchor (
const Reference<XResource>& xResource)
{
bool bResult (false);
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index fc944623a75a..c91e97d19b29 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <com/sun/star/drawing/framework/XView.hpp>
-#include <com/sun/star/drawing/framework/XRelocatableResource.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <comphelper/compbase.hxx>
@@ -35,7 +34,6 @@ namespace sd::framework {
typedef comphelper::WeakComponentImplHelper < css::awt::XWindowListener
, css::view::XSelectionSupplier
- ,
css::drawing::framework::XRelocatableResource
, css::drawing::framework::XView
> ViewShellWrapperInterfaceBase;
@@ -88,9 +86,16 @@ public:
// XRelocatableResource
- virtual sal_Bool SAL_CALL relocateToAnchor (
+ /** Replace the current anchor of the called resource with the given
+ one.
+ @param xNewAnchor
+ The new anchor.
+ @return
+ Returns `TRUE` when the relocation was successful.
+ */
+ bool relocateToAnchor (
const css::uno::Reference<
- css::drawing::framework::XResource>& xResource) override;
+ css::drawing::framework::XResource>& xResource);
// XWindowListener
