filter/source/graphicfilter/ieps/ieps.cxx | 3 ++-
testtools/source/bridgetest/bridgetest.cxx | 7 +++----
testtools/source/bridgetest/constructors.cxx | 7 +++----
testtools/source/bridgetest/cppobj.cxx | 4 ++--
testtools/source/bridgetest/currentcontextchecker.cxx | 4 ++--
testtools/source/bridgetest/currentcontextchecker.hxx | 4 ++--
testtools/source/bridgetest/multi.hxx | 4 ++--
testtools/source/performance/ubtest.cxx | 4 ++--
8 files changed, 18 insertions(+), 19 deletions(-)
New commits:
commit c30c6357743a4f0845269aef493a661cd1375eec
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Sep 9 09:11:50 2015 +0100
speed up eps testing
Change-Id: I5a7c42aff29277a8189dc00a4a3a185d3a8d3021
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index ddabfc7..a1924c6 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -31,6 +31,7 @@
#include <vcl/virdev.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/bmpacc.hxx>
+#include <unotools/configmgr.hxx>
#include <unotools/tempfile.hxx>
#include <osl/process.h>
#include <osl/file.hxx>
@@ -724,7 +725,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic,
FilterConfigItem* )
long nHeight = nNumb[3] - nNumb[1] + 1;
// if there is no preview -> try with gs to make one
- if( !bHasPreview )
+ if (!bHasPreview && !utl::ConfigManager::IsAvoidConfig())
{
bHasPreview = RenderAsEMF(pBuf, nBytesRead, aGraphic);
if (!bHasPreview)
commit ac142d91b6c141f4f2b8ee4966be8c9b2eb63e82
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Tue Sep 8 10:31:57 2015 +0900
testtools: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: I6c77b9219c772f38005431fed7cd0f4132fab2b9
Reviewed-on: https://gerrit.libreoffice.org/18395
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/testtools/source/bridgetest/bridgetest.cxx
b/testtools/source/bridgetest/bridgetest.cxx
index d17900f..4288902 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -32,8 +32,7 @@
#include "uno/environment.hxx"
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -102,7 +101,7 @@ bool checkEmpty(OUString const & string, char const *
message) {
class TestBridgeImpl : public osl::DebugBase<TestBridgeImpl>,
- public WeakImplHelper2< XMain, XServiceInfo >
+ public WeakImplHelper< XMain, XServiceInfo >
{
Reference< XComponentContext > m_xContext;
@@ -305,7 +304,7 @@ static bool performSequenceOfCallTest( const Reference <
XBridgeTest > &xLBT )
return xLBT->sequenceOfCallTestPassed();
}
-class ORecursiveCall : public WeakImplHelper1< XRecursiveCall >
+class ORecursiveCall : public WeakImplHelper< XRecursiveCall >
{
private:
Mutex m_mutex;
diff --git a/testtools/source/bridgetest/constructors.cxx
b/testtools/source/bridgetest/constructors.cxx
index 3eb4d97..9212e97 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -32,8 +32,7 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "cppu/unotype.hxx"
#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx"
#include "rtl/string.h"
@@ -51,7 +50,7 @@ namespace {
namespace ttb = ::test::testtools::bridgetest;
class Impl:
- public cppu::WeakImplHelper1<css::lang::XInitialization>,
+ public cppu::WeakImplHelper<css::lang::XInitialization>,
private boost::noncopyable
{
public:
@@ -198,7 +197,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any >
const & arguments)
}
-class Impl2: public ::cppu::WeakImplHelper2<
+class Impl2: public ::cppu::WeakImplHelper<
css::lang::XInitialization, ttb::XMultiBase1 >
{
public:
diff --git a/testtools/source/bridgetest/cppobj.cxx
b/testtools/source/bridgetest/cppobj.cxx
index 4b74e4a..8e4ed6a 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -26,7 +26,7 @@
#include <osl/mutex.hxx>
#include <osl/time.h>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/factory.hxx>
#include "cppuhelper/exc_hlp.hxx"
#include "cppuhelper/compbase_ex.hxx"
@@ -116,7 +116,7 @@ static void assign( TestData & rData,
class Test_Impl :
public osl::DebugBase<Test_Impl>,
- public WeakImplHelper3< XBridgeTest2, XServiceInfo , XRecursiveCall >
+ public WeakImplHelper< XBridgeTest2, XServiceInfo , XRecursiveCall >
{
TestData _aData, _aStructData;
sal_Int32 m_nLastCallId;
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx
b/testtools/source/bridgetest/currentcontextchecker.cxx
index adb0fb3..17ca1cc 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -28,7 +28,7 @@
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppu/unotype.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include "osl/diagnose.h"
#include "osl/diagnose.hxx"
#include "rtl/string.h"
@@ -44,7 +44,7 @@ static char const VALUE[] = "good";
class CurrentContext:
public ::osl::DebugBase< CurrentContext >,
- public ::cppu::WeakImplHelper1< css::uno::XCurrentContext >,
+ public ::cppu::WeakImplHelper< css::uno::XCurrentContext >,
private boost::noncopyable
{
public:
diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx
b/testtools/source/bridgetest/currentcontextchecker.hxx
index 3c728c9..f16cd5b 100644
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@@ -23,7 +23,7 @@
#include "sal/config.h"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include "osl/diagnose.hxx"
#include "sal/types.h"
#include "test/testtools/bridgetest/XCurrentContextChecker.hpp"
@@ -32,7 +32,7 @@ namespace testtools { namespace bridgetest {
class SAL_DLLPRIVATE CurrentContextChecker :
public ::osl::DebugBase< CurrentContextChecker >,
- public ::cppu::WeakImplHelper1<
+ public ::cppu::WeakImplHelper<
::test::testtools::bridgetest::XCurrentContextChecker >
{
public:
diff --git a/testtools/source/bridgetest/multi.hxx
b/testtools/source/bridgetest/multi.hxx
index 055d09c..e02645e 100644
--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@@ -24,14 +24,14 @@
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include "rtl/ustring.hxx"
#include "sal/types.h"
#include "test/testtools/bridgetest/XMulti.hpp"
namespace testtools { namespace bridgetest {
-class Multi: public cppu::WeakImplHelper1< test::testtools::bridgetest::XMulti
>
+class Multi: public cppu::WeakImplHelper< test::testtools::bridgetest::XMulti >
{
public:
Multi(): m_attribute1(0.0), m_attribute3(0.0) {}
diff --git a/testtools/source/performance/ubtest.cxx
b/testtools/source/performance/ubtest.cxx
index 807b5bd..2b1c834 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -48,7 +48,7 @@
#include <uno/mapping.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -400,7 +400,7 @@ inline static Sequence< OUString >
getSupportedServiceNames()
}
-class TestImpl : public WeakImplHelper2< XServiceInfo, XMain >
+class TestImpl : public WeakImplHelper< XServiceInfo, XMain >
{
Reference< XMultiServiceFactory > _xSMgr;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
