offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/drawing/framework/XToolBar.idl | 33 --------------------- sd/source/ui/inc/ViewTabBar.hxx | 4 +- 3 files changed, 2 insertions(+), 36 deletions(-)
New commits: commit 0e095a3e24283667a748dbf2cb48c78552c1add2 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Thu Jun 19 20:18:33 2025 +0200 Commit: Noel Grandin <noelgran...@gmail.com> CommitDate: Fri Jun 20 08:46:53 2025 +0200 [API CHANGE] remove css::drawing::framework::XToolBar this is internal to sd, no need to use UNO here Change-Id: I6ec94f89da5b7f01f0045e8c748ea43b3a3ad55b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186724 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 43e1718c3ee9..3a2d8508bcdc 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2399,7 +2399,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\ XResource \ XResourceFactory \ XResourceId \ - XToolBar \ XView \ )) $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/embed,\ diff --git a/offapi/com/sun/star/drawing/framework/XToolBar.idl b/offapi/com/sun/star/drawing/framework/XToolBar.idl deleted file mode 100644 index 8ab4b4ad903f..000000000000 --- a/offapi/com/sun/star/drawing/framework/XToolBar.idl +++ /dev/null @@ -1,33 +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 { - -/** Abstraction of tool bars used by the drawing framework. - @see XToolBarController - @see XToolBarFactory -*/ -interface XToolBar - : ::com::sun::star::drawing::framework::XResource -{ -}; - -}; }; }; }; }; // ::com::sun::star::drawing::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 21b1a450f725..67ad0e3fa5d9 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -19,7 +19,7 @@ #pragma once -#include <com/sun/star/drawing/framework/XToolBar.hpp> +#include <com/sun/star/drawing/framework/XResource.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <comphelper/compbase.hxx> #include <vcl/InterimItemWindow.hxx> @@ -83,7 +83,7 @@ struct TabBarButton }; typedef comphelper::WeakComponentImplHelper < - css::drawing::framework::XToolBar, + css::drawing::framework::XResource, css::drawing::framework::XConfigurationChangeListener > ViewTabBarInterfaceBase;