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