diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 11:30:28 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 11:30:28 +0200 |
| commit | 9347f606ec8b85921c3a609befc2fa8005f89459 (patch) | |
| tree | 2bf8da8e1cb1b917940d69565c3f2d5c4bbb75b0 | |
| parent | fc263c4f068ae706e05d0dc0546400301f381303 (diff) | |
wpgimporter.diff: WPG Import filter
| -rw-r--r-- | filter/source/config/fragments/fcfg_draw.mk | 7 | ||||
| -rw-r--r-- | writerperfect/prj/build.lst | 5 | ||||
| -rw-r--r-- | writerperfect/source/filter/DocumentHandler.cxx | 2 | ||||
| -rw-r--r-- | writerperfect/util/makefile.mk | 35 |
4 files changed, 44 insertions, 5 deletions
diff --git a/filter/source/config/fragments/fcfg_draw.mk b/filter/source/config/fragments/fcfg_draw.mk index d6e6d9caad54..71d6b0b119f2 100644 --- a/filter/source/config/fragments/fcfg_draw.mk +++ b/filter/source/config/fragments/fcfg_draw.mk @@ -7,7 +7,8 @@ T4_DRAW = \ draw_StarOffice_XML_Draw_Template \ pdf_Portable_Document_Format\ draw8 \ - draw8_template + draw8_template \ + draw_WordPerfect_Graphics # ----------------------------------------------- # count = 9 @@ -16,7 +17,9 @@ F4_DRAW = \ draw_StarOffice_XML_Draw_Template \ draw_pdf_Export \ draw8 \ - draw8_template + draw8_template \ + WordPerfectGraphics + # ----------------------------------------------- # count = 4 diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst index d708c33341d0..bf7a656a1f2f 100644 --- a/writerperfect/prj/build.lst +++ b/writerperfect/prj/build.lst @@ -1,7 +1,8 @@ -wp writerperfect : LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL +wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL wp writerperfect usr1 - all wp_mkout NULL wp writerperfect\source\stream nmake - all wp_stream NULL wp writerperfect\source\filter nmake - all wp_filter NULL wp writerperfect\source\wpdimp nmake - all wp_wpdimp NULL wp writerperfect\source\wpsimp nmake - all wp_wpsimp NULL -wp writerperfect\util nmake - all wp_util wp_wpsimp wp_wpdimp wp_filter wp_stream NULL +wp writerperfect\source\wpgimp nmake - all wp_wpgimp NULL +wp writerperfect\util nmake - all wp_util wp_wpgimp wp_wpsimp wp_wpdimp wp_filter wp_stream NULL diff --git a/writerperfect/source/filter/DocumentHandler.cxx b/writerperfect/source/filter/DocumentHandler.cxx index a5204c519830..71dd370c96fb 100644 --- a/writerperfect/source/filter/DocumentHandler.cxx +++ b/writerperfect/source/filter/DocumentHandler.cxx @@ -61,7 +61,7 @@ void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xP for (i.rewind(); i.next(); ) { // filter out libwpd elements - if (strlen(i.key()) > 6 && strncmp(i.key(), "libwpd", 6) != 0) + if (strncmp(i.key(), "libwpd", 6) != 0) pAttrList->AddAttribute(OUString::createFromAscii(i.key()), OUString::createFromAscii(i()->getStr().cstr())); } diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk index 56bdfb2c60cb..35daf5e9b3bf 100644 --- a/writerperfect/util/makefile.mk +++ b/writerperfect/util/makefile.mk @@ -19,10 +19,17 @@ LIBWPS=$(LIBWPS_LIBS) LIBWPS=-lwpslib .ENDIF +.IF "$(SYSTEM_LIBWPG)" == "YES" +LIBWPG=$(LIBWPG_LIBS) +.ELSE +LIBWPG=-lwpglib +.ENDIF + .ELSE LIBWPD=$(LIBPRE) wpdlib.lib LIBWPS=$(LIBPRE) wpslib.lib +LIBWPG=$(LIBPRE) wpglib.lib .ENDIF @@ -79,4 +86,32 @@ SHL2LIBS = $(LIB2TARGET) SHL2VERSIONMAP = $(SOLARENV)/src/component.map DEF2NAME = $(SHL2TARGET) +LIB3TARGET= $(SLB)$/wpgimport.lib +LIB3FILES= \ + $(SLB)$/stream.lib \ + $(SLB)$/filter.lib \ + $(SLB)$/wpgimp.lib +SHL3LIBS=$(LIB3TARGET) +SHL3STDLIBS+= \ + $(SVLLIB) \ + $(SOTLIB) \ + $(SO2LIB) \ + $(SVTOOLLIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(XMLOFFLIB) \ + $(LIBWPD) \ + $(LIBWPG) + +SHL3TARGET = wpgimport$(DLLPOSTFIX) +SHL3IMPLIB = i$(SHL3TARGET) +SHL3LIBS = $(LIB3TARGET) +SHL3VERSIONMAP = $(SOLARENV)/src/component.map +DEF3NAME = $(SHL3TARGET) + .INCLUDE : target.mk |