?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
update dev300-m58
[ooovba.git] / applied_patches / 0301-cws-ooo11lotusfilter-lwp-filter-component.diff
blobe67e104f175581b462277c69e521fa66ba33948d
1 diff -urp '--exclude=unxlngx6.pro' lotuswordpro.bak/prj/build.lst lotuswordpro/prj/build.lst
2 --- lotuswordpro.bak/prj/build.lst 2008-10-22 14:01:16.000000000 +0800
3 +++ lotuswordpro/prj/build.lst 2008-10-22 11:42:21.000000000 +0800
4 @@ -1,4 +1,5 @@
5 wp lotuswordpro : sfx2 sot svx comphelper NULL
6 wp lotuswordpro usr1 - all lwp_mkout NULL
7 wp lotuswordpro\source\filter nmake - all lwp_filter NULL
8 -wp lotuswordpro\util nmake - all lwp_util lwp_filter NULL
9 +wp lotuswordpro\source\filter\xfilter nmake - all lwp_xfilter NULL
10 +wp lotuswordpro\util nmake - all lwp_util lwp_filter lwp_xfilter NULL
11 diff -urp '--exclude=unxlngx6.pro' lotuswordpro.bak/source/filter/LotusWordProImportFilter.cxx lotuswordpro/source/filter/LotusWordProImportFilter.cxx
12 --- lotuswordpro.bak/source/filter/LotusWordProImportFilter.cxx 2008-10-22 14:01:16.000000000 +0800
13 +++ lotuswordpro/source/filter/LotusWordProImportFilter.cxx 2008-10-22 11:42:21.000000000 +0800
14 @@ -19,6 +19,8 @@
15
16 #include <vector>
17
18 +#include "lwpfilter.hxx"
19 +
20 using namespace ::rtl;
21 using namespace com::sun::star;
22 using rtl::OString;
23 @@ -252,11 +254,13 @@ sal_Bool SAL_CALL LotusWordProImportFilt
24 uno::Reference< XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
25 uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
26 xImporter->setTargetDocument(mxDoc);
27 -
28 - SimpleXMLImporter xmlImporter( xInternalHandler, inputStream );
29 - xmlImporter.import();
30 +/*
31 + SimpleXMLImporter xmlImporter( xInternalHandler, inputStream );
32 + xmlImporter.import();
33 + return sal_True;
34 +*/
35 + return ( ReadWordproFile( &inputStream, xInternalHandler) == 0 );
36
37 - return sal_True;
38 }
39
40 sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
41 diff -urp '--exclude=unxlngx6.pro' lotuswordpro.bak/source/filter/makefile.mk lotuswordpro/source/filter/makefile.mk
42 --- lotuswordpro.bak/source/filter/makefile.mk 2008-10-22 14:01:16.000000000 +0800
43 +++ lotuswordpro/source/filter/makefile.mk 2008-10-22 11:42:21.000000000 +0800
44 @@ -8,6 +8,103 @@ ENABLE_EXCEPTIONS=true
45
46 SLOFILES= \
47 $(SLO)$/LotusWordProImportFilter.obj \
48 - $(SLO)$/genericfilter.obj
49 + $(SLO)$/genericfilter.obj \
50 + $(SLO)$/lwpfilter.obj \
51 + $(SLO)$/bencont.obj \
52 + $(SLO)$/benlist.obj \
53 + $(SLO)$/benname.obj \
54 + $(SLO)$/benobj.obj \
55 + $(SLO)$/benval.obj \
56 + $(SLO)$/tocread.obj \
57 + $(SLO)$/utbenvs.obj \
58 + $(SLO)$/utlist.obj \
59 + $(SLO)$/lwp9reader.obj \
60 + $(SLO)$/lwpatomholder.obj \
61 + $(SLO)$/lwpbasetype.obj \
62 + $(SLO)$/lwpcolor.obj \
63 + $(SLO)$/lwpcontent.obj \
64 + $(SLO)$/lwpdefobj.obj \
65 + $(SLO)$/lwpdlvlist.obj \
66 + $(SLO)$/lwpdivinfo.obj \
67 + $(SLO)$/lwpdivopts.obj \
68 + $(SLO)$/lwpdoc.obj \
69 + $(SLO)$/lwpfilehdr.obj \
70 + $(SLO)$/lwpfont.obj \
71 + $(SLO)$/lwpfoundry.obj \
72 + $(SLO)$/lwpfrib.obj \
73 + $(SLO)$/lwpfribtext.obj \
74 + $(SLO)$/lwpfribframe.obj \
75 + $(SLO)$/lwpfribbreaks.obj \
76 + $(SLO)$/lwpfribsection.obj \
77 + $(SLO)$/lwpfribptr.obj \
78 + $(SLO)$/lwpfribtable.obj \
79 + $(SLO)$/lwpholder.obj \
80 + $(SLO)$/lwpidxmgr.obj \
81 + $(SLO)$/lwplayout.obj \
82 + $(SLO)$/lwplaypiece.obj \
83 + $(SLO)$/lwplnopts.obj \
84 + $(SLO)$/lwptablelayout.obj \
85 + $(SLO)$/lwprowlayout.obj \
86 + $(SLO)$/lwpcelllayout.obj \
87 + $(SLO)$/lwpframelayout.obj \
88 + $(SLO)$/lwppagelayout.obj \
89 + $(SLO)$/lwpobj.obj \
90 + $(SLO)$/lwpobjhdr.obj \
91 + $(SLO)$/lwpobjid.obj \
92 + $(SLO)$/lwpobjfactory.obj \
93 + $(SLO)$/lwpobjstrm.obj \
94 + $(SLO)$/lwppara.obj \
95 + $(SLO)$/lwppara1.obj \
96 + $(SLO)$/lwpparastyle.obj \
97 + $(SLO)$/lwpprtinfo.obj \
98 + $(SLO)$/lwpborderstuff.obj \
99 + $(SLO)$/lwpparaborderoverride.obj \
100 + $(SLO)$/lwpstory.obj \
101 + $(SLO)$/lwpnumberingoverride.obj \
102 + $(SLO)$/lwpcharborderoverride.obj \
103 + $(SLO)$/lwpbreaksoverride.obj \
104 + $(SLO)$/lwpbackgroundstuff.obj \
105 + $(SLO)$/lwptabrack.obj \
106 + $(SLO)$/lwpcharacterstyle.obj \
107 + $(SLO)$/lwpoverride.obj \
108 + $(SLO)$/lwpsortopt.obj \
109 + $(SLO)$/lwpsvstream.obj \
110 + $(SLO)$/lwptoc.obj \
111 + $(SLO)$/lwptools.obj \
112 + $(SLO)$/lwpusrdicts.obj \
113 + $(SLO)$/lwpuidoc.obj \
114 + $(SLO)$/lwpdllist.obj \
115 + $(SLO)$/lwpparaproperty.obj \
116 + $(SLO)$/lwpsilverbullet.obj \
117 + $(SLO)$/lwpcharsetmgr.obj \
118 + $(SLO)$/lwpsection.obj \
119 + $(SLO)$/lwppagehint.obj \
120 + $(SLO)$/lwpsdwfileloader.obj \
121 + $(SLO)$/lwpoleobject.obj \
122 + $(SLO)$/lwpbulletstylemgr.obj \
123 + $(SLO)$/lwpsdwgrouploaderv0102.obj \
124 + $(SLO)$/lwpgrfobj.obj \
125 + $(SLO)$/lwpdropcapmgr.obj \
126 + $(SLO)$/lwptblcell.obj \
127 + $(SLO)$/lwptable.obj \
128 + $(SLO)$/lwpmarker.obj \
129 + $(SLO)$/lwpproplist.obj \
130 + $(SLO)$/lwphyperlinkmgr.obj \
131 + $(SLO)$/lwpvpointer.obj \
132 + $(SLO)$/lwpdrawobj.obj \
133 + $(SLO)$/lwpsdwrect.obj \
134 + $(SLO)$/lwpfootnote.obj \
135 + $(SLO)$/lwpfnlayout.obj \
136 + $(SLO)$/lwpdocdata.obj \
137 + $(SLO)$/lwpnotes.obj \
138 + $(SLO)$/lwpverdocument.obj \
139 + $(SLO)$/localtime.obj \
140 + $(SLO)$/lwpfribmark.obj \
141 + $(SLO)$/lwpbookmarkmgr.obj \
142 + $(SLO)$/lwptblformula.obj\
143 + $(SLO)$/lwpnumericfmt.obj \
144 + $(SLO)$/lwpchangemgr.obj \
145 + $(SLO)$/explode.obj \
146 + $(SLO)$/lwpglobalmgr.obj
147
148 .INCLUDE : target.mk
149 diff -urp '--exclude=unxlngx6.pro' lotuswordpro.bak/util/makefile.mk lotuswordpro/util/makefile.mk
150 --- lotuswordpro.bak/util/makefile.mk 2008-10-22 14:01:16.000000000 +0800
151 +++ lotuswordpro/util/makefile.mk 2008-10-22 11:42:21.000000000 +0800
152 @@ -7,7 +7,8 @@ VERSION=$(UPD)
153
154 LIB1TARGET= $(SLB)$/$(TARGET).lib
155 LIB1FILES= \
156 - $(SLB)$/filter.lib
157 + $(SLB)$/filter.lib \
158 + $(SLB)$/xfilter.lib
159 SHL1LIBS=$(LIB1TARGET)
160 SHL1STDLIBS+= \
161 $(TOOLSLIB) \
162 @@ -16,6 +17,15 @@ SHL1STDLIBS+= \
163 $(CPPUHELPERLIB) \
164 $(CPPULIB) \
165 $(SALLIB) \
166 + $(SFXLIB) \
167 + $(SOTLIB) \
168 + $(VCLLIB) \
169 + $(ICUUCLIB) \
170 + $(ICUINLIB) \
171 + $(ICULELIB) \
172 + $(SVXCORELIB) \
173 + $(GOODIESLIB) \
174 + $(SVTOOLLIB) \
175 $(XMLOFFLIB)
176
177 SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
vba interoperability for OOo