[Libreoffice-commits] .: configure.in doc/splash.txt patches/dev300 patches/lwp patches/Makefile.am
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Oct 8 11:25:00 PDT 2010
configure.in | 1
doc/splash.txt | 11
patches/Makefile.am | 2
patches/dev300/apply | 15
patches/lwp/Makefile.am | 1
patches/lwp/cws-ooo11lotusfilter-lwp-filter-component.diff | 191
patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff |62596 -------------
patches/lwp/cws-ooo11lotusfilter-lwp-xfilter.diff |33164 ------
patches/lwp/lwp-filter-component.diff | 802
patches/lwp/warning-return-values-lotuswordpro-2.diff | 34
patches/lwp/warning-return-values-lotuswordpro.diff | 79
11 files changed, 8 insertions(+), 96888 deletions(-)
New commits:
commit 5b319206088fa0f7d07ccb5edae9194c39eabb5b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Oct 8 19:23:50 2010 +0100
Remove LWP filters - merged into master ...
diff --git a/configure.in b/configure.in
index a68e5bf..2c12e10 100644
--- a/configure.in
+++ b/configure.in
@@ -1734,7 +1734,6 @@ patches/mono/Makefile
patches/ooxml/Makefile
patches/postgresql/Makefile
patches/unittesting/Makefile
-patches/lwp/Makefile
patches/64bit/Makefile
po/Makefile
po/sdf-templates/Makefile
diff --git a/doc/splash.txt b/doc/splash.txt
index d63f7aa..50538d2 100644
--- a/doc/splash.txt
+++ b/doc/splash.txt
@@ -39,12 +39,13 @@ ooo_custom_images:
./dev_broffice/introabout/intro.png
+* FIXME:
+ + create a branch in clone/ to do the splash work ...
+ + first bin broffice branding completely ...
+ + and make the build logic fully sane
+ + then add it back: splash first ?
-* we no longer need the 'nologo' variants ...
- git rm ./nologo/introabout/intro.png
- git rm ./dev_nologo_broffice/introabout/intro.png
- git rm ./dev_nologo/introabout/intro.png
-
+* FIXME - we want the 'frame' stuff ...
default_images/introabout/ ?
diff --git a/patches/Makefile.am b/patches/Makefile.am
index ad3a476..e435e3a 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=64bit cairo dev300 emf+ evo2 gstreamer hotfixes mono ooxml vba postgresql unittesting lwp
+SUBDIRS=64bit cairo dev300 emf+ evo2 gstreamer hotfixes mono ooxml vba postgresql unittesting
EXTRA_DIST=README apply.pl.in $(wildcard *.diff)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index edd0318..6ca7c71 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -14,7 +14,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
Icons, CalcFixes, WriterFixes, EasterEgg, \
GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
- Layout, VBABits, VBAObjects, CalcErrors, GCJ, Lwp, \
+ Layout, VBABits, VBAObjects, CalcErrors, GCJ, \
OOXML, OOXMLExportDevel, OOXMLExport, UnitTesting, \
FedoraCommonFixes, LayoutDialogs, Fuzz, \
CalcRowLimit, BuildFix, WriterDocComparison, \
@@ -937,19 +937,6 @@ default-evo2-ab.diff, michael
# add JDK paths for MySQL, PostgreSQL, JTDS
jdbc-driver-classpaths-debian.diff
-[ Lwp ]
-# Lotus Word Pro Import Filter
-lwp-filter-component.diff, i#11215, noelpwer
-# Integrate cws ooo11lotusfilter for WordPro filter
-cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
-cws-ooo11lotusfilter-lwp-filter.diff, Fong
-cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
-# avoid warning: control reaches end of non-void function
-warning-return-values-lotuswordpro.diff, pmladek
-# found by gcc-4.5; the empty operator= definitions seems to be evidently broken
-warning-return-values-lotuswordpro-2.diff, pmladek
-
-
[ Win32Only ]
# 2 more makefiles in sysui are seriously broken #35628
diff --git a/patches/lwp/Makefile.am b/patches/lwp/Makefile.am
deleted file mode 100644
index 0b280d2..0000000
--- a/patches/lwp/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = $(wildcard *.diff)
diff --git a/patches/lwp/cws-ooo11lotusfilter-lwp-filter-component.diff b/patches/lwp/cws-ooo11lotusfilter-lwp-filter-component.diff
deleted file mode 100644
index 4f486f9..0000000
--- a/patches/lwp/cws-ooo11lotusfilter-lwp-filter-component.diff
+++ /dev/null
@@ -1,191 +0,0 @@
----
- lotuswordpro/prj/build.lst | 3 +-
- .../source/filter/LotusWordProImportFilter.cxx | 12 ++-
- lotuswordpro/source/filter/makefile.mk | 99 +++++++++++++++++++-
- lotuswordpro/util/makefile.mk | 12 ++-
- 4 files changed, 119 insertions(+), 7 deletions(-)
-
-diff --git lotuswordpro/prj/build.lst lotuswordpro/prj/build.lst
-index ba7d211..64b2b2f 100644
---- lotuswordpro/prj/build.lst
-+++ lotuswordpro/prj/build.lst
-@@ -1,4 +1,5 @@
- wp lotuswordpro : sfx2 sot svx comphelper NULL
- wp lotuswordpro usr1 - all lwp_mkout NULL
- wp lotuswordpro\source\filter nmake - all lwp_filter NULL
--wp lotuswordpro\util nmake - all lwp_util lwp_filter NULL
-+wp lotuswordpro\source\filter\xfilter nmake - all lwp_xfilter NULL
-+wp lotuswordpro\util nmake - all lwp_util lwp_filter lwp_xfilter NULL
-diff --git lotuswordpro/source/filter/LotusWordProImportFilter.cxx lotuswordpro/source/filter/LotusWordProImportFilter.cxx
-index 3de1d92..b5b5028 100644
---- lotuswordpro/source/filter/LotusWordProImportFilter.cxx
-+++ lotuswordpro/source/filter/LotusWordProImportFilter.cxx
-@@ -19,6 +19,8 @@
-
- #include <vector>
-
-+#include "lwpfilter.hxx"
-+
- using namespace ::rtl;
- using namespace com::sun::star;
- using rtl::OString;
-@@ -252,11 +254,13 @@ sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::s
- uno::Reference< XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
- uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
- xImporter->setTargetDocument(mxDoc);
--
-- SimpleXMLImporter xmlImporter( xInternalHandler, inputStream );
-- xmlImporter.import();
--
-+/*
-+ SimpleXMLImporter xmlImporter( xInternalHandler, inputStream );
-+ xmlImporter.import();
- return sal_True;
-+*/
-+ return ( ReadWordproFile( &inputStream, xInternalHandler) == 0 );
-+
- }
-
- sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-diff --git lotuswordpro/source/filter/makefile.mk lotuswordpro/source/filter/makefile.mk
-index 00547b3..d8f6d32 100644
---- lotuswordpro/source/filter/makefile.mk
-+++ lotuswordpro/source/filter/makefile.mk
-@@ -8,6 +8,103 @@ ENABLE_EXCEPTIONS=true
-
- SLOFILES= \
- $(SLO)$/LotusWordProImportFilter.obj \
-- $(SLO)$/genericfilter.obj
-+ $(SLO)$/genericfilter.obj \
-+ $(SLO)$/lwpfilter.obj \
-+ $(SLO)$/bencont.obj \
-+ $(SLO)$/benlist.obj \
-+ $(SLO)$/benname.obj \
-+ $(SLO)$/benobj.obj \
-+ $(SLO)$/benval.obj \
-+ $(SLO)$/tocread.obj \
-+ $(SLO)$/utbenvs.obj \
-+ $(SLO)$/utlist.obj \
-+ $(SLO)$/lwp9reader.obj \
-+ $(SLO)$/lwpatomholder.obj \
-+ $(SLO)$/lwpbasetype.obj \
-+ $(SLO)$/lwpcolor.obj \
-+ $(SLO)$/lwpcontent.obj \
-+ $(SLO)$/lwpdefobj.obj \
-+ $(SLO)$/lwpdlvlist.obj \
-+ $(SLO)$/lwpdivinfo.obj \
-+ $(SLO)$/lwpdivopts.obj \
-+ $(SLO)$/lwpdoc.obj \
-+ $(SLO)$/lwpfilehdr.obj \
-+ $(SLO)$/lwpfont.obj \
-+ $(SLO)$/lwpfoundry.obj \
-+ $(SLO)$/lwpfrib.obj \
-+ $(SLO)$/lwpfribtext.obj \
-+ $(SLO)$/lwpfribframe.obj \
-+ $(SLO)$/lwpfribbreaks.obj \
-+ $(SLO)$/lwpfribsection.obj \
-+ $(SLO)$/lwpfribptr.obj \
-+ $(SLO)$/lwpfribtable.obj \
-+ $(SLO)$/lwpholder.obj \
-+ $(SLO)$/lwpidxmgr.obj \
-+ $(SLO)$/lwplayout.obj \
-+ $(SLO)$/lwplaypiece.obj \
-+ $(SLO)$/lwplnopts.obj \
-+ $(SLO)$/lwptablelayout.obj \
-+ $(SLO)$/lwprowlayout.obj \
-+ $(SLO)$/lwpcelllayout.obj \
-+ $(SLO)$/lwpframelayout.obj \
-+ $(SLO)$/lwppagelayout.obj \
-+ $(SLO)$/lwpobj.obj \
-+ $(SLO)$/lwpobjhdr.obj \
-+ $(SLO)$/lwpobjid.obj \
-+ $(SLO)$/lwpobjfactory.obj \
-+ $(SLO)$/lwpobjstrm.obj \
-+ $(SLO)$/lwppara.obj \
-+ $(SLO)$/lwppara1.obj \
-+ $(SLO)$/lwpparastyle.obj \
-+ $(SLO)$/lwpprtinfo.obj \
-+ $(SLO)$/lwpborderstuff.obj \
-+ $(SLO)$/lwpparaborderoverride.obj \
-+ $(SLO)$/lwpstory.obj \
-+ $(SLO)$/lwpnumberingoverride.obj \
-+ $(SLO)$/lwpcharborderoverride.obj \
-+ $(SLO)$/lwpbreaksoverride.obj \
-+ $(SLO)$/lwpbackgroundstuff.obj \
-+ $(SLO)$/lwptabrack.obj \
-+ $(SLO)$/lwpcharacterstyle.obj \
-+ $(SLO)$/lwpoverride.obj \
-+ $(SLO)$/lwpsortopt.obj \
-+ $(SLO)$/lwpsvstream.obj \
-+ $(SLO)$/lwptoc.obj \
-+ $(SLO)$/lwptools.obj \
-+ $(SLO)$/lwpusrdicts.obj \
-+ $(SLO)$/lwpuidoc.obj \
-+ $(SLO)$/lwpdllist.obj \
-+ $(SLO)$/lwpparaproperty.obj \
-+ $(SLO)$/lwpsilverbullet.obj \
-+ $(SLO)$/lwpcharsetmgr.obj \
-+ $(SLO)$/lwpsection.obj \
-+ $(SLO)$/lwppagehint.obj \
-+ $(SLO)$/lwpsdwfileloader.obj \
-+ $(SLO)$/lwpoleobject.obj \
-+ $(SLO)$/lwpbulletstylemgr.obj \
-+ $(SLO)$/lwpsdwgrouploaderv0102.obj \
-+ $(SLO)$/lwpgrfobj.obj \
-+ $(SLO)$/lwpdropcapmgr.obj \
-+ $(SLO)$/lwptblcell.obj \
-+ $(SLO)$/lwptable.obj \
-+ $(SLO)$/lwpmarker.obj \
-+ $(SLO)$/lwpproplist.obj \
-+ $(SLO)$/lwphyperlinkmgr.obj \
-+ $(SLO)$/lwpvpointer.obj \
-+ $(SLO)$/lwpdrawobj.obj \
-+ $(SLO)$/lwpsdwrect.obj \
-+ $(SLO)$/lwpfootnote.obj \
-+ $(SLO)$/lwpfnlayout.obj \
-+ $(SLO)$/lwpdocdata.obj \
-+ $(SLO)$/lwpnotes.obj \
-+ $(SLO)$/lwpverdocument.obj \
-+ $(SLO)$/localtime.obj \
-+ $(SLO)$/lwpfribmark.obj \
-+ $(SLO)$/lwpbookmarkmgr.obj \
-+ $(SLO)$/lwptblformula.obj\
-+ $(SLO)$/lwpnumericfmt.obj \
-+ $(SLO)$/lwpchangemgr.obj \
-+ $(SLO)$/explode.obj \
-+ $(SLO)$/lwpglobalmgr.obj
-
- .INCLUDE : target.mk
-diff --git lotuswordpro/util/makefile.mk lotuswordpro/util/makefile.mk
-index d1a2635..938cdc0 100644
---- lotuswordpro/util/makefile.mk
-+++ lotuswordpro/util/makefile.mk
-@@ -7,7 +7,8 @@ VERSION=$(UPD)
-
- LIB1TARGET= $(SLB)$/$(TARGET).lib
- LIB1FILES= \
-- $(SLB)$/filter.lib
-+ $(SLB)$/filter.lib \
-+ $(SLB)$/xfilter.lib
- SHL1LIBS=$(LIB1TARGET)
- SHL1STDLIBS+= \
- $(TOOLSLIB) \
-@@ -16,6 +17,15 @@ SHL1STDLIBS+= \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
-+ $(SFXLIB) \
-+ $(SOTLIB) \
-+ $(VCLLIB) \
-+ $(ICUUCLIB) \
-+ $(ICUINLIB) \
-+ $(ICULELIB) \
-+ $(SVXCORELIB) \
-+ $(GOODIESLIB) \
-+ $(SVTOOLLIB) \
- $(XMLOFFLIB)
-
- SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
---
-1.7.0.1
-
diff --git a/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff b/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff
deleted file mode 100644
index 20802a4..0000000
--- a/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff
+++ /dev/null
@@ -1,62596 +0,0 @@
----
- lotuswordpro/source/filter/bencont.cxx | 716 +++++++
- lotuswordpro/source/filter/benlist.cxx | 121 ++
- lotuswordpro/source/filter/benname.cxx | 91 +
- lotuswordpro/source/filter/benobj.cxx | 128 ++
- lotuswordpro/source/filter/bento.hxx | 567 +++++
- lotuswordpro/source/filter/bentoid.hxx | 110 +
- lotuswordpro/source/filter/benval.cxx | 348 +++
- lotuswordpro/source/filter/explode.cxx | 647 ++++++
- lotuswordpro/source/filter/explode.hxx | 125 ++
- lotuswordpro/source/filter/first.hxx | 81 +
- lotuswordpro/source/filter/localtime.cxx | 192 ++
- lotuswordpro/source/filter/localtime.hxx | 73 +
- lotuswordpro/source/filter/lwp9reader.cxx | 291 +++
- lotuswordpro/source/filter/lwp9reader.hxx | 89 +
- lotuswordpro/source/filter/lwparrowstyles.hxx | 101 +
- lotuswordpro/source/filter/lwpatomholder.cxx | 108 +
- lotuswordpro/source/filter/lwpatomholder.hxx | 86 +
- .../source/filter/lwpbackgroundoverride.hxx | 91 +
- lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 182 ++
- lotuswordpro/source/filter/lwpbackgroundstuff.hxx | 168 ++
- lotuswordpro/source/filter/lwpbasetype.cxx | 92 +
- lotuswordpro/source/filter/lwpbasetype.hxx | 117 +
- lotuswordpro/source/filter/lwpbookmarkmgr.cxx | 112 +
- lotuswordpro/source/filter/lwpbookmarkmgr.hxx | 84 +
- lotuswordpro/source/filter/lwpborderstuff.cxx | 246 +++
- lotuswordpro/source/filter/lwpborderstuff.hxx | 119 ++
- lotuswordpro/source/filter/lwpbreaksoverride.cxx | 280 +++
- lotuswordpro/source/filter/lwpbreaksoverride.hxx | 248 +++
- lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 590 ++++++
- lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 168 ++
- lotuswordpro/source/filter/lwpcelllayout.cxx | 955 +++++++++
- lotuswordpro/source/filter/lwpcelllayout.hxx | 209 ++
- lotuswordpro/source/filter/lwpchangemgr.cxx | 383 ++++
- lotuswordpro/source/filter/lwpchangemgr.hxx | 95 +
- lotuswordpro/source/filter/lwpcharacterstyle.cxx | 207 ++
- lotuswordpro/source/filter/lwpcharacterstyle.hxx | 137 ++
- .../source/filter/lwpcharborderoverride.cxx | 148 ++
- .../source/filter/lwpcharborderoverride.hxx | 195 ++
- lotuswordpro/source/filter/lwpcharsetmgr.cxx | 119 ++
- lotuswordpro/source/filter/lwpcharsetmgr.hxx | 86 +
- lotuswordpro/source/filter/lwpchartstreamtools.cxx | 359 ++++
- lotuswordpro/source/filter/lwpchartstreamtools.hxx | 149 ++
- lotuswordpro/source/filter/lwpchartwrapper.cxx | 93 +
- lotuswordpro/source/filter/lwpchartwrapper.hxx | 79 +
- lotuswordpro/source/filter/lwpcolor.cxx | 149 ++
- lotuswordpro/source/filter/lwpcolor.hxx | 130 ++
- lotuswordpro/source/filter/lwpcontent.cxx | 153 ++
- lotuswordpro/source/filter/lwpcontent.hxx | 158 ++
- lotuswordpro/source/filter/lwpdefobj.cxx | 88 +
- lotuswordpro/source/filter/lwpdefobj.hxx | 81 +
- lotuswordpro/source/filter/lwpdefs.hxx | 423 ++++
- lotuswordpro/source/filter/lwpdivinfo.cxx | 174 ++
- lotuswordpro/source/filter/lwpdivinfo.hxx | 166 ++
- lotuswordpro/source/filter/lwpdivopts.cxx | 133 ++
- lotuswordpro/source/filter/lwpdivopts.hxx | 120 ++
- lotuswordpro/source/filter/lwpdllist.cxx | 99 +
- lotuswordpro/source/filter/lwpdllist.hxx | 104 +
- lotuswordpro/source/filter/lwpdlvlist.cxx | 185 ++
- lotuswordpro/source/filter/lwpdlvlist.hxx | 205 ++
- lotuswordpro/source/filter/lwpdoc.cxx | 830 ++++++++
- lotuswordpro/source/filter/lwpdoc.hxx | 248 +++
- lotuswordpro/source/filter/lwpdocdata.cxx | 395 ++++
- lotuswordpro/source/filter/lwpdocdata.hxx | 191 ++
- lotuswordpro/source/filter/lwpdrawobj.cxx | 1551 ++++++++++++++
- lotuswordpro/source/filter/lwpdrawobj.hxx | 376 ++++
- lotuswordpro/source/filter/lwpdropcapmgr.cxx | 82 +
- lotuswordpro/source/filter/lwpdropcapmgr.hxx | 79 +
- lotuswordpro/source/filter/lwpfilehdr.cxx | 83 +
- lotuswordpro/source/filter/lwpfilehdr.hxx | 89 +
- lotuswordpro/source/filter/lwpfilter.cxx | 593 ++++++
- lotuswordpro/source/filter/lwpfilter.hxx | 184 ++
- lotuswordpro/source/filter/lwpfnlayout.cxx | 395 ++++
- lotuswordpro/source/filter/lwpfnlayout.hxx | 195 ++
- lotuswordpro/source/filter/lwpfont.cxx | 556 +++++
- lotuswordpro/source/filter/lwpfont.hxx | 283 +++
- lotuswordpro/source/filter/lwpfootnote.cxx | 595 ++++++
- lotuswordpro/source/filter/lwpfootnote.hxx | 285 +++
- lotuswordpro/source/filter/lwpfoundry.cxx | 579 +++++
- lotuswordpro/source/filter/lwpfoundry.hxx | 326 +++
- lotuswordpro/source/filter/lwpframelayout.cxx | 1281 +++++++++++
- lotuswordpro/source/filter/lwpframelayout.hxx | 240 +++
- lotuswordpro/source/filter/lwpfrib.cxx | 463 ++++
- lotuswordpro/source/filter/lwpfrib.hxx | 139 ++
- lotuswordpro/source/filter/lwpfribbreaks.cxx | 165 ++
- lotuswordpro/source/filter/lwpfribbreaks.hxx | 104 +
- lotuswordpro/source/filter/lwpfribframe.cxx | 235 +++
- lotuswordpro/source/filter/lwpfribframe.hxx | 97 +
- lotuswordpro/source/filter/lwpfribheader.hxx | 135 ++
- lotuswordpro/source/filter/lwpfribmark.cxx | 1460 +++++++++++++
- lotuswordpro/source/filter/lwpfribmark.hxx | 164 ++
- lotuswordpro/source/filter/lwpfribptr.cxx | 689 ++++++
- lotuswordpro/source/filter/lwpfribptr.hxx | 100 +
- lotuswordpro/source/filter/lwpfribsection.cxx | 470 +++++
- lotuswordpro/source/filter/lwpfribsection.hxx | 131 ++
- lotuswordpro/source/filter/lwpfribtable.cxx | 173 ++
- lotuswordpro/source/filter/lwpfribtable.hxx | 74 +
- lotuswordpro/source/filter/lwpfribtext.cxx | 496 +++++
- lotuswordpro/source/filter/lwpfribtext.hxx | 230 ++
- lotuswordpro/source/filter/lwpglobalmgr.cxx | 166 ++
- lotuswordpro/source/filter/lwpglobalmgr.hxx | 103 +
- lotuswordpro/source/filter/lwpgrfobj.cxx | 841 ++++++++
- lotuswordpro/source/filter/lwpgrfobj.hxx | 140 ++
- lotuswordpro/source/filter/lwpheader.hxx | 84 +
- lotuswordpro/source/filter/lwpholder.cxx | 118 ++
- lotuswordpro/source/filter/lwpholder.hxx | 129 ++
- lotuswordpro/source/filter/lwphyperlinkmgr.cxx | 82 +
- lotuswordpro/source/filter/lwphyperlinkmgr.hxx | 82 +
- lotuswordpro/source/filter/lwpidxmgr.cxx | 354 ++++
- lotuswordpro/source/filter/lwpidxmgr.hxx | 116 +
- lotuswordpro/source/filter/lwplayout.cxx | 2215 ++++++++++++++++++++
- lotuswordpro/source/filter/lwplayout.hxx | 458 ++++
- lotuswordpro/source/filter/lwplayoutdef.hxx | 170 ++
- lotuswordpro/source/filter/lwplaypiece.cxx | 464 ++++
- lotuswordpro/source/filter/lwplaypiece.hxx | 392 ++++
- lotuswordpro/source/filter/lwplnopts.cxx | 96 +
- lotuswordpro/source/filter/lwplnopts.hxx | 98 +
- lotuswordpro/source/filter/lwpmargins.hxx | 117 +
- lotuswordpro/source/filter/lwpmarker.cxx | 572 +++++
- lotuswordpro/source/filter/lwpmarker.hxx | 281 +++
- lotuswordpro/source/filter/lwpnotes.cxx | 326 +++
- lotuswordpro/source/filter/lwpnotes.hxx | 161 ++
- .../source/filter/lwpnumberingoverride.cxx | 180 ++
- .../source/filter/lwpnumberingoverride.hxx | 170 ++
- lotuswordpro/source/filter/lwpnumericfmt.cxx | 566 +++++
- lotuswordpro/source/filter/lwpnumericfmt.hxx | 312 +++
- lotuswordpro/source/filter/lwpobj.cxx | 120 ++
- lotuswordpro/source/filter/lwpobj.hxx | 105 +
- lotuswordpro/source/filter/lwpobjfactory.cxx | 781 +++++++
- lotuswordpro/source/filter/lwpobjfactory.hxx | 140 ++
- lotuswordpro/source/filter/lwpobjhdr.cxx | 198 ++
- lotuswordpro/source/filter/lwpobjhdr.hxx | 137 ++
- lotuswordpro/source/filter/lwpobjid.cxx | 256 +++
- lotuswordpro/source/filter/lwpobjid.hxx | 159 ++
- lotuswordpro/source/filter/lwpobjstrm.cxx | 371 ++++
- lotuswordpro/source/filter/lwpobjstrm.hxx | 127 ++
- lotuswordpro/source/filter/lwpobjtags.hxx | 241 +++
- lotuswordpro/source/filter/lwpoleobject.cxx | 752 +++++++
- lotuswordpro/source/filter/lwpoleobject.hxx | 194 ++
- lotuswordpro/source/filter/lwpoverride.cxx | 555 +++++
- lotuswordpro/source/filter/lwpoverride.hxx | 438 ++++
- lotuswordpro/source/filter/lwppagehint.cxx | 117 +
- lotuswordpro/source/filter/lwppagehint.hxx | 129 ++
- lotuswordpro/source/filter/lwppagelayout.cxx | 1061 ++++++++++
- lotuswordpro/source/filter/lwppagelayout.hxx | 169 ++
- lotuswordpro/source/filter/lwppara.cxx | 1046 +++++++++
- lotuswordpro/source/filter/lwppara.hxx | 423 ++++
- lotuswordpro/source/filter/lwppara1.cxx | 730 +++++++
- .../source/filter/lwpparaborderoverride.cxx | 394 ++++
- .../source/filter/lwpparaborderoverride.hxx | 284 +++
- lotuswordpro/source/filter/lwpparaproperty.cxx | 294 +++
- lotuswordpro/source/filter/lwpparaproperty.hxx | 319 +++
- lotuswordpro/source/filter/lwpparastyle.cxx | 795 +++++++
- lotuswordpro/source/filter/lwpparastyle.hxx | 130 ++
- lotuswordpro/source/filter/lwppiece.hxx | 202 ++
- lotuswordpro/source/filter/lwpproplist.cxx | 151 ++
- lotuswordpro/source/filter/lwpproplist.hxx | 99 +
- lotuswordpro/source/filter/lwpprtinfo.cxx | 105 +
- lotuswordpro/source/filter/lwpprtinfo.hxx | 92 +
- lotuswordpro/source/filter/lwppttntbl.hxx | 145 ++
- lotuswordpro/source/filter/lwpresource.hxx | 65 +
- lotuswordpro/source/filter/lwprowlayout.cxx | 491 +++++
- lotuswordpro/source/filter/lwprowlayout.hxx | 134 ++
- lotuswordpro/source/filter/lwpsdwdrawheader.hxx | 297 +++
- lotuswordpro/source/filter/lwpsdwfileloader.cxx | 148 ++
- lotuswordpro/source/filter/lwpsdwfileloader.hxx | 86 +
- .../source/filter/lwpsdwgrouploaderv0102.cxx | 410 ++++
- .../source/filter/lwpsdwgrouploaderv0102.hxx | 94 +
- lotuswordpro/source/filter/lwpsdwrect.cxx | 230 ++
- lotuswordpro/source/filter/lwpsdwrect.hxx | 128 ++
- lotuswordpro/source/filter/lwpsection.cxx | 155 ++
- lotuswordpro/source/filter/lwpsection.hxx | 172 ++
- lotuswordpro/source/filter/lwpshadow.hxx | 120 ++
- lotuswordpro/source/filter/lwpsilverbullet.cxx | 486 +++++
- lotuswordpro/source/filter/lwpsilverbullet.hxx | 189 ++
- lotuswordpro/source/filter/lwpslvlist.hxx | 89 +
- lotuswordpro/source/filter/lwpsortopt.cxx | 105 +
- lotuswordpro/source/filter/lwpsortopt.hxx | 102 +
- lotuswordpro/source/filter/lwpstory.cxx | 549 +++++
- lotuswordpro/source/filter/lwpstory.hxx | 201 ++
- lotuswordpro/source/filter/lwpstyledef.hxx | 257 +++
- lotuswordpro/source/filter/lwpsvstream.cxx | 99 +
- lotuswordpro/source/filter/lwpsvstream.hxx | 99 +
- lotuswordpro/source/filter/lwptable.cxx | 275 +++
- lotuswordpro/source/filter/lwptable.hxx | 236 +++
- lotuswordpro/source/filter/lwptablelayout.cxx | 1542 ++++++++++++++
- lotuswordpro/source/filter/lwptablelayout.hxx | 269 +++
- lotuswordpro/source/filter/lwptaboverride.hxx | 128 ++
- lotuswordpro/source/filter/lwptabrack.cxx | 134 ++
- lotuswordpro/source/filter/lwptabrack.hxx | 162 ++
- lotuswordpro/source/filter/lwptblcell.cxx | 252 +++
- lotuswordpro/source/filter/lwptblcell.hxx | 494 +++++
- lotuswordpro/source/filter/lwptblformula.cxx | 803 +++++++
- lotuswordpro/source/filter/lwptblformula.hxx | 223 ++
- lotuswordpro/source/filter/lwptemp.hxx | 79 +
- lotuswordpro/source/filter/lwptoc.cxx | 456 ++++
- lotuswordpro/source/filter/lwptoc.hxx | 170 ++
- lotuswordpro/source/filter/lwptools.cxx | 920 ++++++++
- lotuswordpro/source/filter/lwptools.hxx | 149 ++
- lotuswordpro/source/filter/lwpuidoc.cxx | 139 ++
- lotuswordpro/source/filter/lwpuidoc.hxx | 154 ++
- lotuswordpro/source/filter/lwpunoheader.hxx | 84 +
- lotuswordpro/source/filter/lwpusewhen.hxx | 176 ++
- lotuswordpro/source/filter/lwpusrdicts.cxx | 85 +
- lotuswordpro/source/filter/lwpusrdicts.hxx | 80 +
- lotuswordpro/source/filter/lwpverdocument.cxx | 109 +
- lotuswordpro/source/filter/lwpverdocument.hxx | 84 +
- lotuswordpro/source/filter/lwpvpointer.cxx | 79 +
- lotuswordpro/source/filter/lwpvpointer.hxx | 82 +
- lotuswordpro/source/filter/schxmlwrapper.cxx | 488 +++++
- lotuswordpro/source/filter/schxmlwrapper.hxx | 118 ++
- lotuswordpro/source/filter/tocread.cxx | 516 +++++
- lotuswordpro/source/filter/tocread.hxx | 89 +
- lotuswordpro/source/filter/ut.hxx | 101 +
- lotuswordpro/source/filter/utbenvs.cxx | 288 +++
- lotuswordpro/source/filter/utlist.cxx | 250 +++
- lotuswordpro/source/filter/utlist.hxx | 157 ++
- 216 files changed, 60843 insertions(+), 0 deletions(-)
- create mode 100644 lotuswordpro/source/filter/bencont.cxx
- create mode 100644 lotuswordpro/source/filter/benlist.cxx
- create mode 100644 lotuswordpro/source/filter/benname.cxx
- create mode 100644 lotuswordpro/source/filter/benobj.cxx
- create mode 100644 lotuswordpro/source/filter/bento.hxx
- create mode 100644 lotuswordpro/source/filter/bentoid.hxx
- create mode 100644 lotuswordpro/source/filter/benval.cxx
- create mode 100644 lotuswordpro/source/filter/explode.cxx
- create mode 100644 lotuswordpro/source/filter/explode.hxx
- create mode 100644 lotuswordpro/source/filter/first.hxx
- create mode 100644 lotuswordpro/source/filter/localtime.cxx
- create mode 100644 lotuswordpro/source/filter/localtime.hxx
- create mode 100644 lotuswordpro/source/filter/lwp9reader.cxx
- create mode 100644 lotuswordpro/source/filter/lwp9reader.hxx
- create mode 100644 lotuswordpro/source/filter/lwparrowstyles.hxx
- create mode 100644 lotuswordpro/source/filter/lwpatomholder.cxx
- create mode 100644 lotuswordpro/source/filter/lwpatomholder.hxx
- create mode 100644 lotuswordpro/source/filter/lwpbackgroundoverride.hxx
- create mode 100644 lotuswordpro/source/filter/lwpbackgroundstuff.cxx
- create mode 100644 lotuswordpro/source/filter/lwpbackgroundstuff.hxx
- create mode 100644 lotuswordpro/source/filter/lwpbasetype.cxx
- create mode 100644 lotuswordpro/source/filter/lwpbasetype.hxx
- create mode 100644 lotuswordpro/source/filter/lwpbookmarkmgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpbookmarkmgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpborderstuff.cxx
- create mode 100644 lotuswordpro/source/filter/lwpborderstuff.hxx
- create mode 100644 lotuswordpro/source/filter/lwpbreaksoverride.cxx
- create mode 100644 lotuswordpro/source/filter/lwpbreaksoverride.hxx
- create mode 100644 lotuswordpro/source/filter/lwpbulletstylemgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpbulletstylemgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpcelllayout.cxx
- create mode 100644 lotuswordpro/source/filter/lwpcelllayout.hxx
- create mode 100644 lotuswordpro/source/filter/lwpchangemgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpchangemgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpcharacterstyle.cxx
- create mode 100644 lotuswordpro/source/filter/lwpcharacterstyle.hxx
- create mode 100644 lotuswordpro/source/filter/lwpcharborderoverride.cxx
- create mode 100644 lotuswordpro/source/filter/lwpcharborderoverride.hxx
- create mode 100644 lotuswordpro/source/filter/lwpcharsetmgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpcharsetmgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpchartstreamtools.cxx
- create mode 100644 lotuswordpro/source/filter/lwpchartstreamtools.hxx
- create mode 100644 lotuswordpro/source/filter/lwpchartwrapper.cxx
- create mode 100644 lotuswordpro/source/filter/lwpchartwrapper.hxx
- create mode 100644 lotuswordpro/source/filter/lwpcolor.cxx
- create mode 100644 lotuswordpro/source/filter/lwpcolor.hxx
- create mode 100644 lotuswordpro/source/filter/lwpcontent.cxx
- create mode 100644 lotuswordpro/source/filter/lwpcontent.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdefobj.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdefobj.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdefs.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdivinfo.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdivinfo.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdivopts.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdivopts.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdllist.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdllist.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdlvlist.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdlvlist.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdoc.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdoc.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdocdata.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdocdata.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdrawobj.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdrawobj.hxx
- create mode 100644 lotuswordpro/source/filter/lwpdropcapmgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpdropcapmgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfilehdr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfilehdr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfilter.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfilter.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfnlayout.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfnlayout.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfont.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfont.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfootnote.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfootnote.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfoundry.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfoundry.hxx
- create mode 100644 lotuswordpro/source/filter/lwpframelayout.cxx
- create mode 100644 lotuswordpro/source/filter/lwpframelayout.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfrib.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfrib.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribbreaks.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfribbreaks.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribframe.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfribframe.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribheader.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribmark.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfribmark.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribptr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfribptr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribsection.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfribsection.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribtable.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfribtable.hxx
- create mode 100644 lotuswordpro/source/filter/lwpfribtext.cxx
- create mode 100644 lotuswordpro/source/filter/lwpfribtext.hxx
- create mode 100644 lotuswordpro/source/filter/lwpglobalmgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpglobalmgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpgrfobj.cxx
- create mode 100644 lotuswordpro/source/filter/lwpgrfobj.hxx
- create mode 100644 lotuswordpro/source/filter/lwpheader.hxx
- create mode 100644 lotuswordpro/source/filter/lwpholder.cxx
- create mode 100644 lotuswordpro/source/filter/lwpholder.hxx
- create mode 100644 lotuswordpro/source/filter/lwphyperlinkmgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwphyperlinkmgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpidxmgr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpidxmgr.hxx
- create mode 100644 lotuswordpro/source/filter/lwplayout.cxx
- create mode 100644 lotuswordpro/source/filter/lwplayout.hxx
- create mode 100644 lotuswordpro/source/filter/lwplayoutdef.hxx
- create mode 100644 lotuswordpro/source/filter/lwplaypiece.cxx
- create mode 100644 lotuswordpro/source/filter/lwplaypiece.hxx
- create mode 100644 lotuswordpro/source/filter/lwplnopts.cxx
- create mode 100644 lotuswordpro/source/filter/lwplnopts.hxx
- create mode 100644 lotuswordpro/source/filter/lwpmargins.hxx
- create mode 100644 lotuswordpro/source/filter/lwpmarker.cxx
- create mode 100644 lotuswordpro/source/filter/lwpmarker.hxx
- create mode 100644 lotuswordpro/source/filter/lwpnotes.cxx
- create mode 100644 lotuswordpro/source/filter/lwpnotes.hxx
- create mode 100644 lotuswordpro/source/filter/lwpnumberingoverride.cxx
- create mode 100644 lotuswordpro/source/filter/lwpnumberingoverride.hxx
- create mode 100644 lotuswordpro/source/filter/lwpnumericfmt.cxx
- create mode 100644 lotuswordpro/source/filter/lwpnumericfmt.hxx
- create mode 100644 lotuswordpro/source/filter/lwpobj.cxx
- create mode 100644 lotuswordpro/source/filter/lwpobj.hxx
- create mode 100644 lotuswordpro/source/filter/lwpobjfactory.cxx
- create mode 100644 lotuswordpro/source/filter/lwpobjfactory.hxx
- create mode 100644 lotuswordpro/source/filter/lwpobjhdr.cxx
- create mode 100644 lotuswordpro/source/filter/lwpobjhdr.hxx
- create mode 100644 lotuswordpro/source/filter/lwpobjid.cxx
- create mode 100644 lotuswordpro/source/filter/lwpobjid.hxx
- create mode 100644 lotuswordpro/source/filter/lwpobjstrm.cxx
- create mode 100644 lotuswordpro/source/filter/lwpobjstrm.hxx
- create mode 100644 lotuswordpro/source/filter/lwpobjtags.hxx
- create mode 100644 lotuswordpro/source/filter/lwpoleobject.cxx
- create mode 100644 lotuswordpro/source/filter/lwpoleobject.hxx
- create mode 100644 lotuswordpro/source/filter/lwpoverride.cxx
- create mode 100644 lotuswordpro/source/filter/lwpoverride.hxx
- create mode 100644 lotuswordpro/source/filter/lwppagehint.cxx
- create mode 100644 lotuswordpro/source/filter/lwppagehint.hxx
- create mode 100644 lotuswordpro/source/filter/lwppagelayout.cxx
- create mode 100644 lotuswordpro/source/filter/lwppagelayout.hxx
- create mode 100644 lotuswordpro/source/filter/lwppara.cxx
- create mode 100644 lotuswordpro/source/filter/lwppara.hxx
- create mode 100644 lotuswordpro/source/filter/lwppara1.cxx
- create mode 100644 lotuswordpro/source/filter/lwpparaborderoverride.cxx
- create mode 100644 lotuswordpro/source/filter/lwpparaborderoverride.hxx
- create mode 100644 lotuswordpro/source/filter/lwpparaproperty.cxx
- create mode 100644 lotuswordpro/source/filter/lwpparaproperty.hxx
- create mode 100644 lotuswordpro/source/filter/lwpparastyle.cxx
- create mode 100644 lotuswordpro/source/filter/lwpparastyle.hxx
- create mode 100644 lotuswordpro/source/filter/lwppiece.hxx
- create mode 100644 lotuswordpro/source/filter/lwpproplist.cxx
- create mode 100644 lotuswordpro/source/filter/lwpproplist.hxx
- create mode 100644 lotuswordpro/source/filter/lwpprtinfo.cxx
- create mode 100644 lotuswordpro/source/filter/lwpprtinfo.hxx
- create mode 100644 lotuswordpro/source/filter/lwppttntbl.hxx
- create mode 100644 lotuswordpro/source/filter/lwpresource.hxx
- create mode 100644 lotuswordpro/source/filter/lwprowlayout.cxx
- create mode 100644 lotuswordpro/source/filter/lwprowlayout.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsdwdrawheader.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsdwfileloader.cxx
- create mode 100644 lotuswordpro/source/filter/lwpsdwfileloader.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
- create mode 100644 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsdwrect.cxx
- create mode 100644 lotuswordpro/source/filter/lwpsdwrect.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsection.cxx
- create mode 100644 lotuswordpro/source/filter/lwpsection.hxx
- create mode 100644 lotuswordpro/source/filter/lwpshadow.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsilverbullet.cxx
- create mode 100644 lotuswordpro/source/filter/lwpsilverbullet.hxx
- create mode 100644 lotuswordpro/source/filter/lwpslvlist.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsortopt.cxx
- create mode 100644 lotuswordpro/source/filter/lwpsortopt.hxx
- create mode 100644 lotuswordpro/source/filter/lwpstory.cxx
- create mode 100644 lotuswordpro/source/filter/lwpstory.hxx
- create mode 100644 lotuswordpro/source/filter/lwpstyledef.hxx
- create mode 100644 lotuswordpro/source/filter/lwpsvstream.cxx
- create mode 100644 lotuswordpro/source/filter/lwpsvstream.hxx
- create mode 100644 lotuswordpro/source/filter/lwptable.cxx
- create mode 100644 lotuswordpro/source/filter/lwptable.hxx
- create mode 100644 lotuswordpro/source/filter/lwptablelayout.cxx
- create mode 100644 lotuswordpro/source/filter/lwptablelayout.hxx
- create mode 100644 lotuswordpro/source/filter/lwptaboverride.hxx
- create mode 100644 lotuswordpro/source/filter/lwptabrack.cxx
- create mode 100644 lotuswordpro/source/filter/lwptabrack.hxx
- create mode 100644 lotuswordpro/source/filter/lwptblcell.cxx
- create mode 100644 lotuswordpro/source/filter/lwptblcell.hxx
- create mode 100644 lotuswordpro/source/filter/lwptblformula.cxx
- create mode 100644 lotuswordpro/source/filter/lwptblformula.hxx
- create mode 100644 lotuswordpro/source/filter/lwptemp.hxx
- create mode 100644 lotuswordpro/source/filter/lwptoc.cxx
- create mode 100644 lotuswordpro/source/filter/lwptoc.hxx
- create mode 100644 lotuswordpro/source/filter/lwptools.cxx
- create mode 100644 lotuswordpro/source/filter/lwptools.hxx
- create mode 100644 lotuswordpro/source/filter/lwpuidoc.cxx
- create mode 100644 lotuswordpro/source/filter/lwpuidoc.hxx
- create mode 100644 lotuswordpro/source/filter/lwpunoheader.hxx
- create mode 100644 lotuswordpro/source/filter/lwpusewhen.hxx
- create mode 100644 lotuswordpro/source/filter/lwpusrdicts.cxx
- create mode 100644 lotuswordpro/source/filter/lwpusrdicts.hxx
- create mode 100644 lotuswordpro/source/filter/lwpverdocument.cxx
- create mode 100644 lotuswordpro/source/filter/lwpverdocument.hxx
- create mode 100644 lotuswordpro/source/filter/lwpvpointer.cxx
- create mode 100644 lotuswordpro/source/filter/lwpvpointer.hxx
- create mode 100644 lotuswordpro/source/filter/schxmlwrapper.cxx
- create mode 100644 lotuswordpro/source/filter/schxmlwrapper.hxx
- create mode 100644 lotuswordpro/source/filter/tocread.cxx
- create mode 100644 lotuswordpro/source/filter/tocread.hxx
- create mode 100644 lotuswordpro/source/filter/ut.hxx
- create mode 100644 lotuswordpro/source/filter/utbenvs.cxx
- create mode 100644 lotuswordpro/source/filter/utlist.cxx
- create mode 100644 lotuswordpro/source/filter/utlist.hxx
-
-diff --git lotuswordpro/source/filter/bencont.cxx lotuswordpro/source/filter/bencont.cxx
-new file mode 100644
-index 0000000..895367f
---- /dev/null
-+++ lotuswordpro/source/filter/bencont.cxx
-@@ -0,0 +1,716 @@
-+/*************************************************************************
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (the "License"); You may not use this file
-+ * except in compliance with the License. You may obtain a copy of the
-+ * License at http://www.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: IBM Corporation
-+ *
-+ * Copyright: 2008 by IBM Corporation
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include "first.hxx"
-+#include "assert.h"
-+#include <stdio.h>
-+#include <sot/storinfo.hxx>
-+namespace OpenStormBento
-+{
-+
-+// String definitions
-+const char gsBenMagicBytes[] = BEN_MAGIC_BYTES;
-+
-+/**
-+* New bento container from file stream
-+* @param pointer to length of bento file
-+* @param pointer to pointer of Bento Container object
-+* @return error code
-+*/
-+ULONG BenOpenContainer(LwpSvStream * pStream, pLtcBenContainer * ppContainer)
-+{
-+ BenError Err;
-+
-+ *ppContainer = NULL;
-+
-+ if (NULL == pStream)
-+ {
-+ return BenErr_ContainerWithNoObjects;
-+ }
-+
-+ pLtcBenContainer pContainer = new LtcBenContainer(pStream);
-+ if ((Err = pContainer->Open()) != BenErr_OK) // delete two inputs
-+ {
-+ delete pContainer;
-+ return BenErr_InvalidTOC;
-+ }
-+
-+ *ppContainer = pContainer;
-+ return BenErr_OK;
-+}
-+BenError
-+LtcBenContainer::Close()
-+{
-+ return BenErr_OK;
-+}
-+
-+LtcBenContainer::~LtcBenContainer()
-+{
-+ Close();
-+}
-+
-+BenError
-+LtcBenContainer::Open() // delete two inputs
-+{
-+ BenError Err;
-+ CBenTOCReader TOCReader(this);
-+ if ((Err = TOCReader.ReadLabelAndTOC()) != BenErr_OK)
-+ {
-+ return Err;
-+ }
-+ return BenErr_OK;
-+}
-+
-+void
-+LtcBenContainer::Release()
-+{
-+ delete this;
-+}
-+
-+BenError
-+LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
-+ pCBenPropertyName * ppPropertyName)
-+{
-+ pCBenNamedObjectListElmt pPrevNamedObjectListElmt;
-+ pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects,
-+ sPropertyName, &pPrevNamedObjectListElmt);
-+
-+ if (pNamedObject != NULL)
-+ {
-+ if (! pNamedObject->IsPropertyName())
-+ return BenErr_NameConflict;
-+ else *ppPropertyName = (pCBenPropertyName) pNamedObject;
-+ }
-+ else
-+ {
-+ pCBenIDListElmt pPrevObject;
-+ if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL)
-+ return BenErr_DuplicateObjectID;
-+
-+ *ppPropertyName = new CBenPropertyName(this, cNextAvailObjectID,
-+ (pCBenObject) pPrevObject, sPropertyName, pPrevNamedObjectListElmt);
-+ ++cNextAvailObjectID;
-+ }
-+
-+ return BenErr_OK;
-+}
-+
-+BenError
-+LtcBenContainer::RegisterTypeName(const char * sTypeName,
-+ pCBenTypeName * ppTypeName)
-+{
-+ pCBenNamedObjectListElmt pPrevNamedObjectListElmt;
-+ pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects, sTypeName,
-+ &pPrevNamedObjectListElmt);
-+
-+ if (pNamedObject != NULL)
-+ {
-+ if (! pNamedObject->IsTypeName())
-+ return BenErr_NameConflict;
-+ else *ppTypeName = (pCBenTypeName) pNamedObject;
-+ }
-+ else
-+ {
-+ pCBenIDListElmt pPrevObject;
-+ if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL)
-+ return BenErr_DuplicateObjectID;
-+
-+ *ppTypeName = new CBenTypeName(this, cNextAvailObjectID,
-+ (pCBenObject) pPrevObject, sTypeName, pPrevNamedObjectListElmt);
-+ ++cNextAvailObjectID;
-+ }
-+
-+ return BenErr_OK;
-+}
-+
-+BenError
-+LtcBenContainer::NewObject(pCBenObject * ppBenObject)
-+{
-+ pCBenIDListElmt pPrev;
-+ if (FindID(&cObjects, cNextAvailObjectID, &pPrev) != NULL)
-+ return BenErr_DuplicateObjectID;
-+
-+ *ppBenObject = new CBenObject(this, cNextAvailObjectID, pPrev);
-+
-+ ++cNextAvailObjectID;
-+ return BenErr_OK;
-+}
-+
-+pCBenObject
-+LtcBenContainer::GetNextObject(pCBenObject pCurrObject)
-+{
-+ return (pCBenObject) cObjects.GetNextOrNULL(pCurrObject);
-+}
-+
-+pCBenObject
-+LtcBenContainer::FindNextObjectWithProperty(pCBenObject pCurrObject,
-+ BenObjectID PropertyID)
-+{
-+ while ((pCurrObject = GetNextObject(pCurrObject)) != NULL)
-+ if (pCurrObject->UseProperty(PropertyID) != NULL)
-+ return pCurrObject;
-+
-+ return NULL;
-+}
-+
-+pCBenObject
-+LtcBenContainer::FindObject(BenObjectID ObjectID)
-+{
-+ return (pCBenObject) FindID(&cObjects, ObjectID, NULL);
-+}
-+
-+/**
-+* Construction
-+* @param Bento file stream pointer
-+* @return
-+*/
-+LtcBenContainer::LtcBenContainer(LwpSvStream * pStream)
-+{
-+ cpStream = pStream;
-+ pStream->Seek(STREAM_SEEK_TO_END);
-+ m_ulLength = pStream->Tell();
-+ pStream->Seek(STREAM_SEEK_TO_BEGIN);
-+}
-+
-+/**
-+* Read buffer fro bento file with specified buffer
-+* @date 07/05/2004
-+* @param buffer pointer
-+* @param buffer size
-+* @param number of bytes read
-+* @return BenError
-+*/
-+BenError LtcBenContainer::Read(BenDataPtr pBuffer, unsigned long MaxSize,
-+ unsigned long * pAmtRead)
-+{
-+ *pAmtRead = cpStream->Read(pBuffer, MaxSize);
-+ return BenErr_OK;
-+}
-+/**
-+* Read buffer from bento file with specified size
-+* @date 07/05/2004
-+* @param buffer pointer
-+* @param number of bytes to be read
-+* @return BenError
-+*/
-+BenError LtcBenContainer::ReadKnownSize(BenDataPtr pBuffer, unsigned long Amt)
-+{
-+ ULONG ulLength;
-+ ulLength = cpStream->Read(pBuffer, Amt);
-+ if(ulLength == Amt)
-+ {
-+ return BenErr_OK;
-+ }
-+ return BenErr_ReadPastEndOfContainer;
-+}
-+/**
-+* Seek to position from the beginning of the bento file
-+* @date 07/05/2004
-+* @param position in container file from beginning
-+* @return BenError
-+*/
-+BenError LtcBenContainer::SeekToPosition(BenContainerPos Pos)
-+{
-+ cpStream->Seek(Pos);
-+ return BenErr_OK;
-+}
-+/**
-+* Seek to position compare to end of bento file
-+* @date 07/05/2004
-+* @param position in container file from end
-+* @return BenError
-+*/
-+BenError LtcBenContainer::SeekFromEnd(long Offset)
-+{
-+ cpStream->Seek(STREAM_SEEK_TO_END);
-+ cpStream->SeekRel(Offset);
-+
-+ return BenErr_OK;
-+}
-+/**
-+* Get position in the bento file
-+* @date 07/05/2004
-+* @param pointer of current position in container file from end
-+* @return BenError
-+*/
-+BenError LtcBenContainer::GetPosition(BenContainerPos * pPosition)
-+{
-+ *pPosition = cpStream->Tell();
-+ return BenErr_OK;
-+}
-+/**
-+* Find the next value stream with property name
-+* @date 07/05/2004
-+* @param string of property name
-+* @param current value stream pointer with the property name
-+* @return next value stream pointer with the property names
-+*/
-+LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream)
-+{
-+ CBenPropertyName * pPropertyName;
-+ RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object
-+
-+ if (NULL == pPropertyName)
-+ return NULL; // Property not exist
-+
-+ // Get current object
-+ CBenObject * pObj = NULL;
-+ if (pCurrentValueStream != NULL)
-+ {
-+ pObj = pCurrentValueStream->GetValue()->GetProperty()->GetBenObject();
-+ }
-+
-+
-+ pObj =FindNextObjectWithProperty(pObj, pPropertyName->GetID()); // Get next object with same property name
-+ if (NULL == pObj)
-+ return NULL;
-+
-+ CBenValue * pValue;
-+ LtcUtBenValueStream * pValueStream;
-+
-+ pValue = pObj->UseValue(pPropertyName->GetID());
-+
-+ pValueStream = new LtcUtBenValueStream(pValue);
-+
-+ return pValueStream;
-+}
-+
-+/**
-+* Find the unique value stream with property name
-+* @date 07/05/2004
-+* @param string of property name
-+* @return the only value stream pointer with the property names
-+*/
-+LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const char * sPropertyName)
-+{
-+ return FindNextValueStreamWithPropertyName(sPropertyName, NULL);
-+}
-+/**
-+* Find the unique value stream with property name and Object ID
-+* @date 10/24/2005
-+* @param object ID
-+* @param string of property name
-+* @return the only value stream pointer with the property names
-+*/
-+LtcUtBenValueStream * LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName)
-+{
-+ CBenPropertyName * pPropertyName;
-+ RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object
-+ if (NULL == pPropertyName)
-+ return NULL; // Property not exist
-+ // Get current object
-+ CBenObject * pObj = NULL;
-+ pObj = FindObject(ObjectID); // Get object with object ID
-+ if (NULL == pObj)
-+ return NULL;
-+ CBenValue * pValue;
-+ LtcUtBenValueStream * pValueStream;
-+ pValue = pObj->UseValue(pPropertyName->GetID());
-+ pValueStream = new LtcUtBenValueStream(pValue);
-+ return pValueStream;
-+}
-+/**
-+* <description>
-+* @date 07/05/2004
-+* @param pointer to length of bento file
-+* @return BenError
-+*/
-+BenError LtcBenContainer::GetSize(ULONG * pLength)
-+{
-+ *pLength = m_ulLength;
-+ return BenErr_OK;
-+}
-+
-+sal_uInt32 GetSvStreamSize(SvStream * pStream)
-+{
-+ sal_uInt32 nCurPos = pStream->Tell();
-+ pStream->Seek(STREAM_SEEK_TO_END);
-+ sal_uInt32 ulLength = pStream->Tell();
-+ pStream->Seek(nCurPos);
-+
-+ return ulLength;
-+}
-+/**
-+* Find hazily according to part of property name
-+* @date 01/31/2005
-+* @param
-+* @return the value stream pointers vector with the property names
-+*/
-+BenError LtcBenContainer::CreateGraphicStreams(std::vector<SvStream *> * pStreamVector)
-+{
-+ /* traverse all named objects to find all the graphic property names */
-+ CBenObject * pObj= NULL;
-+ char *pName;
-+ std::vector<std::string> aGrPropertyVector ;
-+ while(pObj = GetNextObject(pObj) )
-+ {
-+ if(pObj->IsNamedObject())
-+ {
-+ CBenNamedObject * pNamedObj = static_cast<CBenNamedObject *>(pObj);
-+ if(!pNamedObj->IsPropertyName())
-+ continue;
-+
-+ // Gr2E,41FDD458-S
-+ // Gr2E,41FDD458-D
-+ pName = const_cast<char *>(pNamedObj->GetName());
-+ if ( (pName[0] == 'G')
-+ && (pName[1] == 'r')
-+ &&( (pName[14] == 'D') || (pName[14] == 'S') ) )
-+ {
-+ aGrPropertyVector.push_back(std::string(pName));
-+ }
-+ }
-+ }
-+
-+ /* traverse the found properties and construct the stream vectors */
-+ std::vector<std::string>::iterator itor;
-+ for (itor = aGrPropertyVector.begin(); itor != aGrPropertyVector.end(); itor ++)
-+ {
-+ // get property names with suffix of S&D
-+ char sSName[32], sDName[32];
-+ strcpy(sSName, itor->c_str());
-+ strcpy(sDName, itor->c_str());
-+ sSName[14] = 'S';
-+ sDName[14] = 'D';
-+
-+ // erase strings in vector
-+ std::vector<std::string>::iterator itorSearch;
-+ for (itorSearch = aGrPropertyVector.begin(); itorSearch != aGrPropertyVector.end(); itorSearch ++)
-+ {
-+ if( (*itorSearch == sSName) || (*itorSearch == sDName) )
-+ {
-+ std::vector<std::string>::iterator itorDel = itorSearch;
-+ aGrPropertyVector.erase(itorDel);
-+ }
-+ }
-+
-+ // get S&D's stream and merge them together
-+ {
-+ SvStream *pD = NULL, *pS = NULL;
-+
-+ pS = FindValueStreamWithPropertyName(sSName);
-+ assert(pS != NULL);
-+ pD = FindValueStreamWithPropertyName(sDName);
-+ assert(pD != NULL);
-+
-+ sal_uInt32 nDLen = GetSvStreamSize(pD);
-+ sal_uInt32 nLen = GetSvStreamSize(pS) + nDLen;
-+ assert(nLen > 0);
-+ char * pBuf = new char[nLen];
-+ assert(pBuf != NULL);
-+ char * pPointer = pBuf;
-+ pD->Read(pPointer, nDLen);
-+ pPointer += nDLen;
-+ pS->Read(pPointer, nLen - nDLen);
-+
-+ delete pS;
-+ delete pD;
-+
-+ SvMemoryStream * pStream = new SvMemoryStream(pBuf, nLen, STREAM_READ);
-+ assert(pStream != NULL);
-+
-+ pStreamVector->push_back(pStream);
-+ }
-+ }
-+
-+ aGrPropertyVector.clear();
-+ return BenErr_OK;
-+}
-+
-+/**
-+* Find hazily according to object ID
-+* @date 01/31/2005
-+* @param pObjectname - format as "GrXX,XXXXXXXX" wherein XX is high part of object ID, and XXXXXXXX is low part
-+* @return the value stream pointers with the property names
-+*/
-+BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *pObjectName)
-+{
-+ if (!pObjectName)
-+ {
-+ pStream = NULL;
-+ return BenErr_NamedObjectError;
-+ }
-+ // construct the string of property name
-+ char sSName[64]="";
-+ char sDName[64]="";
-+
-+ sprintf(sSName, "%s-S", pObjectName);
-+ sprintf(sDName, "%s-D", pObjectName);
-+
-+ /* traverse the found properties and construct the stream vectors */
-+ SvMemoryStream * pMemStream = NULL;
-+ // get S&D's stream and merge them together
-+ SvStream *pD = NULL, *pS = NULL;
-+
-+ pS = FindValueStreamWithPropertyName(sSName);
-+ pD = FindValueStreamWithPropertyName(sDName);
-+
-+
-+ sal_uInt32 nDLen = 0;
-+ if(pD)
-+ {
-+ nDLen = GetSvStreamSize(pD);
-+ }
-+ sal_uInt32 nLen = nDLen;
-+ if(pS)
-+ {
-+ nLen += GetSvStreamSize(pS) ;
-+ }
-+
-+ assert(nLen > 0);
-+ char * pBuf = new char[nLen];
-+ assert(pBuf != NULL);
-+ char * pPointer = pBuf;
-+ if(pD)
-+ {
-+ pD->Read(pPointer, nDLen);
-+ delete pD;
-+ }
-+ pPointer += nDLen;
-+ if(pS)
-+ {
-+ pS->Read(pPointer, nLen - nDLen);
-+ delete pS;
-+ }
-+
-+ pMemStream = new SvMemoryStream(pBuf, nLen, STREAM_READ);
-+ assert(pMemStream != NULL);
-+
-+ pStream = pMemStream;
-+ return BenErr_OK;
-+}
-+/**
-+* Find ole object stream according to object name
-+* @date 10/24/2005
-+* @param
-+* @return the value ole storage stream pointers
-+*/
-+#include <tools/globname.hxx>
-+SotStorageStreamRef LtcBenContainer::ConvertAswStorageToOLE2Stream(const char * sObjectName)
-+{
-+ SotStorageStreamRef xOleObjStm;
-+
-+ SvStream* pOleStorageStream = NULL;
-+ //Get Ole Storage stream
-+ AswEntry aEntry;
-+ pOleStorageStream = FindOLEStorageStreamWithObjectName(sObjectName, aEntry);
-+
-+ if( !pOleStorageStream )
-+ return xOleObjStm;
-+ //Find it, create Ole stream
-+ //xOleObjStm = new SotStorageStream(String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Ole-Object" ) ));
-+ xOleObjStm = new SotStorageStream(String());
-+ if( xOleObjStm->GetError() )
-+ return xOleObjStm;
-+ xOleObjStm->SetBufferSize( 0xff00 );
-+
-+ SotStorageRef xOleObjStor = new SotStorage( *xOleObjStm );
-+ if( xOleObjStor->GetError() )
-+ return xOleObjStm;
-+ //Set class id
-+ ClsId aClsId = aEntry.GetClassId();
-+ SvGlobalName aGName( aClsId.n1, aClsId.n2, aClsId.n3, aClsId.n4,
-+ aClsId.n5, aClsId.n6,aClsId.n7,aClsId.n8,
-+ aClsId.n9,aClsId.n10,aClsId.n11);
-+ xOleObjStor->SetClass( aGName, 0, String());
-+
-+ xOleObjStor->SetVersion( SOFFICE_FILEFORMAT_60 );
-+ std::string aOleStreamName("OleStream");
-+ sal_uInt32 nDLen = 0;
-+ nDLen = GetSvStreamSize(pOleStorageStream);
-+ for(sal_uInt32 nIndex = 0; nIndex < nDLen / ASWENTRY_SIZE; nIndex ++)
-+ {
-+ AswEntry aOleEntry;
-+ ReadAswEntry(pOleStorageStream, aOleEntry);
-+ if(aOleEntry.GetType()== BEN_STGTY_STREAM)
-+ {
-+ SvStream* pOleStream = FindObjectValueStreamWithObjectIDAndProperty(aOleEntry.GetObjectID(), aOleStreamName.c_str());
-+ if(pOleStream)
-+ {
-+ String strName;
-+ aOleEntry.GetName(strName);
-+ SotStorageStreamRef xStm = xOleObjStor->OpenSotStream( strName );
-+ if( xStm->GetError() )
-+ break;
-+ xStm->SetBufferSize( 8192 );
-+ (*pOleStream) >> (*xStm);
-+ xStm->Commit();
-+ delete pOleStream;
-+ pOleStream = NULL;
-+ }
-+ }
-+ }
-+ xOleObjStor->Commit();
-+ xOleObjStm->Commit();
-+
-+ return xOleObjStm;
-+}
-+/**
-+* Find ole object storage stream data according to object name
-+* @date 10/24/2005
-+* @param
-+* @return the value ole storage stream data pointers
-+*/
-+LtcUtBenValueStream* LtcBenContainer::FindOLEStorageStreamWithObjectName(const char * sObjectName, AswEntry& rEntry)
-+{
-+ if (!sObjectName)
-+ return NULL;
-+
-+ //Find OleRootStorage stream
-+ std::string aRootStroageName("OleRootStorage");
-+ std::string aOleStroageName("OleStorage");
-+ LtcUtBenValueStream* pRootStream = NULL;
-+ pRootStream = FindValueStreamWithPropertyName(aRootStroageName.c_str());
-+ if(!pRootStream)
-+ return NULL;
-+ //Read root storage data and find the ole storage object id according to the object name
-+ sal_uInt32 nDLen = 0;
-+ nDLen = GetSvStreamSize(pRootStream);
-+ for(sal_uInt32 nIndex = 0; nIndex < nDLen / ASWENTRY_SIZE; nIndex ++)
-+ {
-+ //Get entry
-+ ReadAswEntry(pRootStream, rEntry);
-+ String sObjName;
-+ rEntry.GetName(sObjName);
-+ if(sObjName.EqualsAscii(sObjectName))
-+ {
-+ //Find it
-+ delete pRootStream;
-+ return FindObjectValueStreamWithObjectIDAndProperty(rEntry.GetObjectID(), aOleStroageName.c_str());
-+ }
-+ }
-+
-+ // Not find
-+ if(pRootStream)
-+ {
-+ delete pRootStream;
-+ }
-+
-+ return NULL;
-+}
-+void LtcBenContainer::ReadAswEntry(SvStream * pStream, AswEntry & rEntry)
-+{
-+ char* pBuf = new char[ASWENTRY_SIZE];
-+ pStream->Read(pBuf, ASWENTRY_SIZE);
-+ rEntry.Load(pBuf);
-+ delete[] pBuf;
-+}
-+////////////////////////////////////////////////////////////////////
-+//classs AswEntry
-+AswEntry::AswEntry()
-+{
-+ Init();
-+}
-+void AswEntry::Init()
-+{
-+ memset( this, 0, sizeof (AswEntry));
-+}
-+void AswEntry::SetName( const String& rName )
-+{
-+ int i;
-+ for( i = 0; i < rName.Len() && i < 68; i++ )
-+ nName[ i ] = rName.GetChar( i );
-+ while( i < 68 )
-+ nName[ i++ ] = 0;
-+}
-+void AswEntry::GetName(String & rName) const
-+{
-+ rName = nName;
-+}
-+void AswEntry::Store( void* pTo )
-+{
-+ SvMemoryStream r( (sal_Char *)pTo, ASWENTRY_SIZE, STREAM_WRITE );
-+ for( short i = 0; i < 68; i++ )
-+ r << nName[ i ]; // 00 name as WCHAR
-+ r<< nMtime[ 0 ] // 42 entry type
-+ << nMtime[ 1 ] // 43 0 or 1 (tree balance?)
-+ << nCtime[ 0 ] // 44 left node entry
-+ << nCtime[ 1 ] // 48 right node entry
-+ << nAtime[ 0 ] // 44 left node entry
-+ << nAtime[ 1 ]; // 48 right node entry
-+ r.Write(&aClsId ,16); // 50 class ID (optional)
-+ r<< nStatebits // 60 state flags(?)
-+ << nType
-+ << nObjectIDRef // 64 modification time
-+ << nMversion // 6C creation and access time
-+ << nLversion // 6C creation and access time
-+ << nReserved[ 0 ] // 74 starting block (either direct or translated)
-+ << nReserved[ 1 ]; // 78 file size
-+}
-+void AswEntry::Load( const void* pFrom )
-+{
-+ SvMemoryStream r( (sal_Char *)pFrom, ASWENTRY_SIZE, STREAM_WRITE );
-+ for( short i = 0; i < 68; i++ )
-+ r >> nName[ i ]; // 00 name as WCHAR
-+ r>> nMtime[ 0 ] // 42 entry type
-+ >> nMtime[ 1 ] // 43 0 or 1 (tree balance?)
-+ >> nCtime[ 0 ] // 44 left node entry
-+ >> nCtime[ 1 ] // 48 right node entry
-+ >> nAtime[ 0 ] // 44 left node entry
-+ >> nAtime[ 1 ]; // 48 right node entry
-+ r.Read(&aClsId,16); // 50 class ID (optional)
-+ r>> nStatebits // 60 state flags(?)
-+ >> nType
-+ >> nObjectIDRef // 64 modification time
-+ >> nMversion // 6C creation and access time
-+ >> nLversion // 6C creation and access time
-+ >> nReserved[ 0 ] // 74 starting block (either direct or translated)
-+ >> nReserved[ 1 ]; // 78 file size
-+}
-+void AswEntry::SetClassId( const ClsId& r )
-+{
-+ memcpy( &aClsId, &r, sizeof( ClsId ) );
-+}
-+///////////////////////////////////////////////////////////////////
-+}// end namespace OpenStormBento
-diff --git lotuswordpro/source/filter/benlist.cxx lotuswordpro/source/filter/benlist.cxx
-new file mode 100644
-index 0000000..48269ba
---- /dev/null
-+++ lotuswordpro/source/filter/benlist.cxx
-@@ -0,0 +1,121 @@
-+/*************************************************************************
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (the "License"); You may not use this file
-+ * except in compliance with the License. You may obtain a copy of the
-+ * License at http://www.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: IBM Corporation
-+ *
-+ * Copyright: 2008 by IBM Corporation
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include "first.hxx"
-+namespace OpenStormBento
-+{
-+
-+pCBenNamedObject
-+FindNamedObject(pCUtList pList, const char * sName,
-+ pCBenNamedObjectListElmt * ppPrev)
-+{
-+ pCUtListElmt pTerminating = pList->GetTerminating();
-+ for (pCUtListElmt pCurr = pList->GetLast(); pCurr != pTerminating;
-+ pCurr = pCurr->GetPrev())
-+ {
-+ pCBenNamedObjectListElmt pCurrNamedObjectListElmt =
-+ (pCBenNamedObjectListElmt) pCurr;
-+
-+
-+ //Old code
-+// int Comp = strcmp(sName, pCurrNamedObjectListElmt->GetNamedObject()->
-+// GetName());
-+ int Comp = strcmp(sName, pCurrNamedObjectListElmt->GetNamedObject()->
-+ GetNameCStr());
-+
-+
-+ if (Comp == 0)
-+ return pCurrNamedObjectListElmt->GetNamedObject();
-+ else if (Comp < 0)
-+ continue;
-+ else
-+ {
-+ if (ppPrev != NULL)
-+ *ppPrev = pCurrNamedObjectListElmt;
-+ return NULL;
-+ }
-+ }
-+
-+ if (ppPrev != NULL)
-+ *ppPrev = (pCBenNamedObjectListElmt) pTerminating;
-+ return NULL;
-+}
-+
-+// Assume list is of BenIDListElmt list elements, sorted by ID
-+pCBenIDListElmt
-+FindID(pCUtList pList, BenObjectID ObjectID, pCBenIDListElmt * ppPrev)
-+{
-+ pCUtListElmt pTerminating = pList->GetTerminating();
-+ for (pCUtListElmt pCurr = pList->GetLast(); pCurr != pTerminating;
-+ pCurr = pCurr->GetPrev())
-+ {
-+ pCBenIDListElmt pCurrIDListElmt = (pCBenIDListElmt) pCurr;
-+
-+ if (ObjectID == pCurrIDListElmt->GetID())
-+ return pCurrIDListElmt;
-+ else if (ObjectID < pCurrIDListElmt->GetID())
-+ continue;
-+ else
-+ {
-+ if (ppPrev != NULL)
-+ *ppPrev = pCurrIDListElmt;
-+ return NULL;
-+ }
-+ }
-+
-+ if (ppPrev != NULL)
-+ *ppPrev = (pCBenIDListElmt) pTerminating;
-+ return NULL;
-+}
-+} //end namespace OpenStormBento
-diff --git lotuswordpro/source/filter/benname.cxx lotuswordpro/source/filter/benname.cxx
-new file mode 100644
-index 0000000..ea5e584
---- /dev/null
-+++ lotuswordpro/source/filter/benname.cxx
-@@ -0,0 +1,91 @@
-+/*************************************************************************
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (the "License"); You may not use this file
-+ * except in compliance with the License. You may obtain a copy of the
-+ * License at http://www.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: IBM Corporation
-+ *
-+ * Copyright: 2008 by IBM Corporation
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include "first.hxx"
-+namespace OpenStormBento
-+{
-+#if 0
-+CBenNamedObject::CBenNamedObject(pLtcBenContainer pContainer,
-+ BenObjectID ObjectID, pCBenObject pPrevObject, const char * sName,
-+ pCBenNamedObjectListElmt pPrevNamedObjectListElmt) :
-+ CBenObject(pContainer, ObjectID, pPrevObject), csName(sName),
-+ cNameListElmt(this, pPrevNamedObjectListElmt)
-+{
-+}
-+#endif
-+ // changed by to remove warning 2004-06-24
-+CBenNamedObject::CBenNamedObject(pLtcBenContainer pContainer,
-+ BenObjectID ObjectID, pCBenObject pPrevObject, const char * sName,
-+ pCBenNamedObjectListElmt pPrevNamedObjectListElmt) :
-+ CBenObject(pContainer, ObjectID, pPrevObject), csName(sName),
-+ cNameListElmt( pPrevNamedObjectListElmt)
-+{
-+ cNameListElmt.SetNamedObject(this);
-+}
-+
-+UtBool CBenNamedObject::IsNamedObject()
-+{ return UT_TRUE; }
-+
-+UtBool CBenNamedObject::IsPropertyName()
-+{ return UT_FALSE; }
-+
-+UtBool CBenNamedObject::IsTypeName()
-+{ return UT_FALSE; }
-+
-+UtBool CBenPropertyName::IsPropertyName()
-+{ return UT_TRUE; }
-+
-+UtBool CBenTypeName::IsTypeName()
-+{ return UT_TRUE; }
-+} // end namespace OpenStormBento
-diff --git lotuswordpro/source/filter/benobj.cxx lotuswordpro/source/filter/benobj.cxx
-new file mode 100644
-index 0000000..7ade154
---- /dev/null
-+++ lotuswordpro/source/filter/benobj.cxx
-@@ -0,0 +1,128 @@
-+/*************************************************************************
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (the "License"); You may not use this file
-+ * except in compliance with the License. You may obtain a copy of the
-+ * License at http://www.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: IBM Corporation
-+ *
-+ * Copyright: 2008 by IBM Corporation
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#include "first.hxx"
-+namespace OpenStormBento
-+{
-+
-+UtBool
-+CBenObject::IsNamedObject()
-+{
-+ return UT_FALSE;
-+}
-+
-+pCBenProperty
-+CBenObject::GetNextProperty(pCBenProperty pCurrProperty)
-+{
-+ return (pCBenProperty) cProperties.GetNextOrNULL(pCurrProperty);
-+}
-+
-+pCBenProperty
-+CBenObject::UseProperty(BenObjectID PropertyID)
-+{
-+ pCBenIDListElmt pPrev;
-+ return (pCBenProperty) FindID(&cProperties, PropertyID, &pPrev);
-+}
-+
-+void
-+CBenObject::DeleteProperty(pCBenProperty pProperty)
-+{
-+ delete pProperty;
-+}
-+
-+pCBenValue
-+CBenObject::UseValue(BenObjectID PropertyID)
-+{
-+ pCBenProperty pProperty = UseProperty(PropertyID);
-+ if (pProperty == NULL)
-+ return NULL;
-+ return pProperty->UseValue();
-+}
-+
-+pCBenValue
-+CBenObject::UseValueWithPropertyName(const char * sPropertyName)
-+{
-+ pCBenPropertyName pPropertyName;
-+ if (GetContainer()->RegisterPropertyName(sPropertyName, &pPropertyName)
-+ != BenErr_OK)
-+ return NULL;
-+
-+ return UseValue(pPropertyName->GetID());
-+}
-+
-+pCBenValue
-+CBenObject::UseSingleValue()
-+{
-+ if (cProperties.IsEmpty() || cProperties.ContainsAtLeastTwoItems())
-+ return NULL;
-+ pCBenProperty pProperty = (pCBenProperty) cProperties.GetFirst();
-+ return pProperty->UseValue();
-+}
-+
-+BenError
-+CBenObject::NewValue(BenObjectID PropertyID, BenObjectID TypeID, pCBenValue *
-+ ppValue)
-+{
-+ pCBenIDListElmt pPrevProperty;
-+ pCBenProperty pProperty = (pCBenProperty) FindID(&cProperties,
-+ PropertyID, &pPrevProperty);
-+ if (pProperty != NULL)
-+ return BenErr_PropertyAlreadyExists;
-+
-+ pProperty = new CBenProperty(this, PropertyID, TypeID, pPrevProperty);
-+ *ppValue = pProperty->UseValue();
-+
-+ return BenErr_OK;
-+}
-+}// end namespace OpenStormBento
-diff --git lotuswordpro/source/filter/bento.hxx lotuswordpro/source/filter/bento.hxx
-new file mode 100644
-index 0000000..f0e235f
---- /dev/null
-+++ lotuswordpro/source/filter/bento.hxx
-@@ -0,0 +1,567 @@
-+/*************************************************************************
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (the "License"); You may not use this file
-+ * except in compliance with the License. You may obtain a copy of the
-+ * License at http://www.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: IBM Corporation
-+ *
-+ * Copyright: 2008 by IBM Corporation
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#ifndef BENTO_H
-+#define BENTO_H
-+
-+#include <string>
-+#include <vector>
-+#include "lwpsvstream.hxx"
-+
-+#define BEN_CC __stdcall
-+#ifdef COMP_BENTO
-+#define BEN_EXPORT __declspec(dllexport)
-+#else
-+#define BEN_EXPORT
-+#endif
-+
-+using namespace std;
-+
-+#include "ut.hxx"
-+#include "utlist.hxx"
-+// removed for WordPro filter, 2005-01-27
-+//#include <scerrors.hxx> // error code defined for SC
-+//#include <filter.hxx> // error code defined for SC filters
-+#include <tools/stream.hxx> // SvStream definition
-+#include <sot/storage.hxx> // SotStorageStream definition, add by 10/24/2005
-+
-+namespace OpenStormBento
-+{
-+
-+#define BEN_CURR_MAJOR_VERSION 2
-+#define BEN_CURR_MINOR_VERSION 0
-+#define BEN_MAGIC_BYTES_SIZE 8
-+#define BEN_LABEL_SIZE 24
-+
-+#define BEN_MAGIC_BYTES "\xA4""CM""\xA5""Hdr""\xD7"
-+//For Ole2DirectoryStruct, Add by 10/24/2005
-+#define BEN_STGTY_STORAGE 1
-+#define BEN_STGTY_STREAM 2
-+#define ASWENTRY_SIZE 204
-+struct ClsId
-+{
-+ INT32 n1;
-+ INT16 n2, n3;
-+ UINT8 n4, n5, n6, n7, n8, n9, n10, n11;
-+};
-+class AswEntry //total length: 204
-+{
-+ UINT16 nName[ 68 ]; //Name of IStorage or IStream referenced by this entry, length = 136
-+ INT32 nMtime[ 2 ];
-+ INT32 nCtime[ 2 ];
-+ INT32 nAtime[ 2 ];
-+ ClsId aClsId; //CLSID from OLE 2 IStorage::SetClass call
-+ UINT32 nStatebits; //State bits from OLE 2 IStorage::SetStateBits call
-+ UINT32 nType; // STGTY_STORAGE: 1 or STGTY_STREAM:2,
-+ UINT32 nObjectIDRef; //Persistent Bento reference to Bento object for this IStorage or IStream
-+ UINT32 nMversion;
-+ UINT32 nLversion;
-+ UINT32 nReserved[2]; //skip 16 char
-+public:
-+ AswEntry();
-+ void Init(); // initialize the data
-+ void SetName( const String& ); // store a name (ASCII, up to 32 chars)
-+ void GetName( String& rName ) const;
-+ void Load( const void* );
-+ void Store( void* );
-+ UINT32 GetType() const { return nType; }
-+ void SetType( UINT32 t ) { nType = t;}
-+ const ClsId& GetClassId() const { return aClsId;}
-+ void SetClassId( const ClsId& );
-+ void SetObjectID(UINT32 id) { nObjectIDRef = id;}
-+ UINT32 GetObjectID() const { return nObjectIDRef;}
-+};
-+//End by
-+
-+enum BenError
-+{
-+ BenErr_OK = 0,
-+ BenErr_NameConflict = 1,
-+ BenErr_DuplicateObjectID = 2,
-+ BenErr_UnknownBentoFormatVersion = 3,
-+ BenErr_NamedObjectError = 4,
-+ BenErr_NamedObjectIllegalValue = 5,
-+ BenErr_InvalidTOC = 6,
-+ BenErr_64BitOffsetNotSupported = 7,
-+ BenErr_ReadPastEndOfTOC = 8,
-+ BenErr_ContainerWithNoObjects = 9,
-+ BenErr_ObjectWithNoProperties = 10,
-+ BenErr_PropertyWithNoValues = 11,
-+ BenErr_IllegalInMemoryTOC = 12,
-+ BenErr_PropertyAlreadyExists = 13,
-+ BenErr_UnexpectedEndOfFile = 14,
-+ BenErr_InvalidWriteOffset = 15,
-+ BenErr_InvalidImmediateWrite = 16,
-+ BenErr_TOCSeedError = 17,
-+ BenErr_ReadPastEndOfContainer = 18,
-+ BenErr_DuplicateName = 19,
-+ BenErr_BadReferencedList = 20,
-+ BenErr_IllegalContinuedImmediate = 21,
-+ BenErr_NotBentoContainer = 22,
-+ BenErr_PropertyWithMoreThanOneValue = 23
-+
-+ // IMPORTANT - UtStream errors (UtErr_....) are also valid Bento
-+ // errors. They have codes of 100 and higher. When, say, a Bento
-+ // container open fails due to an access violation (somebody else, say,
-+ // has it open exclusive), will get a UtErr code. If define own
-+ // subclass of UtStream (custom handler), can define own error codes--
-+ // those should start at 200
-+};
-+/*
-+ * These two functions are useless in SODC
-+ *
-+inline UtError BenToUtError(BenError Err)
-+{
-+ if (Err == 0 || Err >= 100)
-+ return (UtError) Err;
-+ else return UtErr_Fail;
-+}
-+
-+inline BenError UtToBenError(UtError Err)
-+{ UT_ASSERT(Err == 0 || Err >= 100); return (BenError) Err; }
-+enum BenSeekMode {
-+ BenSeek_FromStart = 1,
-+ BenSeek_FromCurr = 2,
-+ BenSeek_FromEnd = 3
-+};
-+*/
-+
-+UtDefClassP(LtcBenContainer);
-+UtDefClassP(CBenIDListElmt);
-+UtDefClassP(CBenObject);
-+UtDefClassP(CBenProperty);
-+UtDefClassP(CBenReference);
-+UtDefClassP(CBenValue);
-+UtDefClassP(CBenValueSegment);
-+UtDefClassP(CBenNamedObjectListElmt);
-+UtDefClassP(CBenNamedObject);
-+UtDefClassP(CBenPropertyName);
-+UtDefClassP(CBenTypeName);
-+
-+typedef unsigned char BenByte;
-+typedef unsigned short BenWord;
-+typedef unsigned long BenDWord;
-+typedef void * BenDataPtr;
-+typedef const void * BenConstDataPtr;
-+
-+typedef unsigned long BenContainerPos;
-+typedef unsigned long BenObjectID;
-+typedef unsigned long BenGeneration;
-+
-+ULONG BenOpenContainer(LwpSvStream * pStream, pLtcBenContainer * ppContainer);
-+
-+class CBenIDListElmt : public CUtListElmt
-+{
-+public: // Internal methods
-+ CBenIDListElmt(BenObjectID ID, pCBenIDListElmt pPrev) : CUtListElmt(pPrev)
-+ { cID = ID; }
-+ CBenIDListElmt(BenObjectID ID) { cID = ID; }
-+ BenObjectID GetID() { return cID; }
-+
-+private: // Data
-+ BenObjectID cID;
-+};
-+
-+class CBenNamedObjectListElmt : public CUtListElmt
-+{
-+public: // Methods
-+ // added by to remove warning 2004-06-24
-+ CBenNamedObjectListElmt(pCBenNamedObjectListElmt pPrev) : CUtListElmt(pPrev)
-+ { cpNamedObject = NULL; }
-+ void SetNamedObject(pCBenNamedObject pObj)
-+ {
-+ cpNamedObject = pObj;
-+ }
-+
-+ CBenNamedObjectListElmt(pCBenNamedObject pNamedObject,
-+ pCBenNamedObjectListElmt pPrev) : CUtListElmt(pPrev)
-+ { cpNamedObject = pNamedObject; }
-+ pCBenNamedObject GetNamedObject() { return cpNamedObject; }
-+
-+private: // Data
-+ pCBenNamedObject cpNamedObject;
-+};
-+
-+class LtcUtBenValueStream : public SvStream
-+{
-+public:
-+ LtcUtBenValueStream(pCBenValue pValue);
-+ ~LtcUtBenValueStream();
-+
-+public: // Overridden methods
-+#if 0 // Deleted by 2004-06-16
-+ UtError Open(UtBool /* OpenNew */, UtStrmOpenFlags /* Flags */);
-+ UtError Close();
-+ UtError Seek(long Offset, UtSeekMode Mode);
-+ UtError GetPosition(unsigned long * pPosition);
-+ UtError GetSize(unsigned long * pSize);
-+ UtError Read(UtStrmDataPtr pBuffer, unsigned long MaxSize,
-+ unsigned long * pAmtRead);
-+ UtError Write(UtConstStrmDataPtr pBuffer, unsigned long Size,
-+ unsigned long * pAmtWritten);
-+ UtError Flush();
-+#endif
-+
-+ /* added by */
-+ CBenValue * GetValue(){ return cpValue; };
-+ ULONG GetSize() { return m_ulValueLength; };
-+protected: // Overridden methods
-+
-+ virtual ULONG GetData( void* pData, ULONG nSize );
-+ virtual ULONG PutData( const void* pData, ULONG nSize );
-+ virtual ULONG SeekPos( ULONG nPos );
-+ virtual void SetSize( ULONG nSize );
-+ virtual void FlushData();
-+
-+#if 0// Deleted by 2004-06-16
-+ UtError TruncateSize(unsigned long Size);
-+#endif
-+private: // Data
-+ pCBenValue cpValue;
-+ unsigned long cCurrentPosition;
-+
-+ ULONG m_ulValueLength; // Added by , sum of length of all sub-valuesegments
-+// void GetAmountLeft(ULONG * pAmtLeft); useless in SODC
-+};
-+
-+class LtcBenContainer
-+{
-+public:
-+ BenError Open();
-+ void Release(); // Deletes container object--last call
-+ BenError Close();
-+ BenError RegisterTypeName(const char * sTypeName,
-+ pCBenTypeName * ppTypeName);
-+ BenError RegisterPropertyName(const char * sPropertyName,
-+ pCBenPropertyName * ppPropertyName);
-+ // Pass NULL to begin iteration. Done when returns NULL.
-+ // Objects are returned in order of increasing ID
-+ pCBenObject GetNextObject(pCBenObject pCurrObject);
-+ pCBenObject FindObject(BenObjectID ObjectID);
-+ pCBenObject FindNextObjectWithProperty(pCBenObject pCurrObject,
-+ BenObjectID PropertyID);
-+ BenError BEN_EXPORT NewObject(pCBenObject * ppBenObject);
-+
-+public: // Internal methods
-+ LtcBenContainer(LwpSvStream * pStream);
-+ ~LtcBenContainer();
-+
-+ BenError Read(BenDataPtr pBuffer, unsigned long MaxSize,
-+ unsigned long * pAmtRead);
-+ BenError ReadKnownSize(BenDataPtr pBuffer, unsigned long Amt);
-+ BenError SeekToPosition(BenContainerPos Pos);
-+ BenError SeekFromEnd(long Offset);
-+
-+ BenError GetPosition(BenContainerPos * pPosition);
-+
-+ BenObjectID GetNextAvailObjectID() { return cNextAvailObjectID; }
-+ void SetNextAvailObjectID(BenObjectID ID) { cNextAvailObjectID = ID; }
-+ pCUtList GetObjects() { return &cObjects; }
-+ pCUtList GetNamedObjects() { return &cNamedObjects; }
-+
-+ // Added by 2004-06-10
-+ LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream);
-+ LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName);
-+ LtcUtBenValueStream * FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName);
-+ BenError CreateGraphicStreams(std::vector<SvStream *> * pStreamVector) ;
-+ BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName);
-+ //Add by 10/24/2005
-+ SotStorageStreamRef ConvertAswStorageToOLE2Stream(const char * sObjectName);
-+ LtcUtBenValueStream * FindOLEStorageStreamWithObjectName(const char * sObjectName, AswEntry& rDirStruct);
-+ void ReadAswEntry(SvStream * pStream, AswEntry& rEntry);
-+
-+ BenError GetSize(ULONG * pLength);
-+ LwpSvStream * GetStream()
-+ {
-+ return cpStream;
-+ };
-+private: // Data
-+ CUtOwningList cObjects;
-+ CUtList cNamedObjects;
-+ LwpSvStream * cpStream;
-+ ULONG m_ulLength; // Added for TOCRead.cpp
-+ BenObjectID cNextAvailObjectID; // for new object
-+};
-+
-+class CBenObject : public CBenIDListElmt
-+{
-+public:
-+ pCBenProperty GetNextProperty(pCBenProperty pCurrProperty);
-+ pCBenProperty UseProperty(BenObjectID PropertyID);
-+ void DeleteProperty(pCBenProperty pProperty);
-+ pCBenValue UseValue(BenObjectID PropertyID);
-+ pCBenValue UseSingleValue();
-+ // Inefficient to use this method if will use property multiple times--
-+ // instead register property and call UseProperty with property ID
-+ pCBenValue UseValueWithPropertyName(const char * sPropertyName);
-+ virtual UtBool IsNamedObject();
-+ pLtcBenContainer GetContainer() { return cpContainer; }
-+ BenObjectID GetObjectID() { return GetID(); }
-+ BenError BEN_EXPORT NewValue(BenObjectID PropertyID, BenObjectID TypeID,
-+ pCBenValue * ppValue);
-+public: // Internal methods
-+ CBenObject(pLtcBenContainer pContainer, BenObjectID ObjectID,
-+ pCBenIDListElmt pPrev) : CBenIDListElmt(ObjectID, pPrev)
-+ { cpContainer = pContainer; }
-+ pCUtList GetProperties() { return &cProperties; }
-+
-+private: // Data
-+ pLtcBenContainer cpContainer;
-+ CUtOwningList cProperties;
-+};
-+
-+class CBenValue : public CBenIDListElmt
-+{
-+public:
-+ unsigned long GetValueSize();
-+ BenError ReadValueData(BenDataPtr pBuffer,
-+ unsigned long Offset, unsigned long MaxSize, unsigned long * pAmtRead);
-+ BenError ReadValueDataKnownSize(BenDataPtr pBuffer,
-+ unsigned long Offset, unsigned long Amt);
-+
-+ BenError BEN_EXPORT WriteValueData(BenConstDataPtr pBuffer,
-+ unsigned long Offset, unsigned long Size);
-+ BenError BEN_EXPORT WriteValueData(BenConstDataPtr pBuffer,
-+ unsigned long Offset, unsigned long Size, unsigned long * pAmtWritten);
-+ BenError BEN_EXPORT WriteImmediateValueData(BenConstDataPtr pBuffer,
-+ unsigned short Size);
-+ BenError BEN_EXPORT TruncateValueSize(unsigned long NewSize);
-+ BenError BEN_EXPORT NewReference(BenObjectID ReferencedObjectID,
-+ pCBenReference pReference);
-+ BenObjectID BEN_EXPORT GetReferencedObject(pCBenReference pReference);
-+
-+
-+ pCBenProperty BEN_EXPORT GetProperty() { return cpProperty; }
-+
-+public: // Internal methods
-+ // added by to remove WARNING 2004-06-24
-+ CBenValue(BenObjectID TypeID):CBenIDListElmt(TypeID)
-+ {
-+ cpProperty = NULL;
-+ cpReferencedList = NULL;
-+ }
-+
-+ void SetProperty(pCBenProperty pProperty)
-+ {
-+ cpProperty = pProperty;
-+ }
-+
-+ CBenValue(pCBenProperty pProperty, BenObjectID TypeID) :
-+ CBenIDListElmt(TypeID)
-+ {
-+ cpProperty = pProperty;
-+ cpReferencedList = NULL;
-+ }
-+ BenObjectID GetTypeNameID() { return GetID(); }
-+ inline pCBenValueSegment GetNextValueSegment(pCBenValueSegment
-+ pCurrValueSegment);
-+ inline pLtcBenContainer GetContainer();
-+ pCUtList GetValueSegments() { return &cValueSegments; }
-+ BenObjectID GetReferencedListID();
-+ // Currently, no generation support
-+ BenGeneration GetGeneration() { return 1; }
-+
-+private: // Data
-+ pCBenProperty cpProperty;
-+ CUtOwningList cValueSegments;
-+ pCBenValue cpReferencedList;
-+ unsigned long cReferencedObjectsSize;
-+};
-+
-+class CBenProperty : public CBenIDListElmt
-+{
-+public:
-+ // In the Apple Bento, a property can have multiple values, each of a
-+ // different type. But we never use it that way, so in this code a
-+ // property has exactly one value
-+
-+ pCBenValue UseValue() { return &cValue; }
-+ pCBenObject GetBenObject() { return cpObject; }
-+ pLtcBenContainer GetContainer() { return GetBenObject()->GetContainer(); }
-+
-+public: // Internal methods
-+#if 0
-+ CBenProperty(pCBenObject pObject, BenObjectID PropertyID,
-+ BenObjectID TypeID, pCBenIDListElmt pPrevProperty) :
-+ CBenIDListElmt(PropertyID, pPrevProperty), cValue(this, TypeID)
-+ { cpObject = pObject; }
-+#endif
-+ // changed by to remove WARNING here 2004-06-24
-+ CBenProperty(pCBenObject pObject, BenObjectID PropertyID,
-+ BenObjectID TypeID, pCBenIDListElmt pPrevProperty) :
-+ CBenIDListElmt(PropertyID, pPrevProperty), cValue(TypeID)
-+ {
-+ cpObject = pObject;
-+ cValue.SetProperty(this);
-+ }
-+
-+BenObjectID GetPropertyNameID() { return GetID(); }
-+
-+private: // Data
-+ pCBenObject cpObject;
-+ CBenValue cValue;
-+};
-+
-+// In our implementation, reference is always just the object ID for the
-+// object referenced (but you shouldn't assume that)
-+#define BEN_REFERENCE_SIZE 4
-+
-+class CBenReference
-+{
-+public: // Methods
-+ BenByte * GetData() { return cData; }
-+
-+private: // Data
-+ BenByte cData[BEN_REFERENCE_SIZE];
-+};
-+
-+class CBenValueSegment : public CUtListElmt
-+{
-+public: // Internal methods
-+ CBenValueSegment(pCBenValue pValue, BenContainerPos Pos,
-+ unsigned long Size) : CUtListElmt(pValue->GetValueSegments())
-+ { cpValue = pValue; cImmediate = UT_FALSE; cPos = Pos;
-+ cSize = Size; }
-+ CBenValueSegment(pCBenValue pValue, BenConstDataPtr pImmData,
-+ unsigned short Size) : CUtListElmt(pValue->GetValueSegments())
-+ { cpValue = pValue; cImmediate = UT_TRUE;
-+ UtHugeMemcpy(cImmData, pImmData, Size); cSize = Size; }
-+ CBenValueSegment(BenContainerPos Pos, unsigned long Size)
-+ { cpValue = NULL; cImmediate = UT_FALSE; cPos = Pos;
-+ cSize = Size; }
-+ CBenValueSegment(BenConstDataPtr pImmData, unsigned short Size)
-+ { cpValue = NULL; cImmediate = UT_TRUE;
-+ UtHugeMemcpy(cImmData, pImmData, Size); cSize = Size; }
-+ UtBool IsLast()
-+ {
-+ return cpValue == NULL || cpValue->GetValueSegments()->GetLast() ==
-+ this;
-+ }
-+ UtBool IsImmediate() { return cImmediate; }
-+ BenContainerPos GetPosition() { return cPos; }
-+ unsigned long GetSize() { return cSize; }
-+ void SetSize(unsigned long Size) { cSize = Size; }
-+ BenByte * GetImmediateData() { return cImmData; }
-+
-+private: // Data
-+ pCBenValue cpValue;
-+ UtBool cImmediate;
-+ union
-+ {
-+ BenContainerPos cPos;
-+ BenByte cImmData[4];
-+ };
-+ unsigned long cSize;
-+};
-+
-+inline pCBenValueSegment CBenValue::GetNextValueSegment(pCBenValueSegment
-+ pCurrValueSegment)
-+{ return (pCBenValueSegment) cValueSegments.GetNextOrNULL(pCurrValueSegment); }
-+
-+inline pLtcBenContainer CBenValue::GetContainer()
-+{ return GetProperty()->GetContainer(); }
-+
-+class CBenNamedObject : public CBenObject
-+{
-+public: // Methods
-+ virtual UtBool IsNamedObject();
-+ virtual UtBool IsPropertyName();
-+ virtual UtBool IsTypeName();
-+
-+public: // Internal methods
-+ CBenNamedObject(pLtcBenContainer pContainer, BenObjectID ObjectID,
-+ pCBenObject pPrevObject, const char * sName,
-+ pCBenNamedObjectListElmt pPrevNamedObjectListElmt);
-+ const char * GetName() { return csName.data(); }
-+
-+
-+ const char * GetNameCStr() { return csName.c_str(); }
-+
-+
-+ void SetPosition(BenContainerPos Pos) { cPos = Pos; }
-+ BenContainerPos GetPosition(void) { return cPos; }
-+ size_t GetLength(void) { return csName.length()+ 1; }
-+ pCBenNamedObjectListElmt GetNameListElmt() { return &cNameListElmt; }
-+
-+private: // Data
-+ string csName;
-+ CBenNamedObjectListElmt cNameListElmt;
-+ BenContainerPos cPos;
-+};
-+
-+class CBenPropertyName : public CBenNamedObject
-+{
-+public: // Internal methods
-+ CBenPropertyName(pLtcBenContainer pContainer, BenObjectID ObjectID,
-+ pCBenObject pPrevObject, const char * sName,
-+ pCBenNamedObjectListElmt pPrevNamedObjectListElmt) :
-+ CBenNamedObject(pContainer, ObjectID, pPrevObject, sName,
-+ pPrevNamedObjectListElmt) { ; }
-+ virtual UtBool IsPropertyName();
-+};
-+
-+class CBenTypeName : public CBenNamedObject
-+{
-+public: // Internal methods
-+ CBenTypeName(pLtcBenContainer pContainer, BenObjectID ObjectID,
-+ pCBenObject pPrevObject, const char * sName,
-+ pCBenNamedObjectListElmt pPrevNamedObjectListElmt) :
-+ CBenNamedObject(pContainer, ObjectID, pPrevObject, sName,
-+ pPrevNamedObjectListElmt) { ; }
-+ virtual UtBool IsTypeName();
-+};
-+
-+
-+} // end namespace OpenStormBento
-+#endif
-diff --git lotuswordpro/source/filter/bentoid.hxx lotuswordpro/source/filter/bentoid.hxx
-new file mode 100644
-index 0000000..4323faa
---- /dev/null
-+++ lotuswordpro/source/filter/bentoid.hxx
-@@ -0,0 +1,110 @@
-+/*************************************************************************
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (the "License"); You may not use this file
-+ * except in compliance with the License. You may obtain a copy of the
-+ * License at http://www.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: IBM Corporation
-+ *
-+ * Copyright: 2008 by IBM Corporation
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#ifndef BENTOID_H
-+#define BENTOID_H
-+
-+namespace OpenStormBento
-+{
-+
-+#define BEN_OBJID_TOC 1 // TOC object ID
-+#define BEN_PROPID_TOC_SEED 2 // TOC object starting seed
-+#define BEN_PROPID_TOC_MIN_SEED 3 // TOC object minimum seed
-+#define BEN_PROPID_TOC_OBJECT 4 // TOC object
-+#define BEN_PROPID_TOC_CONTAINER 5 // TOC object entire container
-+#define BEN_PROPID_TOC_DELETED 6 // TOC object amount deleted
-+#define BEN_TYPEID_TOC_TYPE 19 // TOC object property value type
-+#define BEN_OBJID_WRITEABLE 20 // Predefined ID's below this value will be
-+ // written to container TOC. Predefined IDs
-+ // above this are not written
-+#define BEN_TYPEID_7_BIT_ASCII 21 // 7-bit ASCII
-+#define BEN_PROPID_GLOBAL_TYPE_NAME 23 // Global type name
-+#define BEN_PROPID_GLOBAL_PROPERTY_NAME 24 // Global property name
-+#define BEN_PROPID_OBJ_REFERENCES 31 // Referenced objects from an object
-+#define BEN_TYPEID_OBJ_REFERENCES_DATA 32 // Reference data
-+#define BEN_OBJID_MIN_GENERAL_ID 100 // Min object ID for general std objects
-+
-+#define BEN_NEW_OBJECT 1 // object + property + type
-+#define BEN_NEW_PROPERTY 2 // property + type
-+#define BEN_NEW_TYPE 3 // type
-+#define BEN_EXPLICIT_GEN 4 // generation
-+
-+#define BEN_SEGMENT_CODE_START 5
-+#define BEN_OFFSET4_LEN4 5 // 4-byte offset + 4-byte length
-+#define BEN_CONT_OFFSET4_LEN4 6 // continued 4-byte offset + 4-byte length
-+#define BEN_OFFSET8_LEN4 7 // 8-byte offset + 4-byte length
-+#define BEN_CONT_OFFSET8_LEN4 8 // continued 8-byte offset + 4-byte length
-+#define BEN_IMMEDIATE0 9 // immediate (length = 0)
-+#define BEN_IMMEDIATE1 10 // immediate (length = 1)
-+#define BEN_IMMEDIATE2 11 // immediate (length = 2)
-+#define BEN_IMMEDIATE3 12 // immediate (length = 3)
-+#define BEN_IMMEDIATE4 13 // immediate (length = 4)
-+#define BEN_CONT_IMMEDIATE4 14 // continued immediate (length = 4)
-+#define BEN_SEGMENT_CODE_END 14
-+
-+#define BEN_REFERENCE_LIST_ID 15 // references recording object ID
-+#define BEN_RESERVED4B 16
-+#define BEN_RESERVED4C 17
-+#define BEN_RESERVED8A 18 // reserved for future use of 8 byte entry
-+#define BEN_RESERVED8B 19 // reserved for future use of 8 byte entry
-+#define BEN_RESERVED8C 20 // reserved for future use of 8 byte entry
-+#define BEN_RESERVED12A 21 // reserved for future use of 12 byte entry
-+#define BEN_RESERVED12B 22 // reserved for future use of 12 byte entry
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list