filter/qa/cppunit/filters-pict-test.cxx | 4 ----
filter/qa/cppunit/filters-tga-test.cxx | 4 ----
filter/qa/cppunit/filters-tiff-test.cxx | 4 ----
3 files changed, 12 deletions(-)
New commits:
commit 2358703d161e58c9ffa23306541e0040bb4f46f2
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Sep 5 20:28:09 2013 +0200
tests that ensure the master to be broken arent that helpful
Change-Id: Ie59f2ba4daec0375d1d64b765be3b1484e8cba3e
Reviewed-on: https://gerrit.libreoffice.org/5830
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/filter/qa/cppunit/filters-pict-test.cxx
b/filter/qa/cppunit/filters-pict-test.cxx
index 36d8d22..d69cf30 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -16,10 +16,6 @@
#include <osl/file.hxx>
#include <osl/process.h>
-#ifdef LIBO_MERGELIBS
-#define GraphicImport iptGraphicImport
-#endif
-
extern "C"
{
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
diff --git a/filter/qa/cppunit/filters-tga-test.cxx
b/filter/qa/cppunit/filters-tga-test.cxx
index 365adb8..a0e0453 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/filter/qa/cppunit/filters-tga-test.cxx
@@ -16,10 +16,6 @@
#include <osl/file.hxx>
#include <osl/process.h>
-#ifdef LIBO_MERGELIBS
-#define GraphicImport itgGraphicImport
-#endif
-
extern "C"
{
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx
b/filter/qa/cppunit/filters-tiff-test.cxx
index e7594e9..0089674 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/filter/qa/cppunit/filters-tiff-test.cxx
@@ -16,10 +16,6 @@
#include <osl/file.hxx>
#include <osl/process.h>
-#ifdef LIBO_MERGELIBS
-#define GraphicImport itiGraphicImport
-#endif
-
extern "C"
{
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
