diff options
| -rw-r--r-- | filter/Configuration_filter.mk | 2 | ||||
| -rw-r--r-- | filter/source/config/fragments/filters/CorelDrawDocument.xcu | 2 | ||||
| -rw-r--r-- | filter/source/config/fragments/types/draw_CorelDraw_Document.xcu (renamed from filter/source/config/fragments/types/draw_CDR_Document.xcu) | 2 | ||||
| -rw-r--r-- | libcdr/makefile.mk | 8 | ||||
| -rw-r--r-- | libcdr/prj/build.lst | 2 | ||||
| -rw-r--r-- | writerperfect/Library_cdrimport.mk | 1 | ||||
| -rw-r--r-- | writerperfect/source/cdrimp/CDRImportFilter.cxx | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index ae2789a71e84..c09c663bbb75 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -545,7 +545,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s draw8_template \ draw_WordPerfect_Graphics \ draw_Visio_Document \ - draw_CDR_Document \ + draw_CorelDraw_Document \ ) $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\ diff --git a/filter/source/config/fragments/filters/CorelDrawDocument.xcu b/filter/source/config/fragments/filters/CorelDrawDocument.xcu index 7de8ac1af7c2..1f3a3c44fc76 100644 --- a/filter/source/config/fragments/filters/CorelDrawDocument.xcu +++ b/filter/source/config/fragments/filters/CorelDrawDocument.xcu @@ -7,7 +7,7 @@ <value xml:lang="x-default">Corel Draw</value> </prop> <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_CDR_Document</value></prop> + <prop oor:name="Type"><value>draw_CorelDraw_Document</value></prop> <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop> </node> diff --git a/filter/source/config/fragments/types/draw_CDR_Document.xcu b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu index 5b07b6200db9..d13a8fcc20ff 100644 --- a/filter/source/config/fragments/types/draw_CDR_Document.xcu +++ b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu @@ -1,4 +1,4 @@ - <node oor:name="draw_CDR_Document" oor:op="replace" > + <node oor:name="draw_CorelDraw_Document" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.CDRImportFilter</value></prop> <prop oor:name="URLPattern"/> <prop oor:name="Extensions"><value>cdr</value></prop> diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index ce9e91d6bdb1..c076512ae988 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -45,17 +45,17 @@ TARGET=visio .IF "$(SYSTEM_LIBWPD)" == "YES" INCPRE+=$(WPD_CFLAGS) .ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream +INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd +INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd-stream .ENDIF .IF "$(SYSTEM_LIBWPG)" == "YES" INCPRE+=$(WPG_CFLAGS) .ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg +INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg .ENDIF TARFILE_NAME=libcdr-0.0.0 -TARFILE_MD5=9c9811817dccbd517ff25af8b2e8a86e +TARFILE_MD5=cc8eb870d6a324d36575420efd856319 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst index 30bd3e4ffa9a..30487b15e87c 100644 --- a/libcdr/prj/build.lst +++ b/libcdr/prj/build.lst @@ -1,3 +1,3 @@ -cdr libcdr : LIBWPD:libwpd LIBWPG:libwpg soltools NULL +cdr libcdr : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL cdr libcdr usr1 - all cdr_mkout NULL cdr libcdr nmake - all cdr_libcdr NULL diff --git a/writerperfect/Library_cdrimport.mk b/writerperfect/Library_cdrimport.mk index 90bcb2e6bac7..b1511f850858 100644 --- a/writerperfect/Library_cdrimport.mk +++ b/writerperfect/Library_cdrimport.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_externals,cdrimport,\ wpd \ wpg \ cdr \ + zlib \ )) $(eval $(call gb_Library_add_exception_objects,cdrimport,\ diff --git a/writerperfect/source/cdrimp/CDRImportFilter.cxx b/writerperfect/source/cdrimp/CDRImportFilter.cxx index f5cce836d660..d72fae64bb30 100644 --- a/writerperfect/source/cdrimp/CDRImportFilter.cxx +++ b/writerperfect/source/cdrimp/CDRImportFilter.cxx @@ -168,7 +168,7 @@ throw( com::sun::star::uno::RuntimeException ) WPXSvInputStream input( xInputStream ); if (libcdr::CDRDocument::isSupported(&input)) - sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Visio_Document" ) ); + sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_CorelDraw_Document" ) ); if (sTypeName.getLength()) { |