[Libreoffice-commits] core.git: writerperfect/Library_wpftdraw.mk

2016-09-19 Thread Jan-Marek Glogowski 
 writerperfect/Library_wpftdraw.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c8ad526447934a5eae94fa5f40584083a874d9f
Author: Jan-Marek Glogowski 
Date:   Mon Sep 12 11:54:51 2016 +0200

Fix '--as-needed' build for zmf with system libpng

Change-Id: I92378dae4a515a587c897fff83b15d8e836b0aa2
Reviewed-on: https://gerrit.libreoffice.org/28974
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/writerperfect/Library_wpftdraw.mk 
b/writerperfect/Library_wpftdraw.mk
index ec9057c..cff3090 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
mspub \
mwaw \
odfgen \
+   zmf \
png \
pagemaker \
revenge \
@@ -58,7 +59,6 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
wpg \
wpd \
zlib \
-   zmf \
lcms2 \
libxml2 \
icui18n \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/Library_wpftdraw.mk writerperfect/source

2014-10-24 Thread Takeshi Abe 
 writerperfect/Library_wpftdraw.mk   |1 
 writerperfect/source/draw/CDRImportFilter.cxx   |2 
 writerperfect/source/draw/CDRImportFilter.hxx   |   10 -
 writerperfect/source/draw/CMXImportFilter.cxx   |2 
 writerperfect/source/draw/CMXImportFilter.hxx   |   10 -
 writerperfect/source/draw/DocumentHandlerForOdg.hxx |   31 +++
 writerperfect/source/draw/FreehandImportFilter.cxx  |2 
 writerperfect/source/draw/FreehandImportFilter.hxx  |   10 -
 writerperfect/source/draw/ImportFilterBase.cxx  |  183 
 writerperfect/source/draw/ImportFilterBase.hxx  |  115 
 writerperfect/source/draw/MSPUBImportFilter.cxx |2 
 writerperfect/source/draw/MSPUBImportFilter.hxx |   10 -
 writerperfect/source/draw/MWAWDrawImportFilter.cxx  |2 
 writerperfect/source/draw/MWAWDrawImportFilter.hxx  |   10 -
 writerperfect/source/draw/PageMakerImportFilter.cxx |2 
 writerperfect/source/draw/PageMakerImportFilter.hxx |   10 -
 writerperfect/source/draw/VisioImportFilter.cxx |2 
 writerperfect/source/draw/VisioImportFilter.hxx |   10 -
 writerperfect/source/draw/WPGImportFilter.cxx   |2 
 writerperfect/source/draw/WPGImportFilter.hxx   |   10 -
 20 files changed, 87 insertions(+), 339 deletions(-)

New commits:
commit bddd965764130656ee8daf84b592de6de3c1db4f
Author: Takeshi Abe 
Date:   Mon Oct 20 22:34:24 2014 +0900

fdo#84168 change writerperfect filters to use a new base class template

in writerperfect/source/draw.

Change-Id: I8ec2861da2af1e203157faa1319b837fe236b507
Reviewed-on: https://gerrit.libreoffice.org/12072
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/writerperfect/Library_wpftdraw.mk 
b/writerperfect/Library_wpftdraw.mk
index c3a3ce0..29409c1 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,wpftdraw,\
writerperfect/source/draw/CDRImportFilter \
writerperfect/source/draw/CMXImportFilter \
writerperfect/source/draw/FreehandImportFilter \
-   writerperfect/source/draw/ImportFilterBase \
writerperfect/source/draw/MSPUBImportFilter \
writerperfect/source/draw/MWAWDrawImportFilter \
writerperfect/source/draw/PageMakerImportFilter \
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx 
b/writerperfect/source/draw/CDRImportFilter.cxx
index 8bb8fe8..e5671da 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence;
 using com::sun::star::uno::XComponentContext;
 using com::sun::star::uno::XInterface;
 
-bool CDRImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, 
librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
+bool CDRImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, 
OdgGenerator &rGenerator, utl::MediaDescriptor &)
 {
 return libcdr::CDRDocument::parse(&rInput, &rGenerator);
 }
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx 
b/writerperfect/source/draw/CDRImportFilter.hxx
index f2a4d45..7754ac8 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -11,16 +11,18 @@
 #ifndef _CDRIMPORTFILTER_HXX
 #define _CDRIMPORTFILTER_HXX
 
-#include "ImportFilterBase.hxx"
+#include "writerperfect/ImportFilter.hxx"
+
+#include "DocumentHandlerForOdg.hxx"
 
 /* This component will be instantiated for both import or export. Whether it 
calls
  * setSourceDocument or setTargetDocument determines which Impl function the 
filter
  * member calls */
-class CDRImportFilter : public writerperfect::draw::ImportFilterBase
+class CDRImportFilter : public writerperfect::ImportFilter
 {
 public:
 CDRImportFilter(const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext > &rxContext)
-: writerperfect::draw::ImportFilterBase(rxContext)
+: writerperfect::ImportFilter(rxContext)
 {
 }
 
@@ -34,7 +36,7 @@ public:
 
 private:
 virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString 
&rTypeName) SAL_OVERRIDE;
-virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, 
librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) 
SAL_OVERRIDE;
+virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, 
OdgGenerator &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
 };
 
 OUString CDRImportFilter_getImplementationName()
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx 
b/writerperfect/source/draw/CMXImportFilter.cxx
index 120e985..2670706 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence;
 using com::sun::star::uno::XComponentContext;
 using com::sun::star::uno:

[Libreoffice-commits] core.git: writerperfect/Library_wpftdraw.mk

2013-09-23 Thread Michael Stahl 
 writerperfect/Library_wpftdraw.mk |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit de063d7a628b920da8c3da76f10d41cf0c63205d
Author: Michael Stahl 
Date:   Mon Sep 23 15:20:48 2013 +0200

re-order externals in Library_wpftdraw for ld with --as-needed

Change-Id: I52e14ead53fe0af0b13919869a5f646586251cca

diff --git a/writerperfect/Library_wpftdraw.mk 
b/writerperfect/Library_wpftdraw.mk
index 2033ca0..566b77b 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -46,17 +46,17 @@ $(eval $(call gb_Library_use_static_libraries,wpftdraw,\
 
 $(eval $(call gb_Library_use_externals,wpftdraw,\
cdr \
-   icui18n \
-   icuuc \
-   icudata \
-   lcms2 \
-   libxml2 \
-mspub \
+   mspub \
odfgen \
visio \
wpg \
wpd \
zlib \
+   lcms2 \
+   libxml2 \
+   icui18n \
+   icuuc \
+   icudata \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,wpftdraw,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits