From d46c13839afcc2998c2b0d61058f86799b358798 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 20 Mar 2017 21:26:13 +0100 Subject: [PATCH 398/398] fix build Change-Id: I571029ffef0e7f426458197a4bbfcddc473f79dd --- desktop/inc/lib/init.hxx | 4 ++-- desktop/qa/desktop_lib/test_desktop_lib.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 560bd06c6cd9..3f1fd67d7ad7 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -21,12 +21,12 @@ class LOKInteractionHandler; namespace desktop { struct DESKTOP_DLLPUBLIC LibLODocument_Impl : public _LibreOfficeKitDocument { - uno::Reference mxComponent; + css::uno::Reference mxComponent; std::shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass; LibreOfficeKitCallback mpCallback; void *mpCallbackData; - explicit LibLODocument_Impl(const uno::Reference &xComponent); + explicit LibLODocument_Impl(const css::uno::Reference &xComponent); ~LibLODocument_Impl(); }; diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 4b08f9448f61..cb0bf721a4a5 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -512,7 +512,7 @@ void DesktopLOKTest::testWriterComments() TimeValue aTimeValue = {2 , 0}; // 2 seconds max m_aCommandResultCondition.reset(); pDocument->pClass->postUnoCommand(pDocument, ".uno:InsertAnnotation", nullptr, true); - m_aCommandResultCondition.wait(aTimeValue); + m_aCommandResultCondition.wait(&aTimeValue); CPPUNIT_ASSERT(!m_aCommandResult.isEmpty()); xToolkit->reschedule(); -- 2.12.0