[Libreoffice-commits] .: Branch 'feature/gnumake4' - 474 commits - binfilter/bf_basic binfilter/bf_forms binfilter/bf_offmgr binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/binfilterdetect binfilter/filter binfilter/inc binfilter/prj filter/inc filter/prj filter/source hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk hwpfilter/prj hwpfilter/source lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk lotuswordpro/prj lotuswordpro/qa lotuswordpro/source oox/inc oox/Library_oox.mk oox/Package_inc.mk oox/source unoxml/Library_unordf.mk unoxml/Library_unoxml.mk unoxml/prj unoxml/source writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/Module_writerfilter.mk writerfilter/source writerfilter/unocomponent writerperfect/source xmerge/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jul 21 10:04:40 PDT 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 38
binfilter/bf_basic/source/classes/image.cxx | 8
binfilter/bf_basic/source/inc/image.hxx | 2
binfilter/bf_basic/source/sbx/sbxobj.cxx | 6
binfilter/bf_basic/source/sbx/sbxvar.cxx | 2
binfilter/bf_forms/source/misc/forms_services.cxx | 6
binfilter/bf_forms/source/resource/makefile.mk | 1
binfilter/bf_forms/util/frm.dxp | 1
binfilter/bf_forms/util/makefile.mk | 1
binfilter/bf_offmgr/util/makefile.mk | 1
binfilter/bf_sc/source/core/data/sc_cell.cxx | 12
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 18
binfilter/bf_sc/source/core/data/sc_pivot.cxx | 13
binfilter/bf_sc/source/core/data/sc_table2.cxx | 51
binfilter/bf_sc/source/core/src/makefile.mk | 1
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 30
binfilter/bf_sc/source/core/tool/sc_refdata.cxx | 37
binfilter/bf_sc/source/ui/app/makefile.mk | 1
binfilter/bf_sc/source/ui/dbgui/makefile.mk | 1
binfilter/bf_sc/source/ui/src/makefile.mk | 1
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 6
binfilter/bf_sc/util/bf_sc.map | 1
binfilter/bf_sc/util/makefile.mk | 3
binfilter/bf_sch/source/core/makefile.mk | 1
binfilter/bf_sch/source/ui/app/makefile.mk | 1
binfilter/bf_sch/source/ui/unoidl/sch_register.cxx | 6
binfilter/bf_sch/util/bf_sch.map | 1
binfilter/bf_sch/util/makefile.mk | 1
binfilter/bf_sd/source/core/makefile.mk | 1
binfilter/bf_sd/source/ui/app/makefile.mk | 1
binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx | 5
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 50
binfilter/bf_sd/util/bf_sd.map | 1
binfilter/bf_sd/util/exports.dxp | 2
binfilter/bf_sd/util/makefile.mk | 3
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 93
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 22
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 132
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 89
binfilter/bf_sfx2/source/inc/cfgmgr.hxx | 7
binfilter/bf_so3/source/inplace/ipenv.cxx | 32
binfilter/bf_so3/src/makefile.mk | 1
binfilter/bf_so3/util/makefile.mk | 1
binfilter/bf_starmath/source/cfgitem.hxx | 3
binfilter/bf_starmath/source/makefile.mk | 1
binfilter/bf_starmath/source/mathml.hxx | 1
binfilter/bf_starmath/source/starmath_cfgitem.cxx | 125
binfilter/bf_starmath/source/starmath_document.cxx | 33
binfilter/bf_starmath/source/starmath_mathml.cxx | 132
binfilter/bf_starmath/source/starmath_register.cxx | 7
binfilter/bf_starmath/util/bf_sm.map | 1
binfilter/bf_starmath/util/makefile.mk | 1
binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx | 21
binfilter/bf_svtools/source/items1/svt_poolio.cxx | 146
binfilter/bf_svtools/source/items1/svt_poolitem.cxx | 8
binfilter/bf_svtools/source/memtools/svt_svarray.cxx | 95
binfilter/bf_svtools/source/misc/makefile.mk | 1
binfilter/bf_svtools/source/uno/svt_registerservices.cxx | 6
binfilter/bf_svtools/util/makefile.mk | 1
binfilter/bf_svx/source/dialog/makefile.mk | 1
binfilter/bf_svx/source/editeng/makefile.mk | 1
binfilter/bf_svx/source/engine3d/makefile.mk | 1
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 30
binfilter/bf_svx/source/form/makefile.mk | 1
binfilter/bf_svx/source/items/makefile.mk | 1
binfilter/bf_svx/source/outliner/makefile.mk | 1
binfilter/bf_svx/source/svdraw/makefile.mk | 1
binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx | 20
binfilter/bf_svx/source/svxlink/makefile.mk | 1
binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx | 5
binfilter/bf_svx/util/makefile.mk | 1
binfilter/bf_svx/util/svx.dxp | 1
binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx | 14
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 5
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 6
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 8
binfilter/bf_sw/source/filter/xml/makefile.mk | 3
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx | 125
binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx | 6
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 18
binfilter/bf_sw/source/filter/xml/xmlexp.hxx | 2
binfilter/bf_sw/source/filter/xml/xmlimp.hxx | 4
binfilter/bf_sw/source/ui/app/makefile.mk | 1
binfilter/bf_sw/source/ui/config/makefile.mk | 1
binfilter/bf_sw/source/ui/dialog/makefile.mk | 1
binfilter/bf_sw/source/ui/envelp/makefile.mk | 1
binfilter/bf_sw/source/ui/fldui/makefile.mk | 1
binfilter/bf_sw/source/ui/globdoc/makefile.mk | 1
binfilter/bf_sw/source/ui/index/makefile.mk | 1
binfilter/bf_sw/source/ui/misc/makefile.mk | 1
binfilter/bf_sw/source/ui/shells/makefile.mk | 1
binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx | 7
binfilter/bf_sw/source/ui/utlui/makefile.mk | 1
binfilter/bf_sw/source/ui/wrtsh/makefile.mk | 1
binfilter/bf_sw/util/bf_sw.map | 1
binfilter/bf_sw/util/makefile.mk | 3
binfilter/bf_xmloff/source/core/xmloff_facreg.cxx | 5
binfilter/bf_xmloff/util/exports.dxp | 2
binfilter/binfilterdetect/source/bindetect.cxx | 6
binfilter/filter/source/bf_migrate/bf_migrateexports.cxx | 8
binfilter/filter/source/bf_migrate/exports.dxp | 1
binfilter/filter/source/bf_offwrp/bf_wrapper.cxx | 7
binfilter/filter/source/bf_offwrp/exports.dxp | 1
binfilter/inc/bf_basic/basmgr.hxx | 4
binfilter/inc/bf_sc/refdata.hxx | 1
binfilter/inc/bf_sfx2/docfile.hxx | 5
binfilter/inc/bf_sfx2/objsh.hxx | 5
binfilter/inc/bf_sfx2/sfxsids.hrc | 2
binfilter/inc/bf_so3/ipenv.hxx | 2
binfilter/inc/bf_starmath/document.hxx | 5
binfilter/inc/bf_svtools/addxmltostorageoptions.hxx | 21
binfilter/inc/bf_svtools/httpcook.hxx | 162
binfilter/inc/bf_svtools/itempool.hxx | 7
binfilter/inc/bf_svtools/poolitem.hxx | 11
binfilter/inc/bf_svtools/svstdarr.hxx | 20
binfilter/inc/bf_svx/globlmn.hrc | 37
binfilter/inc/bf_svx/obj3d.hxx | 1
binfilter/inc/bf_svx/svdoedge.hxx | 1
binfilter/inc/bf_sw/crsrsh.hxx | 1
binfilter/inc/bf_sw/doc.hxx | 1
binfilter/inc/bf_xmloff/xmlexppr.hxx | 4
binfilter/prj/build.lst | 2
filter/inc/filter/msfilter/escherex.hxx | 1298 ++---
filter/inc/filter/msfilter/msdffimp.hxx | 565 +-
filter/inc/filter/msfilter/msocximex.hxx | 10
filter/inc/filter/msfilter/svdfppt.hxx | 14
filter/inc/registration.hxx | 11
filter/prj/d.lst | 1
filter/source/config/cache/registration.cxx | 3
filter/source/config/fragments/makefile.mk | 10
filter/source/config/fragments/types/calc_MS_Excel_2003_XML.xcu | 2
filter/source/config/fragments/types/calc_MS_Excel_97.xcu | 2
filter/source/config/fragments/types/calc_SYLK.xcu | 4
filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu | 2
filter/source/filtertracer/exports.dxp | 2
filter/source/filtertracer/filtertraceruno.cxx | 9
filter/source/flash/swfuno.cxx | 8
filter/source/graphicfilter/epbm/epbm.cxx | 9
filter/source/graphicfilter/epgm/epgm.cxx | 9
filter/source/graphicfilter/eppm/eppm.cxx | 9
filter/source/graphicfilter/eps/eps.cxx | 36
filter/source/graphicfilter/expm/expm.cxx | 9
filter/source/msfilter/escherex.cxx | 116
filter/source/msfilter/makefile.mk | 4
filter/source/msfilter/msdffimp.cxx | 235
filter/source/msfilter/msocximex.cxx | 89
filter/source/msfilter/mstoolbar.cxx | 2
filter/source/msfilter/powerpoint/pptimporteruno.cxx | 5
filter/source/msfilter/services.cxx | 10
filter/source/msfilter/svdfppt.cxx | 99
filter/source/odfflatxml/OdfFlatXml.cxx | 2
filter/source/pdf/impdialog.cxx | 8
filter/source/pdf/impdialog.hrc | 5
filter/source/pdf/impdialog.hxx | 8
filter/source/pdf/impdialog.src | 119
filter/source/pdf/pdfuno.cxx | 8
filter/source/placeware/exports.dxp | 1
filter/source/placeware/uno.cxx | 7
filter/source/svg/exports.map | 1
filter/source/svg/makefile.mk | 3
filter/source/svg/svgdialog.cxx | 6
filter/source/svg/svgexport.cxx | 1552 ++++--
filter/source/svg/svgfilter.cxx | 136
filter/source/svg/svgfilter.hxx | 216
filter/source/svg/svgfontexport.cxx | 82
filter/source/svg/svgfontexport.hxx | 25
filter/source/svg/svgscript.hxx | 1691 ++++++
filter/source/svg/svgwriter.cxx | 354 -
filter/source/svg/svgwriter.hxx | 137
filter/source/t602/filterenv.cxx | 7
filter/source/xmlfilteradaptor/genericfilter.cxx | 7
filter/source/xmlfilterdetect/fdcomp.cxx | 7
filter/source/xsltdialog/exports.dxp | 1
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 8
filter/source/xsltfilter/XSLTFilter.cxx | 6
filter/source/xsltfilter/makefile.mk | 4
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 7
hwpfilter/Library_hwp.mk | 7
hwpfilter/prj/build.lst | 2
hwpfilter/source/htags.cxx | 7
hwpfilter/source/htags.h | 4
hwpfilter/source/hwpreader.cxx | 5
hwpfilter/source/hwpreader.hxx | 11
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 7
lotuswordpro/Library_lwpft.mk | 6
lotuswordpro/prj/build.lst | 2
lotuswordpro/qa/cppunit/test_lotuswordpro.cxx | 4
lotuswordpro/source/filter/genericfilter.cxx | 5
lotuswordpro/source/filter/lwptablelayout.cxx | 2
lotuswordpro/source/filter/tocread.cxx | 2
lotuswordpro/source/filter/xfilter/xffilestream.cxx | 9
lotuswordpro/source/filter/xfilter/xfutil.cxx | 32
lotuswordpro/source/filter/xfilter/xfutil.hxx | 4
oox/Library_oox.mk | 6
oox/Package_inc.mk | 1
oox/inc/oox/core/contexthandler.hxx | 2
oox/inc/oox/ole/axcontrol.hxx | 21
oox/inc/oox/ole/olehelper.hxx | 40
oox/inc/oox/ppt/backgroundproperties.hxx | 8
oox/inc/oox/ppt/customshowlistcontext.hxx | 10
oox/inc/oox/ppt/layoutfragmenthandler.hxx | 3
oox/inc/oox/ppt/presentationfragmenthandler.hxx | 10
oox/inc/oox/ppt/slidefragmenthandler.hxx | 8
oox/inc/oox/ppt/slidemastertextstylescontext.hxx | 8
oox/inc/oox/ppt/slidetimingcontext.hxx | 11
oox/inc/oox/ppt/slidetransitioncontext.hxx | 16
oox/inc/oox/ppt/soundactioncontext.hxx | 10
oox/inc/oox/ppt/timenodelistcontext.hxx | 17
oox/inc/oox/xls/worksheethelper.hxx | 8
oox/source/core/contexthandler.cxx | 2
oox/source/core/services.cxx | 10
oox/source/core/xmlfilterbase.cxx | 4
oox/source/drawingml/chart/axisconverter.cxx | 4
oox/source/drawingml/chart/chartconverter.cxx | 6
oox/source/drawingml/chart/seriesconverter.cxx | 45
oox/source/export/chartexport.cxx | 24
oox/source/ole/axcontrol.cxx | 100
oox/source/ole/olehelper.cxx | 137
oox/source/ppt/animvariantcontext.cxx | 41
oox/source/ppt/animvariantcontext.hxx | 10
oox/source/ppt/backgroundproperties.cxx | 16
oox/source/ppt/buildlistcontext.cxx | 35
oox/source/ppt/buildlistcontext.hxx | 10
oox/source/ppt/commonbehaviorcontext.cxx | 31
oox/source/ppt/commonbehaviorcontext.hxx | 15
oox/source/ppt/commontimenodecontext.cxx | 43
oox/source/ppt/commontimenodecontext.hxx | 6
oox/source/ppt/conditioncontext.cxx | 37
oox/source/ppt/conditioncontext.hxx | 8
oox/source/ppt/customshowlistcontext.cxx | 39
oox/source/ppt/headerfootercontext.cxx | 23
oox/source/ppt/headerfootercontext.hxx | 8
oox/source/ppt/layoutfragmenthandler.cxx | 17
oox/source/ppt/presentationfragmenthandler.cxx | 43
oox/source/ppt/slidefragmenthandler.cxx | 69
oox/source/ppt/slidemastertextstylescontext.cxx | 13
oox/source/ppt/slidetimingcontext.cxx | 32
oox/source/ppt/slidetransitioncontext.cxx | 65
oox/source/ppt/soundactioncontext.cxx | 29
oox/source/ppt/timeanimvaluecontext.cxx | 27
oox/source/ppt/timeanimvaluecontext.hxx | 11
oox/source/ppt/timenodelistcontext.cxx | 281 -
oox/source/ppt/timetargetelementcontext.cxx | 60
oox/source/ppt/timetargetelementcontext.hxx | 9
oox/source/token/properties.txt | 2
oox/source/vml/vmldrawingfragment.cxx | 7
oox/source/xls/formulaparser.cxx | 6
oox/source/xls/sheetdatabuffer.cxx | 3
oox/source/xls/sheetdatacontext.cxx | 18
oox/source/xls/workbookfragment.cxx | 7
oox/source/xls/worksheethelper.cxx | 14
unoxml/Library_unordf.mk | 8
unoxml/Library_unoxml.mk | 6
unoxml/prj/build.lst | 2
unoxml/source/rdf/librdf_services.cxx | 8
unoxml/source/rdf/unordf.component | 2
unoxml/source/service/services.cxx | 7
unoxml/source/service/unoxml.component | 2
writerfilter/Library_writerfilter.mk | 9
writerfilter/Module_writerfilter.mk | 4
writerfilter/inc/WriterFilterDllApi.hxx | 6
writerfilter/inc/dmapper/DomainMapper.hxx | 1
writerfilter/inc/rtftok/RTFDocument.hxx | 72
writerfilter/inc/rtftok/RTFInputSource.hxx | 45
writerfilter/inc/rtftok/RTFParseException.hxx | 45
writerfilter/inc/rtftok/RTFScanner.hxx | 68
writerfilter/inc/rtftok/RTFScannerHandler.hxx | 53
writerfilter/source/dmapper/DomainMapper.cxx | 14
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 4
writerfilter/source/dmapper/NumberingManager.cxx | 2
writerfilter/source/dmapper/PropertyMap.cxx | 226
writerfilter/source/doctok/DffImpl.cxx | 5
writerfilter/source/doctok/WW8DocumentImpl.cxx | 131
writerfilter/source/doctok/WW8PropertySetImpl.cxx | 35
writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 12
writerfilter/source/filter/RtfFilter.cxx | 39
writerfilter/source/filter/WriterFilter.cxx | 5
writerfilter/source/rtftok/FlexLexer.h | 151
writerfilter/source/rtftok/RTFParseException.cxx | 35
writerfilter/source/rtftok/RTFScanner.lex | 333 -
writerfilter/source/rtftok/RTFScanner.skl | 1527 -----
writerfilter/source/rtftok/rtfcharsets.cxx | 75
writerfilter/source/rtftok/rtfcontrolwords.cxx | 1855 +++++++
writerfilter/source/rtftok/rtfcontrolwords.hxx | 1854 +++++++
writerfilter/source/rtftok/rtfdocumentfactory.cxx | 44
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2547 ++++++++++
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 305 +
writerfilter/source/rtftok/rtfreferenceproperties.cxx | 69
writerfilter/source/rtftok/rtfreferenceproperties.hxx | 58
writerfilter/source/rtftok/rtfreferencetable.cxx | 56
writerfilter/source/rtftok/rtfreferencetable.hxx | 57
writerfilter/source/rtftok/rtfsprm.cxx | 121
writerfilter/source/rtftok/rtfsprm.hxx | 68
writerfilter/source/rtftok/rtftypes.hxx | 58
writerfilter/source/rtftok/rtfvalue.cxx | 174
writerfilter/source/rtftok/rtfvalue.hxx | 76
writerfilter/unocomponent/component.cxx | 6
writerfilter/unocomponent/exports.dxp | 1
writerperfect/source/filter/OdgGenerator.cxx | 336 +
writerperfect/source/vsdimp/visioimport_genericfilter.cxx | 5
writerperfect/source/wpdimp/wpft_genericfilter.cxx | 7
writerperfect/source/wpgimp/wpgimport_genericfilter.cxx | 5
writerperfect/source/wpsimp/msworks_genericfilter.cxx | 5
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java | 2
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java | 2
307 files changed, 13635 insertions(+), 7527 deletions(-)
New commits:
commit 93c063e6abc6d19d1f768ab78ce3835cc18a2a4e
Merge: 6df1864... 6cb84c5...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:38:50 2011 +0200
resyncing to master
diff --cc oox/Library_oox.mk
index 2abfb96,282d845..69ddb25
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@@ -34,14 -34,21 +34,18 @@@ $(eval $(call gb_Library_add_package_he
$(eval $(call gb_Library_set_include,oox,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(realpath $(SRCDIR)/oox/inc) \
- $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter -I%,$(OPENSSL_CFLAGS))) \
))
-$(eval $(call gb_Library_set_defs,oox,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,oox,\
-DOOX_DLLIMPLEMENTATION \
- $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter-out -I%,$(OPENSSL_CFLAGS))) \
))
+ $(eval $(call gb_Library_add_api,oox,\
+ offapi \
+ udkapi \
+ ))
+
$(eval $(call gb_Library_add_linked_libs,oox,\
basegfx \
comphelper \
diff --cc unoxml/Library_unordf.mk
index 0e1fe61,bc993fb..f716cf2
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@@ -31,7 -31,15 +31,11 @@@ $(eval $(call gb_Library_set_componentf
$(eval $(call gb_Library_set_include,unordf,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
+ ))
+
-$(eval $(call gb_Library_set_defs,unordf,\
- $$(DEFS) \
-))
-
+ $(eval $(call gb_Library_add_api,unordf,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,unordf,\
@@@ -54,5 -59,12 +58,7 @@@ $(eval $(call gb_Library_add_exception_
unoxml/source/rdf/librdf_services \
))
-$(eval $(call gb_Library_set_cxxflags,unordf,\
- $$(CXXFLAGS) \
+ $$(REDLAND_CFLAGS) \
- $$(LIBXSLT_CFLAGS) \
+ $$(LIBXML_CFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
diff --cc unoxml/Library_unoxml.mk
index 3303e5d,907ee0f..b51253a
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@@ -31,9 -31,17 +31,13 @@@ $(eval $(call gb_Library_set_componentf
$(eval $(call gb_Library_set_include,unoxml,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,unoxml,\
- $$(DEFS) \
+ ))
+
+ $(eval $(call gb_Library_add_api,unoxml,\
+ udkapi \
+ offapi \
-))
-
$(eval $(call gb_Library_add_linked_libs,unoxml,\
ucbhelper \
sax \
diff --cc writerfilter/Library_writerfilter.mk
index 1de3e78,679511b..6e3f6d8
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@@ -25,47 -25,48 +25,54 @@@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+include $(SRCDIR)/writerfilter/source/generated.mk
+
$(eval $(call gb_Library_Library,writerfilter))
+$(eval $(call gb_Library_add_package_headers,writerfilter,writerfilter_inc writerfilter_generated))
+
+$(eval $(call gb_Library_add_precompiled_header,writerfilter,$(SRCDIR)/writerfilter/PCH_FILE))
+
+$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
+
$(eval $(call gb_Library_set_include,writerfilter,\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
++))
-I$(realpath $(SRCDIR)/writerfilter/inc) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
- -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
+ -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
+ -I$(realpath $(SRCDIR)/writerfilter/source/doctok) \
+ -I$(realpath $(SRCDIR)/writerfilter/source/ooxml) \
+ -I$(realpath $(SRCDIR)/writerfilter/source/dmapper) \
))
+ $(eval $(call gb_Library_add_api,writerfilter,\
+ offapi \
+ udkapi \
+ ))
+
$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
-include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
-
-$(eval $(call gb_Library_set_defs,writerfilter,\
- $$(DEFS) \
- -DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
- $(writerfilter_debug_flags) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+$(eval $(call gb_Library_add_defs,writerfilter,\
+ -DWRITERFILTER_DLLIMPLEMENTATION \
))
+$(call gb_Library_use_external,writerfilter,libxml2)
+
$(eval $(call gb_Library_add_linked_libs,writerfilter,\
- resourcemodel \
comphelper \
cppu \
cppuhelper \
i18nisolang1 \
i18npaper \
oox \
- ooxml \
+ rtftok \
sal \
sot \
+ svt \
tl \
utl \
- xml2 \
$(gb_STDLIBS) \
))
diff --cc writerfilter/Module_writerfilter.mk
index d51031d,6f2c532..01f149b
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@@ -28,16 -28,13 +28,14 @@@
$(eval $(call gb_Module_Module,writerfilter))
$(eval $(call gb_Module_add_targets,writerfilter,\
- Library_doctok \
- Library_ooxml \
+ Library_rtftok \
- Library_resourcemodel \
Library_writerfilter \
- Library_writerfilter_uno \
- Package_generated \
+ Package_inc \
+ Package_writerfilter_generated \
))
+# Library_doctok \
+# Library_ooxml \
+# Library_resourcemodel \
+# Library_writerfilter_uno \
- # not used
- # Library_rtftok
-
# vim: set noet ts=4 sw=4:
diff --cc writerfilter/inc/WriterFilterDllApi.hxx
index 3e4f620,debf4c3..af16945
--- a/writerfilter/inc/WriterFilterDllApi.hxx
+++ b/writerfilter/inc/WriterFilterDllApi.hxx
@@@ -30,11 -31,43 +30,17 @@@
#include "sal/types.h"
-#if defined(WRITERFILTER_DOCTOK_DLLIMPLEMENTATION)
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#if defined(WRITERFILTER_DLLIMPLEMENTATION)
+#define WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#define WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-
-#if defined(WRITERFILTER_OOXML_DLLIMPLEMENTATION)
-#define WRITERFILTER_OOXML_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_OOXML_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
+ #if defined(WRITERFILTER_RTFTOK_DLLIMPLEMENTATION)
+ #define WRITERFILTER_RTFTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+ #else
+ #define WRITERFILTER_RTFTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+ #endif
+
-#if defined(WRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION)
-#define WRITERFILTER_RESOURCEMODEL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_RESOURCEMODEL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined(WRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION)
-#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined(WRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION)
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-// This one can be shared
#define WRITERFILTER_DLLPRIVATE SAL_DLLPRIVATE
#endif /* INCLUDED_WRITERFILTERDLLAPI_H */
commit 6cb84c5ae7080e989524893b42629ce76ce4d282
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 16:48:59 2011 +0300
Generate correctly named import library for WNTGCC
diff --git a/filter/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk
index cbc06ff..8070bc4 100644
--- a/filter/source/msfilter/makefile.mk
+++ b/filter/source/msfilter/makefile.mk
@@ -58,7 +58,11 @@ SLOFILES= \
$(SLO)$/mstoolbar.obj
SHL1TARGET= msfilter$(DLLPOSTFIX)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= msfilter$(DLLPOSTFIX)
+.ENDIF
SHL1OBJS= $(SLOFILES)
SHL1USE_EXPORTS=name
SHL1STDLIBS= \
commit 5db719abaa5d6be05c86f1f438ae82e9c0ee8070
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jul 15 14:00:53 2011 +0300
Just use REDLAND_CFLAGS, LIBXSLT_CFLAGS and LIBXML_CFLAGS always
They are empty anyway when not needed, I think.
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 7990c69..bc993fb 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -59,19 +59,12 @@ $(eval $(call gb_Library_add_exception_objects,unordf,\
unoxml/source/rdf/librdf_services \
))
-ifeq ($(SYSTEM_REDLAND),YES)
-$(eval $(call gb_Library_set_cxxflags,unordf,\
- $$(CXXFLAGS) \
- -DSYSTEM_REDLAND $$(REDLAND_CFLAGS) \
-))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
$(eval $(call gb_Library_set_cxxflags,unordf,\
$$(CXXFLAGS) \
+ $$(REDLAND_CFLAGS) \
$$(LIBXSLT_CFLAGS) \
+ $$(LIBXML_CFLAGS) \
))
-endif
# vim: set noet sw=4 ts=4:
commit 3096f37078859486f06c5d64b5810a4c9e1d6636
Author: Marc-Andre Laverdiere <marc-andre at atc.tcs.com / marcandre.laverdiere at tcs.com>
Date: Thu Jul 21 15:55:01 2011 +0530
Removed dead code listed in unusedcode.easy
diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx
index a8dfdaa..e690cb5 100644
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ b/writerfilter/source/doctok/DffImpl.cxx
@@ -285,11 +285,6 @@ DffOPT::get_property(sal_uInt32 nPos)
return writerfilter::Reference<Properties>::Pointer_t(pTmp);
}
-sal_uInt32 DffOPT::get_extraoffset_count()
-{
- return get_property_count();
-}
-
sal_uInt32 DffOPT::get_extraoffset(sal_uInt32 pos)
{
sal_uInt32 nResult;
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx
index f7b79a3..6c6e649 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.cxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx
@@ -116,11 +116,6 @@ WW8DocumentIteratorImpl::getSubDocument() const
return mpDocument->getSubDocument(mCpAndFc);
}
-WW8SED * WW8DocumentIteratorImpl::getSED() const
-{
- return mpDocument->getSED(mCpAndFc);
-}
-
WW8Stream::Sequence WW8DocumentIteratorImpl::getText()
{
return mpDocument->getText(mCpAndFc);
@@ -588,12 +583,6 @@ void WW8DocumentImpl::parseBinTableCpAndFcs(WW8BinTable & rTable,
{
for (sal_uInt32 i = 0; i < rTable.getEntryCount(); i++)
{
-#if 0
- char sBuffer[255];
- snprintf(sBuffer, 255, "%ld", i);
- char sBufferPageNum[255];
- snprintf(sBufferPageNum, 255, "%ld", rTable.getPageNumber(i));
-#endif
Fc aFcFromTable(rTable.getFc(i));
if (aFcFromTable < mpPieceTable->getFirstFc())
@@ -751,16 +740,6 @@ CpAndFc WW8DocumentImpl::getEndnoteEndCp() const
return mEndnoteEndCpAndFc;
}
-CpAndFc WW8DocumentImpl::getTextboxEndCp() const
-{
- return mTextboxEndCpAndFc;
-}
-
-CpAndFc WW8DocumentImpl::getTextboxHeaderEndCp() const
-{
- return mTextboxHeaderEndCpAndFc;
-}
-
CpAndFc WW8DocumentImpl::getNextCp(const CpAndFc & rCpAndFc) const
{
CpAndFc aResult = mCpAndFcEnd;
@@ -1129,16 +1108,6 @@ writerfilter::Reference<Stream>::Pointer_t WW8DocumentImpl::getHeader(sal_uInt32
CpAndFc aCpAndFcStart(getHeaderCpAndFc(nPos));
CpAndFc aCpAndFcEnd(getHeaderCpAndFc(nPos + 1));
-#if 0
- sal_uInt32 nEquals = 1;
- while (aCpAndFcEnd == aCpAndFcStart && nPos + nEquals < getHeaderCount())
- {
- ++nEquals;
-
- aCpAndFcEnd = getHeaderCpAndFc(nPos + nEquals);
- }
-#endif
-
if (aCpAndFcStart < aCpAndFcEnd)
pResult = writerfilter::Reference<Stream>::Pointer_t
(new WW8DocumentImpl(*this, aCpAndFcStart, aCpAndFcEnd));
@@ -1146,22 +1115,6 @@ writerfilter::Reference<Stream>::Pointer_t WW8DocumentImpl::getHeader(sal_uInt32
return pResult;
}
-sal_uInt32 WW8DocumentImpl::getFootnoteCount() const
-{
- return (mpFootnoteHelper.get() != NULL) ? mpFootnoteHelper->getCount() : 0;
-}
-
-writerfilter::Reference<Stream>::Pointer_t
-WW8DocumentImpl::getFootnote(sal_uInt32 nPos)
-{
- writerfilter::Reference<Stream>::Pointer_t pResult;
-
- if (! bSubDocument)
- pResult = mpFootnoteHelper->get(nPos);
-
- return pResult;
-}
-
writerfilter::Reference<Stream>::Pointer_t
WW8DocumentImpl::getFootnote(const CpAndFc & rCpAndFc)
{
@@ -1173,22 +1126,6 @@ WW8DocumentImpl::getFootnote(const CpAndFc & rCpAndFc)
return pResult;
}
-sal_uInt32 WW8DocumentImpl::getEndnoteCount() const
-{
- return mpEndnoteHelper.get() != NULL ? mpEndnoteHelper->getCount() : 0;
-}
-
-writerfilter::Reference<Stream>::Pointer_t
-WW8DocumentImpl::getEndnote(sal_uInt32 nPos)
-{
- writerfilter::Reference<Stream>::Pointer_t pResult;
-
- if (! bSubDocument)
- pResult = mpEndnoteHelper->get(nPos);
-
- return pResult;
-}
-
writerfilter::Reference<Stream>::Pointer_t
WW8DocumentImpl::getEndnote(const CpAndFc & rCpAndFc)
{
@@ -1200,22 +1137,6 @@ WW8DocumentImpl::getEndnote(const CpAndFc & rCpAndFc)
return pResult;
}
-sal_uInt32 WW8DocumentImpl::getAnnotationCount() const
-{
- return mpAnnotationHelper.get() != NULL ?
- mpAnnotationHelper->getCount() : 0;
-}
-
-writerfilter::Reference<Stream>::Pointer_t
-WW8DocumentImpl::getAnnotation(sal_uInt32 nPos)
-{
- writerfilter::Reference<Stream>::Pointer_t pResult;
-
- if (! bSubDocument)
- pResult = mpAnnotationHelper->get(nPos);
-
- return pResult;
-}
writerfilter::Reference<Stream>::Pointer_t
WW8DocumentImpl::getAnnotation(const CpAndFc & rCpAndFc)
@@ -1308,11 +1229,6 @@ WW8FLD::Pointer_t WW8DocumentImpl::getCurrentFLD() const
return mpFLD;
}
-sal_uInt32 WW8DocumentImpl::getPicLocation() const
-{
- return mfcPicLoc;
-}
-
void WW8DocumentImpl::setPicLocation(sal_uInt32 fcPicLoc)
{
mfcPicLoc = fcPicLoc;
@@ -1421,13 +1337,6 @@ CpAndFc WW8DocumentImpl::getCpAndFc(const Cp & cp, PropertyType type) const
return CpAndFc(cp, aFc, type);
}
-CpAndFc WW8DocumentImpl::getCpAndFc(const Fc & fc, PropertyType type) const
-{
- Cp aCp = fc2cp(fc);
-
- return CpAndFc(aCp, fc, type);
-}
-
void WW8DocumentImpl::resolvePicture(Stream & rStream)
{
WW8Stream::Pointer_t pStream = getDataStream();
@@ -1672,24 +1581,11 @@ void WW8DocumentImpl::resolve(Stream & rStream)
rStream.props(pFibRgFcLcb2000);
}
-#if 0
- if (mpTextBoxStories.get() != NULL)
- {
- output.addItem("<textbox.boxes>");
- mpTextBoxStories->dump(output);
- output.addItem("</textbox.boxes>");
- }
-#endif
if (mpFib->get_lcbPlcftxbxBkd() > 0)
{
PLCF<WW8BKD> aPLCF(*mpTableStream,
mpFib->get_fcPlcftxbxBkd(),
mpFib->get_lcbPlcftxbxBkd());
-#if 0
- output.addItem("<textbox.breaks>");
- aPLCF.dump(output);
- output.addItem("</textbox.breaks>");
-#endif
}
if (mpDffBlock.get() != NULL)
@@ -1711,33 +1607,6 @@ void WW8DocumentImpl::resolve(Stream & rStream)
rStream.info("/headers");
}
-#if 0
- {
- sal_uInt32 nFootnoteCount = getFootnoteCount();
- for (sal_uInt32 n = 0; n < nFootnoteCount; ++n)
- {
- //clog << "<footnote num=\"" << n << "\"/>" << endl;
-
- writerfilter::Reference<Stream>::Pointer_t pFootnote(getFootnote(n));
-
- if (pFootnote.get() != NULL)
- rStream.substream(NS_rtf::LN_footnote, pFootnote);
- }
- }
- {
- sal_uInt32 nEndnoteCount = getEndnoteCount();
- for (sal_uInt32 n = 0; n < nEndnoteCount; ++n)
- {
- //clog << "<endnote num=\"" << n << "\"/>" << endl;
-
- writerfilter::Reference<Stream>::Pointer_t pEndnote(getEndnote(n));
-
- if (pEndnote.get() != NULL)
- rStream.substream(NS_rtf::LN_endnote, pEndnote);
- }
- }
-#endif
-
writerfilter::Reference<Table>::Pointer_t pSttbRgtplc = getListTplcs();
if (pSttbRgtplc.get() != NULL)
diff --git a/writerfilter/source/doctok/WW8PropertySetImpl.cxx b/writerfilter/source/doctok/WW8PropertySetImpl.cxx
index 897fd75..1cd8aa2 100644
--- a/writerfilter/source/doctok/WW8PropertySetImpl.cxx
+++ b/writerfilter/source/doctok/WW8PropertySetImpl.cxx
@@ -54,12 +54,6 @@ WW8PropertySetIterator::~WW8PropertySetIterator()
{
}
-WW8PropertyImpl::WW8PropertyImpl(WW8Stream & rStream,
- sal_uInt32 nOffset, sal_uInt32 nCount)
-: WW8StructBase(rStream, nOffset, nCount)
-{
-}
-
WW8PropertyImpl::WW8PropertyImpl(const WW8StructBase & rBase,
sal_uInt32 nOffset,
sal_uInt32 nCount)
@@ -67,13 +61,6 @@ WW8PropertyImpl::WW8PropertyImpl(const WW8StructBase & rBase,
{
}
-WW8PropertyImpl::WW8PropertyImpl(WW8StructBase * pBase,
- sal_uInt32 nOffset,
- sal_uInt32 nCount)
-: WW8StructBase(pBase, nOffset, nCount)
-{
-}
-
WW8PropertyImpl::~WW8PropertyImpl()
{
}
@@ -164,28 +151,6 @@ sal_uInt32 WW8PropertyImpl::getByteLength() const
return nParamSize + 2;
}
-sal_uInt32 WW8PropertyImpl::getParamOffset() const
-{
- sal_uInt32 nReturn = 0;
-
- if (get_spra() == 6)
- nReturn = 1;
-
- switch (getId())
- {
- case 0xd608:
- case 0xd609:
- nReturn = 3;
-
- break;
-
- default:
- break;
- }
-
- return nReturn;
-}
-
void WW8PropertyImpl::dump(OutputWithDepth<string> & o) const
{
o.addItem(toString());
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index f4d807a..807363e 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -201,12 +201,6 @@ string WW8PropertiesReference::getType() const
}
WW8BinaryObjReference::WW8BinaryObjReference
-(WW8StructBase & rParent, sal_uInt32 nOffset, sal_uInt32 nCount)
-: WW8StructBase(rParent, nOffset, nCount)
-{
-}
-
-WW8BinaryObjReference::WW8BinaryObjReference
(WW8StructBase * pParent, sal_uInt32 nOffset, sal_uInt32 nCount)
: WW8StructBase(pParent, nOffset, nCount)
{
@@ -218,12 +212,6 @@ WW8BinaryObjReference::WW8BinaryObjReference
{
}
-WW8BinaryObjReference::WW8BinaryObjReference
-(WW8Stream & rStream, sal_uInt32 nOffset, sal_uInt32 nCount)
-: WW8StructBase(rStream, nOffset, nCount)
-{
-}
-
writerfilter::Reference<BinaryObj>::Pointer_t
WW8BinaryObjReference::getBinary()
{
commit ccae9c8504a18369086dfca8559a12b16189bb62
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 21 09:25:23 2011 +0100
unused methods
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 34832e7..a3e6372 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -891,15 +891,6 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath )
bBasMgrModified = FALSE;
}
-BasicManager::BasicManager()
-{
- DBG_CTOR( BasicManager, 0 );
- // Diese CTOR darf nur verwendet werden um bei 'Speichern unter'
- // die relativen Pfade anzupassen, das gibt kein AppBasic und somit
- // duerfen auch keine Libs geladen werden...
- Init();
-}
-
BOOL BasicManager::HasBasicWithModules( const SotStorage& rStorage, const String& rBaseURL )
{
if( !rStorage.IsStream( ManagerStreamName ) )
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index db034a1..b02f8ce 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -219,12 +219,6 @@ static const char pStorageName[] = "Configurations";
/*N*/ return TRUE;
/*N*/ }
-/*?*/ BOOL SfxConfigManager::StoreConfiguration_Impl( SotStorage* /*pStorage*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ BOOL bRet = TRUE;
-/*?*/ return bRet;
-/*?*/ }
-
// ----------------------------------------------------------------------------
/*N*/ void SfxConfigManager::AddConfigItem( SfxConfigItem& rCItem )
diff --git a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
index b254285..17390f4 100644
--- a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
+++ b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
@@ -51,7 +51,6 @@ private:
const SfxConfigManager& operator=( const SfxConfigManager& );
BOOL LoadConfiguration( SotStorage& rStorage );
- BOOL StoreConfiguration_Impl( SotStorage* pStorage=NULL );
public:
enum Error {
diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx
index c093977..a3bd2b1 100644
--- a/binfilter/inc/bf_basic/basmgr.hxx
+++ b/binfilter/inc/bf_basic/basmgr.hxx
@@ -165,8 +165,7 @@ protected:
BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const;
void CheckModules( StarBASIC* pBasic, BOOL bReference ) const;
void SetFlagToAllLibs( short nFlag, BOOL bSet ) const;
- BasicManager(); // Nur zum anpassen von Pfaden bei 'Speichern unter'.
- ~BasicManager();
+ ~BasicManager();
public:
TYPEINFO();
commit 9ae1a63b1c74e19bc2f21d31e6979c507ce43f7c
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Jul 20 12:08:07 2011 -0400
Correctly detect documents with xlk extension as Excel binary.
XLK is an extension for Excel backup file automatically created by
Excel upon opening of a document. The content is still a normal Excel
file so why not detect it correctly.
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
index 24bbc6d..0f7b643 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
@@ -1,7 +1,7 @@
<node oor:name="calc_MS_Excel_97" oor:op="replace" >
<prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>xls xlc xlm xlw</value></prop>
+ <prop oor:name="Extensions"><value>xls xlc xlm xlw xlk</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>MS Excel 97</value></prop>
commit 2322b1370cdfa6dcece27fe36a42169bd25d2d44
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 22:05:27 2011 +0100
ByteString::CreateFromInt32->rtl::OString::valueOf
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 9b412c1..3b8bd44 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -213,13 +213,10 @@ void PGMWriter::ImplWriteBody()
// ------------------------------------------------------------------------
// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-void PGMWriter::ImplWriteNumber( sal_Int32 nNumber )
+void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
{
- const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
- for( sal_Int16 n = 0UL, nLen = aNum.Len(); n < nLen; n++ )
- m_rOStm << aNum.GetChar( n );
-
+ const rtl::OString aNum(rtl::OString::valueOf(nNumber));
+ m_rOStm << aNum.getStr();
}
// ------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index eab45ce..bf934c9 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -221,13 +221,10 @@ void PPMWriter::ImplWriteBody()
// ------------------------------------------------------------------------
// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-void PPMWriter::ImplWriteNumber( sal_Int32 nNumber )
+void PPMWriter::ImplWriteNumber(sal_Int32 nNumber)
{
- const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
- for( sal_Int16 n = 0, nLen = aNum.Len(); n < nLen; n++ )
- m_rOStm << aNum.GetChar( n );
-
+ const rtl::OString aNum(rtl::OString::valueOf(nNumber));
+ m_rOStm << aNum.getStr();
}
// ------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index e10b09b..f8ffcd9 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2466,28 +2466,24 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode)
void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode )
{
- sal_Int32 nLength;
-
sal_Int32 nPTemp = (sal_Int32)fNumber;
sal_Int32 nATemp = labs( (sal_Int32)( ( fNumber - nPTemp ) * 100000 ) );
if ( !nPTemp && nATemp && ( fNumber < 0.0 ) )
*mpPS << (sal_Char)'-';
- ByteString aNumber1( ByteString::CreateFromInt32( nPTemp ) );
- nLength = aNumber1.Len();
- mnCursorPos += nLength;
- for ( sal_Int32 n = 0; n < nLength; n++ )
- *mpPS << aNumber1.GetChar( (sal_uInt16)n );
+ const rtl::OString aNumber1(rtl::OString::valueOf(nPTemp));
+ *mpPS << aNumber1.getStr();
+ mnCursorPos += aNumber1.getLength();
if ( nATemp )
{
int zCount = 0;
*mpPS << (sal_uInt8)'.';
mnCursorPos++;
- const ByteString aNumber2( ByteString::CreateFromInt32( nATemp ) );
+ const rtl::OString aNumber2(rtl::OString::valueOf(nATemp));
- sal_Int16 n, nLen = aNumber2.Len();
+ sal_Int16 n, nLen = aNumber2.getLength();
if ( nLen < 8 )
{
mnCursorPos += 6 - nLen;
@@ -2499,9 +2495,9 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode )
mnCursorPos += nLen;
for ( n = 0; n < nLen; n++ )
{
- *mpPS << aNumber2.GetChar( n );
+ *mpPS << aNumber2[n];
zCount--;
- if ( aNumber2.GetChar( n ) != '0' )
+ if ( aNumber2[n] != '0' )
zCount = 0;
}
if ( zCount )
@@ -2522,8 +2518,8 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode
nNumber = -nNumber;
mnCursorPos++;
}
- const ByteString aScaleFactor( ByteString::CreateFromInt32( nNumber ) );
- sal_uLong nLen = aScaleFactor.Len();
+ const rtl::OString aScaleFactor(rtl::OString::valueOf(nNumber));
+ sal_uLong nLen = aScaleFactor.getLength();
long nStSize = ( nCount + 1 ) - nLen;
if ( nStSize >= 1 )
{
@@ -2547,7 +2543,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode
*mpPS << (sal_uInt8)'.';
mnCursorPos++;
}
- *mpPS << aScaleFactor.GetChar( n );
+ *mpPS << aScaleFactor[n];
}
ImplExecMode( nMode );
}
commit 45384abc83a0c7323374563d5f659e01d29b1636
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 00:12:38 2011 +0100
callcatcher: remove some unused methods
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index 9edf218..34832e7 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -1178,35 +1178,6 @@ BasicLibInfo* BasicManager::CreateLibInfo()
return pInf;
}
-BOOL BasicManager::CopyBasicData( SotStorage* pStorFrom, const String& rSourceURL, const String& rBaseURL, SotStorage* pStorTo )
-{
- /*-----------------------------------------------------------------
- Diese Methode wird vom SXF gerufen bei 'Datei speichern unter',
- damit die Basic-Storages kopiert werden.
- Neu: ggf. muessen relative Pfade angepasst werden!
- ------------------------------------------------------------------*/
- BOOL bOk = TRUE;
-
- // bei remote Dokumenten identische Storage
- if ( pStorFrom != pStorTo )
- {
- if( pStorFrom->IsStorage( BasicStreamName ) )
- bOk = pStorFrom->CopyTo( BasicStreamName, pStorTo, BasicStreamName );
- if( bOk && pStorFrom->IsStream( ManagerStreamName ) )
- {
- BasicManager aBasMgr;
- // Die aktuelle Base-URL ist die vom speichern...
- String aStorName( pStorFrom->GetName() );
- DBG_ASSERT( aStorName.Len(), "No Storage Name!" );
-
- aBasMgr.LoadBasicManager( *pStorFrom, rSourceURL, FALSE );
- aBasMgr.Store( *pStorTo, rBaseURL, FALSE );
- }
- }
-
- return bOk;
-}
-
BOOL BasicManager::ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const
{
DBG_CHKTHIS( BasicManager, 0 );
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index 67b1bc0..db034a1 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -219,88 +219,6 @@ static const char pStorageName[] = "Configurations";
/*N*/ return TRUE;
/*N*/ }
-/*N*/ BOOL SfxConfigManager::StoreConfiguration( SotStorage* pStorage )
-/*N*/ {
-/*N*/ // What about the Modified flag ?! ( see also appmisc, config dialog, objcont! )
-/*N*/ BOOL bOwnSaveDone = FALSE;
-/*N*/ BOOL bRet = TRUE;
-/*N*/ if ( m_xStorage.Is() )
-/*N*/ {
-/*N*/ // first update own storage
-/*N*/ bRet = !bModified || (StoreConfiguration_Impl( m_xStorage ) && m_xStorage->Commit());
-/*N*/ bOwnSaveDone = TRUE;
-/*N*/ if ( !pStorage && pObjShell )
-/*N*/ {
-/*?*/ // pStorage == NULL means : storage of document should be updated also
-/*?*/ SotStorage* pDocumentStorage = pObjShell->GetStorage();
-/*?*/ if ( !pDocumentStorage->IsOLEStorage() )
-/*?*/ {
-/*?*/ // use the configuration substorage of the document
-/*?*/ SotStorageRef xCfgStorage = pDocumentStorage->OpenSotStorage(
-/*?*/ String::CreateFromAscii(pStorageName), STREAM_STD_READWRITE, STORAGE_TRANSACTED );
-/*?*/ bRet = m_xStorage->CopyTo( xCfgStorage ) && xCfgStorage->Commit();
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ // 5.0 format : store compact configuration stream
-/*?*/ SfxConfigManagerImExport_Impl aExporter( pObjShell, pItemArr );
-/*?*/ nErrno = aExporter.Export( m_xStorage, pDocumentStorage );
-/*?*/ bRet = ( nErrno == ERR_NO );
-/*?*/ }
-/*?*/
-/*?*/ if ( bRet )
-/*?*/ {
-/*?*/ // can't commit changes if the documents' storage is under control of the document
-/*?*/ if( pObjShell->GetCreateMode() == SFX_CREATE_MODE_ORGANIZER )
-/*?*/ bRet = pDocumentStorage->Commit();
-/*?*/ else
-/*?*/ {
-/*?*/ // The configuration will be stored together the document, so the modified flag
-/*?*/ // must remain set!
-/*?*/ return TRUE;
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/
-/*N*/ if ( (bRet && !pStorage) || pStorage == (SotStorage*) m_xStorage )
-/*N*/ {
-/*N*/ // only storing into own storage was requested
-/*N*/ bModified = FALSE;
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*?*/ DBG_ASSERT( pStorage, "Can't save configuration!" );
-/*?*/
-/*?*/ if ( !bRet || !pStorage )
-/*?*/ return FALSE;
-/*?*/
-/*?*/ // store also into storage passed as parameter, but don't commit the changes, because this will be done by the caller
-/*?*/ if ( !pStorage->IsOLEStorage() )
-/*?*/ {
-/*?*/ // 6.0 format
-/*?*/ if ( bOwnSaveDone )
-/*?*/ {
-/*?*/ // if own storage is updated, just copy it to the destination storage
-/*?*/ bRet = m_xStorage->CopyTo( pStorage );
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ bRet = StoreConfiguration_Impl( pStorage );
-/*?*/ }
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ // 5.0 format : store compact configuration stream
-/*?*/ SfxConfigManagerImExport_Impl aExporter( pObjShell, pItemArr );
-/*?*/ nErrno = aExporter.Export( m_xStorage, pStorage );
-/*?*/ bRet = ( nErrno == ERR_NO );
-/*?*/ }
-/*?*/
-/*?*/ bModified = !bRet;
-/*?*/ return bRet;
-/*N*/ }
-
/*?*/ BOOL SfxConfigManager::StoreConfiguration_Impl( SotStorage* /*pStorage*/ )
/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ BOOL bRet = TRUE;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index 7ca0679..7d5001b 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -95,14 +95,6 @@ using namespace ::com::sun::star::uno;
/*?*/ { return NULL;
/*?*/ }
-/*N*/ bool SfxObjectShell::SaveWindows_Impl( SvStorage & /*rStor*/ ) const
-/*N*/ {
-/*N*/ return FALSE;
-/*N*/ }
-
-//====================================================================
-
-
//====================================================================
/*N*/ void SfxObjectShell::UpdateDocInfoForSave()
diff --git a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
index c729421..b254285 100644
--- a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
+++ b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
@@ -82,10 +82,6 @@ public:
USHORT GetErrorCode()
{ return nErrno; }
- // store the whole configuration into a storage
- // pStore == NULL means store into own storage
- BOOL StoreConfiguration( SotStorage* pStorage=NULL );
-
BOOL LoadConfigItem( SfxConfigItem& );
BOOL StoreConfigItem( SfxConfigItem& );
BOOL StoreAlwaysConfigItem( SfxConfigItem& );
diff --git a/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx b/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx
index c605a2f..4e59798 100644
--- a/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_addxmltostorageoptions.cxx
@@ -251,27 +251,6 @@ SvtAddXMLToStorageOptions::~SvtAddXMLToStorageOptions()
delete m_pDataContainer, m_pDataContainer = 0;
}
-sal_Bool SvtAddXMLToStorageOptions::IsWriter_Add_XML_to_Storage() const
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- return m_pDataContainer->IsWriter_Add_XML_to_Storage();
-}
-sal_Bool SvtAddXMLToStorageOptions::IsCalc_Add_XML_to_Storage() const
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- return m_pDataContainer->IsCalc_Add_XML_to_Storage();
-}
-sal_Bool SvtAddXMLToStorageOptions::IsImpress_Add_XML_to_Storage() const
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- return m_pDataContainer->IsImpress_Add_XML_to_Storage();
-}
-sal_Bool SvtAddXMLToStorageOptions::IsDraw_Add_XML_to_Storage() const
-{
- MutexGuard aGuard( GetOwnStaticMutex() );
- return m_pDataContainer->IsDraw_Add_XML_to_Storage();
-}
-
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx
index 6f434e4..c093977 100644
--- a/binfilter/inc/bf_basic/basmgr.hxx
+++ b/binfilter/inc/bf_basic/basmgr.hxx
@@ -189,7 +189,6 @@ public:
static BOOL HasBasicWithModules( const SotStorage& rStorage, const String& rBaseURL );
- static BOOL CopyBasicData( SotStorage* pFrom, const String& rSourceURL, const String& rBaseURL, SotStorage* pTo);
USHORT GetLibCount() const;
StarBASIC* GetLib( USHORT nLib ) const;
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 496da22..e7354b1 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -376,7 +376,6 @@ public:
void SetProgress_Impl( SfxProgress *pProgress );
sal_uInt16& GetAktViewNo() { return nViewNo; }
void SetActivateEvent_Impl(sal_uInt16 );
- bool SaveWindows_Impl( SvStorage &rStor ) const;
#endif
};
diff --git a/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx b/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx
index 18ba1a9..d335d77 100644
--- a/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx
+++ b/binfilter/inc/bf_svtools/addxmltostorageoptions.hxx
@@ -96,27 +96,6 @@ class SvtAddXMLToStorageOptions: public Options
SvtAddXMLToStorageOptions();
virtual ~SvtAddXMLToStorageOptions();
- //---------------------------------------------------------------------------------------------------------
- // interface
- //---------------------------------------------------------------------------------------------------------
-
- /*-****************************************************************************************************//**
- @short interface methods to get value of config key
- @descr
-
- @seealso -
-
- @param
- @return The values which represent current state of internal variable.
-
- @onerror No error should occurre!
- *//*-*****************************************************************************************************/
-
- sal_Bool IsWriter_Add_XML_to_Storage() const;
- sal_Bool IsCalc_Add_XML_to_Storage() const;
- sal_Bool IsImpress_Add_XML_to_Storage() const;
- sal_Bool IsDraw_Add_XML_to_Storage() const;
-
//-------------------------------------------------------------------------------------------------------------
// private methods
//-------------------------------------------------------------------------------------------------------------
commit eb1d986b424a07a32dcc07e854e2b078150a3396
Author: Marc-Andre Laverdiere <marc-andre at atc.tcs.com / marcandre.laverdiere at tcs.com>
Date: Tue Jul 19 09:41:27 2011 +0530
Fix for valgrind error in msdffimp.cxx
Error: Conditional jump or move depends on uninitialised value(s)
Fix: Ensure that nGroupShapeFlags is initialized in the constructor
Also cleaned up some duplicate variables
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 1f01f10..af3ec30 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4586,27 +4586,22 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
rSt >> aRecHd;
if ( aRecHd.nRecType == DFF_msofbtSpContainer )
{
- sal_Int32 nGroupRotateAngle = 0;
- sal_Int32 nSpFlags = 0;
mnFix16Angle = 0;
if (!aRecHd.SeekToBegOfRecord(rSt))
return pRet;
+
pRet = ImportObj( rSt, pClientData, rClientRect, rGlobalChildRect, nCalledByGroup + 1, pShapeId );
if ( pRet )
{
- nSpFlags = nGroupShapeFlags;
- nGroupRotateAngle = mnFix16Angle;
-
Rectangle aClientRect( rClientRect );
-
Rectangle aGlobalChildRect;
if ( !nCalledByGroup || rGlobalChildRect.IsEmpty() )
aGlobalChildRect = GetGlobalChildAnchor( rHd, rSt, aClientRect );
else
aGlobalChildRect = rGlobalChildRect;
- if ( ( nGroupRotateAngle > 4500 && nGroupRotateAngle <= 13500 )
- || ( nGroupRotateAngle > 22500 && nGroupRotateAngle <= 31500 ) )
+ if ( ( mnFix16Angle > 4500 && mnFix16Angle <= 13500 )
+ || ( mnFix16Angle > 22500 && mnFix16Angle <= 31500 ) )
{
sal_Int32 nHalfWidth = ( aClientRect.GetWidth() + 1 ) >> 1;
sal_Int32 nHalfHeight = ( aClientRect.GetHeight() + 1 ) >> 1;
@@ -4657,18 +4652,18 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
return pRet;
}
- if ( nGroupRotateAngle )
+ if ( mnFix16Angle )
{
- double a = nGroupRotateAngle * nPi180;
- pRet->NbcRotate( aClientRect.Center(), nGroupRotateAngle, sin( a ), cos( a ) );
+ double a = mnFix16Angle * nPi180;
+ pRet->NbcRotate( aClientRect.Center(), mnFix16Angle, sin( a ), cos( a ) );
}
- if ( nSpFlags & SP_FFLIPV ) // Vertikal gespiegelt?
+ if ( nGroupShapeFlags & SP_FFLIPV ) // Vertical flip?
{ // BoundRect in aBoundRect
Point aLeft( aClientRect.Left(), ( aClientRect.Top() + aClientRect.Bottom() ) >> 1 );
Point aRight( aLeft.X() + 1000, aLeft.Y() );
pRet->NbcMirror( aLeft, aRight );
}
- if ( nSpFlags & SP_FFLIPH ) // Horizontal gespiegelt?
+ if ( nGroupShapeFlags & SP_FFLIPH ) // Horizontal flip?
{ // BoundRect in aBoundRect
Point aTop( ( aClientRect.Left() + aClientRect.Right() ) >> 1, aClientRect.Top() );
Point aBottom( aTop.X(), aTop.Y() + 1000 );
@@ -5992,14 +5987,14 @@ SV_IMPL_OP_PTRARR_SORT( SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder_Ptr );
SV_IMPL_OP_PTRARR_SORT(MSDffImportRecords, MSDffImportRec_Ptr)
//---------------------------------------------------------------------------
-// exportierte Klasse: oeffentliche Methoden
+// exported class: Public Methods
//---------------------------------------------------------------------------
SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
const String& rBaseURL,
sal_uInt32 nOffsDgg_,
SvStream* pStData_,
- SdrModel* pSdrModel_,// s. unten: SetModel()
+ SdrModel* pSdrModel_,// see SetModel() below
long nApplicationScale,
ColorData mnDefaultColor_,
sal_uLong nDefaultFontHeight_,
@@ -6012,8 +6007,10 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
pShapeOrders( new SvxMSDffShapeOrders ),
nDefaultFontHeight( nDefaultFontHeight_),
nOffsDgg( nOffsDgg_ ),
- nBLIPCount( USHRT_MAX ), // mit Error initialisieren, da wir erst pruefen,
- nShapeCount( USHRT_MAX ), // ob Kontroll-Stream korrekte Daten enthaellt
+ nBLIPCount( USHRT_MAX ), // initialize with error, since we fist check if the
+ nShapeCount( USHRT_MAX ), // control stream has correct data
+ nGroupShapeFlags(0), //ensure initialization here, as some corrupted
+ //files may yield to this being unitialized
maBaseURL( rBaseURL ),
mpFidcls( NULL ),
rStCtrl( rStCtrl_ ),
commit 34b1c0659dbc81daaf39e9c6e4e57b020a953318
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 18 01:14:54 2011 +0100
ByteString::CreateFromInt32->rtl::OString::valueOf and simplify
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index 5f3eca3..3ef0d94 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -188,13 +188,10 @@ void PBMWriter::ImplWriteBody()
// ------------------------------------------------------------------------
// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-void PBMWriter::ImplWriteNumber( sal_Int32 nNumber )
+void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
{
- const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
- for( sal_Int16 n = 0, nLen = aNum.Len(); n < nLen; n++ )
- m_rOStm << aNum.GetChar( n );
-
+ const rtl::OString aNum(rtl::OString::valueOf(nNumber));
+ m_rOStm << aNum.getStr();
}
// ------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 8ff0ca7..e10b09b 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2454,14 +2454,12 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
//---------------------------------------------------------------------------------
-void PSWriter::ImplWriteLong( sal_Int32 nNumber, sal_uLong nMode )
+void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode)
{
- const ByteString aNumber( ByteString::CreateFromInt32( nNumber ) );
- sal_uLong nLen = aNumber.Len();
- mnCursorPos += nLen;
- for ( sal_uInt16 n = 0; n < nLen; n++ )
- *mpPS << aNumber.GetChar( n );
- ImplExecMode( nMode );
+ const rtl::OString aNumber(rtl::OString::valueOf(nNumber));
+ mnCursorPos += aNumber.getLength();
+ *mpPS << aNumber.getStr();
+ ImplExecMode(nMode);
}
//---------------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index 856dfcc..c962cee 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -215,13 +215,10 @@ void XPMWriter::ImplWriteBody()
// ------------------------------------------------------------------------
// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-void XPMWriter::ImplWriteNumber( sal_Int32 nNumber )
+void XPMWriter::ImplWriteNumber(sal_Int32 nNumber)
{
- const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
- for( sal_Int16 n = 0UL, nLen = aNum.Len(); n < nLen; ++n )
- m_rOStm << aNum.GetChar( n );
-
+ const rtl::OString aNum(rtl::OString::valueOf(nNumber));
+ m_rOStm << aNum.getStr();
}
// ------------------------------------------------------------------------
commit b81e5396ba29b7dc714564aa782cee768a821671
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 23:35:09 2011 +0100
not going to get re-enabled, is it
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index eda20bd..66892c8 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -112,12 +112,6 @@ Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMul
SVGDialog::SVGDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
OGenericUnoDialog( rxMSF )
{
- ByteString aResMgrName( "svgfilter" );
-
- aResMgrName.Append( ByteString::CreateFromInt32( 0/*SOLARUPD*/ ) );
-
- // !!! KA: enable ResMgr
- // mapResMgr.reset( ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ) );
}
// -----------------------------------------------------------------------------
commit 9d24263957ba12bcc3ff3dedb7c8f99402b1d9ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 21:49:51 2011 +0100
overlong lines
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 2766253..cb7075c 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -70,7 +70,9 @@ namespace
int m_nLoadedDocs;
};
- LotusWordProTest::LotusWordProTest() : m_aSrcRoot( RTL_CONSTASCII_USTRINGPARAM( "file://" ) ), m_nLoadedDocs(0)
+ LotusWordProTest::LotusWordProTest()
+ : m_aSrcRoot(RTL_CONSTASCII_USTRINGPARAM("file://" ))
+ , m_nLoadedDocs(0)
{
m_xContext = cppu::defaultBootstrap_InitialComponentContext();
m_xFactory = m_xContext->getServiceManager();
commit 03e489ea4951fa6c551a8b82a59cf66d094b2fe4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 16 22:17:27 2011 +0100
these can be sal_uInt32, and pre-sanity-check massive allocs
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 2588018..e51791e 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -542,9 +542,9 @@ protected :
/*
folgende Methoden sind zum Excel-Import zu ueberschreiben:
*/
- virtual sal_Bool ProcessClientAnchor(SvStream& rStData, sal_uLong nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
+ virtual sal_Bool ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
virtual void ProcessClientAnchor2( SvStream& rStData, DffRecordHeader& rHd, void* pData, DffObjData& );
- virtual sal_Bool ProcessClientData( SvStream& rStData, sal_uLong nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
+ virtual sal_Bool ProcessClientData( SvStream& rStData, sal_uInt32 nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const;
virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = NULL);
virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const;
virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 62a7c76..1f01f10 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6968,29 +6968,26 @@ sal_Bool SvxMSDffManager::ReadCommonRecordHeader( SvStream& rSt,
return rSt.GetError() == 0;
}
-
-
-
-sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uLong nDatLen,
+sal_Bool SvxMSDffManager::ProcessClientAnchor(SvStream& rStData, sal_uInt32 nDatLen,
char*& rpBuff, sal_uInt32& rBuffLen ) const
{
if( nDatLen )
{
- rpBuff = new char[ nDatLen ];
- rBuffLen = nDatLen;
- rStData.Read( rpBuff, nDatLen );
+ rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_Size>(nDatLen));
+ rpBuff = new char[rBuffLen];
+ rBuffLen = rStData.Read(rpBuff, rBuffLen);
}
return sal_True;
}
-sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uLong nDatLen,
+sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
char*& rpBuff, sal_uInt32& rBuffLen ) const
{
if( nDatLen )
{
- rpBuff = new char[ nDatLen ];
- rBuffLen = nDatLen;
- rStData.Read( rpBuff, nDatLen );
+ rBuffLen = std::min(rStData.remainingSize(), static_cast<sal_Size>(nDatLen));
+ rpBuff = new char[rBuffLen];
+ rBuffLen = rStData.Read(rpBuff, rBuffLen);
}
return sal_True;
}
commit eb71fecb9901563a488bef62301000e88c6e18c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 15 22:19:11 2011 +0100
callcatcher: unused methods
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 228d7e2..794ac61 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -821,10 +821,6 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
in diesem SfxItemPool
- 'rWhichId' enth"alt die ggf. gemappte Which-Id
Laufzeit: Tiefe des Ziel Sekund"arpools * 10 + 10
-
- [Querverweise]
-
- <SfxItemPool::StoreSurrogate(SvStream&,const SfxPoolItem &)const>
*/
{
@@ -907,48 +903,6 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
return 0;
}
-//-------------------------------------------------------------------------
-
-
-bool SfxItemPool::StoreSurrogate
-(
- SvStream& rStream,
- const SfxPoolItem* pItem
-) const
-
-/* [Beschreibung]
-
- Speichert ein Surrogat f"ur '*pItem' in 'rStream'.
-
-
- [R"uckgabewert]
-
- bool TRUE
- es wurde ein echtes Surrogat gespeichert, auch
- SFX_ITEMS_NULL bei 'pItem==0',
- SFX_ITEMS_STATICDEFAULT und SFX_ITEMS_POOLDEFAULT
- gelten als 'echte' Surrogate
-
- FALSE
- es wurde ein Dummy-Surrogat (SFX_ITEMS_DIRECT)
- gespeichert, das eigentliche Item mu\s direkt
- hinterher selbst gespeichert werden
-*/
-
-{
- if ( pItem )
- {
- bool bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE);
- rStream << ( bRealSurrogate
- ? GetSurrogate( pItem )
- : (UINT16) SFX_ITEMS_DIRECT );
- return bRealSurrogate;
- }
-
- rStream << (UINT16) SFX_ITEMS_NULL;
- return TRUE;
-}
-
// -----------------------------------------------------------------------
USHORT SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
@@ -984,14 +938,6 @@ USHORT SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
// -----------------------------------------------------------------------
-bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const
-{
- return nWhich >= pImp->nStoringStart &&
- nWhich <= pImp->nStoringEnd;
-}
-
-// -----------------------------------------------------------------------
-
void SfxItemPool::SetVersionMap
(
USHORT nVer, /* neue Versionsnummer */
diff --git a/binfilter/inc/bf_svtools/itempool.hxx b/binfilter/inc/bf_svtools/itempool.hxx
index 15d73b2..ce0df76 100644
--- a/binfilter/inc/bf_svtools/itempool.hxx
+++ b/binfilter/inc/bf_svtools/itempool.hxx
@@ -195,8 +195,6 @@ public:
const SfxPoolItem* LoadSurrogate(SvStream& rStream,
USHORT &rWhich, USHORT nSlotId,
const SfxItemPool* pRefPool = 0 );
- bool StoreSurrogate(SvStream& rStream,
- const SfxPoolItem *pItem ) const;
virtual SvStream & Load(SvStream &);
virtual SvStream & Store(SvStream &rStream) const { return rStream; }
@@ -210,7 +208,6 @@ public:
return nWhich >= nStart &&
nWhich <= nEnd; }
bool IsInVersionsRange( USHORT nWhich ) const;
- bool IsInStoringRange( USHORT nWhich ) const;
void SetSecondaryPool( SfxItemPool *pPool );
SfxItemPool* GetSecondaryPool() const {
return pSecondary; }
commit fb94c7e9a514e48fce3d8a348db269b0ba56b3ec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 22:06:04 2011 +0100
callcatcher: remove unused methods
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 604e49c..2c64c2e 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1274,48 +1274,12 @@ struct ImplRenderPaintProc
const SdrLayerAdmin& rLayerAdmin;
SdrPageView* pSdrPageView;
- sal_Bool IsVisible ( const SdrObject* pObj ) const;
- sal_Bool IsPrintable( const SdrObject* pObj ) const;
-
ImplRenderPaintProc( const SdrLayerAdmin& rLA, SdrPageView* pView ) :
rLayerAdmin ( rLA ),
pSdrPageView ( pView )
{}
};
-sal_Bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const
-{
- sal_Bool bVisible = sal_True;
- SdrLayerID nLayerId = pObj->GetLayer();
- if( pSdrPageView )
- {
- const SdrLayer* pSdrLayer = rLayerAdmin.GetLayer( nLayerId );
- if ( pSdrLayer )
- {
- String aLayerName = pSdrLayer->GetName();
- bVisible = pSdrPageView->IsLayerVisible( aLayerName );
- }
- }
- return bVisible;
-}
-
-sal_Bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const
-{
- sal_Bool bPrintable = sal_True;
- SdrLayerID nLayerId = pObj->GetLayer();
- if( pSdrPageView )
- {
- const SdrLayer* pSdrLayer = rLayerAdmin.GetLayer( nLayerId );
- if ( pSdrLayer )
- {
- String aLayerName = pSdrLayer->GetName();
- bPrintable = pSdrPageView->IsLayerPrintable( aLayerName );
- }
- }
- return bPrintable;
-
-}
-
void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& /*rSelection*/,
const uno::Sequence< beans::PropertyValue >& rxOptions )
throw (lang::IllegalArgumentException, uno::RuntimeException)
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index bf597c1..67b1bc0 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -154,11 +154,6 @@ static const char pStorageName[] = "Configurations";
// ------------------------------------------------------------------------
-/*?*/ SotStorage* SfxConfigManager::GetConfigurationStorage( SotStorage* pDocStor )
-/*?*/ {
-/*?*/ return pDocStor->OpenSotStorage( String::CreateFromAscii(pStorageName), STREAM_STD_READWRITE );
-/*?*/ }
-
/*?*/ void SfxConfigManager::SetModified(BOOL /*bMod*/)
/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index c8be253..7ca0679 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -147,130 +147,6 @@ using namespace ::com::sun::star::uno;
/*N*/ }
/*N*/ }
-// -----------------------------------------------------------------------
-
-/*N*/ BOOL SfxObjectShell::SaveInfoAndConfig_Impl( SvStorageRef pNewStg )
-/*N*/ {
-/*N*/ //Demnaechst mal gemeinsame Teile zusammenfassen
-/*N*/ UpdateDocInfoForSave();
-/*N*/
-/*N*/ #if !defined( SFX_KEY_MAXPREVIEWSIZE ) && defined( TFPLUGCOMM )
-/*N*/ #define SFX_KEY_MAXPREVIEWSIZE SFX_KEY_ISFREE
-/*N*/ #endif
-/*N*/
-/*N*/ #ifdef MI_doch_wieder_die_alte_preview
-/*N*/ String aMaxSize = SFX_INIMANAGER()->Get( SFX_KEY_MAXPREVIEWSIZE );
-/*N*/ ULONG nMaxSize = aMaxSize.Len() ? ULONG( aMaxSize ) : 50000;
-/*N*/ #else
-/*N*/ ULONG nMaxSize = 0L;
-/*N*/ #endif
-/*N*/ if( nMaxSize && !GetDocInfo().IsPasswd() &&
-/*N*/ SFX_CREATE_MODE_STANDARD == eCreateMode )
-/*N*/ {
-/*N*/ }
-
-/*N*/ if( pImp->bIsSaving )
-/*N*/ {
-/*N*/ //!! kein Aufruf der Basisklasse wegen doppeltem Aufruf in Persist
-/*N*/ SvStorageRef aRef = GetMedium()->GetStorage();
-/*N*/ if ( aRef.Is() )
-/*N*/ {
-/*N*/ SfxDocumentInfo& rDocInfo = GetDocInfo();
-/*N*/ rDocInfo.Save(pNewStg);
-/*N*/
-/*N*/ // wenn es sich um ein Dokument lokales Basic handelt, dieses
-/*N*/ // schreiben
-/*N*/ if ( pImp->pBasicMgr )
-/*?*/ pImp->pBasicMgr->Store(
- *pNewStg,
- ::binfilter::StaticBaseUrl::GetBaseURL(
- INetURLObject::NO_DECODE) );
-/*N*/ else
-/*N*/ {
-/*N*/ String aURL;
-/*N*/ if( HasName() )
-/*N*/ aURL = GetMedium()->GetName();
-/*N*/ else
-/*?*/ {
-/*?*/ aURL = GetDocInfo().GetTemplateFileName();
-/*?*/ // Bei Templates keine URL...
-/*?*/ aURL = ::binfilter::StaticBaseUrl::SmartRelToAbs( aURL );
-/*N*/ }
-/*N*/ #ifndef TFPLUGCOMM
-/*N*/ BasicManager::CopyBasicData(
- GetStorage(), aURL,
- ::binfilter::StaticBaseUrl::GetBaseURL(
- INetURLObject::NO_DECODE),
- pNewStg );
-/*N*/ #endif
-/*N*/ }
-/*N*/
-/*N*/ // Windows-merken
-/*N*/ if ( TRUE ) HACK(aus config)
-/*N*/ SaveWindows_Impl( *pNewStg );
-/*N*/
-/*N*/ // Konfiguration schreiben
-/*N*/ if ( GetConfigManager() )
-/*N*/ {
-/*N*/ {
-/*?*/ GetConfigManager()->StoreConfiguration( pNewStg );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ /*SfxApplication *pSfxApp =*/ SFX_APP();
-/*N*/ /*SfxMedium *pActMed =*/ GetMedium();
-/*N*/
-/*N*/ // alte DocInfo laden
-/*N*/ SfxDocumentInfo &rDocInfo = GetDocInfo();
-/*N*/
-/*N*/ // DocInfo speichern
-/*N*/ rDocInfo.Save( pNewStg );
-/*N*/
-/*N*/ // wenn es sich um ein Dokument lokales Basic handelt, dieses schreiben
-/*N*/ if ( pImp->pBasicMgr )
-/*N*/ pImp->pBasicMgr->Store(
- *pNewStg,
- ::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE) );
-/*N*/ #ifndef MI_NONOS
-/*N*/ else
-/*N*/ {
-/*?*/ String aURL;
-/*?*/ if( HasName() )
-/*?*/ aURL = GetMedium()->GetName();
-/*?*/ else
-/*?*/ {
-/*?*/ aURL = GetDocInfo().GetTemplateFileName();
-/*?*/ // Bei Templates keine URL...
-/*?*/ aURL = ::binfilter::StaticBaseUrl::SmartRelToAbs( aURL );
-/*?*/ }
-/*?*/ #ifndef TFPLUGCOMM
-/*?*/ BasicManager::CopyBasicData(
- GetStorage(), aURL,
- ::binfilter::StaticBaseUrl::GetBaseURL(INetURLObject::NO_DECODE),
- pNewStg );
-/*?*/ #endif
-/*N*/ }
-/*N*/ #endif
-/*N*/ // Windows-merken
-/*N*/ if ( TRUE ) HACK(aus config)
-/*N*/ SaveWindows_Impl( *pNewStg );
-/*N*/
-/*N*/ // Konfiguration schreiben
-/*N*/ if (GetConfigManager())
-/*N*/ {
-/*N*/ {
-/*?*/ GetConfigManager()->StoreConfiguration(pNewStg);
- }
-/*N*/ }
-/*N*/
-/*N*/ return TRUE;
-/*N*/ }
-/*N*/ }
-
//--------------------------------------------------------------------
// Bearbeitungszeit aktualisieren
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index a34251d..3a3a6e7 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -1351,95 +1351,6 @@ sal_Bool DocSh::ConvertTo( SfxMedium &rMedium )
/*N*/ else
/*N*/ return sal_False;
/*N*/ }
-
-/*N*/ void SfxObjectShell::AddXMLAsZipToTheStorage( SvStorage& rRoot )
-/*N*/ {
-/*N*/ static struct _ObjExpType {
-/*N*/ sal_Bool (SvtAddXMLToStorageOptions:: *fnIsAdd)() const;
-/*N*/ const sal_Char* pModuleNm;
-/*N*/ // GlobalNameId
-/*N*/ UINT32 n1;
-/*N*/ USHORT n2, n3;
-/*N*/ BYTE b8, b9, b10, b11, b12, b13, b14, b15;
-/*N*/ } aArr[] = {
-/*N*/ { &SvtAddXMLToStorageOptions::IsWriter_Add_XML_to_Storage,
-/*N*/ "Writer", BF_SO3_SW_CLASSID_50 },
-/*N*/ { &SvtAddXMLToStorageOptions::IsCalc_Add_XML_to_Storage,
-/*N*/ "Calc", BF_SO3_SC_CLASSID_50 },
-/*N*/ { &SvtAddXMLToStorageOptions::IsImpress_Add_XML_to_Storage,
-/*N*/ "Impress", BF_SO3_SIMPRESS_CLASSID_50 },
-/*N*/ { &SvtAddXMLToStorageOptions::IsDraw_Add_XML_to_Storage,
-/*N*/ "Draw", BF_SO3_SDRAW_CLASSID_50 },
-/*N*/ { NULL,NULL,0,0,0,0,0,0,0,0,0,0,0 }
-/*N*/ };
-/*N*/
-/*N*/ for( const _ObjExpType* pArr = aArr; pArr->fnIsAdd; ++pArr )
-/*N*/ {
-/*N*/ SvGlobalName aGlbNm( pArr->n1, pArr->n2, pArr->n3,
-/*N*/ pArr->b8, pArr->b9, pArr->b10, pArr->b11,
-/*N*/ pArr->b12, pArr->b13, pArr->b14, pArr->b15 );
-/*N*/ if( *GetSvFactory() == aGlbNm )
-/*N*/ {
-/*?*/ // 1. check if the option is set and unequal 0 or is not set
-/*?*/ SvtAddXMLToStorageOptions aOpt;
-/*?*/ if( (aOpt.*pArr->fnIsAdd)() )
-/*?*/ {
-/*?*/ // the flag is set
-/*?*/ String sStr;
-/*?*/ sStr.AssignAscii( "StarOffice XML (" );
-/*?*/ sStr.AppendAscii( pArr->pModuleNm );
-/*?*/ sStr += ')';
-/*?*/ // 2. exist the XML filter? "StarOffice XML (<Application>)"?
-/*?*/ const SfxFilter* pFilter = GetFactory().GetFilterContainer()->
-/*?*/ GetFilter4FilterName( sStr );
-/*?*/ if( pFilter )
-/*?*/ {
-/*?*/ ::utl::TempFile aTempFile;
-/*?*/ SfxMedium aTmpMed( aTempFile.GetURL(), STREAM_READ | STREAM_WRITE, sal_True );
-/*?*/
-/*?*/ aTmpMed.SetFilter( pFilter );
-/*?*/
-/*?*/ if( ConvertTo( aTmpMed ) )
-/*?*/ {
-/*?*/ SvStorage* pXMLStor = aTmpMed.GetStorage();
-/*?*/
-/*?*/ if( pXMLStor )
-/*?*/ {
-/*?*/ const String aContent( String::CreateFromAscii( "Content" ) );
-/*?*/ const String aContentXML( String::CreateFromAscii( "Content.xml" ) );
-/*?*/ const String aXMLFormatName( String::CreateFromAscii( "XMLFormat2" ) );
-/*?*/ String aContentName;
-/*?*/
-/*?*/ if( pXMLStor->IsContained( aContentXML ) )
-/*?*/ aContentName = aContentXML;
-/*?*/ else if( pXMLStor->IsContained( aContent ) )
-/*?*/ aContentName = aContent;
-/*?*/
-/*?*/ if( aContentName.Len() )
-/*?*/ {
-/*?*/ SvStorageStreamRef xOStm( rRoot.OpenStream( aXMLFormatName, STREAM_WRITE | STREAM_TRUNC ) );
-/*?*/ SvStorageStreamRef xIStm( pXMLStor->OpenStream( aContentName, STREAM_READ | STREAM_NOCREATE ) );
-/*?*/
-/*?*/ if( xOStm.Is() && xIStm.Is() )
-/*?*/ {
-/*?*/ ZCodec aCodec;
-/*?*/
-/*?*/ xIStm->Seek( 0 );
-/*?*/ aCodec.BeginCompression( ZCODEC_BEST_COMPRESSION );
-/*?*/ aCodec.Compress( *xIStm, *xOStm );
-/*?*/ aCodec.EndCompression();
-/*?*/ xOStm->Commit();
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ // that's all
-/*?*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
index 69e10f4..c729421 100644
--- a/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
+++ b/binfilter/bf_sfx2/source/inc/cfgmgr.hxx
@@ -76,8 +76,6 @@ public:
SfxConfigManager( SfxObjectShell& rDoc );
~SfxConfigManager();
- SotStorage* GetConfigurationStorage( SotStorage* );
-
void AddConfigItem( SfxConfigItem& rCItem );
void RemoveConfigItem( SfxConfigItem& rCItem );
SfxConfigItem* GetNextItem( SfxConfigItem& rCItem );
diff --git a/binfilter/bf_so3/source/inplace/ipenv.cxx b/binfilter/bf_so3/source/inplace/ipenv.cxx
index c46d418..50c9800 100644
--- a/binfilter/bf_so3/source/inplace/ipenv.cxx
+++ b/binfilter/bf_so3/source/inplace/ipenv.cxx
@@ -508,38 +508,6 @@ void SvContainerEnvironment::Scroll( const Size & rSize )
}
/************************************************************************
-|* SvContainerEnvironment::SetTopToolFramePixel()
-
-|* Beschreibung
-*************************************************************************/
-void SvContainerEnvironment::SetTopToolFramePixel( const SvBorder & rBorder )
-{
- if( rBorder != aTopBorder )
- {
- aTopBorder = rBorder;
- if( pIPEnv )
- // InPlace-Objekt fragt nach rOuter, deshalb vorher setzen
- pIPEnv->DoTopWinResize();
- }
-}
-
-/************************************************************************
-|* SvContainerEnvironment::SetDocToolFramePixel()
-
-|* Beschreibung
-*************************************************************************/
-void SvContainerEnvironment::SetDocToolFramePixel( const SvBorder & rBorder )
-{
- if( rBorder != aDocBorder )
- {
- aDocBorder = rBorder;
- if( pIPEnv )
- // InPlace-Objekt fragt nach rOuter, deshalb vorher setzen
- pIPEnv->DoDocWinResize();
- }
-}
-
-/************************************************************************
|* SvContainerEnvironment::RequestTopToolSpacePixel()
|*
|* Beschreibung
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 4532900..228d7e2 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -990,31 +990,6 @@ bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const
nWhich <= pImp->nStoringEnd;
}
-//------------------------------------------------------------------------
-
-void SfxItemPool::SetStoringRange( USHORT nFrom, USHORT nTo )
-
-/* [Beschreibung]
-
- Mit dieser Methode kann der Which-Bereich eingeengt werden, der
- von ItemSets dieses Pool (und dem Pool selbst) gespeichert wird.
- Die Methode muss dazu vor <SfxItemPool::Store()> gerufen werden
- und die Werte muessen auch noch gesetzt sein, wenn das eigentliche
- Dokument (also die ItemSets gespeicher werden).
-
- Ein Zuruecksetzen ist dann nicht noetig, wenn dieser Range vor
- JEDEM Speichern richtig gesetzt wird, da er nur beim Speichern
- beruecksichtigt wird.
-
- Dieses muss fuer das 3.1-Format gemacht werden, da dort eine
- Bug in der Pool-Lade-Methode vorliegt.
-*/
-
-{
- pImp->nStoringStart = nFrom;
- pImp->nStoringEnd = nTo;
-}
-
// -----------------------------------------------------------------------
void SfxItemPool::SetVersionMap
@@ -1270,73 +1245,6 @@ bool SfxItemPool::IsVer2_Impl() const
//-------------------------------------------------------------------------
-
-bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
- bool bDirect ) const
-
-/* [Beschreibung]
-
- Speichert das <SfxPoolItem> 'rItem' in den <SvStream> 'rStream'
- entweder als Surrogat ('bDirect == FALSE') oder direkt mit 'rItem.Store()'.
- Nicht poolable Items werden immer direkt gespeichert. Items ohne Which-Id,
- also SID-Items, werden nicht gespeichert, ebenso wenn Items, die in der
- File-Format-Version noch nicht vorhanden waren (return FALSE).
-
- Das Item wird im Stream wie folgt abgelegt:
-
- USHORT rItem.Which()
- USHORT GetSlotId( rItem.Which() ) bzw. 0 falls nicht verf"urbar
- USHORT GetSurrogate( &rItem ) bzw. SFX_ITEM_DIRECT bei '!SFX_ITEM_POOLBLE'
-
- optional (falls 'bDirect == TRUE' oder '!rItem.IsPoolable()':
-
- USHORT rItem.GetVersion()
- ULONG Size
- Size rItem.Store()
-
-
- [Querverweise]
-
- <SfxItemPool::LoadItem(SvStream&,bool)const>
-*/
-
-{
- DBG_ASSERT( !IsInvalidItem(&rItem), "cannot store invalid items" );
-
- if ( IsSlot( rItem.Which() ) )
- return FALSE;
- const SfxItemPool *pPool = this;
- while ( !pPool->IsInStoringRange(rItem.Which()) )
- if ( 0 == ( pPool = pPool->pSecondary ) )
- return FALSE;
-
- DBG_ASSERT( !pImp->bInSetItem || !rItem.ISA(SfxSetItem),
- "SetItem contains ItemSet with SetItem" );
-
- USHORT nSlotId = pPool->GetSlotId( rItem.Which(), TRUE );
- USHORT nItemVersion = rItem.GetVersion(_nFileFormatVersion);
- if ( USHRT_MAX == nItemVersion )
- return FALSE;
-
- rStream << rItem.Which() << nSlotId;
- if ( bDirect || !pPool->StoreSurrogate( rStream, &rItem ) )
- {
- rStream << nItemVersion;
- rStream << (UINT32) 0L; // Platz fuer Laenge in Bytes
- ULONG nIStart = rStream.Tell();
- rItem.Store(rStream, nItemVersion);
- ULONG nIEnd = rStream.Tell();
- rStream.Seek( nIStart-4 );
- rStream << (INT32) ( nIEnd-nIStart );
- rStream.Seek( nIEnd );
- }
-
- return TRUE;
-}
-
-//-------------------------------------------------------------------------
-
-
const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect,
const SfxItemPool *pRefPool )
diff --git a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
index 8aac9a5..b7c0319 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolitem.cxx
@@ -240,14 +240,6 @@ bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString,
return rStream.GetError() == ERRCODE_NONE;
}
-//============================================================================
-// static
-void SfxPoolItem::writeUnicodeString(SvStream & rStream,
- UniString const & rString)
-{
- rStream.WriteByteString(rString, RTL_TEXTENCODING_UCS2);
-}
-
// ------------------------------------------------------------------------
SfxItemPresentation SfxPoolItem::GetPresentation
(
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
index 9219561..8fa8886 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx
@@ -200,12 +200,6 @@ SwXMLExport::SwXMLExport(
}
#endif
-void SwXMLExport::setBlockMode()
-{
- bBlock = sal_True;
-
-}
-
sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
{
if( !GetModel().is() )
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index 84e27c6..3cf577c 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -364,24 +364,6 @@ void SwXMLImport::setTextInsertMode(
GetTextImport()->SetCursor( xTextCursor );
}
-void SwXMLImport::setStyleInsertMode( sal_uInt16 nFamilies,
- sal_Bool bOverwrite )
-{
- bInsert = !bOverwrite;
- nStyleFamilyMask = nFamilies;
- bLoadDoc = sal_False;
-}
-
-void SwXMLImport::setBlockMode( )
-{
- bBlock = sal_True;
-}
-
-void SwXMLImport::setOrganizerMode( )
-{
- bOrganizerMode = sal_True;
-}
-
const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() throw()
{
static uno::Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
diff --git a/binfilter/bf_sw/source/filter/xml/xmlexp.hxx b/binfilter/bf_sw/source/filter/xml/xmlexp.hxx
index b7ea00d..4c0bd17 100644
--- a/binfilter/bf_sw/source/filter/xml/xmlexp.hxx
+++ b/binfilter/bf_sw/source/filter/xml/xmlexp.hxx
@@ -163,8 +163,6 @@ public:
#endif
virtual ~SwXMLExport();
- void setBlockMode();
-
virtual sal_uInt32 exportDoc( enum ::binfilter::xmloff::token::XMLTokenEnum eClass = ::binfilter::xmloff::token::XML_TOKEN_INVALID );
inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
diff --git a/binfilter/bf_sw/source/filter/xml/xmlimp.hxx b/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
index 0d46d7d..d320526 100644
--- a/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
+++ b/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
@@ -128,10 +128,6 @@ public:
void setTextInsertMode(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange > & rInsertPos );
- void setStyleInsertMode( sal_uInt16 nFamilies,
- sal_Bool bOverwrite );
- void setBlockMode();
- void setOrganizerMode();
// ::com::sun::star::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument(void)
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 581186a..496da22 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -177,7 +177,6 @@ private:
sal_Bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet, BOOL bPrepareForDirectAccess );
sal_Bool ConnectTmpStorage_Impl( SvStorage* pStg);
sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
- sal_Bool SaveInfoAndConfig_Impl( SvStorageRef pNewStg );
#endif
protected:
@@ -187,9 +186,6 @@ protected:
virtual void ModifyChanged();
virtual sal_Bool Close();
- // add optional to the storage the XML format as a zip stream
- void AddXMLAsZipToTheStorage( SvStorage& rRoot );
-
public:
TYPEINFO();
diff --git a/binfilter/inc/bf_so3/ipenv.hxx b/binfilter/inc/bf_so3/ipenv.hxx
index 97a936a..717b522 100644
--- a/binfilter/inc/bf_so3/ipenv.hxx
+++ b/binfilter/inc/bf_so3/ipenv.hxx
@@ -195,10 +195,8 @@ public:
virtual void RequestObjAreaPixel( const Rectangle & rObjRect );
// Groessen und Positionsverhandlungen fuer Tools
- void SetTopToolFramePixel( const SvBorder & rBorder );
Rectangle GetTopOuterRectPixel() const;
- void SetDocToolFramePixel( const SvBorder & rBorder );
Rectangle GetDocOuterRectPixel() const;
// Das rInnerRect bezieht sich auf rOuterRect
diff --git a/binfilter/inc/bf_svtools/httpcook.hxx b/binfilter/inc/bf_svtools/httpcook.hxx
deleted file mode 100644
index e00fc06..0000000
--- a/binfilter/inc/bf_svtools/httpcook.hxx
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVTOOLS_HTTPCOOK_HXX
-#define SVTOOLS_HTTPCOOK_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include <tools/datetime.hxx>
-#include <tools/stream.hxx>
-#include <tools/string.hxx>
-
-#include <bf_svtools/poolitem.hxx>
-
-namespace binfilter
-{
-
-/*=======================================================================
- *
- *=====================================================================*/
-#define CNTHTTP_COOKIE_FLAG_SECURE 0x01
-
-#define CNTHTTP_COOKIE_POLICY_INTERACTIVE 0x00
-#define CNTHTTP_COOKIE_POLICY_ACCEPTED 0x01
-#define CNTHTTP_COOKIE_POLICY_BANNED 0x02
-
-#define CNTHTTP_COOKIE_DOMAIN_POLICY 0x10
-
-#define CNTHTTP_COOKIE_DOMAIN_ACCEPTED \
- (CNTHTTP_COOKIE_DOMAIN_POLICY | CNTHTTP_COOKIE_POLICY_ACCEPTED)
-#define CNTHTTP_COOKIE_DOMAIN_BANNED \
- (CNTHTTP_COOKIE_DOMAIN_POLICY | CNTHTTP_COOKIE_POLICY_BANNED)
-
-/*=======================================================================
- *
- * CntHTTPCookie.
- *
- *=====================================================================*/
-struct CntHTTPCookie
-{
- String m_aName;
- String m_aValue;
- String m_aDomain;
- String m_aPath;
- DateTime m_aExpires;
- USHORT m_nFlags;
- USHORT m_nPolicy;
-
- CntHTTPCookie (void)
- : m_aExpires (Date(0), Time(0)),
- m_nFlags (0),
- m_nPolicy (CNTHTTP_COOKIE_POLICY_INTERACTIVE)
- {}
-
- BOOL replaces (const CntHTTPCookie& rOther) const
- {
- return ((m_aDomain == rOther.m_aDomain) &&
- (m_aPath == rOther.m_aPath ) &&
- (m_aName == rOther.m_aName ) );
- }
-
- BOOL operator== (const CntHTTPCookie& rOther) const
- {
- return ((m_aName == rOther.m_aName ) &&
- (m_aValue == rOther.m_aValue ) &&
- (m_aDomain == rOther.m_aDomain ) &&
- (m_aPath == rOther.m_aPath ) &&
- (m_aExpires == rOther.m_aExpires) &&
- (m_nFlags == rOther.m_nFlags ) &&
- (m_nPolicy == rOther.m_nPolicy ) );
- }
-
- void write (SvStream& rStrm) const
- {
- SfxPoolItem::writeUnicodeString(rStrm, m_aName);
- SfxPoolItem::writeUnicodeString(rStrm, m_aValue);
- SfxPoolItem::writeUnicodeString(rStrm, m_aDomain);
- SfxPoolItem::writeUnicodeString(rStrm, m_aPath);
-
- rStrm << m_aExpires.GetDate();
- rStrm << m_aExpires.GetTime();
-
- rStrm << m_nFlags;
- rStrm << m_nPolicy;
- }
-
- void read (SvStream& rStrm, bool bUnicode)
- {
- SfxPoolItem::readUnicodeString(rStrm, m_aName, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aValue, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aDomain, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aPath, bUnicode);
-
- sal_uInt32 nValue = 0;
- rStrm >> nValue;
- m_aExpires.SetDate (nValue);
- rStrm >> nValue;
- m_aExpires.SetTime (nValue);
-
- rStrm >> m_nFlags;
- rStrm >> m_nPolicy;
- }
-};
-
-/*=======================================================================
- *
- * CntHTTPCookieRequest.
- *
- *=====================================================================*/
-enum CntHTTPCookieRequestType
-{
- CNTHTTP_COOKIE_REQUEST_RECV = 0,
- CNTHTTP_COOKIE_REQUEST_SEND
-};
-
-struct CntHTTPCookieRequest
-{
- const String& m_rURL;
- List& m_rCookieList;
- CntHTTPCookieRequestType m_eType;
- USHORT m_nRet;
-
- CntHTTPCookieRequest (
- const String& rURL,
- List& rCookieList,
- CntHTTPCookieRequestType eType)
- : m_rURL (rURL),
- m_rCookieList (rCookieList),
- m_eType(eType),
- m_nRet (CNTHTTP_COOKIE_POLICY_BANNED) {}
-};
-
-}
-
-#endif // SVTOOLS_HTTPCOOK_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svtools/itempool.hxx b/binfilter/inc/bf_svtools/itempool.hxx
index 548936d..15d73b2 100644
--- a/binfilter/inc/bf_svtools/itempool.hxx
+++ b/binfilter/inc/bf_svtools/itempool.hxx
@@ -188,9 +188,6 @@ public:
const SfxPoolItem* LoadItem( SvStream &rStream,
bool bDirect = FALSE,
const SfxItemPool *pRefPool = 0 );
- bool StoreItem( SvStream &rStream,
- const SfxPoolItem &rItem,
- bool bDirect = FALSE ) const;
USHORT GetSurrogate(const SfxPoolItem *) const;
const SfxPoolItem * GetItem(USHORT nWhich, USHORT nSurrogate) const;
@@ -214,7 +211,6 @@ public:
nWhich <= nEnd; }
bool IsInVersionsRange( USHORT nWhich ) const;
bool IsInStoringRange( USHORT nWhich ) const;
- void SetStoringRange( USHORT nFrom, USHORT nTo );
void SetSecondaryPool( SfxItemPool *pPool );
SfxItemPool* GetSecondaryPool() const {
return pSecondary; }
diff --git a/binfilter/inc/bf_svtools/poolitem.hxx b/binfilter/inc/bf_svtools/poolitem.hxx
index 94f1eda..df379ba 100644
--- a/binfilter/inc/bf_svtools/poolitem.hxx
+++ b/binfilter/inc/bf_svtools/poolitem.hxx
@@ -264,17 +264,6 @@ public:
*/
static bool readUnicodeString(SvStream & rStream, UniString & rString,
bool bUnicode);
-
- /** Write a Unicode string representation of a Unicode string into a
- stream.
-
- @param rStream Some (output) stream.
-
- @param rString Some Unicode string.
- */
- static void writeUnicodeString(SvStream & rStream,
- UniString const & rString);
-
private:
SfxPoolItem& operator=( const SfxPoolItem& ); // n.i.!!
};
diff --git a/lotuswordpro/source/filter/xfilter/xffilestream.cxx b/lotuswordpro/source/filter/xfilter/xffilestream.cxx
index 2daf9af..0d7b50e 100644
--- a/lotuswordpro/source/filter/xfilter/xffilestream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffilestream.cxx
@@ -61,7 +61,6 @@
#include "xffileattrlist.hxx"
#include "ixfattrlist.hxx"
-void WriteStartTag(std::ofstream& ofs, const char *pStr, int len);
void WriteEndTag(std::ofstream& ofs, const char *pStr, int len);
void WriteString(std::ofstream& ofs, const char *pStr, int len);
void WriteXmlString(std::ofstream& ofs, const char *pStr, int len);
@@ -133,14 +132,6 @@ IXFAttrList* XFFileStream::GetAttrList()
return m_pAttrList;
}
-//------------------------------------------------------------------------------
-
-void WriteStartTag(std::ofstream& ofs, const char *pStr, int len)
-{
- ofs.write("\n<",2);
- ofs.write(pStr,len);
-}
-
void WriteEndTag(std::ofstream& ofs, const char *pStr, int len)
{
ofs.write("</",2);
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index a1a9cd9..e642cef 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -109,11 +109,6 @@ rtl::OUString DoubleToOUString(double num, sal_Int32 /*precision*/)
return rtl::OUString::valueOf(num);
}
-rtl::OUString OEMToOUString(const std::string& /*str*/)
-{
- return rtl::OUString();
-}
-
rtl::OUString DateTimeToOUString(XFDateTime& dt)
{
rtl::OUStringBuffer buf;
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index 91ef260..666043b 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -77,8 +77,6 @@ rtl::OUString FloatToOUString(float num, sal_Int32 precision=6);
rtl::OUString DoubleToOUString(double num, sal_Int32 precision=6);
-rtl::OUString OEMToOUString(const std::string& str);
-
rtl::OUString DateTimeToOUString(XFDateTime& dt);
rtl::OUString GetTableColName(sal_Int32 col);
commit 5daba528a1c461fe05a0a56804ee69db519862a8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Jul 15 17:04:20 2011 +0200
Fix a bug in bounding box computing
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index 1d073a3..8269c0a 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -792,7 +792,7 @@ void OdgGeneratorPrivate::_drawPath(const WPXPropertyListVector& path)
double xmin, xmax, ymin, ymax;
getEllipticalArcBBox(lastX, lastY, path[k]["svg:rx"]->getDouble(), path[k]["svg:ry"]->getDouble(),
- 2.0*M_PI*(path[k]["libwpg:rotate"] ? path[k]["libwpg:rotate"]->getDouble() : 0.0),
+ path[k]["libwpg:rotate"] ? path[k]["libwpg:rotate"]->getDouble() : 0.0,
path[k]["libwpg:large-arc"] ? path[k]["libwpg:large-arc"]->getInt() : 1,
path[k]["libwpg:sweep"] ? path[k]["libwpg:sweep"]->getInt() : 1,
path[k]["svg:x"]->getDouble(), path[k]["svg:y"]->getDouble(), xmin, ymin, xmax, ymax);
commit 848c3254b97b740fa60aaee3c59a949206c705d8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Jul 15 14:41:15 2011 +0200
Bounding box algorithm needs angle in radians
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index 30d3e7a..1d073a3 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -49,6 +49,7 @@ static void getEllipticalArcBBox(double x1, double y1,
double rx, double ry, double phi, bool largeArc, bool sweep, double x2, double y2,
double &xmin, double &ymin, double &xmax, double &ymax)
{
+ phi *= M_PI/180;
if (rx < 0.0)
rx *= -1.0;
if (ry < 0.0)
@@ -149,31 +150,30 @@ static void getEllipticalArcBBox(double x1, double y1,
txmax = M_PI - atan (ry*tan(phi)/rx);
xmin = cx + rx*cos(txmin)*cos(phi) - ry*sin(txmin)*sin(phi);
xmax = cx + rx*cos(txmax)*cos(phi) - ry*sin(txmax)*sin(phi);
- if (xmin > xmax)
- {
- std::swap(xmin,xmax);
- std::swap(txmin,txmax);
- }
double tmpY = cy + rx*cos(txmin)*sin(phi) + ry*sin(txmin)*cos(phi);
txmin = getAngle(xmin - cx, tmpY - cy);
tmpY = cy + rx*cos(txmax)*sin(phi) + ry*sin(txmax)*cos(phi);
txmax = getAngle(xmax - cx, tmpY - cy);
-
tymin = atan(ry/(tan(phi)*rx));
tymax = atan(ry/(tan(phi)*rx))+M_PI;
ymin = cy + rx*cos(tymin)*sin(phi) + ry*sin(tymin)*cos(phi);
ymax = cy + rx*cos(tymax)*sin(phi) + ry*sin(tymax)*cos(phi);
- if (ymin > ymax)
- {
- std::swap(ymin,ymax);
- std::swap(tymin,tymax);
- }
double tmpX = cx + rx*cos(tymin)*cos(phi) - ry*sin(tymin)*sin(phi);
tymin = getAngle(tmpX - cx, ymin - cy);
tmpX = cx + rx*cos(tymax)*cos(phi) - ry*sin(tymax)*sin(phi);
tymax = getAngle(tmpX - cx, ymax - cy);
}
+ if (xmin > xmax)
+ {
+ std::swap(xmin,xmax);
+ std::swap(txmin,txmax);
+ }
+ if (ymin > ymax)
+ {
+ std::swap(ymin,ymax);
+ std::swap(tymin,tymax);
+ }
double angle1 = getAngle(x1 - cx, y1 - cy);
double angle2 = getAngle(x2 - cx, y2 - cy);
commit 44f8e4ccf69cb7e922846f145a4c7f4abce513b4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 21:21:44 2011 +0100
callcatcher: remove unused methods
diff --git a/binfilter/bf_basic/source/classes/image.cxx b/binfilter/bf_basic/source/classes/image.cxx
index c070a99..cecf102 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -305,14 +305,6 @@ SbiImage::ReleaseLegacyBuffer()
nLegacyCodeSize = 0;
}
-BOOL
-SbiImage::ExceedsLegacyLimits()
-{
- if ( ( nStringSize > 0xFF00L ) || ( CalcLegacyOffset( nCodeSize ) > 0xFF00L ) )
- return TRUE;
- return FALSE;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_basic/source/inc/image.hxx b/binfilter/bf_basic/source/inc/image.hxx
index aed46a0..f4e2685 100644
--- a/binfilter/bf_basic/source/inc/image.hxx
+++ b/binfilter/bf_basic/source/inc/image.hxx
@@ -92,8 +92,6 @@ public:
UINT16 CalcLegacyOffset( INT32 nOffset );
UINT32 CalcNewOffset( INT16 nOffset );
void ReleaseLegacyBuffer();
- BOOL ExceedsLegacyLimits();
-
};
#define SBIMG_EXPLICIT 0x0001 // OPTION EXPLICIT ist aktiv
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 72539d9..604e49c 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1281,9 +1281,8 @@ struct ImplRenderPaintProc
rLayerAdmin ( rLA ),
pSdrPageView ( pView )
{}
-
- DECL_LINK(_ImplRenderPaintProc, SdrPaintProcRec*);
};
+
sal_Bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const
{
sal_Bool bVisible = sal_True;
@@ -1299,6 +1298,7 @@ sal_Bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const
}
return bVisible;
}
+
sal_Bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const
{
sal_Bool bPrintable = sal_True;
@@ -1315,20 +1315,6 @@ sal_Bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const
return bPrintable;
}
-IMPL_LINK( ImplRenderPaintProc, _ImplRenderPaintProc, SdrPaintProcRec*, pRecord )
-{
- SdrObject* pObj = pRecord->pObj;
- if( !pObj->IsEmptyPresObj() && IsVisible( pObj ) && IsPrintable( pObj ) )
- {
- pObj->Paint( pRecord->rOut, pRecord->rInfoRec );
- }
- else
- {
- if( pObj->GetPage()->IsMasterPage() && (pObj->GetPage() == pObj->GetObjList()) && (pObj->GetOrdNum() == 0) && pObj->ISA( SdrRectObj ) )
- pObj->Paint( pRecord->rOut, pRecord->rInfoRec );
- }
- return 0;
-}
void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& /*rSelection*/,
const uno::Sequence< beans::PropertyValue >& rxOptions )
commit 685082c4ab245cae18674243e56bb3b82635c180
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Jul 14 15:41:47 2011 +0200
Trying to use the svg:fill-rule in ODG
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index 5edb71a..30d3e7a 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -100,7 +100,7 @@ static void getEllipticalArcBBox(double x1, double y1,
// now compute bounding box of the whole ellipse
- // Parametrick equation of an ellipse:
+ // Parametric equation of an ellipse:
// x(theta) = cx + rx*cos(theta)*cos(phi) - ry*sin(theta)*sin(phi)
// y(theta) = cy + rx*cos(theta)*sin(phi) + ry*sin(theta)*cos(phi)
@@ -753,9 +753,7 @@ void OdgGeneratorPrivate::_drawPath(const WPXPropertyListVector& path)
// accurate but that should be enough for this purpose
bool isFirstPoint = true;
- std::vector<double> px, py, qx, qy;
- int boundingBoxIndex = 0;
- px.push_back(0.0); py.push_back(0.0); qx.push_back(0.0); qy.push_back(0.0);
+ double px = 0.0, py = 0.0, qx = 0.0, qy = 0.0;
double lastX = 0.0;
double lastY = 0.0;
@@ -763,40 +761,31 @@ void OdgGeneratorPrivate::_drawPath(const WPXPropertyListVector& path)
{
if (!path[k]["svg:x"] || !path[k]["svg:y"])
continue;
-
- if(path[k]["libwpg:path-action"]->getStr() == "M" && !isFirstPoint)
- {
- px.push_back(0.0);
- py.push_back(0.0);
- qx.push_back(0.0);
- qy.push_back(0.0);
- boundingBoxIndex++;
- isFirstPoint = true;
- }
-
if (isFirstPoint)
{
- px[boundingBoxIndex] = path[k]["svg:x"]->getDouble();
- py[boundingBoxIndex] = path[k]["svg:y"]->getDouble();
- qx[boundingBoxIndex] = px[boundingBoxIndex];
- qy[boundingBoxIndex] = py[boundingBoxIndex];
+ px = path[k]["svg:x"]->getDouble();
+ py = path[k]["svg:y"]->getDouble();
+ qx = px;
+ qy = py;
+ lastX = px;
+ lastY = py;
isFirstPoint = false;
}
- px[boundingBoxIndex] = (px[boundingBoxIndex] > path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : px[boundingBoxIndex];
- py[boundingBoxIndex] = (py[boundingBoxIndex] > path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : py[boundingBoxIndex];
- qx[boundingBoxIndex] = (qx[boundingBoxIndex] < path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : qx[boundingBoxIndex];
- qy[boundingBoxIndex] = (qy[boundingBoxIndex] < path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : qy[boundingBoxIndex];
+ px = (px > path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : px;
+ py = (py > path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : py;
+ qx = (qx < path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : qx;
+ qy = (qy < path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : qy;
if(path[k]["libwpg:path-action"]->getStr() == "C")
{
- px[boundingBoxIndex] = (px[boundingBoxIndex] > path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : px[boundingBoxIndex];
- py[boundingBoxIndex] = (py[boundingBoxIndex] > path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : py[boundingBoxIndex];
- qx[boundingBoxIndex] = (qx[boundingBoxIndex] < path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : qx[boundingBoxIndex];
- qy[boundingBoxIndex] = (qy[boundingBoxIndex] < path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : qy[boundingBoxIndex];
- px[boundingBoxIndex] = (px[boundingBoxIndex] > path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : px[boundingBoxIndex];
- py[boundingBoxIndex] = (py[boundingBoxIndex] > path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : py[boundingBoxIndex];
- qx[boundingBoxIndex] = (qx[boundingBoxIndex] < path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : qx[boundingBoxIndex];
- qy[boundingBoxIndex] = (qy[boundingBoxIndex] < path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : qy[boundingBoxIndex];
+ px = (px > path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : px;
+ py = (py > path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : py;
+ qx = (qx < path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : qx;
+ qy = (qy < path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : qy;
+ px = (px > path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : px;
+ py = (py > path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : py;
+ qx = (qx < path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : qx;
+ qy = (qy < path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : qy;
}
if(path[k]["libwpg:path-action"]->getStr() == "A")
{
@@ -808,10 +797,10 @@ void OdgGeneratorPrivate::_drawPath(const WPXPropertyListVector& path)
path[k]["libwpg:sweep"] ? path[k]["libwpg:sweep"]->getInt() : 1,
path[k]["svg:x"]->getDouble(), path[k]["svg:y"]->getDouble(), xmin, ymin, xmax, ymax);
- px[boundingBoxIndex] = (px[boundingBoxIndex] > xmin ? xmin : px[boundingBoxIndex]);
- py[boundingBoxIndex] = (py[boundingBoxIndex] > ymin ? ymin : py[boundingBoxIndex]);
- qx[boundingBoxIndex] = (qx[boundingBoxIndex] < xmax ? xmax : qx[boundingBoxIndex]);
- qy[boundingBoxIndex] = (qy[boundingBoxIndex] < ymax ? ymax : qy[boundingBoxIndex]);
+ px = (px > xmin ? xmin : px);
+ py = (py > ymin ? ymin : py);
+ qx = (qx < xmax ? xmax : qx);
+ qy = (qy < ymax ? ymax : qy);
}
lastX = path[k]["svg:x"]->getDouble();
lastY = path[k]["svg:y"]->getDouble();
@@ -819,91 +808,63 @@ void OdgGeneratorPrivate::_drawPath(const WPXPropertyListVector& path)
WPXString sValue;
- boundingBoxIndex = 0;
_writeGraphicsStyle();
TagOpenElement *pDrawPathElement = new TagOpenElement("draw:path");
sValue.sprintf("gr%i", miGraphicsStyleIndex-1);
pDrawPathElement->addAttribute("draw:style-name", sValue);
pDrawPathElement->addAttribute("draw:text-style-name", "P1");
pDrawPathElement->addAttribute("draw:layer", "layout");
- sValue = doubleToString(px[boundingBoxIndex]); sValue.append("in");
+ sValue = doubleToString(px); sValue.append("in");
pDrawPathElement->addAttribute("svg:x", sValue);
- sValue = doubleToString(py[boundingBoxIndex]); sValue.append("in");
+ sValue = doubleToString(py); sValue.append("in");
pDrawPathElement->addAttribute("svg:y", sValue);
- sValue = doubleToString((qx[boundingBoxIndex] - px[boundingBoxIndex])); sValue.append("in");
+ sValue = doubleToString((qx - px)); sValue.append("in");
pDrawPathElement->addAttribute("svg:width", sValue);
- sValue = doubleToString((qy[boundingBoxIndex] - py[boundingBoxIndex])); sValue.append("in");
+ sValue = doubleToString((qy - py)); sValue.append("in");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list