[Libreoffice-commits] core.git: uui/CppunitTest_uui_dialogs_test.mk uui/inc uui/Library_uui.mk uui/source
Caolán McNamara
caolanm at redhat.com
Fri May 18 07:56:44 UTC 2018
uui/CppunitTest_uui_dialogs_test.mk | 1 -
uui/Library_uui.mk | 1 -
uui/inc/pch/precompiled_uui.hxx | 1 -
uui/source/iahndl.cxx | 11 -----------
uui/source/iahndl.hxx | 3 ---
5 files changed, 17 deletions(-)
New commits:
commit 3f1faf10bbeeeb50e0c46aeaf360c7c1a6b95584
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 17 10:55:50 2018 +0100
UUIInteractionHelper::getParentProperty now unused
Change-Id: I539df7d7ddddb6dd9811ac93fc7445b12e1119ae
Reviewed-on: https://gerrit.libreoffice.org/54490
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/uui/CppunitTest_uui_dialogs_test.mk b/uui/CppunitTest_uui_dialogs_test.mk
index ed652c7770b0..90d17cfbc8bc 100644
--- a/uui/CppunitTest_uui_dialogs_test.mk
+++ b/uui/CppunitTest_uui_dialogs_test.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_CppunitTest_use_libraries,uui_dialogs_test, \
svt \
test \
tl \
- tk \
ucbhelper \
unotest \
utl \
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk
index 7cef0e1da345..7ca8d9a0e984 100644
--- a/uui/Library_uui.mk
+++ b/uui/Library_uui.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,uui,\
svl \
svt \
svx \
- tk \
tl \
utl \
vcl \
diff --git a/uui/inc/pch/precompiled_uui.hxx b/uui/inc/pch/precompiled_uui.hxx
index ca2e75cbe217..b4a72850d41a 100644
--- a/uui/inc/pch/precompiled_uui.hxx
+++ b/uui/inc/pch/precompiled_uui.hxx
@@ -54,7 +54,6 @@
#include <sal/typesizes.h>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
-#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index ce610c46ec41..16fd450ce05c 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -72,7 +72,6 @@
#include <comphelper/propertysequence.hxx>
#include <svtools/sfxecode.hxx>
#include <unotools/configmgr.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <typelib/typedescription.hxx>
#include <unotools/confignode.hxx>
@@ -957,16 +956,6 @@ UUIInteractionHelper::getInteractionHandlerList(
}
}
-vcl::Window *
-UUIInteractionHelper::getParentProperty()
-{
- uno::Reference< awt::XWindow > xWindow = getParentXWindow();
- if ( xWindow.is() )
- return VCLUnoHelper::GetWindow(xWindow);
-
- return nullptr;
-}
-
const uno::Reference< awt::XWindow>&
UUIInteractionHelper::getParentXWindow() const
{
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index cffe7bd3ba27..056b66103ad3 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -122,9 +122,6 @@ private:
static void getstringfromrequest(void* pHandleData, void* pInteractionHandler);
- vcl::Window *
- getParentProperty();
-
const css::uno::Reference< css::awt::XWindow>&
getParentXWindow() const;
More information about the Libreoffice-commits
mailing list