From 247be4c2e6e31e73396cf7b9ce6abf37c617a2e2 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 1 Mar 2012 01:11:28 +0100 Subject: clean-up sw's filters-test filters-test does not initialize vcl, for these sort of tests use macros_test --- sw/qa/core/filters-test.cxx | 51 --------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'sw') diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index a8682bdeeee3..99292710f515 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -32,9 +32,6 @@ #include -#include -#include - #include #include @@ -54,29 +51,6 @@ SO2_IMPL_REF(SwDocShell) using namespace ::com::sun::star; - -class EventListener - : public ::cppu::WeakImplHelper1 -{ -public: - bool m_bLayoutFinished; - explicit EventListener() : m_bLayoutFinished(false) { } - virtual void SAL_CALL documentEventOccured( - document::DocumentEvent const& rEvent) - throw (uno::RuntimeException) - { -// fprintf(stderr, "EVENT: %s\n", ::rtl::OUStringToOString(rEvent.EventName, RTL_TEXTENCODING_UTF8).getStr()); - if (rEvent.EventName.equalsAscii("OnLayoutFinished")) - { - m_bLayoutFinished = true; - } - } - virtual void SAL_CALL disposing(lang::EventObject const&) - throw (uno::RuntimeException) - { - } -}; - /* Implementation of Filters test */ class SwFiltersTest @@ -101,18 +75,6 @@ private: bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData) { - ::rtl::Reference xListener; - if (false) // does not work: missing ViewShell, no VCL timers, or both - { - xListener.set(new EventListener); - uno::Reference xGEB; - xGEB.set(::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.GlobalEventBroadcaster"))), - uno::UNO_QUERY_THROW); - xGEB->addDocumentEventListener( - uno::Reference(xListener.get())); - } SfxFilter* pFilter = new SfxFilter( rFilter, rtl::OUString(), 0, 0, rtl::OUString(), 0, rtl::OUString(), @@ -122,19 +84,6 @@ bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true); pSrcMed->SetFilter(pFilter); bool bLoaded = xDocShRef->DoLoad(pSrcMed); - if (bLoaded && xListener.is()) - { - TimeValue delay = {0, 100000000}; - int tries(0); - while (!xListener->m_bLayoutFinished) { - osl_waitThread(& delay); - ++tries; - if (tries >= 300) { - fprintf(stderr, "timed out: no OnLayoutFinished received\n"); - break; - } - } - } if (xDocShRef.Is()) xDocShRef->DoClose(); return bLoaded; -- cgit