forms/source/xforms/submission.cxx | 7 ------- forms/source/xforms/submission.hxx | 9 --------- sd/source/ui/inc/ViewTabBar.hxx | 10 +--------- sd/source/ui/view/ViewTabBar.cxx | 13 ------------- 4 files changed, 1 insertion(+), 38 deletions(-)
New commits: commit 6e0d5afa233484e36e323e8466829ec573d11cbd Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Jan 16 16:11:49 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jan 17 16:10:07 2023 +0000 XUnoTUnnel->dynamic_cast in sd::ViewTabBar Change-Id: I0aae59685986f07e74a15ef7e7261de808b20c47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145639 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index d483f2b057d0..61670cc1432b 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/drawing/framework/XTabBar.hpp> #include <com/sun/star/drawing/framework/XToolBar.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/compbase.hxx> #include <vcl/InterimItemWindow.hxx> @@ -62,8 +61,7 @@ private: typedef comphelper::WeakComponentImplHelper < css::drawing::framework::XToolBar, css::drawing::framework::XTabBar, - css::drawing::framework::XConfigurationChangeListener, - css::lang::XUnoTunnel + css::drawing::framework::XConfigurationChangeListener > ViewTabBarInterfaceBase; /** Tab control for switching between views in the center pane. @@ -123,12 +121,6 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly() override; - //----- XUnoTunnel -------------------------------------------------------- - - static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); - - virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override; - /** The returned value is calculated as the difference between the total height of the control and the height of its first tab page. This can be considered a hack. diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 6e9f23e3b674..09925e32d37b 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -265,19 +265,6 @@ sal_Bool SAL_CALL ViewTabBar::isAnchorOnly() return false; } -//----- XUnoTunnel ------------------------------------------------------------ - -const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId() -{ - static const comphelper::UnoIdInit theViewTabBarUnoTunnelId; - return theViewTabBarUnoTunnelId.getSeq(); -} - -sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) -{ - return comphelper::getSomethingImpl(rId, this); -} - bool ViewTabBar::ActivatePage(size_t nIndex) { try commit fc41f4d58c7c0e60025c1b43127ef1b3c87fa1ac Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Sat Jan 14 12:41:58 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jan 17 16:10:02 2023 +0000 XUnoTunnel->dynamic_cast in Submission Change-Id: I2bafbecdd1b3f16375880e49708fe932db060812 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145626 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 7a27305760e3..fde73057b4e4 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -384,13 +384,6 @@ void SAL_CALL Submission::setName( const OUString& sID ) } -sal_Int64 SAL_CALL Submission::getSomething( - const Sequence<sal_Int8>& aId ) -{ - return comphelper::getSomethingImpl(aId, this); -} - - static OUString lcl_message( std::u16string_view rID, std::u16string_view rText ) { OUString aMessage = OUString::Concat("XForms submission '") + rID + "' failed" + rText + "."; diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index 31c5b9af07b9..8dbfb2b3f1aa 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -21,7 +21,6 @@ #include <cppuhelper/implbase.hxx> #include "propertysetbase.hxx" -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xml/dom/XDocumentFragment.hpp> #include <com/sun/star/xml/xpath/XXPathObject.hpp> @@ -52,7 +51,6 @@ namespace xforms */ typedef cppu::ImplInheritanceHelper< PropertySetBase, - css::lang::XUnoTunnel, css::xforms::XSubmission > Submission_t; @@ -194,13 +192,6 @@ public: virtual void SAL_CALL setName( const OUString& ) override; - // XUnoTunnel - - - virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence<sal_Int8>& ) override; - - // XSubmission