[Libreoffice-commits] core.git: Branch 'private/tml/iculess' - 147 commits - avmedia/source basctl/source basegfx/source basic/source bridges/source canvas/source chart2/source chart2/uiconfig codemaker/source compilerplugins/clang compilerplugins/Makefile-clang.mk configure.ac connectivity/source cppuhelper/test cppu/source cui/source cui/uiconfig dbaccess/source drawinglayer/source editeng/source embeddedobj/source extensions/source external/libxml2 external/libxmlsec filter/source helpcontent2 hwpfilter/source i18nlangtag/source i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/inc i18npool/Library_i18npool.mk i18npool/Module_i18npool.mk i18npool/source iculess/Library_iculess.mk iculess/README iculess/source include/avmedia include/basebmp include/basegfx include/cppu include/drawinglayer include/editeng include/iculess include/rtl include/sfx2 include/svl include/svtools include/svx include/tools include/unotools include/vcl include/xmloff l10ntools/inc l10ntools/source offapi/com offapi/UnoApi_offapi.mk pyuno/source registry/tools RepositoryExternal.mk rsc/inc rsc/source sal/osl sal/rtl sal/textenc sax/source scaddins/source sc/inc scp2/source sc/source sdext/source sd/inc sd/source sd/uiconfig sfx2/inc sfx2/source sfx2/uiconfig solenv/bin sot/source starmath/source svl/source svtools/source svx/source sw/inc sw/qa sw/source sw/uiconfig toolkit/source tools/source ucb/source unotools/source unusedcode.easy vcl/generic vcl/inc vcl/null vcl/osx vcl/quartz vcl/source vcl/unx vcl/win writerfilter/inc writerfilter/source xmloff/source
Tor Lillqvist
tml at collabora.com
Sun Jan 12 08:33:13 PST 2014
RepositoryExternal.mk | 8
avmedia/source/framework/mediaitem.cxx | 2
basctl/source/basicide/sbxitem.cxx | 2
basctl/source/inc/sbxitem.hxx | 2
basegfx/source/polygon/b2dpolygonclipper.cxx | 2
basegfx/source/polygon/b2dpolygontools.cxx | 2
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 4
basegfx/source/polygon/b3dpolygon.cxx | 4
basic/source/classes/image.cxx | 24
basic/source/classes/sb.cxx | 2
basic/source/classes/sbxmod.cxx | 16
basic/source/runtime/iosys.cxx | 2
basic/source/runtime/methods1.cxx | 26
basic/source/sbx/sbxarray.cxx | 8
basic/source/sbx/sbxbase.cxx | 20
basic/source/sbx/sbxcoll.cxx | 2
basic/source/sbx/sbxobj.cxx | 48
basic/source/sbx/sbxvalue.cxx | 30
basic/source/sbx/sbxvar.cxx | 22
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 2
canvas/source/opengl/ogl_canvastools.cxx | 2
canvas/source/tools/verifyinput.cxx | 20
canvas/source/vcl/backbuffer.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 14
chart2/source/view/inc/AbstractShapeFactory.hxx | 17
chart2/source/view/inc/OpenglShapeFactory.hxx | 13
chart2/source/view/inc/ShapeFactory.hxx | 13
chart2/source/view/main/OpenglShapeFactory.cxx | 12
chart2/source/view/main/ShapeFactory.cxx | 21
chart2/source/view/main/VLegend.cxx | 2
chart2/uiconfig/ui/datarangedialog.ui | 4
codemaker/source/codemaker/global.cxx | 7
codemaker/source/javamaker/javatype.cxx | 2
compilerplugins/Makefile-clang.mk | 5
compilerplugins/clang/plugin.cxx | 6
compilerplugins/clang/svstreamoutputoperators.cxx | 181
configure.ac | 27
connectivity/source/drivers/dbase/DTable.cxx | 88
connectivity/source/drivers/dbase/dindexnode.cxx | 8
cppu/source/AffineBridge/AffineBridge.cxx | 6
cppu/source/LogBridge/LogBridge.cxx | 6
cppu/source/UnsafeBridge/UnsafeBridge.cxx | 6
cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 4
cppuhelper/test/bootstrap/TestEnv.cxx | 6
cui/source/dialogs/SpellAttrib.cxx | 6
cui/source/dialogs/SpellAttrib.hxx | 6
cui/source/factory/dlgfact.cxx | 11
cui/source/inc/dbregister.hxx | 2
cui/source/options/cfgchart.cxx | 2
cui/source/options/cfgchart.hxx | 2
cui/source/options/connpoolsettings.cxx | 2
cui/source/options/connpoolsettings.hxx | 2
cui/source/options/dbregister.cxx | 14
cui/source/options/dbregistersettings.cxx | 2
cui/source/options/dbregistersettings.hxx | 2
cui/source/options/optgdlg.cxx | 13
cui/source/options/optinet2.cxx | 10
cui/source/tabpages/border.cxx | 2
cui/uiconfig/ui/connpooloptions.ui | 8
cui/uiconfig/ui/dbregisterpage.ui | 2
cui/uiconfig/ui/optlanguagespage.ui | 23
cui/uiconfig/ui/optsavepage.ui | 35
cui/uiconfig/ui/optviewpage.ui | 528
dbaccess/source/core/dataaccess/databasedocument.cxx | 31
dbaccess/source/ui/control/FieldDescControl.cxx | 6
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/dlgsave.cxx | 2
dbaccess/source/ui/dlg/dsnItem.hxx | 2
dbaccess/source/ui/dlg/optionalboolitem.cxx | 2
dbaccess/source/ui/dlg/optionalboolitem.hxx | 2
dbaccess/source/ui/inc/propertysetitem.hxx | 2
dbaccess/source/ui/inc/stringlistitem.hxx | 2
dbaccess/source/ui/misc/WCPage.cxx | 4
dbaccess/source/ui/misc/propertysetitem.cxx | 2
dbaccess/source/ui/misc/stringlistitem.cxx | 2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 8
dbaccess/source/ui/tabledesign/TableRow.cxx | 28
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2
drawinglayer/source/attribute/fillgraphicattribute.cxx | 2
drawinglayer/source/attribute/fillhatchattribute.cxx | 2
drawinglayer/source/attribute/fontattribute.cxx | 14
drawinglayer/source/attribute/linestartendattribute.cxx | 2
drawinglayer/source/attribute/sdrfillgraphicattribute.cxx | 28
drawinglayer/source/attribute/sdrlightattribute3d.cxx | 2
drawinglayer/source/attribute/sdrlinestartendattribute.cxx | 8
drawinglayer/source/attribute/sdrobjectattribute3d.cxx | 10
drawinglayer/source/attribute/sdrsceneattribute3d.cxx | 2
drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 12
editeng/source/editeng/editobj.cxx | 40
editeng/source/items/bulitem.cxx | 36
editeng/source/items/flditem.cxx | 24
editeng/source/items/frmitems.cxx | 145
editeng/source/items/numitem.cxx | 62
editeng/source/items/optitems.cxx | 8
editeng/source/items/paraitem.cxx | 60
editeng/source/items/svdfield.cxx | 2
editeng/source/items/textitem.cxx | 90
editeng/source/items/writingmodeitem.cxx | 2
editeng/source/items/xmlcnitm.cxx | 2
embeddedobj/source/inc/oleembobj.hxx | 2
embeddedobj/source/msole/olemisc.cxx | 6
extensions/source/nsplugin/source/npshell.cxx | 1
extensions/source/plugin/unx/npnapi.cxx | 2
extensions/source/scanner/sane.cxx | 78
external/libxml2/ExternalProject_xml2.mk | 2
external/libxmlsec/ExternalProject_xmlsec.mk | 2
filter/source/flash/swfwriter.cxx | 6
filter/source/flash/swfwriter2.cxx | 22
filter/source/graphicfilter/egif/egif.cxx | 82
filter/source/graphicfilter/egif/giflzwc.cxx | 6
filter/source/graphicfilter/eos2met/eos2met.cxx | 308
filter/source/graphicfilter/epbm/epbm.cxx | 20
filter/source/graphicfilter/epgm/epgm.cxx | 32
filter/source/graphicfilter/epict/epict.cxx | 250
filter/source/graphicfilter/eppm/eppm.cxx | 36
filter/source/graphicfilter/eps/eps.cxx | 150
filter/source/graphicfilter/eras/eras.cxx | 28
filter/source/graphicfilter/etiff/etiff.cxx | 42
filter/source/graphicfilter/expm/expm.cxx | 36
filter/source/graphicfilter/ieps/ieps.cxx | 6
filter/source/graphicfilter/ios2met/ios2met.cxx | 10
filter/source/msfilter/escherex.cxx | 278
filter/source/msfilter/msdffimp.cxx | 20
filter/source/msfilter/svdfppt.cxx | 4
helpcontent2 | 2
hwpfilter/source/drawing.h | 16
hwpfilter/source/hbox.h | 50
hwpfilter/source/hgzip.cxx | 2
hwpfilter/source/hpara.cxx | 2
hwpfilter/source/hpara.h | 2
hwpfilter/source/hwpeq.cxx | 3
hwpfilter/source/hwpread.cxx | 54
hwpfilter/source/lexer.cxx | 12
i18nlangtag/source/isolang/isolang.cxx | 2
i18npool/CppunitTest_i18npool_test_breakiterator.mk | 4
i18npool/Library_i18npool.mk | 24
i18npool/Module_i18npool.mk | 14
i18npool/inc/breakiterator_apple.hxx | 85
i18npool/source/breakiterator/breakiteratorImpl.cxx | 6
i18npool/source/breakiterator/breakiterator_apple.cxx | 231
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 2
iculess/Library_iculess.mk | 16
iculess/README | 5
iculess/source/apple.mm | 79
iculess/source/darwin/foo.cxx | 1
include/avmedia/mediaitem.hxx | 2
include/basebmp/clippedlinerenderer.hxx | 12
include/basebmp/polypolygonrenderer.hxx | 2
include/basegfx/matrix/b2dhommatrixtools.hxx | 2
include/cppu/Enterable.hxx | 2
include/drawinglayer/attribute/sdrfillgraphicattribute.hxx | 2
include/drawinglayer/primitive2d/animatedprimitive2d.hxx | 2
include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx | 2
include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx | 2
include/drawinglayer/primitive2d/sceneprimitive2d.hxx | 2
include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 10
include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx | 2
include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx | 12
include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx | 12
include/drawinglayer/primitive3d/shadowprimitive3d.hxx | 2
include/drawinglayer/primitive3d/textureprimitive3d.hxx | 4
include/drawinglayer/processor2d/hittestprocessor2d.hxx | 8
include/drawinglayer/processor2d/linegeometryextractor2d.hxx | 2
include/drawinglayer/processor3d/defaultprocessor3d.hxx | 6
include/drawinglayer/processor3d/shadow3dextractor.hxx | 6
include/drawinglayer/texture/texture3d.hxx | 2
include/editeng/adjustitem.hxx | 2
include/editeng/boxitem.hxx | 4
include/editeng/brushitem.hxx | 2
include/editeng/bulletitem.hxx | 2
include/editeng/charrotateitem.hxx | 2
include/editeng/colritem.hxx | 2
include/editeng/crossedoutitem.hxx | 2
include/editeng/escapementitem.hxx | 2
include/editeng/fhgtitem.hxx | 2
include/editeng/flditem.hxx | 2
include/editeng/flstitem.hxx | 2
include/editeng/fontitem.hxx | 2
include/editeng/formatbreakitem.hxx | 2
include/editeng/frmdiritem.hxx | 2
include/editeng/fwdtitem.hxx | 2
include/editeng/hyphenzoneitem.hxx | 2
include/editeng/lineitem.hxx | 2
include/editeng/lrspitem.hxx | 2
include/editeng/lspcitem.hxx | 2
include/editeng/numitem.hxx | 2
include/editeng/optitems.hxx | 4
include/editeng/paravertalignitem.hxx | 2
include/editeng/postitem.hxx | 2
include/editeng/protitem.hxx | 2
include/editeng/shaditem.hxx | 2
include/editeng/sizeitem.hxx | 2
include/editeng/tstpitem.hxx | 2
include/editeng/twolinesitem.hxx | 2
include/editeng/udlnitem.hxx | 4
include/editeng/ulspitem.hxx | 2
include/editeng/wghtitem.hxx | 2
include/editeng/writingmodeitem.hxx | 2
include/editeng/xmlcnitm.hxx | 2
include/iculess/dllapi.h | 33
include/iculess/iculess.h | 50
include/iculess/unicode/brkiter.h | 31
include/iculess/unicode/locid.h | 13
include/iculess/unicode/rbbi.h | 32
include/iculess/unicode/tblcoll.h | 2
include/iculess/unicode/uchar.h | 26
include/iculess/unicode/udata.h | 17
include/rtl/math.hxx | 6
include/sfx2/app.hxx | 2
include/sfx2/dinfdlg.hxx | 2
include/sfx2/evntconf.hxx | 2
include/sfx2/fcontnr.hxx | 2
include/sfx2/frame.hxx | 6
include/sfx2/frmdescr.hxx | 2
include/sfx2/minfitem.hxx | 2
include/sfx2/objitem.hxx | 2
include/sfx2/objsh.hxx | 2
include/sfx2/recentdocsviewitem.hxx | 3
include/sfx2/thumbnailview.hxx | 4
include/sfx2/tplpitem.hxx | 2
include/sfx2/viewfrm.hxx | 4
include/sfx2/zoomitem.hxx | 2
include/svl/cenumitm.hxx | 4
include/svl/cintitem.hxx | 8
include/svl/cntwall.hxx | 2
include/svl/ctypeitm.hxx | 2
include/svl/custritm.hxx | 2
include/svl/eitem.hxx | 2
include/svl/flagitem.hxx | 2
include/svl/globalnameitem.hxx | 2
include/svl/grabbagitem.hxx | 2
include/svl/ilstitem.hxx | 2
include/svl/imageitm.hxx | 2
include/svl/intitem.hxx | 2
include/svl/itempool.hxx | 4
include/svl/itemset.hxx | 2
include/svl/lckbitem.hxx | 2
include/svl/macitem.hxx | 2
include/svl/poolitem.hxx | 18
include/svl/ptitem.hxx | 2
include/svl/rectitem.hxx | 2
include/svl/rngitem.hxx | 4
include/svl/slstitm.hxx | 2
include/svl/srchitem.hxx | 2
include/svl/szitem.hxx | 2
include/svl/undo.hxx | 7
include/svl/visitem.hxx | 2
include/svl/zformat.hxx | 2
include/svtools/editbrowsebox.hxx | 8
include/svtools/editimplementation.hxx | 6
include/svtools/svparser.hxx | 2
include/svtools/xwindowitem.hxx | 2
include/svx/AffineMatrixItem.hxx | 2
include/svx/SmartTagItem.hxx | 2
include/svx/algitem.hxx | 2
include/svx/chrtitem.hxx | 2
include/svx/clipfmtitem.hxx | 2
include/svx/drawitem.hxx | 12
include/svx/e3ditem.hxx | 2
include/svx/galleryitem.hxx | 2
include/svx/grafctrl.hxx | 2
include/svx/grfcrop.hxx | 2
include/svx/hlnkitem.hxx | 2
include/svx/numinf.hxx | 2
include/svx/ofaitem.hxx | 4
include/svx/optgrid.hxx | 2
include/svx/pageitem.hxx | 2
include/svx/rulritem.hxx | 10
include/svx/sdasaitm.hxx | 2
include/svx/sdasitm.hxx | 2
include/svx/sdtfsitm.hxx | 2
include/svx/svxgrahicitem.hxx | 2
include/svx/sxfiitm.hxx | 2
include/svx/unoshape.hxx | 14
include/svx/viewlayoutitem.hxx | 2
include/svx/xbtmpit.hxx | 2
include/svx/xcolit.hxx | 2
include/svx/xflftrit.hxx | 2
include/svx/xflgrit.hxx | 2
include/svx/xflhtit.hxx | 2
include/svx/xit.hxx | 2
include/svx/xlndsit.hxx | 2
include/svx/xlnedit.hxx | 2
include/svx/xlnstit.hxx | 2
include/svx/zoomslideritem.hxx | 2
include/tools/b3dtrans.hxx | 2
include/tools/debug.hxx | 31
include/tools/stream.hxx | 93
include/tools/wldcrd.hxx | 2
include/unotools/textsearch.hxx | 16
include/vcl/cmdevt.hxx | 6
include/vcl/edit.hxx | 12
include/vcl/graph.hxx | 8
include/vcl/printerinfomanager.hxx | 4
include/vcl/toolbox.hxx | 6
include/vcl/txtattr.hxx | 12
include/vcl/vclmedit.hxx | 4
include/xmloff/odffields.hxx | 1
l10ntools/inc/export.hxx | 2
l10ntools/source/merge.cxx | 5
offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/drawing/XShapes2.idl | 47
pyuno/source/module/pyuno_impl.hxx | 8
registry/tools/options.cxx | 6
rsc/inc/rscdef.hxx | 2
rsc/inc/rscflag.hxx | 2
rsc/inc/rscrange.hxx | 3
rsc/source/parser/rscyacc.y | 2
rsc/source/prj/start.cxx | 2
rsc/source/tools/rscdef.cxx | 2
sal/osl/unx/process.cxx | 8
sal/rtl/alloc_arena.cxx | 4
sal/rtl/alloc_cache.cxx | 8
sal/rtl/hash.cxx | 2
sal/textenc/tcvtutf7.cxx | 4
sal/textenc/tcvtutf8.cxx | 6
sax/source/fastparser/fastparser.cxx | 4
sc/inc/attrib.hxx | 16
sc/inc/defaultsoptions.hxx | 2
sc/inc/docoptio.hxx | 2
sc/inc/document.hxx | 8
sc/inc/documentlinkmgr.hxx | 14
sc/inc/formulaopt.hxx | 2
sc/inc/patattr.hxx | 2
sc/inc/printopt.hxx | 2
sc/inc/scextopt.hxx | 7
sc/inc/viewopti.hxx | 2
sc/source/core/data/attrib.cxx | 16
sc/source/core/data/column.cxx | 4
sc/source/core/data/documen2.cxx | 2
sc/source/core/data/documen8.cxx | 172
sc/source/core/data/patattr.cxx | 6
sc/source/core/opencl/formulagroupcl.cxx | 62
sc/source/core/tool/autoform.cxx | 74
sc/source/core/tool/ddelink.cxx | 4
sc/source/core/tool/defaultsoptions.cxx | 2
sc/source/core/tool/docoptio.cxx | 2
sc/source/core/tool/formulaopt.cxx | 2
sc/source/core/tool/interpr3.cxx | 3
sc/source/core/tool/printopt.cxx | 2
sc/source/core/tool/rechead.cxx | 10
sc/source/core/tool/viewopti.cxx | 2
sc/source/core/tool/zforauto.cxx | 2
sc/source/filter/excel/xecontent.cxx | 6
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xestream.cxx | 22
sc/source/filter/excel/xiescher.cxx | 12
sc/source/filter/excel/xiformula.cxx | 4
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2
sc/source/ui/app/inputwin.cxx | 36
sc/source/ui/app/scmod.cxx | 4
sc/source/ui/app/uiitems.cxx | 18
sc/source/ui/docshell/docsh.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 15
sc/source/ui/docshell/documentlinkmgr.cxx | 162
sc/source/ui/docshell/impex.cxx | 24
sc/source/ui/inc/tabview.hxx | 6
sc/source/ui/inc/uiitems.hxx | 18
sc/source/ui/unoobj/linkuno.cxx | 14
sc/source/ui/view/scextopt.cxx | 12
sc/source/ui/view/tabview.cxx | 4
sc/source/ui/view/tabview3.cxx | 13
sc/source/ui/view/tabview4.cxx | 10
sc/source/ui/view/tabvwsh4.cxx | 8
sc/source/ui/view/viewdata.cxx | 4
scaddins/source/analysis/analysis.cxx | 4
scp2/source/ooo/directory_ooo_macosx.scp | 1
scp2/source/ooo/file_library_ooo.scp | 138
sd/inc/sdattr.hxx | 2
sd/source/core/sdattr.cxx | 2
sd/source/core/sdiocmpt.cxx | 4
sd/source/filter/eppt/eppt.cxx | 316
sd/source/filter/eppt/epptso.cxx | 624
sd/source/filter/eppt/escherex.cxx | 68
sd/source/filter/eppt/pptexanimations.cxx | 124
sd/source/filter/eppt/pptexsoundcollection.cxx | 20
sd/source/filter/eppt/pptx-stylesheet.cxx | 90
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/filter/html/htmlex.cxx | 8
sd/source/filter/html/pubdlg.cxx | 38
sd/source/ui/app/optsitem.cxx | 10
sd/source/ui/dlg/morphdlg.cxx | 6
sd/source/ui/dlg/vectdlg.cxx | 4
sd/source/ui/inc/optsitem.hxx | 10
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 23
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 2
sfx2/inc/inettbc.hxx | 1
sfx2/inc/sorgitm.hxx | 2
sfx2/source/config/evntconf.cxx | 2
sfx2/source/control/minfitem.cxx | 2
sfx2/source/control/recentdocsview.cxx | 2
sfx2/source/control/recentdocsviewitem.cxx | 28
sfx2/source/control/sorgitm.cxx | 2
sfx2/source/control/thumbnailview.cxx | 36
sfx2/source/dialog/backingwindow.cxx | 16
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/tplpitem.cxx | 2
sfx2/source/doc/frmdescr.cxx | 2
sfx2/source/doc/objitem.cxx | 4
sfx2/source/doc/oleprops.cxx | 49
sfx2/source/doc/zoomitem.cxx | 8
sfx2/source/inet/inettbc.cxx | 4
sfx2/source/view/frame.cxx | 6
sfx2/source/view/viewfrm.cxx | 2
sfx2/uiconfig/ui/optprintpage.ui | 19
sfx2/uiconfig/ui/startcenter.ui | 3
solenv/bin/modules/installer.pm | 2
solenv/bin/modules/installer/scriptitems.pm | 15
solenv/bin/modules/installer/simplepackage.pm | 25
sot/source/sdstor/stgdir.cxx | 2
sot/source/sdstor/stgelem.cxx | 84
sot/source/sdstor/stgole.cxx | 28
sot/source/sdstor/stgstrms.cxx | 8
sot/source/sdstor/storinfo.cxx | 12
sot/source/sdstor/ucbstorage.cxx | 2
starmath/source/mathtype.cxx | 590
svl/source/filerec/filerec.cxx | 36
svl/source/items/cenumitm.cxx | 10
svl/source/items/cintitem.cxx | 16
svl/source/items/cntwall.cxx | 9
svl/source/items/ctypeitm.cxx | 2
svl/source/items/custritm.cxx | 2
svl/source/items/flagitem.cxx | 4
svl/source/items/globalnameitem.cxx | 2
svl/source/items/grabbagitem.cxx | 2
svl/source/items/ilstitem.cxx | 2
svl/source/items/imageitm.cxx | 4
svl/source/items/intitem.cxx | 4
svl/source/items/itemset.cxx | 12
svl/source/items/lckbitem.cxx | 6
svl/source/items/macitem.cxx | 10
svl/source/items/poolio.cxx | 6
svl/source/items/poolitem.cxx | 6
svl/source/items/ptitem.cxx | 2
svl/source/items/rectitem.cxx | 2
svl/source/items/rngitem.cxx | 8
svl/source/items/sitem.cxx | 2
svl/source/items/slstitm.cxx | 6
svl/source/items/srchitem.cxx | 2
svl/source/items/szitem.cxx | 2
svl/source/items/visitem.cxx | 4
svl/source/numbers/numhead.cxx | 10
svl/source/numbers/zformat.cxx | 32
svtools/source/contnr/treelistbox.cxx | 4
svtools/source/control/ruler.cxx | 2
svtools/source/dialogs/insdlg.cxx | 5
svtools/source/dialogs/mcvmath.cxx | 14
svtools/source/dialogs/prnsetup.cxx | 4
svtools/source/dialogs/restartdialog.cxx | 4
svtools/source/filter/exportdialog.cxx | 2
svtools/source/filter/exportdialog.hxx | 2
svtools/source/graphic/grfattr.cxx | 16
svtools/source/graphic/grfmgr.cxx | 3
svtools/source/hatchwindow/ipwin.cxx | 84
svtools/source/hatchwindow/ipwin.hxx | 7
svtools/source/inc/svimpbox.hxx | 2
svtools/source/misc/ehdl.cxx | 51
svtools/source/misc/embedhlp.cxx | 21
svtools/source/misc/imap.cxx | 73
svtools/source/misc/imap2.cxx | 12
svtools/source/misc/imap3.cxx | 2
svtools/source/misc/itemdel.cxx | 8
svtools/source/misc/templatefoldercache.cxx | 20
svtools/source/misc/transfer.cxx | 14
svtools/source/misc/xwindowitem.cxx | 2
svtools/source/svhtml/htmlout.cxx | 17
svtools/source/svhtml/parhtml.cxx | 18
svtools/source/svrtf/parrtf.cxx | 64
svtools/source/svrtf/rtfkeywd.cxx | 8
svtools/source/svrtf/rtfout.cxx | 2
svtools/source/svrtf/svparser.cxx | 65
svtools/source/table/tablecontrol_impl.cxx | 1
svtools/source/table/tablecontrol_impl.hxx | 3
svtools/source/uno/unoiface.cxx | 19
svx/source/dialog/optgrid.cxx | 2
svx/source/dialog/rulritem.cxx | 10
svx/source/dialog/svxgrahicitem.cxx | 2
svx/source/fmcomp/gridcell.cxx | 8
svx/source/form/fmitems.cxx | 2
svx/source/gallery2/codec.cxx | 6
svx/source/gallery2/gallery1.cxx | 2
svx/source/gallery2/galobj.cxx | 6
svx/source/inc/fmitems.hxx | 2
svx/source/inc/gridcell.hxx | 6
svx/source/items/SmartTagItem.cxx | 2
svx/source/items/algitem.cxx | 10
svx/source/items/chrtitem.cxx | 2
svx/source/items/clipfmtitem.cxx | 2
svx/source/items/customshapeitem.cxx | 2
svx/source/items/drawitem.cxx | 12
svx/source/items/e3ditem.cxx | 2
svx/source/items/galleryitem.cxx | 2
svx/source/items/grfitem.cxx | 4
svx/source/items/hlnkitem.cxx | 18
svx/source/items/numinf.cxx | 2
svx/source/items/ofaitem.cxx | 2
svx/source/items/pageitem.cxx | 4
svx/source/items/viewlayoutitem.cxx | 2
svx/source/items/zoomslideritem.cxx | 2
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 24
svx/source/sidebar/nbdtmg.cxx | 6
svx/source/svdraw/svdattr.cxx | 16
svx/source/svdraw/svdotextdecomposition.cxx | 35
svx/source/tbxctrls/grafctrl.cxx | 2
svx/source/unodraw/unoshap2.cxx | 39
svx/source/xoutdev/xattr.cxx | 82
svx/source/xoutdev/xattr2.cxx | 2
svx/source/xoutdev/xattrbmp.cxx | 2
svx/source/xoutdev/xexch.cxx | 6
sw/inc/IDocumentMarkAccess.hxx | 2
sw/inc/ccoll.hxx | 2
sw/inc/cellatr.hxx | 6
sw/inc/doc.hxx | 27
sw/inc/fchrfmt.hxx | 2
sw/inc/fmtanchr.hxx | 2
sw/inc/fmtautofmt.hxx | 2
sw/inc/fmtclds.hxx | 2
sw/inc/fmtcnct.hxx | 2
sw/inc/fmtcntnt.hxx | 2
sw/inc/fmtflcnt.hxx | 2
sw/inc/fmtfld.hxx | 2
sw/inc/fmtfsize.hxx | 2
sw/inc/fmtftn.hxx | 2
sw/inc/fmtftntx.hxx | 2
sw/inc/fmthdft.hxx | 4
sw/inc/fmtinfmt.hxx | 113
sw/inc/fmtline.hxx | 2
sw/inc/fmtmeta.hxx | 2
sw/inc/fmtornt.hxx | 4
sw/inc/fmtpdsc.hxx | 2
sw/inc/fmtrfmrk.hxx | 2
sw/inc/fmtruby.hxx | 2
sw/inc/fmtsrnd.hxx | 2
sw/inc/fmturl.hxx | 2
sw/inc/fmtwrapinfluenceonobjpos.hxx | 2
sw/inc/grfatr.hxx | 6
sw/inc/hints.hxx | 2
sw/inc/paratr.hxx | 4
sw/inc/tgrditem.hxx | 2
sw/inc/tox.hxx | 3
sw/inc/unomap.hxx | 1
sw/inc/unoprnms.hxx | 1
sw/qa/core/exportdata/rtf/pass/fdo67386.doc |binary
sw/qa/core/uwriter.cxx | 42
sw/qa/extras/ooxmlexport/data/TOC_field_f.docx |binary
sw/qa/extras/ooxmlexport/data/fdo71834.docx |binary
sw/qa/extras/ooxmlexport/data/fdo73227.docx |binary
sw/qa/extras/ooxmlexport/data/preserve_Z_field_TOC.docx |binary
sw/qa/extras/ooxmlexport/data/toc_doc.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 76
sw/qa/extras/uiwriter/data/fdo70807.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 31
sw/qa/extras/ww8export/ww8export.cxx | 9
sw/source/core/attr/cellatr.cxx | 6
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 2
sw/source/core/attr/hints.cxx | 2
sw/source/core/crsr/annotationmark.cxx | 1
sw/source/core/crsr/pam.cxx | 15
sw/source/core/crsr/swcrsr.cxx | 5
sw/source/core/doc/docbm.cxx | 104
sw/source/core/doc/doccorr.cxx | 20
sw/source/core/doc/doctxm.cxx | 20
sw/source/core/doc/swserv.cxx | 2
sw/source/core/doc/tblafmt.cxx | 82
sw/source/core/edit/edglss.cxx | 2
sw/source/core/graphic/grfatr.cxx | 6
sw/source/core/layout/atrfrm.cxx | 32
sw/source/core/layout/dbg_lay.cxx | 3
sw/source/core/layout/laycache.cxx | 26
sw/source/core/para/paratr.cxx | 4
sw/source/core/text/inftxt.hxx | 2
sw/source/core/text/portxt.cxx | 2
sw/source/core/tox/tox.cxx | 2
sw/source/core/txtnode/atrfld.cxx | 2
sw/source/core/txtnode/atrflyin.cxx | 2
sw/source/core/txtnode/atrftn.cxx | 2
sw/source/core/txtnode/atrref.cxx | 2
sw/source/core/txtnode/fmtatr2.cxx | 145
sw/source/core/txtnode/txtatr2.cxx | 36
sw/source/core/undo/undobj.cxx | 13
sw/source/core/unocore/unoidx.cxx | 3
sw/source/core/unocore/unomap.cxx | 2
sw/source/core/unocore/unoobj.cxx | 74
sw/source/filter/ascii/wrtasc.cxx | 5
sw/source/filter/html/htmldraw.cxx | 8
sw/source/filter/html/htmlfldw.cxx | 18
sw/source/filter/html/htmlfly.cxx | 62
sw/source/filter/html/htmlftn.cxx | 24
sw/source/filter/html/htmlnum.cxx | 6
sw/source/filter/html/htmlplug.cxx | 40
sw/source/filter/inc/fltshell.hxx | 10
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww1/fltshell.cxx | 10
sw/source/filter/ww8/WW8FFData.cxx | 6
sw/source/filter/ww8/attributeoutputbase.hxx | 6
sw/source/filter/ww8/docxattributeoutput.cxx | 54
sw/source/filter/ww8/docxattributeoutput.hxx | 15
sw/source/filter/ww8/docxexport.cxx | 62
sw/source/filter/ww8/docxexport.hxx | 3
sw/source/filter/ww8/docxsdrexport.cxx | 39
sw/source/filter/ww8/docxsdrexport.hxx | 4
sw/source/filter/ww8/rtfattributeoutput.cxx | 8
sw/source/filter/ww8/rtfattributeoutput.hxx | 4
sw/source/filter/ww8/rtfsdrexport.cxx | 19
sw/source/filter/ww8/rtfstringbuffer.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 64
sw/source/filter/ww8/wrtw8nds.cxx | 18
sw/source/filter/ww8/wrtw8num.cxx | 12
sw/source/filter/ww8/wrtw8sty.cxx | 6
sw/source/filter/ww8/wrtww8.cxx | 36
sw/source/filter/ww8/wrtww8.hxx | 1
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 43
sw/source/filter/ww8/ww8attributeoutput.hxx | 2
sw/source/filter/ww8/ww8par.cxx | 14
sw/source/filter/ww8/ww8par5.cxx | 16
sw/source/ui/app/docsh2.cxx | 6
sw/source/ui/chrdlg/ccoll.cxx | 2
sw/source/ui/chrdlg/chardlg.cxx | 33
sw/source/ui/config/cfgitems.cxx | 10
sw/source/ui/dialog/swwrtshitem.cxx | 2
sw/source/ui/dochdl/swdtflvr.cxx | 2
sw/source/ui/docvw/SidebarWin.cxx | 25
sw/source/ui/docvw/edtwin.cxx | 2
sw/source/ui/envelp/envimg.cxx | 2
sw/source/ui/envelp/labimg.cxx | 2
sw/source/ui/inc/cfgitems.hxx | 10
sw/source/ui/inc/envimg.hxx | 2
sw/source/ui/inc/labimg.hxx | 2
sw/source/ui/inc/swwrtshitem.hxx | 2
sw/source/ui/inc/uiitems.hxx | 8
sw/source/ui/index/cntex.cxx | 1
sw/source/ui/shells/textfld.cxx | 3
sw/source/ui/shells/txtattr.cxx | 31
sw/source/ui/utlui/uiitems.cxx | 8
sw/source/ui/wrtsh/wrtsh2.cxx | 21
sw/uiconfig/swriter/ui/optcaptionpage.ui | 21
toolkit/source/awt/vclxprinter.cxx | 2
toolkit/source/controls/stdtabcontroller.cxx | 2
tools/source/debug/debug.cxx | 10
tools/source/fsys/wldcrd.cxx | 10
tools/source/generic/color.cxx | 10
tools/source/generic/fract.cxx | 4
tools/source/generic/gen.cxx | 10
tools/source/generic/poly.cxx | 14
tools/source/generic/poly2.cxx | 4
tools/source/inet/inetmime.cxx | 6
tools/source/inet/inetmsg.cxx | 10
tools/source/inet/inetstrm.cxx | 30
tools/source/rc/resmgr.cxx | 2
tools/source/ref/globname.cxx | 6
tools/source/ref/pstm.cxx | 36
tools/source/stream/stream.cxx | 107
tools/source/stream/vcompat.cxx | 4
tools/source/zcodec/zcodec.cxx | 2
ucb/source/ucp/cmis/cmis_content.cxx | 4
ucb/source/ucp/cmis/cmis_repo_content.cxx | 6
unotools/source/config/dynamicmenuoptions.cxx | 2
unusedcode.easy | 31
vcl/generic/print/printerjob.cxx | 2
vcl/inc/cupsmgr.hxx | 2
vcl/inc/salwtype.hxx | 1
vcl/null/printerinfomanager.cxx | 2
vcl/osx/salframeview.mm | 3
vcl/quartz/salgdicommon.cxx | 12
vcl/source/control/combobox.cxx | 2
vcl/source/control/edit.cxx | 28
vcl/source/edit/textview.cxx | 51
vcl/source/edit/txtattr.cxx | 10
vcl/source/edit/vclmedit.cxx | 33
vcl/source/filter/wmf/emfwr.cxx | 180
vcl/source/filter/wmf/enhwmf.cxx | 48
vcl/source/filter/wmf/winmtf.cxx | 6
vcl/source/filter/wmf/wmfwr.cxx | 177
vcl/source/gdi/animate.cxx | 18
vcl/source/gdi/cvtsvm.cxx | 401
vcl/source/gdi/dibtools.cxx | 90
vcl/source/gdi/font.cxx | 42
vcl/source/gdi/gdimtf.cxx | 4
vcl/source/gdi/gfxlink.cxx | 2
vcl/source/gdi/gradient.cxx | 19
vcl/source/gdi/graphictools.cxx | 30
vcl/source/gdi/hatch.cxx | 4
vcl/source/gdi/jobset.cxx | 8
vcl/source/gdi/lineinfo.cxx | 12
vcl/source/gdi/mapmod.cxx | 6
vcl/source/gdi/metaact.cxx | 81
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/pngwrite.cxx | 10
vcl/source/gdi/print.cxx | 4
vcl/source/gdi/region.cxx | 6
vcl/source/gdi/regionband.cxx | 14
vcl/source/gdi/wall.cxx | 5
vcl/source/window/cmdevt.cxx | 6
vcl/source/window/printdlg.cxx | 2
vcl/source/window/toolbox.cxx | 14
vcl/source/window/winproc.cxx | 5
vcl/unx/generic/app/i18n_cb.cxx | 1
vcl/unx/generic/app/i18n_ic.cxx | 3
vcl/unx/generic/printer/cupsmgr.cxx | 4
vcl/unx/generic/printer/printerinfomanager.cxx | 2
vcl/unx/generic/window/salframe.cxx | 3
vcl/unx/gtk/window/gtksalframe.cxx | 3
vcl/win/source/window/salframe.cxx | 2
writerfilter/inc/ooxml/OOXMLDocument.hxx | 3
writerfilter/source/dmapper/DomainMapper.cxx | 192
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12
writerfilter/source/dmapper/GraphicImport.cxx | 81
writerfilter/source/dmapper/PropertyIds.cxx | 1
writerfilter/source/dmapper/PropertyIds.hxx | 1
writerfilter/source/doctok/resources.xmi |11599 ----------
writerfilter/source/filter/ImportFilter.cxx | 6
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 68
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 4
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 10
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 28
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 12
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 1
writerfilter/source/ooxml/factoryimpl_ns.xsl | 10
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8
xmloff/source/text/txtfldi.cxx | 4
723 files changed, 7108 insertions(+), 17766 deletions(-)
New commits:
commit 8e9e390f2c8cc02e1afb4e3c26421ca2f34c1052
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Jan 12 16:06:42 2014 +0200
Further hacking on "iculess" code
Still not sure if this will work or not.
I got a bit more optimistic when I noticed NSString's
enumerateLinguisticTagsInRange:scheme:options:orthography:usingBlock:
method. That should hopefully provide enough functionality for the
"BreakIterator" stuff. But how could u_charType() be implemented?
Change-Id: Ia69a9c945014af6d2d72da49a7308947de293079
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6c4b8e6..83d4e7a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1164,17 +1164,17 @@ $(call gb_LinkTarget_set_include,$(1),\
endef
define gb_LinkTarget__use_icudata
-$(call gb_LinkTarget_add_libs,$(1),-liculess)
+$(call gb_LinkTarget_add_libs,$(1),-liculesslo)
endef
define gb_LinkTarget__use_icui18n
-$(call gb_LinkTarget_add_libs,$(1),-liculess)
+$(call gb_LinkTarget_add_libs,$(1),-liculesslo)
endef
define gb_LinkTarget__use_icuuc
-$(call gb_LinkTarget_add_libs,$(1),-liculess)
+$(call gb_LinkTarget_add_libs,$(1),-liculesslo)
endef
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index f264bc3..530b24a 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -34,8 +34,12 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\
i18npool/util/i18npool \
))
+ifeq (,$(filter ICULESS,$(BUILD_TYPE)))
+
$(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : \
$(call gb_Library_get_target,dict_ja) \
$(call gb_Library_get_target,dict_zh)
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index f8900bf..92a17a3 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -36,11 +36,17 @@ $(eval $(call gb_Library_use_externals,i18npool,\
))
$(eval $(call gb_Library_add_exception_objects,i18npool,\
- i18npool/source/breakiterator/breakiterator_cjk \
- i18npool/source/breakiterator/breakiterator_ctl \
- i18npool/source/breakiterator/breakiteratorImpl \
- i18npool/source/breakiterator/breakiterator_th \
- i18npool/source/breakiterator/breakiterator_unicode \
+ $(if $(filter ICULESS,$(BUILD_TYPE)), \
+ $(if $(filter IOS MACOSX,$(OS)), \
+ i18npool/source/breakiterator/breakiterator_apple \
+ ) \
+ , \
+ i18npool/source/breakiterator/breakiterator_cjk \
+ i18npool/source/breakiterator/breakiterator_ctl \
+ i18npool/source/breakiterator/breakiteratorImpl \
+ i18npool/source/breakiterator/breakiterator_th \
+ i18npool/source/breakiterator/breakiterator_unicode \
+ ) \
i18npool/source/breakiterator/xdictionary \
i18npool/source/calendar/calendarImpl \
i18npool/source/calendar/calendar_gregorian \
@@ -52,7 +58,13 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/characterclassification/unoscripttypedetector \
i18npool/source/collator/chaptercollator \
i18npool/source/collator/collatorImpl \
- i18npool/source/collator/collator_unicode \
+ $(if $(filter ICULESS,$(BUILD_TYPE)), \
+ $(if $(filter IOS MACOSX,$(OS)), \
+ i18npool/source/collator/collator_apple \
+ ) \
+ , \
+ i18npool/source/collator/collator_unicode \
+ ) \
i18npool/source/defaultnumberingprovider/defaultnumberingprovider \
i18npool/source/indexentry/indexentrysupplier \
i18npool/source/indexentry/indexentrysupplier_asian \
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 73b0110..bba18ab 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -10,14 +10,16 @@
$(eval $(call gb_Module_Module,i18npool))
$(eval $(call gb_Module_add_targets,i18npool,\
- CustomTarget_breakiterator \
- CustomTarget_collator \
+ $(if $(filter ICULESS,$(BUILD_TYPE)),, \
+ CustomTarget_breakiterator \
+ Library_dict_ja \
+ Library_dict_zh \
+ CustomTarget_collator \
+ ) \
CustomTarget_indexentry \
CustomTarget_localedata \
CustomTarget_textconversion \
Library_collator_data \
- Library_dict_ja \
- Library_dict_zh \
Library_i18npool \
Library_i18nsearch \
Library_index_data \
@@ -29,7 +31,9 @@ $(eval $(call gb_Module_add_targets,i18npool,\
))
$(eval $(call gb_Module_add_targets_for_build,i18npool,\
- Executable_gencoll_rule \
+ $(if $(filter ICULESS,$(BUILD_TYPE)),, \
+ Executable_gencoll_rule \
+ ) \
Executable_genconv_dict \
Executable_gendict \
Executable_genindex_data \
diff --git a/i18npool/inc/breakiterator_apple.hxx b/i18npool/inc/breakiterator_apple.hxx
new file mode 100644
index 0000000..bf07ad3
--- /dev/null
+++ b/i18npool/inc/breakiterator_apple.hxx
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_I18N_INC_BREAKITERATOR_APPLE_HXX
+#define INCLUDED_I18N_INC_BREAKITERATOR_APPLE_HXX
+
+#include <sal/types.h>
+
+#include "breakiteratorImpl.hxx"
+
+namespace com { namespace sun { namespace star { namespace i18n {
+
+class BreakIterator_Apple : public BreakIteratorImpl
+{
+public:
+ BreakIterator_Apple();
+ ~BreakIterator_Apple();
+
+ virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
+ const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
+ sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
+ const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
+ sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
+ const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
+ virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
+ const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
+ virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
+ const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
+ throw(com::sun::star::uno::RuntimeException);
+
+ virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
+ const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
+ const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
+
+ virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
+ const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
+ const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
+ throw(com::sun::star::uno::RuntimeException);
+
+ //XServiceInfo
+ virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
+ throw( com::sun::star::uno::RuntimeException );
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( com::sun::star::uno::RuntimeException );
+
+protected:
+ const sal_Char *cBreakIterator, *wordRule, *lineRule;
+ Boundary result; // for word break iterator
+
+ struct BI_Data {
+ com::sun::star::lang::Locale maLocale;
+ OUString aText;
+ } character, sentence, line, *BI;
+ BI_Data words[4]; // 4 is css::i18n::WordType enumeration size
+
+ sal_Int16 aBreakType;
+
+ void SAL_CALL loadBreakIterator(const com::sun::star::lang::Locale& rLocale,
+ sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(com::sun::star::uno::RuntimeException);
+};
+
+} } } }
+
+#endif // INCLUDED_I18N_INC_BREAKITERATOR_APPLE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/breakiterator/breakiterator_apple.cxx b/i18npool/source/breakiterator/breakiterator_apple.cxx
new file mode 100644
index 0000000..f4e8769
--- /dev/null
+++ b/i18npool/source/breakiterator/breakiterator_apple.cxx
@@ -0,0 +1,231 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <breakiterator_apple.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <localedata.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <i18nlangtag/languagetagicu.hxx>
+#include <unicode/uchar.h>
+#include <unicode/locid.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <string.h>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+
+namespace com { namespace sun { namespace star { namespace i18n {
+
+BreakIterator_Apple::BreakIterator_Apple() :
+ cBreakIterator( "com.sun.star.i18n.BreakIterator_Apple" ), // implementation name
+ wordRule( "word" ),
+ lineRule( "line" )
+{
+}
+
+BreakIterator_Apple::~BreakIterator_Apple()
+{
+}
+
+/*
+ Wrapper class to provide public access to the RuleBasedBreakIterator's
+ setbreakType method.
+*/
+class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator {
+ public:
+ inline void publicSetBreakType(int32_t type) {
+ setBreakType(type);
+ };
+ OOoRuleBasedBreakIterator(UDataMemory* image,
+ UErrorCode &status) :
+ RuleBasedBreakIterator(image, status) { };
+
+};
+
+void SAL_CALL BreakIterator_Apple::loadBreakIterator(const com::sun::star::lang::Locale& rLocale,
+ sal_Int16 rBreakType,
+ sal_Int16 nWordType,
+ const sal_Char *rule,
+ const OUString& rText)
+ throw(uno::RuntimeException)
+{
+ (void) rBreakType;
+ (void) nWordType;
+ (void) rule;
+
+ if (rLocale.Language != BI->maLocale.Language ||
+ rLocale.Country != BI->maLocale.Country ||
+ rLocale.Variant != BI->maLocale.Variant) {
+ BI->aText = rText;
+ }
+}
+
+sal_Int32 SAL_CALL BreakIterator_Apple::nextCharacters( const OUString& Text,
+ sal_Int32 nStartPos,
+ const lang::Locale &rLocale,
+ sal_Int16 nCharacterIteratorMode,
+ sal_Int32 nCount,
+ sal_Int32& nDone )
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nStartPos;
+ (void) rLocale;
+ (void) nCharacterIteratorMode;
+ (void) nCount;
+ (void) nDone;
+
+ return 0;
+}
+
+sal_Int32 SAL_CALL BreakIterator_Apple::previousCharacters( const OUString& Text,
+ sal_Int32 nStartPos,
+ const lang::Locale& rLocale,
+ sal_Int16 nCharacterIteratorMode,
+ sal_Int32 nCount,
+ sal_Int32& nDone )
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nStartPos;
+ (void) rLocale;
+ (void) nCharacterIteratorMode;
+ (void) nCount;
+ (void) nDone;
+
+ return 0;
+}
+
+Boundary SAL_CALL BreakIterator_Apple::nextWord( const OUString& Text,
+ sal_Int32 nStartPos,
+ const lang::Locale& rLocale,
+ sal_Int16 rWordType )
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nStartPos;
+ (void) rLocale;
+ (void) rWordType;
+
+ return 0;
+}
+
+
+Boundary SAL_CALL BreakIterator_Apple::previousWord(const OUString& Text,
+ sal_Int32 nStartPos,
+ const lang::Locale& rLocale,
+ sal_Int16 rWordType)
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nStartPos;
+ (void) rLocale;
+ (void) nCharacterIteratorMode;
+ (void) rWordType;
+
+ return 0;
+}
+
+
+Boundary SAL_CALL BreakIterator_Apple::getWordBoundary( const OUString& Text,
+ sal_Int32 nPos,
+ const lang::Locale& rLocale,
+ sal_Int16 rWordType,
+ sal_Bool bDirection )
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nPos;
+ (void) rLocale;
+ (void) nCharacterIteratorMode;
+ (void) rWordType;
+ (void) bDirection;
+
+ return 0;
+}
+
+
+sal_Int32 SAL_CALL BreakIterator_Apple::beginOfSentence( const OUString& Text,
+ sal_Int32 nStartPos,
+ const lang::Locale &rLocale )
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nStartPos;
+ (void) rLocale;
+
+ return 0;
+}
+
+sal_Int32 SAL_CALL BreakIterator_Apple::endOfSentence( const OUString& Text,
+ sal_Int32 nStartPos,
+ const lang::Locale &rLocale )
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nStartPos;
+ (void) rLocale;
+
+ return 0;
+}
+
+LineBreakResults SAL_CALL BreakIterator_Apple::getLineBreak( const OUString& Text,
+ sal_Int32 nStartPos,
+ const lang::Locale& rLocale,
+ sal_Int32 nMinBreakPos,
+ const LineBreakHyphenationOptions& hOptions,
+ const LineBreakUserOptions& /*rOptions*/ )
+ throw(uno::RuntimeException)
+{
+ (void) Text;
+ (void) nStartPos;
+ (void) rLocale;
+ (void) nMinBreakPos;
+ (void) hOptions;
+
+ return 0;
+}
+
+OUString SAL_CALL
+BreakIterator_Apple::getImplementationName(void)
+ throw( uno::RuntimeException )
+{
+ return OUString::createFromAscii(cBreakIterator);
+}
+
+sal_Bool SAL_CALL
+BreakIterator_Apple::supportsService(const OUString& rServiceName)
+ throw( uno::RuntimeException )
+{
+ return cppu::supportsService(this, rServiceName);
+}
+
+uno::Sequence< OUString > SAL_CALL
+BreakIterator_Apple::getSupportedServiceNames(void)
+ throw( uno::RuntimeException )
+{
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = OUString::createFromAscii(cBreakIterator);
+ return aRet;
+}
+
+} } } }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/iculess/Library_iculess.mk b/iculess/Library_iculess.mk
index 59ea74a..3abd0ac 100644
--- a/iculess/Library_iculess.mk
+++ b/iculess/Library_iculess.mk
@@ -9,10 +9,22 @@
$(eval $(call gb_Library_Library,iculess))
+$(eval $(call gb_Library_use_externals,iculess,\
+ icu_headers \
+))
+
+$(eval $(call gb_Library_add_defs,vcl,\
+ -DICULESS_DLLIMPLEMENTATION \
+))
+
ifneq (,$(filter IOS MACOSX,$(OS)))
-$(eval $(call gb_Library_add_exception_objects,iculess,\
- iculess/source/darwin/foo \
+$(eval $(call gb_Library_use_system_darwin_frameworks,iculess,\
+ CoreFoundation \
+))
+
+$(eval $(call gb_Library_add_objcxxobjects,iculess,\
+ iculess/source/apple \
))
endif
diff --git a/iculess/README b/iculess/README
new file mode 100644
index 0000000..7ed063a
--- /dev/null
+++ b/iculess/README
@@ -0,0 +1,5 @@
+Implementations of a "fake" partial ICU API
+
+We would like to avoid buindling the huge ICU with LibreOffice-based
+apps on iOS and Android. I am experimenting with replacing ICU
+functionality with system-dependent APIs.
diff --git a/iculess/source/apple.mm b/iculess/source/apple.mm
new file mode 100644
index 0000000..dda7a30
--- /dev/null
+++ b/iculess/source/apple.mm
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+// Partial ICU replacement for iOS and OS X
+
+#include <stdlib.h>
+
+#import <CoreFoundation/CFString.h>
+
+#include <unicode/locid.h>
+
+using namespace icu;
+
+Locale::Locale() :
+ m_localeRef(NULL)
+{
+}
+
+Locale::Locale(const char *language,
+ const char *country,
+ const char *variant,
+ const char * /* keywordsAndValues */)
+{
+ CFMutableStringRef identifier = CFStringCreateMutable(NULL, 0);
+
+ CFStringAppendCString(identifier, language, kCFStringEncodingUTF8);
+
+ if (country) {
+ CFStringAppendCString(identifier, "_", kCFStringEncodingUTF8);
+ CFStringAppendCString(identifier, country, kCFStringEncodingUTF8);
+
+ if (variant) {
+ CFStringAppendCString(identifier, "_", kCFStringEncodingUTF8);
+ CFStringAppendCString(identifier, variant, kCFStringEncodingUTF8);
+ }
+ }
+
+ m_localeRef = CFLocaleCreate(NULL, identifier);
+
+ CFRelease(identifier);
+}
+
+Locale::~Locale()
+{
+ if (m_localeRef)
+ CFRelease(m_localeRef);
+}
+
+Locale Locale::createFromName(const char *name)
+{
+ return Locale(name);
+}
+
+UBool u_isalpha(UChar32 c)
+{
+ return CFCharacterSetIsLongCharacterMember(CFCharacterSetGetPredefined(kCFCharacterSetLetter), c);
+}
+
+UBool u_ispunct(UChar32 c)
+{
+ return CFCharacterSetIsLongCharacterMember(CFCharacterSetGetPredefined(kCFCharacterSetPunctuation), c);
+}
+
+UBool u_isWhitespace(UChar32 c)
+{
+ return ((c != 0x00A0 &&
+ c != 0x2007 &&
+ c != 0x202F &&
+ CFCharacterSetIsLongCharacterMember(CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline), c)) ||
+ (c >= 0x001C && c <= 0x001F));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/iculess/source/darwin/foo.cxx b/iculess/source/darwin/foo.cxx
deleted file mode 100644
index 05870f1..0000000
--- a/iculess/source/darwin/foo.cxx
+++ /dev/null
@@ -1 +0,0 @@
-int dummy_iculess_source_darwin_foo;
diff --git a/include/iculess/dllapi.h b/include/iculess/dllapi.h
new file mode 100644
index 0000000..333c816
--- /dev/null
+++ b/include/iculess/dllapi.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_ICULESS_DLLAPI_H
+#define INCLUDED_ICULESS_DLLAPI_H
+
+#include <sal/types.h>
+
+#if defined ICULESS_DLLIMPLEMENTATION
+#define ICULESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define ICULESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif // INCLUDED_ICULESS_DLLAPI_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/iculess/iculess.h b/include/iculess/iculess.h
index 947f952..71260a9 100644
--- a/include/iculess/iculess.h
+++ b/include/iculess/iculess.h
@@ -16,19 +16,6 @@
#include <Availability.h>
-#ifdef __cplusplus
-#include <rtl/ustrbuf.hxx>
-#endif
-
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
-
-// The iOS SDK has a subset of ICU as public API, so use that version number
-#include <unicode/uversion.h>
-#include <unicode/utypes.h>
-#include <unicode/utext.h>
-
-#else
-
#include <stdint.h>
// Pretend to be like ICU 2.4
@@ -37,7 +24,30 @@
// Directly lifted from ICU
+#define U_CAPI
+#define U_EXPORT2
+
typedef int32_t UChar32;
+typedef int16_t UChar;
+typedef int8_t UBool;
+
+// Sigh... how antiquated
+#ifndef TRUE
+# define TRUE 1
+#endif
+#ifndef FALSE
+# define FALSE 0
+#endif
+
+typedef double UDate;
+/** The number of milliseconds per second @stable ICU 2.0 */
+#define U_MILLIS_PER_SECOND (1000)
+/** The number of milliseconds per minute @stable ICU 2.0 */
+#define U_MILLIS_PER_MINUTE (60000)
+/** The number of milliseconds per hour @stable ICU 2.0 */
+#define U_MILLIS_PER_HOUR (3600000)
+/** The number of milliseconds per day @stable ICU 2.0 */
+#define U_MILLIS_PER_DAY (86400000)
typedef enum UErrorCode {
/* The ordering of U_ERROR_INFO_START Vs U_USING_FALLBACK_WARNING looks weird
@@ -247,9 +257,9 @@ typedef enum UErrorCode {
U_ERROR_LIMIT=U_PLUGIN_ERROR_LIMIT /**< This must always be the last value to indicate the limit for UErrorCode (last error code +1) */
} UErrorCode;
-struct UText;
+inline UBool U_SUCCESS(UErrorCode code) { return (UBool)(code<=U_ZERO_ERROR); }
-#endif
+struct UText;
#define U_ICU_IS_ICULESS 1
@@ -262,7 +272,12 @@ namespace icu {
}
#endif
-class UnicodeString : OUStringBuffer {
+struct _rtl_uString;
+
+class UnicodeString {
+private:
+ _rtl_uString *buffer;
+
public:
UnicodeString();
@@ -275,6 +290,9 @@ public:
using namespace icu; // Eek, but this is what ICU does...
+#define U_ICU_ENTRY_POINT_RENAME2(x,y) x ## y
+#define U_ICU_ENTRY_POINT_RENAME(x) U_ICU_ENTRY_POINT_RENAME2(iculess_,x)
+
#endif // __cplusplus
#endif // INCLUDED_ICULESS_ICULESS_H
diff --git a/include/iculess/unicode/locid.h b/include/iculess/unicode/locid.h
index e617e23..84bde7f 100644
--- a/include/iculess/unicode/locid.h
+++ b/include/iculess/unicode/locid.h
@@ -10,7 +10,10 @@
#ifndef INCLUDED_ICULESS_UNICODE_LOCID_H
#define INCLUDED_ICULESS_UNICODE_LOCID_H
+#include <sal/types.h>
+
#include <iculess.h>
+#include <iculess/dllapi.h>
#ifdef __APPLE__
@@ -23,7 +26,7 @@ namespace icu {
}
#endif
-class Locale {
+class ICULESS_DLLPUBLIC Locale {
private:
#ifdef __APPLE__
CFLocaleRef m_localeRef;
@@ -31,10 +34,10 @@ private:
public:
Locale();
- Locale( const char * language,
- const char * country = 0,
- const char * variant = 0,
- const char * keywordsAndValues = 0);
+ Locale(const char *language,
+ const char *country = 0,
+ const char *variant = 0,
+ const char *keywordsAndValues = 0);
virtual ~Locale();
static Locale createFromName(const char *name);
diff --git a/include/iculess/unicode/rbbi.h b/include/iculess/unicode/rbbi.h
deleted file mode 100644
index 15add20..0000000
--- a/include/iculess/unicode/rbbi.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_ICULESS_UNICODE_RBBI_H
-#define INCLUDED_ICULESS_UNICODE_RBBI_H
-
-#include <iculess.h>
-#include <unicode/brkiter.h>
-
-namespace icu {
-#if 0
-}
-#endif
-
-class RuleBasedBreakIterator : public BreakIterator {
-private:
-
-public:
- virtual ~RuleBasedBreakIterator();
-};
-
-} // namespace icu
-
-#endif // INCLUDED_ICULESS_UNICODE_RBBI_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/iculess/unicode/tblcoll.h b/include/iculess/unicode/tblcoll.h
index cf65a7e..4252ab4 100644
--- a/include/iculess/unicode/tblcoll.h
+++ b/include/iculess/unicode/tblcoll.h
@@ -14,6 +14,8 @@
#include <iculess.h>
+#include <unicode/locid.h>
+
typedef enum {
/** string a == string b */
UCOL_EQUAL = 0,
diff --git a/include/iculess/unicode/brkiter.h b/include/iculess/unicode/uchar.h
similarity index 52%
rename from include/iculess/unicode/brkiter.h
rename to include/iculess/unicode/uchar.h
index 0d19cba..6ec0aba 100644
--- a/include/iculess/unicode/brkiter.h
+++ b/include/iculess/unicode/uchar.h
@@ -7,25 +7,20 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_ICULESS_UNICODE_BRKITER_H
-#define INCLUDED_ICULESS_UNICODE_BRKITER_H
+#ifndef INCLUDED_ICULESS_UNICODE_UCHAR_H
+#define INCLUDED_ICULESS_UNICODE_UCHAR_H
#include <iculess.h>
-namespace icu {
-#if 0
-}
-#endif
+#define u_isalpha U_ICU_ENTRY_POINT_RENAME(u_isalpha)
+UBool u_isalpha(UChar32 c);
-class BreakIterator {
-private:
+#define u_ispunct U_ICU_ENTRY_POINT_RENAME(u_ispunct)
+UBool u_ispunct(UChar32 c);
-public:
- virtual ~BreakIterator();
-};
+#define u_isWhitespace U_ICU_ENTRY_POINT_RENAME(u_isWhitespace)
+UBool u_isWhitespace(UChar32 c);
-} // namespace icu
-
-#endif // INCLUDED_ICULESS_UNICODE_BRKITER_H
+#endif // INCLUDED_ICULESS_UNICODE_UCHAR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/iculess/unicode/udata.h b/include/iculess/unicode/udata.h
deleted file mode 100644
index a49b891..0000000
--- a/include/iculess/unicode/udata.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_ICULESS_UNICODE_UDATA_H
-#define INCLUDED_ICULESS_UNICODE_UDATA_H
-
-#include <iculess.h>
-
-#endif // INCLUDED_ICULESS_UNICODE_UDATA_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2d907fbf7185d28089811101ea2de9c1fd04ff1a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 11 21:01:19 2014 +0000
mnDeltaStart is unused
Change-Id: I4f970a150b8ecf6e5631c89ae78ae97134c78d7c
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index de9e2a4..770c025 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -177,7 +177,6 @@ struct SalExtTextInputEvent
OUString maText; // Text
const sal_uInt16* mpTextAttr; // Text-Attribute
sal_uLong mnCursorPos; // Cursor-Position
- sal_uLong mnDeltaStart; // Start-Position of last change
sal_uInt8 mnCursorFlags; // EXTTEXTINPUT_CURSOR_xxx
sal_Bool mbOnlyCursor; // sal_True: Only Cursor-Position has been changed
};
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 81ae1cd..cc4b768 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1084,7 +1084,6 @@ private:
aEvent.maText = aInsertString;
aEvent.mpTextAttr = NULL;
aEvent.mnCursorPos = aInsertString.getLength();
- aEvent.mnDeltaStart = 0;
aEvent.mnCursorFlags = 0;
aEvent.mbOnlyCursor = FALSE;
mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, &aEvent );
@@ -1099,7 +1098,6 @@ private:
aEvent.maText = OUString();
aEvent.mpTextAttr = NULL;
aEvent.mnCursorPos = 0;
- aEvent.mnDeltaStart = 0;
aEvent.mnCursorFlags = 0;
aEvent.mbOnlyCursor = FALSE;
mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, &aEvent );
@@ -1612,7 +1610,6 @@ private:
int len = [aString length];
SalExtTextInputEvent aInputEvent;
aInputEvent.mnTime = mpFrame->mnLastEventTime;
- aInputEvent.mnDeltaStart = 0;
aInputEvent.mbOnlyCursor = FALSE;
if( len > 0 ) {
NSString *pString = [aString string];
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 6c34568..b5c2f77 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -386,7 +386,6 @@ PreeditDrawCallback(XIC ic, XPointer client_data,
pPreeditData->aInputEv.maText = OUString(pPreeditData->aText.pUnicodeBuffer,
pPreeditData->aText.nLength);
pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible
- pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first;
pPreeditData->aInputEv.mbOnlyCursor = False;
if ( pPreeditData->eState == ePreeditStatusActive && pPreeditData->pFrame )
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 3348a4f..345f4f7 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -50,7 +50,6 @@ static void sendEmptyCommit( SalFrame* pFrame )
aEmptyEv.maText = "";
aEmptyEv.mnCursorPos = 0;
aEmptyEv.mnCursorFlags = 0;
- aEmptyEv.mnDeltaStart = 0;
aEmptyEv.mbOnlyCursor = False;
pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv );
if( ! aDel.isDeleted() )
@@ -170,7 +169,6 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
maClientData.aInputEv.mnTime = 0;
maClientData.aInputEv.mpTextAttr = NULL;
maClientData.aInputEv.mnCursorPos = 0;
- maClientData.aInputEv.mnDeltaStart = 0;
maClientData.aInputEv.mnCursorFlags = 0;
maClientData.aInputEv.mbOnlyCursor = sal_False;
@@ -570,7 +568,6 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
aTextEvent.mnCursorPos = nLength;
aTextEvent.maText = OUString(pText, nLength);
aTextEvent.mnCursorFlags = 0;
- aTextEvent.mnDeltaStart = 0;
aTextEvent.mbOnlyCursor = False;
maClientData.pFrame->CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent);
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index ee04b72..ee1abf8 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2974,7 +2974,6 @@ void X11SalFrame::beginUnicodeSequence()
aEv.maText = rSeq;
aEv.mpTextAttr = &nTextAttr;
aEv.mnCursorPos = 0;
- aEv.mnDeltaStart = 0;
aEv.mnCursorFlags = 0;
aEv.mbOnlyCursor = sal_False;
@@ -3004,7 +3003,6 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
aEv.maText = rSeq;
aEv.mpTextAttr = &attribs[0];
aEv.mnCursorPos = 0;
- aEv.mnDeltaStart = 0;
aEv.mnCursorFlags = 0;
aEv.mbOnlyCursor = sal_False;
@@ -3037,7 +3035,6 @@ bool X11SalFrame::endUnicodeSequence()
aEv.maText = OUString( sal_Unicode(nValue) );
aEv.mpTextAttr = &nTextAttr;
aEv.mnCursorPos = 0;
- aEv.mnDeltaStart = 0;
aEv.mnCursorFlags = 0;
aEv.mbOnlyCursor = sal_False;
CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index de96dbd..6e6fef0 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -4037,7 +4037,6 @@ void GtkSalFrame::IMHandler::sendEmptyCommit()
aEmptyEv.maText = "";
aEmptyEv.mnCursorPos = 0;
aEmptyEv.mnCursorFlags = 0;
- aEmptyEv.mnDeltaStart = 0;
aEmptyEv.mbOnlyCursor = False;
m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv );
if( ! aDel.isDeleted() )
@@ -4230,7 +4229,6 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p
pThis->m_aInputEvent.maText = OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 );
pThis->m_aInputEvent.mnCursorPos = pThis->m_aInputEvent.maText.getLength();
pThis->m_aInputEvent.mnCursorFlags = 0;
- pThis->m_aInputEvent.mnDeltaStart = 0;
pThis->m_aInputEvent.mbOnlyCursor = False;
pThis->m_aInputFlags.clear();
@@ -4317,7 +4315,6 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
pThis->m_aInputEvent.maText = OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 );
pThis->m_aInputEvent.mnCursorPos = nCursorPos;
pThis->m_aInputEvent.mnCursorFlags = 0;
- pThis->m_aInputEvent.mnDeltaStart = 0;
pThis->m_aInputEvent.mbOnlyCursor = False;
pThis->m_aInputFlags = std::vector<sal_uInt16>( std::max( 1, (int)pThis->m_aInputEvent.maText.getLength() ), 0 );
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index db91127..817d277 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5194,7 +5194,6 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
aEvt.mnTime = GetMessageTime();
aEvt.mpTextAttr = NULL;
aEvt.mnCursorPos = 0;
- aEvt.mnDeltaStart = 0;
aEvt.mbOnlyCursor = FALSE;
aEvt.mnCursorFlags = 0;
@@ -5339,7 +5338,6 @@ static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam )
aEvt.mnTime = GetMessageTime();
aEvt.mpTextAttr = NULL;
aEvt.mnCursorPos = 0;
- aEvt.mnDeltaStart = 0;
aEvt.mbOnlyCursor = FALSE;
aEvt.mnCursorFlags = 0;
pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEvt );
commit e2b7f58695aa6ecf2f42b1fa717f65d6e6a15375
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date: Sun Jan 12 01:04:24 2014 +0100
Updated core
Project: help 63d3d0a24085e9bbad5518be9d13284e0b1bfa06
diff --git a/helpcontent2 b/helpcontent2
index c519af8..63d3d0a 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c519af849a7e6c3cdc61080c3395697f66344ea3
+Subproject commit 63d3d0a24085e9bbad5518be9d13284e0b1bfa06
commit ae6449dd151a671b0e775c0bff495f2353fb6451
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date: Sun Jan 12 00:14:43 2014 +0100
Startcenter: no need to set helpids manually (new widget layout)
Change-Id: If7a9f6f0538c33ec1eca3f33f23ad6a76908a98c
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 60ce65f..fcfdfc2 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -135,19 +135,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
Reference<XDesktop2> xDesktop = Desktop::create( comphelper::getProcessComponentContext() );
mxDesktopDispatchProvider = xDesktop;
- mpOpenButton->SetHelpId( ".HelpId:StartCenter:OpenButton" );
- mpTemplateButton->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
-
- mpWriterAllButton->SetHelpId( ".HelpId:StartCenter:WriterButton" );
- mpCalcAllButton->SetHelpId( ".HelpId:StartCenter:CalcButton" );
- mpImpressAllButton->SetHelpId( ".HelpId:StartCenter:ImpressButton" );
- mpDrawAllButton->SetHelpId( ".HelpId:StartCenter:DrawButton" );
- mpDBAllButton->SetHelpId( ".HelpId:StartCenter:DBButton" );
- mpMathAllButton->SetHelpId( ".HelpId:StartCenter:MathButton" );
-
- mpHelpButton->SetHelpId(".HelpId:StartCenter:Info");
- mpExtensionsButton->SetHelpId(".HelpId:StartCenter:Extensions");
-
// init background
SetBackground();
}
commit ded530ba66976e0fb6eae6e84982f384001e6a6b
Author: Andras Timar <andras.timar at collabora.com>
Date: Sat Jan 11 22:49:24 2014 +0100
Updated core
Project: help c519af849a7e6c3cdc61080c3395697f66344ea3
diff --git a/helpcontent2 b/helpcontent2
index 0f7b9d0..c519af8 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0f7b9d00562b8d87d1fb12bb21555907d3f0e874
+Subproject commit c519af849a7e6c3cdc61080c3395697f66344ea3
commit 6ad08efb97004258c5e49f7fc58ff1295de9de56
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Jan 11 22:09:07 2014 +0100
Related: fdo#67386 RtfSdrExport: fix crash by respecting size of aVertices
Fix a crash that happened when nSeg was something huge, and we tried to
read uninitialized memory when reading more than nPropSize.
Change-Id: If9fe9e903678794106b10d8eb0dac6050b77d6b7
diff --git a/sw/qa/core/exportdata/rtf/pass/fdo67386.doc b/sw/qa/core/exportdata/rtf/pass/fdo67386.doc
new file mode 100755
index 0000000..ecd3d13
Binary files /dev/null and b/sw/qa/core/exportdata/rtf/pass/fdo67386.doc differ
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 5496639..9a2f051 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -115,13 +115,14 @@ inline sal_uInt16 impl_GetUInt16( const sal_uInt8* &pVal )
return nRet;
}
-inline sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPointSize )
+inline sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_Size& rVerticesPos, sal_uInt16 nPointSize )
{
sal_Int32 nRet = 0;
if ( ( nPointSize == 0xfff0 ) || ( nPointSize == 4 ) )
{
sal_uInt16 nUnsigned = *pVal++;
nUnsigned += ( *pVal++ ) << 8;
+ rVerticesPos += 2;
nRet = sal_Int16( nUnsigned );
}
@@ -131,6 +132,7 @@ inline sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPoi
nUnsigned += ( *pVal++ ) << 8;
nUnsigned += ( *pVal++ ) << 16;
nUnsigned += ( *pVal++ ) << 24;
+ rVerticesPos += 4;
nRet = nUnsigned;
}
@@ -261,6 +263,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
rProps.GetOpt( ESCHER_Prop_pSegmentInfo, aSegments ) )
{
const sal_uInt8 *pVerticesIt = aVertices.pBuf + 6;
+ sal_Size nVerticesPos = 0;
const sal_uInt8 *pSegmentIt = aSegments.pBuf;
OStringBuffer aSegmentInfo( 512 );
@@ -283,8 +286,8 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
case 0x0001: // lineto
case 0x4000: // moveto
{
- sal_Int32 nX = impl_GetPointComponent( pVerticesIt, nPointSize );
- sal_Int32 nY = impl_GetPointComponent( pVerticesIt, nPointSize );
+ sal_Int32 nX = impl_GetPointComponent( pVerticesIt, nVerticesPos, nPointSize );
+ sal_Int32 nY = impl_GetPointComponent( pVerticesIt, nVerticesPos, nPointSize );
aVerticies.append( ";(" ).append( nX ).append( "," ).append( nY ).append( ")" );
nVertices ++;
}
@@ -293,8 +296,8 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
{
for (int i = 0; i < 3; i++)
{
- sal_Int32 nX = impl_GetPointComponent( pVerticesIt, nPointSize );
- sal_Int32 nY = impl_GetPointComponent( pVerticesIt, nPointSize );
+ sal_Int32 nX = impl_GetPointComponent( pVerticesIt, nVerticesPos, nPointSize );
+ sal_Int32 nY = impl_GetPointComponent( pVerticesIt, nVerticesPos, nPointSize );
aVerticies.append( ";(" ).append( nX ).append( "," ).append( nY ).append( ")" );
nVertices ++;
}
@@ -311,8 +314,10 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
// See EscherPropertyContainer::CreateCustomShapeProperties, by default nSeg is simply the number of points.
for (int i = 0; i < nSeg; ++i)
{
- sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nPointSize);
- sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nPointSize);
+ if (nVerticesPos >= aVertices.nPropSize)
+ break;
+ sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
+ sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nVerticesPos, nPointSize);
aVerticies.append(";(").append(nX).append(",").append(nY).append(")");
++nVertices;
}
commit 8da58ddd6bb964fb29b8261054e62e881eb01886
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date: Sat Jan 11 21:55:33 2014 +0100
Updated core
Project: help 0f7b9d00562b8d87d1fb12bb21555907d3f0e874
diff --git a/helpcontent2 b/helpcontent2
index 72d802a..0f7b9d0 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 72d802a9eb9fb042e18ad74dc15c956a301b0462
+Subproject commit 0f7b9d00562b8d87d1fb12bb21555907d3f0e874
commit 7df226c585918da76e057ab90b927dfdf5222884
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 11 17:15:18 2014 +0000
longparas: OldTextLen and DeltaStart are unused
Change-Id: Icfcbfece1954675cd4b8882f66726d80b7315e61
diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx
index 58b8b08..e67a2a9 100644
--- a/include/vcl/cmdevt.hxx
+++ b/include/vcl/cmdevt.hxx
@@ -48,8 +48,6 @@ private:
OUString maText;
sal_uInt16* mpTextAttr;
xub_StrLen mnCursorPos;
- xub_StrLen mnDeltaStart;
- xub_StrLen mnOldTextLen;
sal_uInt16 mnCursorFlags;
sal_Bool mbOnlyCursor;
@@ -58,8 +56,6 @@ public:
const sal_uInt16* pTextAttr,
sal_Int32 nCursorPos,
sal_uInt16 nCursorFlags,
- sal_Int32 nDeltaStart,
- sal_Int32 nOldTextLen,
sal_Bool bOnlyCursor );
CommandExtTextInputData( const CommandExtTextInputData& rData );
~CommandExtTextInputData();
@@ -71,8 +67,6 @@ public:
sal_Bool IsCursorVisible() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_INVISIBLE) == 0; }
sal_Bool IsCursorOverwrite() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_OVERWRITE) != 0; }
sal_uInt16 GetCursorFlags() const { return mnCursorFlags; }
- xub_StrLen GetDeltaStart() const { return mnDeltaStart; }
- xub_StrLen GetOldTextLen() const { return mnOldTextLen; }
sal_Bool IsOnlyCursorChanged() const { return mbOnlyCursor; }
};
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 93607fb..0cf02b6 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5778,7 +5778,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen )
EXTTEXTINPUT_ATTR_HIGHLIGHT;
const std::vector<sal_uInt16> aAttrs( nL, nVal );
CommandExtTextInputData aCETID( sStr, &aAttrs[0], nL,
- 0, 0, 0, sal_False );
+ 0, false );
//fdo#33092. If the current input language is the default
//language that text would appear in if typed, then don't
diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx
index 15f6d06..6326def 100644
--- a/vcl/source/window/cmdevt.cxx
+++ b/vcl/source/window/cmdevt.cxx
@@ -26,8 +26,6 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText,
const sal_uInt16* pTextAttr,
sal_Int32 nCursorPos,
sal_uInt16 nCursorFlags,
- sal_Int32 nDeltaStart,
- sal_Int32 nOldTextLen,
sal_Bool bOnlyCursor ) :
maText( rText )
{
@@ -39,8 +37,6 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText,
else
mpTextAttr = NULL;
mnCursorPos = nCursorPos;
- mnDeltaStart = nDeltaStart;
- mnOldTextLen = nOldTextLen;
mnCursorFlags = nCursorFlags;
mbOnlyCursor = bOnlyCursor;
}
@@ -58,8 +54,6 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData&
else
mpTextAttr = NULL;
mnCursorPos = rData.mnCursorPos;
- mnDeltaStart = rData.mnDeltaStart;
- mnOldTextLen = rData.mnOldTextLen;
mnCursorFlags = rData.mnCursorFlags;
mbOnlyCursor = rData.mbOnlyCursor;
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 83cd4d2..d42cb95 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1301,7 +1301,6 @@ static long ImplHandleExtTextInput( Window* pWindow,
// Call Event and store the information
CommandExtTextInputData aData( rText, pTextAttr,
nCursorPos, nCursorFlags,
- nDeltaStart, pWinData->mpExtOldText->getLength(),
bOnlyCursor );
*pWinData->mpExtOldText = rText;
if ( pWinData->mpExtOldAttrAry )
commit 5b10ed13378d3412a275c526cc4c16e85ecf6614
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 11 17:00:51 2014 +0000
longparas: unnecessary xub_StrLen cast
Change-Id: I794faf7ba0c2dd32b0c846dd1cf6d1825cf8b63c
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 214bbf5..92ea28e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -394,7 +394,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl)
if ( (nP != LISTBOX_ENTRY_NOTFOUND) && (!mpImplLB->GetEntryList()->IsEntryPosSelected( nP )) )
{
aText = aText.replaceAt( nPrevIndex, nTokenLen, "" );
- nIndex = sal::static_int_cast<xub_StrLen>(nIndex - nTokenLen);
+ nIndex = nIndex - nTokenLen;
sal_Int32 nSepCount=0;
if ( (nPrevIndex+nSepCount < aText.getLength()) && (aText[nPrevIndex+nSepCount] == mcMultiSep) )
{
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 460244e..aa579e7 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1297,12 +1297,12 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const
GetCaretPositions( aText, pDX, 0, aText.getLength() );
long nX = rWindowPos.X() - mnXOffset - ImplGetExtraOffset();
- for( int i = 0; i < aText.getLength(); i++ )
+ for( sal_Int32 i = 0; i < aText.getLength(); i++ )
{
if( (pDX[2*i] >= nX && pDX[2*i+1] <= nX) ||
(pDX[2*i+1] >= nX && pDX[2*i] <= nX))
{
- nIndex = sal::static_int_cast<xub_StrLen>(i);
+ nIndex = i;
if( pDX[2*i] < pDX[2*i+1] )
{
if( nX > (pDX[2*i]+pDX[2*i+1])/2 )
@@ -1320,13 +1320,13 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const
{
nIndex = 0;
long nDiff = std::abs( pDX[0]-nX );
- for( int i = 1; i < aText.getLength(); i++ )
+ for( sal_Int32 i = 1; i < aText.getLength(); i++ )
{
long nNewDiff = std::abs( pDX[2*i]-nX );
if( nNewDiff < nDiff )
{
- nIndex = sal::static_int_cast<xub_StrLen>(i);
+ nIndex = i;
nDiff = nNewDiff;
}
}
@@ -2270,7 +2270,7 @@ void Edit::Command( const CommandEvent& rCEvt )
{
if ( mpIMEInfos )
{
- xub_StrLen nCursorPos = (sal_uInt16)GetSelection().Max();
+ sal_Int32 nCursorPos = GetSelection().Max();
SetCursorRect( NULL, GetTextWidth( maText.toString(), nCursorPos, mpIMEInfos->nPos+mpIMEInfos->nLen-nCursorPos ) );
}
else
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 2f4c755..3d9cec0 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -91,7 +91,7 @@ private:
ScrollBarBox* mpScrollBox;
Point maTextWindowOffset;
- xub_StrLen mnTextWidth;
+ sal_Int32 mnTextWidth;
mutable Selection maSelection;
protected:
@@ -286,7 +286,7 @@ void ImpVclMEdit::ImpSetScrollBarRanges()
// Es gibt kein Notify bei Breiten-Aenderung...
// sal_uLong nW = Max( (sal_uLong)mpTextWindow->GetOutputSizePixel().Width()*5, (sal_uLong)nTextWidth );
// mpHScrollBar->SetRange( Range( 0, (long)nW ) );
- mpHScrollBar->SetRange( Range( 0, (long)mnTextWidth-1 ) );
+ mpHScrollBar->SetRange( Range( 0, mnTextWidth-1 ) );
}
}
@@ -547,11 +547,11 @@ void ImpVclMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( mpHScrollBar )
{
- sal_uLong nWidth = mpTextWindow->GetTextEngine()->CalcTextWidth();
+ sal_Int32 nWidth = mpTextWindow->GetTextEngine()->CalcTextWidth();
if ( nWidth != mnTextWidth )
{
- mnTextWidth = sal::static_int_cast< xub_StrLen >(nWidth);
- mpHScrollBar->SetRange( Range( 0, (long)mnTextWidth-1 ) );
+ mnTextWidth = nWidth;
+ mpHScrollBar->SetRange( Range( 0, mnTextWidth-1 ) );
ImpSetHScrollBarThumbPos();
}
}
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 54dafd3..43b285c 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -281,13 +281,13 @@ void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm, OUString& rSt
{
sal_uInt16 nType;
sal_uInt32 nActionSize;
- xub_StrLen nStringLen;
+ sal_Size nStringLen;
rIStm.Seek( nStrmPos );
rIStm >> nType
>> nActionSize;
- nStringLen = sal::static_int_cast<xub_StrLen>(( nActionSize - 4 ) >> 1);
+ nStringLen = (nActionSize - 4) >> 1;
if ( nStringLen && ( nType == GDI_UNICODE_COMMENT ) )
rString = read_uInt16s_ToOUString(rIStm, nStringLen);
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 7a93680..83cd4d2 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1282,7 +1282,7 @@ static long ImplHandleExtTextInput( Window* pWindow,
nDeltaStart = 0;
else
{
- xub_StrLen i = 0;
+ sal_Int32 i = 0;
while ( i < nDeltaStart )
{
if ( pWinData->mpExtOldAttrAry[i] != pTextAttr[i] )
@@ -1300,7 +1300,7 @@ static long ImplHandleExtTextInput( Window* pWindow,
// Call Event and store the information
CommandExtTextInputData aData( rText, pTextAttr,
- (xub_StrLen)nCursorPos, nCursorFlags,
+ nCursorPos, nCursorFlags,
nDeltaStart, pWinData->mpExtOldText->getLength(),
bOnlyCursor );
*pWinData->mpExtOldText = rText;
commit a43bce0358e4e44660111a7b7afa57a216e9dc88
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 11 16:37:01 2014 +0000
longparas: lift 16bit max edit length
Change-Id: Ide74f0a48f06cbe9539f16ef6c6d04bba043dcf9
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 40b2f4b..9f76105 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -896,7 +896,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
return;
m_nPos++;
{
- sal_uInt32 nMax = EDIT_NOLIMIT;
+ sal_Int32 nMax = EDIT_NOLIMIT;
OUString aTmpString;
try
{
@@ -907,7 +907,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
aTmpString = xMetaData->getExtraNameCharacters();
}
}
- catch(Exception&)
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -917,7 +917,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
STR_HELP_DEFAULT_VALUE,
FIELD_PRPOERTY_COLUMNNAME,
WB_BORDER );
- m_pColumnName->SetMaxTextLen(xub_StrLen( nMax ? nMax : EDIT_NOLIMIT));
+ m_pColumnName->SetMaxTextLen(nMax ? nMax : EDIT_NOLIMIT);
m_pColumnName->setCheck( isSQL92CheckEnabled(getConnection()) );
}
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index c7d63f7..ce21f4d 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -271,7 +271,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
m_pImpl->m_aPB_CANCEL.SetPosPixel(Point(m_pImpl->m_aPB_CANCEL.GetPosPixel().X(),aPos.Y()));
m_pImpl->m_aPB_HELP.SetPosPixel(Point(m_pImpl->m_aPB_HELP.GetPosPixel().X(),aPos.Y()));
- sal_uInt16 nLength = m_pImpl->m_xMetaData.is() ? static_cast<sal_uInt16>(m_pImpl->m_xMetaData->getMaxTableNameLength()) : 0;
+ sal_Int32 nLength = m_pImpl->m_xMetaData.is() ? m_pImpl->m_xMetaData->getMaxTableNameLength() : 0;
nLength = nLength ? nLength : EDIT_NOLIMIT;
m_pImpl->m_aTitle.SetMaxTextLen(nLength);
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 67c4eb2..ad6439f 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -71,7 +71,7 @@ OCopyTable::OCopyTable( Window * pParent )
{
DBG_CTOR(OCopyTable,NULL);
- m_edTableName.SetMaxTextLen( EDIT_NOLIMIT );
+ m_edTableName.SetMaxTextLen(EDIT_NOLIMIT);
if ( m_pParent->m_xDestConnection.is() )
{
@@ -98,7 +98,7 @@ OCopyTable::OCopyTable( Window * pParent )
m_edKeyName.SetText(sKeyName);
sal_Int32 nMaxLen = m_pParent->getMaxColumnNameLength();
- m_edKeyName.SetMaxTextLen(nMaxLen ? (xub_StrLen)nMaxLen : EDIT_NOLIMIT);
+ m_edKeyName.SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT);
}
FreeResource();
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 6156cd3..820ba0f 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -219,7 +219,7 @@ void OTableEditorCtrl::InitCellController()
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
// Cell Field name
- xub_StrLen nMaxTextLen = EDIT_NOLIMIT;
+ sal_Int32 nMaxTextLen = EDIT_NOLIMIT;
OUString sExtraNameChars;
Reference<XConnection> xCon;
try
@@ -227,7 +227,7 @@ void OTableEditorCtrl::InitCellController()
xCon = GetView()->getController().getConnection();
Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
- nMaxTextLen = ((xub_StrLen)xMetaData.is() ? static_cast<xub_StrLen>(xMetaData->getMaxColumnNameLength()) : 0);
+ nMaxTextLen = xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0;
if( nMaxTextLen == 0 )
nMaxTextLen = EDIT_NOLIMIT;
@@ -312,7 +312,7 @@ sal_Bool OTableEditorCtrl::SetDataPtr( long nRow )
if(nRow == -1)
return sal_False;
- OSL_ENSURE((xub_StrLen)nRow < m_pRowList->size(),"Row is greater than size!");
+ OSL_ENSURE(nRow < (long)m_pRowList->size(),"Row is greater than size!");
if(nRow >= (long)m_pRowList->size())
return sal_False;
pActRow = (*m_pRowList)[nRow];
@@ -806,7 +806,7 @@ OUString OTableEditorCtrl::GenerateName( const OUString& rName )
Reference<XConnection> xCon = GetView()->getController().getConnection();
Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
- xub_StrLen nMaxTextLen((xub_StrLen)( xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0));
+ sal_Int32 nMaxTextLen(xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0);
if( (rName.getLength()+2) >nMaxTextLen )
aBaseName = rName.copy( 0, nMaxTextLen-2 );
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 93d0c59..517d61c 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -134,8 +134,8 @@ namespace svt
virtual sal_Bool IsReadOnly() const = 0;
virtual void SetReadOnly( sal_Bool bReadOnly ) = 0;
- virtual xub_StrLen GetMaxTextLen() const = 0;
- virtual void SetMaxTextLen( xub_StrLen _nMaxLen ) = 0;
+ virtual sal_Int32 GetMaxTextLen() const = 0;
+ virtual void SetMaxTextLen( sal_Int32 _nMaxLen ) = 0;
virtual Selection GetSelection() const = 0;
virtual void SetSelection( const Selection& _rSelection ) = 0;
@@ -170,8 +170,8 @@ namespace svt
virtual sal_Bool IsReadOnly() const;
virtual void SetReadOnly( sal_Bool bReadOnly );
- virtual xub_StrLen GetMaxTextLen() const;
- virtual void SetMaxTextLen( xub_StrLen _nMaxLen );
+ virtual sal_Int32 GetMaxTextLen() const;
+ virtual void SetMaxTextLen( sal_Int32 _nMaxLen );
virtual Selection GetSelection() const;
virtual void SetSelection( const Selection& _rSelection );
diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx
index 19fb48f..c6de2b7 100644
--- a/include/svtools/editimplementation.hxx
+++ b/include/svtools/editimplementation.hxx
@@ -101,16 +101,16 @@ OUString GenericEditImplementation< EDIT >::GetSelected( LineEnd ) const
//----------------------------------------------------------------------
template <class EDIT>
-void GenericEditImplementation< EDIT >::SetMaxTextLen( xub_StrLen _nMaxLen )
+void GenericEditImplementation< EDIT >::SetMaxTextLen( sal_Int32 _nMaxLen )
{
m_rEdit.SetMaxTextLen( _nMaxLen );
}
//----------------------------------------------------------------------
template <class EDIT>
-xub_StrLen GenericEditImplementation< EDIT >::GetMaxTextLen() const
+sal_Int32 GenericEditImplementation< EDIT >::GetMaxTextLen() const
{
- return (xub_StrLen)m_rEdit.GetMaxTextLen( );
+ return m_rEdit.GetMaxTextLen( );
}
//----------------------------------------------------------------------
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 23fce46..6df0714 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -44,7 +44,7 @@ struct Impl_IMEInfos;
// - Edit-Types -
// --------------
-#define EDIT_NOLIMIT STRING_LEN
+#define EDIT_NOLIMIT SAL_MAX_INT32
#define EDIT_UPDATEDATA_TIMEOUT 350
typedef OUString (*FncGetSpecialChars)( Window* pWin, const Font& rFont );
@@ -70,7 +70,7 @@ private:
long mnXOffset;
Selection maSelection;
sal_uInt16 mnAlign;
- xub_StrLen mnMaxTextLen;
+ sal_Int32 mnMaxTextLen;
sal_Int32 mnWidthInChars;
sal_Int32 mnMaxWidthChars;
AutocompleteAction meAutocompleteAction;
@@ -89,7 +89,7 @@ private:
DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* );
- SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_uInt32 nSelectionLen ) const;
+ SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const;
SAL_DLLPRIVATE void ImplInitEditData();
SAL_DLLPRIVATE void ImplModified();
SAL_DLLPRIVATE OUString ImplGetText() const;
@@ -189,8 +189,8 @@ public:
void SetInsertMode( sal_Bool bInsert );
sal_Bool IsInsertMode() const;
- virtual void SetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT );
- virtual xub_StrLen GetMaxTextLen() const { return mnMaxTextLen; }
+ virtual void SetMaxTextLen( sal_Int32 nMaxLen = EDIT_NOLIMIT );
+ virtual sal_Int32 GetMaxTextLen() const { return mnMaxTextLen; }
void SetWidthInChars(sal_Int32 nWidthInChars);
sal_Int32 GetWidthInChars() const { return mnWidthInChars; }
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 36a1f69..ce567e9 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -79,8 +79,8 @@ public:
void EnableFocusSelectionHide( sal_Bool bHide );
- virtual void SetMaxTextLen( xub_StrLen nMaxLen = 0 );
- virtual xub_StrLen GetMaxTextLen() const;
+ virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0);
+ virtual sal_Int32 GetMaxTextLen() const;
void SetMaxTextWidth( sal_uLong nMaxWidth );
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b47d510..72b77c5 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1067,7 +1067,7 @@ void DbLimitedLengthField::implAdjustGenericFieldSetting( const Reference< XProp
}
//------------------------------------------------------------------------------
-void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int16 _nMaxLen )
+void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
{
dynamic_cast< Edit* >( m_pWindow )->SetMaxTextLen( _nMaxLen );
if ( m_pPainter )
@@ -1212,7 +1212,7 @@ void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel )
OUString sText;
_rxModel->getPropertyValue( FM_PROP_TEXT ) >>= sText;
- xub_StrLen nMaxTextLen = m_pEdit->GetMaxTextLen();
+ sal_Int32 nMaxTextLen = m_pEdit->GetMaxTextLen();
if ( EDIT_NOLIMIT != nMaxTextLen && sText.getLength() > nMaxTextLen )
{
sal_Int32 nDiff = sText.getLength() - nMaxTextLen;
@@ -1229,7 +1229,7 @@ sal_Bool DbTextField::commitControl()
{
OUString aText( m_pEdit->GetText( getModelLineEndSetting( m_rColumn.getModel() ) ) );
// we have to check if the length before we can decide if the value was modified
- xub_StrLen nMaxTextLen = m_pEdit->GetMaxTextLen();
+ sal_Int32 nMaxTextLen = m_pEdit->GetMaxTextLen();
if ( EDIT_NOLIMIT != nMaxTextLen )
{
OUString sOldValue;
@@ -1243,7 +1243,7 @@ sal_Bool DbTextField::commitControl()
}
//------------------------------------------------------------------------------
-void DbTextField::implSetEffectiveMaxTextLen( sal_Int16 _nMaxLen )
+void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
{
if ( m_pEdit )
m_pEdit->SetMaxTextLen( _nMaxLen );
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index e8eed6f..df3d10d 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -381,11 +381,11 @@ protected:
virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel );
protected:
- inline void implSetMaxTextLen( sal_Int16 _nMaxLen )
+ void implSetMaxTextLen( sal_Int16 _nMaxLen )
{
implSetEffectiveMaxTextLen( _nMaxLen ? _nMaxLen : EDIT_NOLIMIT );
}
- virtual void implSetEffectiveMaxTextLen( sal_Int16 _nMaxLen );
+ virtual void implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen );
};
//==================================================================
@@ -419,7 +419,7 @@ protected:
virtual sal_Bool commitControl( );
virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel );
// DbLimitedLengthField
- virtual void implSetEffectiveMaxTextLen( sal_Int16 _nMaxLen );
+ virtual void implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen );
};
//==================================================================
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 85022c9..460244e 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -867,14 +867,12 @@ void Edit::ShowTruncationWarning( Window* pParent )
// -----------------------------------------------------------------------
-bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_uInt32 nSelectionLen ) const
+bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_Int32 nSelectionLen ) const
{
bool bWasTruncated = false;
- const sal_uInt32 nMaxLen = mnMaxTextLen < 65534 ? mnMaxTextLen : 65534;
- sal_uInt32 nLenAfter = static_cast<sal_uInt32>(maText.getLength()) + rStr.getLength() - nSelectionLen;
- if ( nLenAfter > nMaxLen )
+ if (maText.getLength() - nSelectionLen > mnMaxTextLen - rStr.getLength())
{
- sal_uInt32 nErasePos = nMaxLen - static_cast<sal_uInt32>(maText.getLength()) + nSelectionLen;
+ sal_Int32 nErasePos = mnMaxTextLen - maText.getLength() + nSelectionLen;
rStr = rStr.copy( 0, nErasePos );
bWasTruncated = true;
}
@@ -2594,7 +2592,7 @@ sal_Bool Edit::IsInsertMode() const
// -----------------------------------------------------------------------
-void Edit::SetMaxTextLen( xub_StrLen nMaxLen )
+void Edit::SetMaxTextLen(sal_Int32 nMaxLen)
{
mnMaxTextLen = nMaxLen ? nMaxLen : EDIT_NOLIMIT;
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 340d8fe..2f4c755 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -112,8 +112,8 @@ public:
void SetReadOnly( sal_Bool bRdOnly );
sal_Bool IsReadOnly() const;
- void SetMaxTextLen( xub_StrLen nLen );
- xub_StrLen GetMaxTextLen() const;
+ void SetMaxTextLen(sal_Int32 nLen);
+ sal_Int32 GetMaxTextLen() const;
void SetMaxTextWidth( sal_uLong nMaxWidth );
@@ -376,15 +376,14 @@ sal_Bool ImpVclMEdit::IsReadOnly() const
return mpTextWindow->GetTextView()->IsReadOnly();
}
-void ImpVclMEdit::SetMaxTextLen( xub_StrLen nLen )
+void ImpVclMEdit::SetMaxTextLen(sal_Int32 nLen)
{
- mpTextWindow->GetTextEngine()->SetMaxTextLen( nLen );
+ mpTextWindow->GetTextEngine()->SetMaxTextLen(nLen);
}
-xub_StrLen ImpVclMEdit::GetMaxTextLen() const
+sal_Int32 ImpVclMEdit::GetMaxTextLen() const
{
- return sal::static_int_cast< xub_StrLen >(
- mpTextWindow->GetTextEngine()->GetMaxTextLen());
+ return mpTextWindow->GetTextEngine()->GetMaxTextLen();
}
void ImpVclMEdit::InsertText( const OUString& rStr )
@@ -718,7 +717,7 @@ TextWindow::TextWindow( Window* pParent ) : Window( pParent )
SetPointer( Pointer( POINTER_TEXT ) );
mpExtTextEngine = new ExtTextEngine;
- mpExtTextEngine->SetMaxTextLen( STRING_MAXLEN );
+ mpExtTextEngine->SetMaxTextLen(EDIT_NOLIMIT);
if( pParent->GetStyle() & WB_BORDER )
mpExtTextEngine->SetLeftMargin( 2 );
mpExtTextEngine->SetLocale( GetSettings().GetLanguageTag().getLocale() );
@@ -949,7 +948,7 @@ VclMultiLineEdit::VclMultiLineEdit( Window* pParent, const ResId& rResId )
ImplInitSettings( sal_True, sal_True, sal_True );
pUpdateDataTimer = 0;
- sal_uInt16 nMaxLen = Edit::GetMaxTextLen();
+ sal_Int32 nMaxLen = Edit::GetMaxTextLen();
if ( nMaxLen )
SetMaxTextLen( nMaxLen );
@@ -1114,9 +1113,9 @@ sal_Bool VclMultiLineEdit::IsReadOnly() const
return pImpVclMEdit->IsReadOnly();
}
-void VclMultiLineEdit::SetMaxTextLen( xub_StrLen nMaxLen )
+void VclMultiLineEdit::SetMaxTextLen(sal_Int32 nMaxLen)
{
- pImpVclMEdit->SetMaxTextLen( nMaxLen );
+ pImpVclMEdit->SetMaxTextLen(nMaxLen);
}
void VclMultiLineEdit::SetMaxTextWidth( sal_uLong nMaxWidth )
@@ -1124,7 +1123,7 @@ void VclMultiLineEdit::SetMaxTextWidth( sal_uLong nMaxWidth )
pImpVclMEdit->SetMaxTextWidth(nMaxWidth );
}
-xub_StrLen VclMultiLineEdit::GetMaxTextLen() const
+sal_Int32 VclMultiLineEdit::GetMaxTextLen() const
{
return pImpVclMEdit->GetMaxTextLen();
}
commit b5c09d9975ad90e083b41bd5add1d74a2a5693e2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 11 16:42:32 2014 +0000
longparas: convert GetMaxVisChars from xub_StrLen to sal_Int32
Change-Id: I25fcfc3ae5a599bbd7ebef3071895ec9dbf2949e
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index a5f7757..23fce46 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -234,7 +234,7 @@ public:
virtual Size CalcMinimumSizeForText(const OUString &rString) const;
virtual Size GetOptimalSize() const;
virtual Size CalcSize( sal_uInt16 nChars ) const;
- virtual xub_StrLen GetMaxVisChars() const;
+ virtual sal_Int32 GetMaxVisChars() const;
sal_Int32 GetCharPos( const Point& rWindowPos ) const;
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index d8c3721..6675253 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -788,7 +788,7 @@ void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
nLines = 1;
FileControl* pControl = (FileControl*) GetWindow();
if ( pControl )
- nCols = (sal_Int16) pControl->GetEdit().GetMaxVisChars();
+ nCols = pControl->GetEdit().GetMaxVisChars();
}
void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index dee721f..85022c9 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2957,12 +2957,12 @@ Size Edit::CalcSize( xub_StrLen nChars ) const
// -----------------------------------------------------------------------
-xub_StrLen Edit::GetMaxVisChars() const
+sal_Int32 Edit::GetMaxVisChars() const
{
const Window* pW = mpSubEdit ? mpSubEdit : this;
- long nOutWidth = pW->GetOutputSizePixel().Width();
- long nCharWidth = GetTextWidth( OUString('x') );
- return nCharWidth ? (xub_StrLen)(nOutWidth/nCharWidth) : 0;
+ sal_Int32 nOutWidth = pW->GetOutputSizePixel().Width();
+ sal_Int32 nCharWidth = GetTextWidth( OUString('x') );
+ return nCharWidth ? nOutWidth/nCharWidth : 0;
}
// -----------------------------------------------------------------------
commit 1b26b2680d19307e77e0395d1cc8f2c3759c7d9c
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Jan 11 20:30:13 2014 +0200
WaE: unsafe mix of type 'sal_Bool' and type 'bool'
Change-Id: I9b09447dbc91c130827d1f38537b5703689e12fa
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0073a9e..87c5e24 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -568,7 +568,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
{
bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs );
- sal_Bool bPut = sal_True;
+ bool bPut = true;
sal_uInt16 nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER );
sal_uInt16 nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False );
const SfxItemSet& rOldSet = GetItemSet();
commit 3346de254bfe4ec4653b22467d0c8d251e2fddb8
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Wed Jan 8 09:57:01 2014 +0100
Add -fdata-sections for Android.
Change-Id: Id76fa23c0203028c52fb63f5cbc80ac12c4e20f2
diff --git a/configure.ac b/configure.ac
index d208711..01c66bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,7 +336,7 @@ if test -n "$with_android_ndk"; then
ANDROID_APP_ABI=x86
ANDROIDCFLAGS="-march=atom"
fi
- ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections"
+ ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections"
ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI"
ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu"
ANDROIDCFLAGS="$ANDROIDCFLAGS -Wl,--fix-cortex-a8"
commit 71361ac3fbc22f25f26f85be9f51d8e8c74d2908
Author: Laurent Godard <lgodard.libre at laposte.net>
Date: Sat Jan 11 10:15:12 2014 +0100
correct loops in UpdateNoteCaptions for notes
Change-Id: Icec072eea61a194d72ce00c58dfbd85b1ec85abb
Reviewed-on: https://gerrit.libreoffice.org/7390
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index e852e1f..145f61a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2175,14 +2175,14 @@ void ScColumn::UpdateNoteCaptions()
sc::cellnote_block::const_iterator itData, itDataEnd;
SCROW curRow = 0;
- for (;itBlk==itBlkEnd;++itBlk)
+ for (;itBlk!=itBlkEnd;++itBlk)
{
if (itBlk->data)
{
// non empty block
itData = sc::cellnote_block::begin(*itBlk->data);
itDataEnd = sc::cellnote_block::end(*itBlk->data);
- for(;itData==itDataEnd; ++itData)
+ for(;itData!=itDataEnd; ++itData)
{
ScPostIt* pNote = *itData;
pNote->UpdateCaptionPos(ScAddress(nCol, curRow, nTab));
commit 40856e8bfd47ed9f65baa72e35ef1d9e3a110703
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Jan 11 17:51:30 2014 +0200
WaE: unsafe mix of type 'sal_Bool' and type 'bool'
Change-Id: I6d9910d33b34672d412f3346ee9dd131610215d0
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 4589b24..2b53572 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -498,7 +498,7 @@ public:
void SetOutStyle( sal_uInt16 nNewStyle );
sal_uInt16 GetOutStyle() const { return mnOutStyle; }
- void EnableCustomize( sal_Bool bEnable = sal_True );
+ void EnableCustomize( bool bEnable = true );
sal_Bool IsCustomize() { return mbCustomize; }
sal_Bool IsInCustomizeMode() const { return mbCustomizeMode; }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index e78b6c1..1b4a2be 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -707,7 +707,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn
long nBottom = 0;
Size aSize;
WindowAlign eOldAlign = pThis->meAlign;
- sal_Bool bOldHorz = pThis->mbHorz;
+ bool bOldHorz = pThis->mbHorz;
sal_Bool bOldAssumeDocked = pThis->mpData->mbAssumeDocked;
sal_Bool bOldAssumeFloating = pThis->mpData->mbAssumeFloating;
@@ -1596,13 +1596,13 @@ void ToolBox::ImplLoadRes( const ResId& rResId )
if ( nObjMask & RSC_TOOLBOX_CUSTOMIZE )
{
- sal_Bool bCust = (sal_Bool)ReadShortRes();
+ bool bCust = ReadShortRes();
EnableCustomize( bCust );
}
if ( nObjMask & RSC_TOOLBOX_MENUSTRINGS )
{
- sal_Bool bCust = (sal_Bool)ReadShortRes();
+ bool bCust = ReadShortRes();
EnableMenuStrings( bCust );
}
@@ -3514,7 +3514,7 @@ sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat
if ( mbUpper )
{
- sal_Bool bNewIn = maUpperRect.IsInside( aMousePos );
+ bool bNewIn = maUpperRect.IsInside( aMousePos );
if ( bNewIn != mbIn )
{
mbIn = bNewIn;
@@ -3525,7 +3525,7 @@ sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat
if ( mbLower )
{
- sal_Bool bNewIn = maLowerRect.IsInside( aMousePos );
+ bool bNewIn = maLowerRect.IsInside( aMousePos );
if ( bNewIn != mbIn )
{
mbIn = bNewIn;
@@ -4582,7 +4582,7 @@ void ToolBox::ToggleFloatingMode()
{
DockingWindow::ToggleFloatingMode();
- sal_Bool mbOldHorz = mbHorz;
+ bool mbOldHorz = mbHorz;
if ( ImplIsFloatingMode() )
{
@@ -4934,7 +4934,7 @@ Size ToolBox::CalcMinimumWindowSizePixel() const
// -----------------------------------------------------------------------
-void ToolBox::EnableCustomize( sal_Bool bEnable )
+void ToolBox::EnableCustomize( bool bEnable )
{
if ( bEnable != mbCustomize )
{
commit e14296f5be49fa3d382f8597b0f32892e42fc217
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 11 15:33:15 2014 +0000
longparas: shouldn't need to split strings in textview anymore
Change-Id: Ide2d0ba95e4ef8bf1500f086bd03b7a1590a2848
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index cd614f1..cd5a9b3 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1335,43 +1335,22 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent )
void TextView::InsertText( const OUString& rStr, sal_Bool bSelect )
{
-// HideSelection();
mpImpl->mpTextEngine->UndoActionStart();
- /* #i87633#
- break inserted text into chunks that fit into the underlying String
- based API (which has a maximum length of 65534 elements
+ TextSelection aNewSel( mpImpl->maSelection );
+ TextPaM aPaM = mpImpl->mpTextEngine->ImpInsertText( mpImpl->maSelection, rStr );
- note: this will of course still cause problems for lines longer than those
- 65534 elements, but those cases will hopefully be few.
- In the long run someone should switch the TextEngine to OUString instead of String
- */
- sal_Int32 nLen = rStr.getLength();
- sal_Int32 nPos = 0;
- do
+ if ( bSelect )
{
- sal_Int32 nChunkLen = nLen > 65534 ? 65534 : nLen;
- OUString aChunk( rStr.copy( nPos, nChunkLen ) );
-
- TextSelection aNewSel( mpImpl->maSelection );
-
- TextPaM aPaM = mpImpl->mpTextEngine->ImpInsertText( mpImpl->maSelection, aChunk );
-
- if ( bSelect )
- {
- aNewSel.Justify();
- aNewSel.GetEnd() = aPaM;
- }
- else
- {
- aNewSel = aPaM;
- }
-
- ImpSetSelection( aNewSel );
- nLen -= nChunkLen;
- nPos += nChunkLen;
+ aNewSel.Justify();
+ aNewSel.GetEnd() = aPaM;
+ }
+ else
+ {
+ aNewSel = aPaM;
}
- while( nLen );
+
+ ImpSetSelection( aNewSel );
mpImpl->mpTextEngine->UndoActionEnd();
@@ -1952,14 +1931,8 @@ bool TextView::ImplTruncateNewText( OUString& rNewText ) const
{
bool bTruncated = false;
- if( rNewText.getLength() > 65534 ) // limit to String API
- {
- rNewText = rNewText.copy( 0, 65534 );
- bTruncated = true;
- }
-
sal_uLong nMaxLen = mpImpl->mpTextEngine->GetMaxTextLen();
- // 0 means unlimited, there is just the String API limit handled above
+ // 0 means unlimited
if( nMaxLen != 0 )
{
sal_uLong nCurLen = mpImpl->mpTextEngine->GetTextLen();
commit 3bb7d28bb5410b0233123adc869bbf78d25aec46
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Jan 11 16:38:08 2014 +0100
Resolves: fdo#72277 https CMIS Alfresco "The specified device is invalid."
Change-Id: I34f8b5e19d9bea0c6d98a7f3258b67e82c50e1de
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 53777bc..a2e1868 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -297,9 +297,11 @@ namespace cmis
ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) );
+ OUString pURL = m_aURL.getBindingUrl( );
+
m_pSession = libcmis::SessionFactory::createSession(
OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
- rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), sal_False, oauth2Data );
+ rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), pURL.startsWith("https")?true:false, oauth2Data );
if ( m_pSession == NULL )
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_INVALID_DEVICE,
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 88fefb5..918a3d4 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -159,9 +159,11 @@ namespace cmis
ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) );
+ OUString pURL = m_aURL.getBindingUrl( );
+
libcmis::Session* session = libcmis::SessionFactory::createSession(
- OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
- rUsername, rPassword, "", sal_False, oauth2Data );
+ OUSTR_TO_STDSTR(pURL),
+ rUsername, rPassword, "", pURL.startsWith("https")?true:false, oauth2Data );
if (session == NULL )
ucbhelper::cancelCommandExecution(
ucb::IOErrorCode_INVALID_DEVICE,
commit d286e21a03918c90eda52714b3ad2d18607e7fc2
Author: Tsutomu Uchino <hanya at apache.org>
Date: Fri Jan 10 11:47:19 2014 +0000
Resolves: #i42309# change behavior for equal button of input line...
according to the current content of the cell
(cherry picked from commit ff1d1ea1f5f15ce7888957d09f4783d8055c7654)
Conflicts:
sc/source/ui/app/inputwin.cxx
Change-Id: I054aa55de14e2dec5a9ace1124d7eb6aa261162f
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 0407276..5f7b032 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -510,12 +510,44 @@ void ScInputWindow::Select()
if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt
{
aTextWindow.StartEditEngine();
- aTextWindow.SetTextString(OUString('='));
+
+ sal_Int32 nStartPos = 1;
+ sal_Int32 nEndPos = 1;
+
+ ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
+ if ( pViewSh )
+ {
+ const OUString& rString = aTextWindow.GetTextString();
+ const sal_Int32 nLen = rString.getLength();
+
+ ScDocument* pDoc = pViewSh->GetViewData()->GetDocument();
+ CellType eCellType = pDoc->GetCellType( pViewSh->GetViewData()->GetCurPos() );
+ switch ( eCellType )
+ {
+ case CELLTYPE_VALUE:
+ {
+ nEndPos = nLen + 1;
+ aTextWindow.SetTextString("=" + rString);
+ break;
+ }
+ case CELLTYPE_STRING:
+ case CELLTYPE_EDIT:
+ nStartPos = 0;
+ nEndPos = nLen;
+ break;
+ case CELLTYPE_FORMULA:
+ nEndPos = nLen;
+ break;
+ default:
+ aTextWindow.SetTextString("=");
+ break;
+ }
+ }
EditView* pView = aTextWindow.GetEditView();
if (pView)
{
- pView->SetSelection( ESelection(0,1, 0,1) );
+ pView->SetSelection( ESelection(0, nStartPos, 0, nEndPos) );
pScMod->InputChanged(pView);
SetOkCancelMode();
pView->SetEditEngineUpdateMode(sal_True);
commit a9f8174e32b773792e0ff95dcf2909488d05224e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Jan 11 14:35:17 2014 +0100
writerfilter: drop no longer generated rtf:LCB* tokens
Change-Id: Id033f1b893e323cbe735eac58d40ec0e0408ed85
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 7c87688..b237a0a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -213,45 +213,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_PNFBPCHPFIRST:
case NS_rtf::LN_PNFBPPAPFIRST:
case NS_rtf::LN_PNFBPLVCFIRST:
- case NS_rtf::LN_LCBSTSHFORIG:
- case NS_rtf::LN_LCBPLCFPAD:
- case NS_rtf::LN_LCBSTTBFGLSY:
- case NS_rtf::LN_LCBPLCFGLSY:
- case NS_rtf::LN_LCBPLCFSEA:
- case NS_rtf::LN_LCBPLCFFLDMCR:
- case NS_rtf::LN_LCBCMDS:
- case NS_rtf::LN_LCBPLCMCR:
- case NS_rtf::LN_LCBSTTBFMCR:
- case NS_rtf::LN_LCBPRDRVR:
- case NS_rtf::LN_LCBPRENVPORT:
- case NS_rtf::LN_LCBPRENVLAND:
- case NS_rtf::LN_LCBWSS:
- case NS_rtf::LN_LCBPLCFPGDFTN:
- case NS_rtf::LN_LCBAUTOSAVESOURCE:
- case NS_rtf::LN_LCBPLCDOAMOM:
- case NS_rtf::LN_LCBPLCDOAHDR:
- case NS_rtf::LN_LCBPMS:
- case NS_rtf::LN_LCBPLCFPGDEDN:
- case NS_rtf::LN_LCBPLCFWKB:
- case NS_rtf::LN_LCBPLCFSPL:
- case NS_rtf::LN_LCBSTWUSER:
- case NS_rtf::LN_LCBUNUSED:
- case NS_rtf::LN_LCBSTTBFINTLFLD:
- case NS_rtf::LN_LCBROUTESLIP:
- case NS_rtf::LN_LCBSTTBSAVEDBY:
- case NS_rtf::LN_LCBSTTBFNM:
- case NS_rtf::LN_LCBDOCUNDO:
- case NS_rtf::LN_LCBRGBUSE:
- case NS_rtf::LN_LCBUSP:
- case NS_rtf::LN_LCBUSKF:
- case NS_rtf::LN_LCBPLCUPCRGBUSE:
- case NS_rtf::LN_LCBPLCUPCUSP:
- case NS_rtf::LN_LCBPLGOSL:
- case NS_rtf::LN_LCBPLCOCX:
case NS_rtf::LN_DWLOWDATETIME:
case NS_rtf::LN_DWHIGHDATETIME:
- case NS_rtf::LN_LCBPLCASUMY:
- case NS_rtf::LN_LCBPLCFGRAM:
break;
case NS_rtf::LN_ISTD: //index of applied style
@@ -411,60 +374,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_PNLVCFIRST:
case NS_rtf::LN_CPNBTELVC:
case NS_rtf::LN_CFCLCB:
- case NS_rtf::LN_LCBSTSHF:
- case NS_rtf::LN_LCBPLCFFNDREF:
- case NS_rtf::LN_LCBPLCFFNDTXT:
- case NS_rtf::LN_LCBPLCFANDREF:
- case NS_rtf::LN_LCBPLCFANDTXT:
- case NS_rtf::LN_LCBPLCFSED:
- case NS_rtf::LN_LCBPLCFPHE:
- case NS_rtf::LN_LCBPLCFHDD:
- case NS_rtf::LN_LCBPLCFBTECHPX:
- case NS_rtf::LN_LCBPLCFBTEPAPX:
- case NS_rtf::LN_LCBSTTBFFFN:
- case NS_rtf::LN_LCBPLCFFLDMOM:
- case NS_rtf::LN_LCBPLCFFLDHDR:
- case NS_rtf::LN_LCBPLCFFLDFTN:
- case NS_rtf::LN_LCBPLCFFLDATN:
- case NS_rtf::LN_LCBSTTBFBKMK:
- case NS_rtf::LN_LCBPLCFBKF:
- case NS_rtf::LN_LCBPLCFBKL:
- case NS_rtf::LN_LCBDOP:
- case NS_rtf::LN_LCBSTTBFASSOC:
- case NS_rtf::LN_LCBCLX:
- case NS_rtf::LN_LCBGRPXSTATNOWNERS:
- case NS_rtf::LN_LCBSTTBFATNBKMK:
- case NS_rtf::LN_LCBPLCSPAMOM:
- case NS_rtf::LN_LCBPLCSPAHDR:
- case NS_rtf::LN_LCBPLCFATNBKF:
- case NS_rtf::LN_LCBPLCFATNBKL:
- case NS_rtf::LN_LCBFORMFLDSTTBF:
- case NS_rtf::LN_LCBPLCFENDREF:
- case NS_rtf::LN_LCBPLCFENDTXT:
- case NS_rtf::LN_LCBPLCFFLDEDN:
- case NS_rtf::LN_LCBDGGINFO:
- case NS_rtf::LN_LCBSTTBFRMARK:
- case NS_rtf::LN_LCBSTTBFCAPTION:
- case NS_rtf::LN_LCBSTTBFAUTOCAPTION:
- case NS_rtf::LN_LCBPLCFTXBXTXT:
- case NS_rtf::LN_LCBPLCFFLDTXBX:
- case NS_rtf::LN_LCBPLCFHDRTXBXTXT:
- case NS_rtf::LN_LCBPLCFFLDHDRTXBX:
- case NS_rtf::LN_LCBSTTBTTMBD:
- case NS_rtf::LN_LCBPGDMOTHER:
- case NS_rtf::LN_LCBBKDMOTHER:
- case NS_rtf::LN_LCBPGDFTN:
- case NS_rtf::LN_LCBBKDFTN:
- case NS_rtf::LN_LCBPGDEDN:
- case NS_rtf::LN_LCBBKDEDN:
- case NS_rtf::LN_LCBPLCFLST:
- case NS_rtf::LN_LCBPLFLFO:
- case NS_rtf::LN_LCBPLCFTXBXBKD:
- case NS_rtf::LN_LCBPLCFTXBXHDRBKD:
- case NS_rtf::LN_LCBSTTBGLSYSTYLE:
- case NS_rtf::LN_LCBPLCFBTELVC:
- case NS_rtf::LN_LCBPLCFLVC:
- case NS_rtf::LN_LCBSTTBLISTNAMES:
case NS_rtf::LN_LCBSTTBFUSSR:
{
m_pImpl->GetFIB().SetData( nName, nIntValue );
@@ -563,8 +472,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
break;
case NS_rtf::LN_HMF:
break;
- case NS_rtf::LN_LCB:
- break;
case NS_rtf::LN_CBHEADER:
break;
case NS_rtf::LN_MFP:
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 064a60f..7415582 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -452,7 +452,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
sal_Int32 nIntValue = val.getInt();
switch( nName )
{
- case NS_rtf::LN_LCB: break;//byte count
case NS_rtf::LN_CBHEADER: break;//ignored
case NS_rtf::LN_MFP: //MetafilePict
case NS_rtf::LN_BRCTOP: //top border
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 74cae0b..4ce2022 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -6968,5068 +6968,6 @@
</UML:Attribute>
</UML:Classifier.feature>
<UML:Classifier.feature>
- <UML:Attribute name="lcbStshfOrig">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>count of bytes of original STSH allocation</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x009E</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:LCBSTSHFORIG</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U32"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
- <UML:Attribute name="lcbStshf">
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>count of bytes of current STSH allocation</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="comment"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0x00A6</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="offset"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="shift"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="mask"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue/>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="bits"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:ModelElement.taggedValue>
- <UML:TaggedValue>
- <UML:TaggedValue.dataValue>rtf:LCBSTSHF</UML:TaggedValue.dataValue>
- <UML:TaggedValue.type>
- <UML:TagDefinition xmi.idref="attrid"/>
- </UML:TaggedValue.type>
- </UML:TaggedValue>
- </UML:ModelElement.taggedValue>
- <UML:StructuralFeature.type>
- <UML:DataType xmi.idref="U32"/>
- </UML:StructuralFeature.type>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="attribute"/>
- </UML:ModelElement.stereotype>
- </UML:Attribute>
- </UML:Classifier.feature>
- <UML:Classifier.feature>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list