mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CDR importer: fixing some build and esthetic issues

Browse Source
This commit is contained in:
Fridrich Štrba 2011-12-08 12:34:09 +01:00
parent d701a0e9cc
commit dd8b86ea55
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filter/Configuration_filter.mk
View File

@ -545,7 +545,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
draw8_template \ draw8_template \
draw_WordPerfect_Graphics \ draw_WordPerfect_Graphics \
draw_Visio_Document \ 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,\ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\

2
filter/source/config/fragments/filters/CorelDrawDocument.xcu
View File

@ -7,7 +7,7 @@
<value xml:lang="x-default">Corel Draw</value> <value xml:lang="x-default">Corel Draw</value>
</prop> </prop>
<prop oor:name="FileFormatVersion"><value>0</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="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop> <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
</node> </node>

2
filter/source/config/fragments/types/draw_CDR_Document.xcu → filter/source/config/fragments/types/draw_CorelDraw_Document.xcu
View File

@ -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="DetectService"><value>com.sun.star.comp.Draw.CDRImportFilter</value></prop>
<prop oor:name="URLPattern"/> <prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>cdr</value></prop> <prop oor:name="Extensions"><value>cdr</value></prop>

8
libcdr/makefile.mk
View File

@ -45,17 +45,17 @@ TARGET=visio
.IF "$(SYSTEM_LIBWPD)" == "YES" .IF "$(SYSTEM_LIBWPD)" == "YES"
INCPRE+=$(WPD_CFLAGS) INCPRE+=$(WPD_CFLAGS)
.ELSE .ELSE
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd-stream
.ENDIF .ENDIF
.IF "$(SYSTEM_LIBWPG)" == "YES" .IF "$(SYSTEM_LIBWPG)" == "YES"
INCPRE+=$(WPG_CFLAGS) INCPRE+=$(WPG_CFLAGS)
.ELSE .ELSE
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
.ENDIF .ENDIF
TARFILE_NAME=libcdr-0.0.0 TARFILE_NAME=libcdr-0.0.0
TARFILE_MD5=9c9811817dccbd517ff25af8b2e8a86e TARFILE_MD5=cc8eb870d6a324d36575420efd856319
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib BUILD_DIR=src$/lib

2
libcdr/prj/build.lst
View File

@ -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 usr1 - all cdr_mkout NULL
cdr libcdr nmake - all cdr_libcdr NULL cdr libcdr nmake - all cdr_libcdr NULL

1
writerperfect/Library_cdrimport.mk
View File

@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_externals,cdrimport,\
wpd \ wpd \
wpg \ wpg \
cdr \ cdr \
zlib \
)) ))
$(eval $(call gb_Library_add_exception_objects,cdrimport,\ $(eval $(call gb_Library_add_exception_objects,cdrimport,\

2
writerperfect/source/cdrimp/CDRImportFilter.cxx
View File

@ -168,7 +168,7 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream ); WPXSvInputStream input( xInputStream );
if (libcdr::CDRDocument::isSupported(&input)) if (libcdr::CDRDocument::isSupported(&input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Visio_Document" ) ); sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_CorelDraw_Document" ) );
if (sTypeName.getLength()) if (sTypeName.getLength())
{ {