[Libreoffice-commits] core.git: 2 commits - connectivity/Library_evoab.mk drawinglayer/source include/drawinglayer include/sfx2 include/svx include/test include/vcl sc/source sd/source sfx2/source svgio/inc svgio/qa svgio/source svx/inc svx/source sw/source test/source vcl/source
David Tardon
dtardon at redhat.com
Fri Dec 11 00:12:13 PST 2015
connectivity/Library_evoab.mk | 1
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 4
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 26 +-
drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx | 14 -
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 120 ++++++++--
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 10
drawinglayer/source/primitive2d/controlprimitive2d.cxx | 12 -
drawinglayer/source/primitive2d/cropprimitive2d.cxx | 14 -
drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx | 6
drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx | 8
drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx | 8
drawinglayer/source/primitive2d/epsprimitive2d.cxx | 6
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx | 16 -
drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx | 8
drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx | 8
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 12 -
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 32 +-
drawinglayer/source/primitive2d/gridprimitive2d.cxx | 14 -
drawinglayer/source/primitive2d/groupprimitive2d.cxx | 6
drawinglayer/source/primitive2d/helplineprimitive2d.cxx | 12 -
drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx | 8
drawinglayer/source/primitive2d/invertprimitive2d.cxx | 2
drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx | 6
drawinglayer/source/primitive2d/maskprimitive2d.cxx | 2
drawinglayer/source/primitive2d/mediaprimitive2d.cxx | 11
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 64 ++---
drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx | 2
drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx | 2
drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx | 16 -
drawinglayer/source/primitive2d/patternfillprimitive2d.cxx | 20 -
drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 34 +-
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx | 54 ++--
drawinglayer/source/primitive2d/primitivetools2d.cxx | 36 +--
drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 31 +-
drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx | 2
drawinglayer/source/primitive2d/shadowprimitive2d.cxx | 14 -
drawinglayer/source/primitive2d/structuretagprimitive2d.cxx | 2
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 82 +++---
drawinglayer/source/primitive2d/textbreakuphelper.cxx | 10
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx | 24 +-
drawinglayer/source/primitive2d/texteffectprimitive2d.cxx | 24 +-
drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx | 12 -
drawinglayer/source/primitive2d/textlineprimitive2d.cxx | 11
drawinglayer/source/primitive2d/textprimitive2d.cxx | 8
drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx | 10
drawinglayer/source/primitive2d/transformprimitive2d.cxx | 4
drawinglayer/source/primitive2d/transparenceprimitive2d.cxx | 4
drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx | 14 -
drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx | 12 -
drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx | 4
drawinglayer/source/processor2d/baseprocessor2d.cxx | 9
drawinglayer/source/processor2d/contourextractor2d.cxx | 8
drawinglayer/source/processor2d/hittestprocessor2d.cxx | 4
drawinglayer/source/processor2d/textaspolygonextractor2d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 28 +-
drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx | 2
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 6
drawinglayer/source/processor2d/vclprocessor2d.cxx | 12 -
drawinglayer/source/processor3d/geometry2dextractor.cxx | 4
drawinglayer/source/processor3d/shadow3dextractor.cxx | 16 -
drawinglayer/source/tools/converters.cxx | 10
include/drawinglayer/primitive2d/animatedprimitive2d.hxx | 12 -
include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 4
include/drawinglayer/primitive2d/baseprimitive2d.hxx | 34 ++
include/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 2
include/drawinglayer/primitive2d/controlprimitive2d.hxx | 4
include/drawinglayer/primitive2d/cropprimitive2d.hxx | 4
include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx | 2
include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx | 2
include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx | 4
include/drawinglayer/primitive2d/epsprimitive2d.hxx | 2
include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx | 8
include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx | 2
include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx | 4
include/drawinglayer/primitive2d/graphicprimitive2d.hxx | 2
include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx | 6
include/drawinglayer/primitive2d/gridprimitive2d.hxx | 4
include/drawinglayer/primitive2d/groupprimitive2d.hxx | 8
include/drawinglayer/primitive2d/helplineprimitive2d.hxx | 4
include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx | 4
include/drawinglayer/primitive2d/invertprimitive2d.hxx | 2
include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx | 2
include/drawinglayer/primitive2d/maskprimitive2d.hxx | 2
include/drawinglayer/primitive2d/mediaprimitive2d.hxx | 2
include/drawinglayer/primitive2d/metafileprimitive2d.hxx | 2
include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx | 2
include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx | 2
include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx | 8
include/drawinglayer/primitive2d/patternfillprimitive2d.hxx | 8
include/drawinglayer/primitive2d/polygonprimitive2d.hxx | 10
include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx | 14 -
include/drawinglayer/primitive2d/primitivetools2d.hxx | 8
include/drawinglayer/primitive2d/sceneprimitive2d.hxx | 10
include/drawinglayer/primitive2d/shadowprimitive2d.hxx | 4
include/drawinglayer/primitive2d/structuretagprimitive2d.hxx | 2
include/drawinglayer/primitive2d/svggradientprimitive2d.hxx | 32 +-
include/drawinglayer/primitive2d/textbreakuphelper.hxx | 6
include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 2
include/drawinglayer/primitive2d/texteffectprimitive2d.hxx | 10
include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx | 12 -
include/drawinglayer/primitive2d/textlineprimitive2d.hxx | 2
include/drawinglayer/primitive2d/textprimitive2d.hxx | 2
include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx | 4
include/drawinglayer/primitive2d/transformprimitive2d.hxx | 2
include/drawinglayer/primitive2d/transparenceprimitive2d.hxx | 8
include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx | 4
include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx | 2
include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx | 2
include/drawinglayer/processor2d/baseprocessor2d.hxx | 2
include/drawinglayer/processor3d/geometry2dextractor.hxx | 4
include/drawinglayer/processor3d/shadow3dextractor.hxx | 6
include/drawinglayer/tools/converters.hxx | 2
include/sfx2/thumbnailviewitem.hxx | 2
include/svx/charthelper.hxx | 2
include/svx/framelink.hxx | 6
include/svx/sdr/animation/animationstate.hxx | 4
include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 4
include/svx/sdr/contact/viewcontact.hxx | 16 -
include/svx/sdr/contact/viewcontactofe3d.hxx | 4
include/svx/sdr/contact/viewcontactofe3dscene.hxx | 4
include/svx/sdr/contact/viewcontactofpageobj.hxx | 2
include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 2
include/svx/sdr/contact/viewcontactofsdrobj.hxx | 4
include/svx/sdr/contact/viewcontactofsdrrectobj.hxx | 2
include/svx/sdr/contact/viewcontactofvirtobj.hxx | 2
include/svx/sdr/contact/viewobjectcontact.hxx | 16 -
include/svx/sdr/contact/viewobjectcontactofpageobj.hxx | 2
include/svx/sdr/contact/viewobjectcontactredirector.hxx | 2
include/svx/sdr/overlay/overlayanimatedbitmapex.hxx | 2
include/svx/sdr/overlay/overlaybitmapex.hxx | 2
include/svx/sdr/overlay/overlayobject.hxx | 16 -
include/svx/sdr/overlay/overlayobjectcell.hxx | 2
include/svx/sdr/overlay/overlaypolypolygon.hxx | 2
include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx | 8
include/svx/sdr/overlay/overlayselection.hxx | 6
include/svx/sdr/overlay/overlaytriangle.hxx | 2
include/svx/sdr/primitive2d/sdrdecompositiontools.hxx | 4
include/svx/svddrgmt.hxx | 16 -
include/svx/svdotext.hxx | 12 -
include/svx/svdpage.hxx | 2
include/test/primitive2dxmldump.hxx | 4
include/vcl/svgdata.hxx | 6
sc/source/ui/inc/overlayobject.hxx | 2
sc/source/ui/view/overlayobject.cxx | 6
sd/source/core/CustomAnimationEffect.cxx | 4
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/tools/PreviewRenderer.cxx | 10
sd/source/ui/unoidl/unomodel.cxx | 10
sd/source/ui/view/sdview.cxx | 13 -
sfx2/source/control/recentdocsviewitem.cxx | 2
sfx2/source/control/templateabstractview.cxx | 2
sfx2/source/control/templatecontaineritem.cxx | 2
sfx2/source/control/templateviewitem.cxx | 2
sfx2/source/control/thumbnailview.cxx | 2
sfx2/source/control/thumbnailviewitem.cxx | 8
sfx2/source/dialog/infobar.cxx | 4
svgio/inc/svgio/svgreader/svgcharacternode.hxx | 4
svgio/inc/svgio/svgreader/svgcirclenode.hxx | 2
svgio/inc/svgio/svgreader/svgclippathnode.hxx | 4
svgio/inc/svgio/svgreader/svgellipsenode.hxx | 2
svgio/inc/svgio/svgreader/svggnode.hxx | 2
svgio/inc/svgio/svgreader/svgimagenode.hxx | 2
svgio/inc/svgio/svgreader/svglinenode.hxx | 2
svgio/inc/svgio/svgreader/svgmarkernode.hxx | 4
svgio/inc/svgio/svgreader/svgmasknode.hxx | 4
svgio/inc/svgio/svgreader/svgnode.hxx | 2
svgio/inc/svgio/svgreader/svgpathnode.hxx | 2
svgio/inc/svgio/svgreader/svgpatternnode.hxx | 4
svgio/inc/svgio/svgreader/svgpolynode.hxx | 2
svgio/inc/svgio/svgreader/svgrectnode.hxx | 2
svgio/inc/svgio/svgreader/svgstyleattributes.hxx | 24 +-
svgio/inc/svgio/svgreader/svgsvgnode.hxx | 2
svgio/inc/svgio/svgreader/svgtextnode.hxx | 8
svgio/inc/svgio/svgreader/svgtextpathnode.hxx | 4
svgio/inc/svgio/svgreader/svgusenode.hxx | 2
svgio/qa/cppunit/SvgImportTest.cxx | 6
svgio/source/svgreader/svgcharacternode.cxx | 12 -
svgio/source/svgreader/svgcirclenode.cxx | 6
svgio/source/svgreader/svgclippathnode.cxx | 32 +-
svgio/source/svgreader/svgellipsenode.cxx | 6
svgio/source/svgreader/svggnode.cxx | 6
svgio/source/svgreader/svgimagenode.cxx | 24 --
svgio/source/svgreader/svglinenode.cxx | 6
svgio/source/svgreader/svgmarkernode.cxx | 4
svgio/source/svgreader/svgmasknode.cxx | 37 +--
svgio/source/svgreader/svgnode.cxx | 12 -
svgio/source/svgreader/svgpathnode.cxx | 6
svgio/source/svgreader/svgpatternnode.cxx | 6
svgio/source/svgreader/svgpolynode.cxx | 6
svgio/source/svgreader/svgrectnode.cxx | 6
svgio/source/svgreader/svgstyleattributes.cxx | 98 +++-----
svgio/source/svgreader/svgsvgnode.cxx | 50 +---
svgio/source/svgreader/svgtextnode.cxx | 38 +--
svgio/source/svgreader/svgtextpathnode.cxx | 14 -
svgio/source/svgreader/svgusenode.cxx | 10
svgio/source/svguno/xsvgparser.cxx | 5
svx/inc/sdr/contact/viewcontactofgraphic.hxx | 6
svx/inc/sdr/contact/viewcontactofgroup.hxx | 2
svx/inc/sdr/contact/viewcontactofmasterpagedescriptor.hxx | 2
svx/inc/sdr/contact/viewcontactofopenglobj.hxx | 2
svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx | 2
svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx | 2
svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx | 2
svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx | 2
svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx | 2
svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx | 4
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 20 -
svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx | 2
svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx | 4
svx/inc/sdr/contact/viewobjectcontactofgraphic.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofgroup.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofsdrole2obj.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofsdrpage.hxx | 12 -
svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 4
svx/inc/sdr/overlay/overlaycrosshair.hxx | 2
svx/inc/sdr/overlay/overlayhandle.hxx | 2
svx/inc/sdr/overlay/overlayhelpline.hxx | 2
svx/inc/sdr/overlay/overlayline.hxx | 2
svx/inc/sdr/overlay/overlayrectangle.hxx | 2
svx/inc/sdr/overlay/overlayrollingrectangle.hxx | 2
svx/inc/sdr/overlay/overlaytools.hxx | 12 -
svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx | 8
svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx | 4
svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx | 8
svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx | 2
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 16 -
svx/source/dialog/framelink.cxx | 10
svx/source/dialog/pagectrl.cxx | 6
svx/source/engine3d/view3d.cxx | 14 -
svx/source/sdr/animation/animationstate.cxx | 6
svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 10
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 7
svx/source/sdr/contact/objectcontactofpageview.cxx | 8
svx/source/sdr/contact/viewcontact.cxx | 20 -
svx/source/sdr/contact/viewcontactofe3d.cxx | 12 -
svx/source/sdr/contact/viewcontactofe3dscene.cxx | 12 -
svx/source/sdr/contact/viewcontactofgraphic.cxx | 31 +-
svx/source/sdr/contact/viewcontactofgroup.cxx | 10
svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx | 6
svx/source/sdr/contact/viewcontactofpageobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx | 8
svx/source/sdr/contact/viewcontactofsdrcircobj.cxx | 6
svx/source/sdr/contact/viewcontactofsdredgeobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 13 -
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx | 16 -
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 19 -
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 70 ++---
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrrectobj.cxx | 4
svx/source/sdr/contact/viewcontactofunocontrol.cxx | 6
svx/source/sdr/contact/viewcontactofvirtobj.cxx | 12 -
svx/source/sdr/contact/viewobjectcontact.cxx | 56 ++--
svx/source/sdr/contact/viewobjectcontactofe3d.cxx | 5
svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx | 16 -
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 8
svx/source/sdr/contact/viewobjectcontactofgroup.cxx | 10
svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx | 15 -
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 24 +-
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 7
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx | 44 +--
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 27 +-
svx/source/sdr/contact/viewobjectcontactredirector.cxx | 2
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 6
svx/source/sdr/overlay/overlaybitmapex.cxx | 6
svx/source/sdr/overlay/overlaycrosshair.cxx | 6
svx/source/sdr/overlay/overlayhandle.cxx | 4
svx/source/sdr/overlay/overlayhelpline.cxx | 6
svx/source/sdr/overlay/overlayline.cxx | 6
svx/source/sdr/overlay/overlaymanager.cxx | 4
svx/source/sdr/overlay/overlayobject.cxx | 16 -
svx/source/sdr/overlay/overlayobjectcell.cxx | 10
svx/source/sdr/overlay/overlayobjectlist.cxx | 4
svx/source/sdr/overlay/overlaypolypolygon.cxx | 8
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx | 4
svx/source/sdr/overlay/overlayrectangle.cxx | 4
svx/source/sdr/overlay/overlayrollingrectangle.cxx | 8
svx/source/sdr/overlay/overlayselection.cxx | 20 -
svx/source/sdr/overlay/overlaytools.cxx | 46 +--
svx/source/sdr/overlay/overlaytriangle.cxx | 4
svx/source/sdr/primitive2d/primitivefactory2d.cxx | 5
svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx | 18 -
svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx | 10
svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 10
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 29 +-
svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx | 24 +-
svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 14 -
svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx | 24 +-
svx/source/sdr/primitive2d/sdrole2primitive2d.cxx | 20 -
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 10
svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx | 14 -
svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx | 14 -
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 36 +--
svx/source/svdraw/charthelper.cxx | 12 -
svx/source/svdraw/sdrhittesthelper.cxx | 4
svx/source/svdraw/svdcrtv.cxx | 2
svx/source/svdraw/svddrgmt.cxx | 59 ++--
svx/source/svdraw/svdedxv.cxx | 2
svx/source/svdraw/svdhdl.cxx | 6
svx/source/svdraw/svdobj.cxx | 18 -
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdotextdecomposition.cxx | 30 +-
svx/source/svdraw/svdotextpathdecomposition.cxx | 30 +-
svx/source/svdraw/svdotxtr.cxx | 4
svx/source/svdraw/svdpage.cxx | 4
svx/source/svdraw/svdpntv.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 7
svx/source/table/tablehandles.cxx | 12 -
svx/source/table/viewcontactoftableobj.cxx | 40 +--
svx/source/table/viewcontactoftableobj.hxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 6
svx/source/xoutdev/xtabdash.cxx | 2
svx/source/xoutdev/xtabgrdt.cxx | 2
svx/source/xoutdev/xtabhtch.cxx | 2
svx/source/xoutdev/xtablend.cxx | 2
sw/source/core/crsr/overlayrangesoutline.cxx | 6
sw/source/core/crsr/overlayrangesoutline.hxx | 2
sw/source/core/doc/notxtfrm.cxx | 10
sw/source/core/draw/dcontact.cxx | 22 -
sw/source/core/draw/dflyobj.cxx | 26 +-
sw/source/core/graphic/ndgrf.cxx | 4
sw/source/core/inc/frame.hxx | 2
sw/source/core/layout/paintfrm.cxx | 78 ++----
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 26 +-
sw/source/uibase/docvw/AnchorOverlayObject.hxx | 2
sw/source/uibase/docvw/DashedLine.cxx | 6
sw/source/uibase/docvw/HeaderFooterWin.cxx | 8
sw/source/uibase/docvw/OverlayRanges.cxx | 10
sw/source/uibase/docvw/OverlayRanges.hxx | 2
sw/source/uibase/docvw/PageBreakWin.cxx | 8
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 16 -
sw/source/uibase/docvw/ShadowOverlayObject.hxx | 2
test/source/primitive2dxmldump.cxx | 6
vcl/source/gdi/svgdata.cxx | 19 -
344 files changed, 1812 insertions(+), 1729 deletions(-)
New commits:
commit b672126e7c4ffd32d42594cf527b09a9f0434cb9
Author: David Tardon <dtardon at redhat.com>
Date: Fri Dec 11 09:08:00 2015 +0100
tdf#96396 evoab2 does not need gtk
Change-Id: I727d90e4ffc4d567ad02ca5b55b1e8d26d15e928
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index a413581..ea20753 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_Library_set_include,evoab,\
$(eval $(call gb_Library_use_externals,evoab,\
boost_headers \
- gtk \
gobject \
))
commit 58d8d8ac67aa9b907f1304a48efa0f7a473d9de4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 10 12:27:50 2015 +0200
tdf#69977: uno::Sequence is expensive
when used as a mutable data-structure. Plain std::vector halves the time
taken to display the chart dialog
Create a class to represent the std::vector we are going to be passing
around, and move some of the utility methods into it to make the code
prettier.
Also create an optimised append(&&) method for the common case of
appending small temporaries.
Change-Id: I7f5b43fb4a8a84e40e6a52fcb7e9f974091b4485
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 70cae59..f4adb26 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -161,8 +161,8 @@ namespace drawinglayer
const primitive2d::Primitive2DReference xEmbedRef(
new primitive2d::TransformPrimitive2D(
aEmbedding,
- Primitive2DSequence));
- const primitive2d::Primitive2DSequence xEmbedSeq(&xEmbedRef, 1);
+ primitive2d::Primitive2DContainer()));
+ const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef };
BitmapEx aBitmapEx(
tools::convertToBitmapEx(
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index d8c0883..a6d23de 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -35,7 +35,7 @@ namespace drawinglayer
{
AnimatedSwitchPrimitive2D::AnimatedSwitchPrimitive2D(
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DSequence& rChildren,
+ const Primitive2DContainer& rChildren,
bool bIsTextAnimation)
: GroupPrimitive2D(rChildren),
mpAnimationEntry(nullptr),
@@ -63,12 +63,12 @@ namespace drawinglayer
return false;
}
- Primitive2DSequence AnimatedSwitchPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer AnimatedSwitchPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- if(getChildren().hasElements())
+ if(!getChildren().empty())
{
const double fState(getAnimationEntry().getStateAtTime(rViewInformation.getViewTime()));
- const sal_uInt32 nLen(getChildren().getLength());
+ const sal_uInt32 nLen(getChildren().size());
sal_uInt32 nIndex(basegfx::fround(fState * (double)nLen));
if(nIndex >= nLen)
@@ -77,10 +77,10 @@ namespace drawinglayer
}
const Primitive2DReference xRef(getChildren()[nIndex], uno::UNO_QUERY_THROW);
- return Primitive2DSequence(&xRef, 1L);
+ return Primitive2DContainer { xRef };
}
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
// provide unique ID
@@ -97,15 +97,15 @@ namespace drawinglayer
{
AnimatedBlinkPrimitive2D::AnimatedBlinkPrimitive2D(
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DSequence& rChildren,
+ const Primitive2DContainer& rChildren,
bool bIsTextAnimation)
: AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation)
{
}
- Primitive2DSequence AnimatedBlinkPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer AnimatedBlinkPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- if(getChildren().hasElements())
+ if(!getChildren().empty())
{
const double fState(getAnimationEntry().getStateAtTime(rViewInformation.getViewTime()));
@@ -115,7 +115,7 @@ namespace drawinglayer
}
}
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
// provide unique ID
@@ -133,7 +133,7 @@ namespace drawinglayer
AnimatedInterpolatePrimitive2D::AnimatedInterpolatePrimitive2D(
const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack,
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DSequence& rChildren,
+ const Primitive2DContainer& rChildren,
bool bIsTextAnimation)
: AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation),
maMatrixStack()
@@ -148,7 +148,7 @@ namespace drawinglayer
}
}
- Primitive2DSequence AnimatedInterpolatePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer AnimatedInterpolatePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
const sal_uInt32 nSize(maMatrixStack.size());
@@ -195,7 +195,7 @@ namespace drawinglayer
// create new transform primitive reference, return new sequence
const Primitive2DReference xRef(new TransformPrimitive2D(aTargetTransform, getChildren()));
- return Primitive2DSequence(&xRef, 1L);
+ return Primitive2DContainer { xRef };
}
else
{
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
index ea10d20..90b5bbd 100644
--- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
@@ -35,17 +35,17 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence BackgroundColorPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer BackgroundColorPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
if(!rViewInformation.getViewport().isEmpty())
{
const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(rViewInformation.getViewport()));
const Primitive2DReference xRef(new PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aOutline), getBColor()));
- return Primitive2DSequence(&xRef, 1L);
+ return Primitive2DContainer { xRef };
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
@@ -77,17 +77,17 @@ namespace drawinglayer
return rViewInformation.getViewport();
}
- Primitive2DSequence BackgroundColorPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer BackgroundColorPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
- if(getBuffered2DDecomposition().hasElements() && (maLastViewport != rViewInformation.getViewport()))
+ if(!getBuffered2DDecomposition().empty() && (maLastViewport != rViewInformation.getViewport()))
{
// conditions of last local decomposition have changed, delete
- const_cast< BackgroundColorPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< BackgroundColorPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember ViewRange
const_cast< BackgroundColorPrimitive2D* >(this)->maLastViewport = rViewInformation.getViewport();
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index aba65aa..361cd22 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -21,6 +21,7 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <basegfx/tools/canvastools.hxx>
+#include <comphelper/sequence.hxx>
@@ -48,18 +49,18 @@ namespace drawinglayer
basegfx::B2DRange BasePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
{
- return getB2DRangeFromPrimitive2DSequence(get2DDecomposition(rViewInformation), rViewInformation);
+ return get2DDecomposition(rViewInformation).getB2DRange(rViewInformation);
}
- Primitive2DSequence BasePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer BasePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
Primitive2DSequence SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
{
const geometry::ViewInformation2D aViewInformation(rViewParameters);
- return get2DDecomposition(aViewInformation);
+ return comphelper::containerToSequence(get2DDecomposition(aViewInformation));
}
css::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
@@ -76,9 +77,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence BufferedDecompositionPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer BufferedDecompositionPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D()
@@ -87,13 +88,13 @@ namespace drawinglayer
{
}
- Primitive2DSequence BufferedDecompositionPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer BufferedDecompositionPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
- const Primitive2DSequence aNewSequence(create2DDecomposition(rViewInformation));
+ const Primitive2DContainer aNewSequence(create2DDecomposition(rViewInformation));
const_cast< BufferedDecompositionPrimitive2D* >(this)->setBuffered2DDecomposition(aNewSequence);
}
@@ -110,7 +111,7 @@ namespace drawinglayer
namespace primitive2d
{
// convert helper stl vector of primitives to Primitive2DSequence
- Primitive2DSequence Primitive2DVectorToPrimitive2DSequence(const Primitive2DVector& rSource, bool bInvert)
+ Primitive2DSequence Primitive2DContainerToPrimitive2DSequence(const Primitive2DContainer& rSource, bool bInvert)
{
const sal_uInt32 nSize(rSource.size());
Primitive2DSequence aRetval;
@@ -125,7 +126,26 @@ namespace drawinglayer
// all entries taken over to Uno References as owners. To avoid
// errors with users of this mechanism to delete pointers to BasePrimitive2D
// itself, clear given vector
- const_cast< Primitive2DVector& >(rSource).clear();
+ const_cast< Primitive2DContainer& >(rSource).clear();
+
+ return aRetval;
+ }
+ Primitive2DContainer Primitive2DContainer::maybeInvert(bool bInvert) const
+ {
+ const sal_uInt32 nSize(size());
+ Primitive2DContainer aRetval;
+
+ aRetval.resize(nSize);
+
+ for(sal_uInt32 a(0); a < nSize; a++)
+ {
+ aRetval[bInvert ? nSize - 1 - a : a] = (*this)[a];
+ }
+
+ // all entries taken over to Uno References as owners. To avoid
+ // errors with users of this mechanism to delete pointers to BasePrimitive2D
+ // itself, clear given vector
+ const_cast< Primitive2DContainer& >(*this).clear();
return aRetval;
}
@@ -157,13 +177,29 @@ namespace drawinglayer
}
// get B2DRange from a given Primitive2DSequence
- basegfx::B2DRange getB2DRangeFromPrimitive2DSequence(const Primitive2DSequence& rCandidate, const geometry::ViewInformation2D& aViewInformation)
+ basegfx::B2DRange Primitive2DContainer::getB2DRange(const geometry::ViewInformation2D& aViewInformation) const
{
basegfx::B2DRange aRetval;
- if(rCandidate.hasElements())
+ if(!empty())
{
- const sal_Int32 nCount(rCandidate.getLength());
+ const sal_Int32 nCount(this->size());
+
+ for(sal_Int32 a(0L); a < nCount; a++)
+ {
+ aRetval.expand(getB2DRangeFromPrimitive2DReference((*this)[a], aViewInformation));
+ }
+ }
+
+ return aRetval;
+ }
+ basegfx::B2DRange getB2DRangeFromPrimitive2DSequence(const Primitive2DContainer& rCandidate, const geometry::ViewInformation2D& aViewInformation)
+ {
+ basegfx::B2DRange aRetval;
+
+ if(!rCandidate.empty())
+ {
+ const sal_Int32 nCount(rCandidate.size());
for(sal_Int32 a(0L); a < nCount; a++)
{
@@ -237,6 +273,38 @@ namespace drawinglayer
return true;
}
+ bool Primitive2DContainer::operator==(const Primitive2DContainer& rB) const
+ {
+ const bool bAHasElements(!empty());
+
+ if(bAHasElements != !rB.empty())
+ {
+ return false;
+ }
+
+ if(!bAHasElements)
+ {
+ return true;
+ }
+
+ const size_t nCount(size());
+
+ if(nCount != rB.size())
+ {
+ return false;
+ }
+
+ for(size_t a(0L); a < nCount; a++)
+ {
+ if(!arePrimitive2DReferencesEqual((*this)[a], rB[a]))
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
// concatenate sequence
void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource)
{
@@ -271,6 +339,30 @@ namespace drawinglayer
}
}
+ void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DContainer& rSource)
+ {
+ appendPrimitive2DSequenceToPrimitive2DSequence(rDest, comphelper::containerToSequence(rSource));
+ }
+
+ void Primitive2DContainer::append(const Primitive2DContainer& rSource)
+ {
+ insert(end(), rSource.begin(), rSource.end());
+ }
+/*
+ void Primitive2DContainer::append(Primitive2DContainer&& rSource)
+ {
+ resize(size() + rSource.size());
+ memcpy(data() + size(),
+ rSource.data(),
+ rSource.size() * sizeof(Primitive2DReference));
+ memset(reinterpret_cast<void*>(rSource.data()), 0, rSource.size() * sizeof(Primitive2DReference));
+ }
+*/
+ void Primitive2DContainer::append(const Primitive2DSequence& rSource)
+ {
+ std::copy(rSource.begin(), rSource.end(), std::back_inserter(*this));
+ }
+
// concatenate single Primitive2D
void appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource)
{
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 30e656d..038e3e9 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -161,9 +161,9 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
return basegfx::B2DPolyPolygon( clipPolygon );
}
- Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer BorderLinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- Primitive2DSequence xRetval;
+ Primitive2DContainer xRetval;
if(!getStart().equal(getEnd()) && ( isInsideUsed() || isOutsideUsed() ) )
{
@@ -181,7 +181,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
const basegfx::B2DPoint aTmpStart(getStart() - (fExt * aVector));
const basegfx::B2DPoint aTmpEnd(getEnd() + (fExt * aVector));
- xRetval.realloc(2);
+ xRetval.resize(2);
double fLeftWidth = getLeftWidth();
bool bLeftHairline = lcl_UseHairline(fLeftWidth, getStart(), getEnd(), rViewInformation);
@@ -239,7 +239,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
aPolygon.append( getStart() );
aPolygon.append( getEnd() );
- xRetval.realloc(1);
+ xRetval.resize(1);
xRetval[0] = Primitive2DReference(new PolygonHairlinePrimitive2D(
aPolygon,
aColor));
@@ -276,7 +276,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive(
}
sal_uInt32 n = aDashed.count();
- xRetval.realloc(n);
+ xRetval.resize(n);
for (sal_uInt32 i = 0; i < n; ++i)
{
basegfx::B2DPolygon aDash = aDashed.getB2DPolygon(i);
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index d782962..1367692 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -237,7 +237,7 @@ namespace drawinglayer
return xRetval;
}
- Primitive2DSequence ControlPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer ControlPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
// try to create a bitmap decomposition. If that fails for some reason,
// at least create a replacement decomposition.
@@ -248,7 +248,7 @@ namespace drawinglayer
xReference = createPlaceholderDecomposition(rViewInformation);
}
- return Primitive2DSequence(&xReference, 1L);
+ return Primitive2DContainer { xReference };
}
ControlPrimitive2D::ControlPrimitive2D(
@@ -329,23 +329,23 @@ namespace drawinglayer
return aRetval;
}
- Primitive2DSequence ControlPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer ControlPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
// this primitive is view-dependent related to the scaling. If scaling has changed,
// destroy existing decomposition. To detect change, use size of unit size in view coordinates
::osl::MutexGuard aGuard( m_aMutex );
const basegfx::B2DVector aNewScaling(rViewInformation.getObjectToViewTransformation() * basegfx::B2DVector(1.0, 1.0));
- if(getBuffered2DDecomposition().hasElements())
+ if(!getBuffered2DDecomposition().empty())
{
if(!maLastViewScaling.equal(aNewScaling))
{
// conditions of last local decomposition have changed, delete
- const_cast< ControlPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< ControlPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember ViewTransformation
const_cast< ControlPrimitive2D* >(this)->maLastViewScaling = aNewScaling;
diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index b2a7ea4..6a76d4e 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -37,7 +37,7 @@ namespace drawinglayer
namespace primitive2d
{
CropPrimitive2D::CropPrimitive2D(
- const Primitive2DSequence& rChildren,
+ const Primitive2DContainer& rChildren,
const basegfx::B2DHomMatrix& rTransformation,
double fCropLeft,
double fCropTop,
@@ -68,11 +68,11 @@ namespace drawinglayer
return false;
}
- Primitive2DSequence CropPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer CropPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- Primitive2DSequence xRetval;
+ Primitive2DContainer xRetval;
- if(getChildren().hasElements())
+ if(!getChildren().empty())
{
// get original object scale in unit coordinates (no mirroring)
const basegfx::B2DVector aObjectScale(basegfx::absolute(getTransformation() * basegfx::B2DVector(1.0, 1.0)));
@@ -130,7 +130,7 @@ namespace drawinglayer
{
// the new range is completely inside the old range (unit range),
// so no masking is needed
- xRetval = Primitive2DSequence(&xTransformPrimitive, 1);
+ xRetval = Primitive2DContainer { xTransformPrimitive };
}
else
{
@@ -142,9 +142,9 @@ namespace drawinglayer
const Primitive2DReference xMask(
new MaskPrimitive2D(
aMaskPolyPolygon,
- Primitive2DSequence(&xTransformPrimitive, 1)));
+ Primitive2DContainer { xTransformPrimitive }));
- xRetval = Primitive2DSequence(&xMask, 1);
+ xRetval = Primitive2DContainer { xMask };
}
}
}
diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
index e406a3b..06d481d 100644
--- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
@@ -27,12 +27,12 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence DiscreteBitmapPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer DiscreteBitmapPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// use getViewTransformation() and getObjectTransformation() from
// ObjectAndViewTransformationDependentPrimitive2D to create a BitmapPrimitive2D
// with the correct mapping
- Primitive2DSequence xRetval;
+ Primitive2DContainer xRetval;
if(!getBitmapEx().IsEmpty())
{
@@ -67,7 +67,7 @@ namespace drawinglayer
// create BitmapPrimitive2D with now object-local coordinate data
const Primitive2DReference xRef(new BitmapPrimitive2D(getBitmapEx(), aObjectTransform));
- xRetval = Primitive2DSequence(&xRef, 1);
+ xRetval = Primitive2DContainer { xRef };
}
return xRetval;
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index b845602..0f663a4 100644
--- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -163,9 +163,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence DiscreteShadowPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer DiscreteShadowPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- Primitive2DSequence xRetval;
+ Primitive2DContainer xRetval;
if(!getDiscreteShadow().getBitmapEx().IsEmpty())
{
@@ -178,7 +178,7 @@ namespace drawinglayer
const double fBigLenX((fBorderX * 2.0) + fSingleX);
const double fBigLenY((fBorderY * 2.0) + fSingleY);
- xRetval.realloc(8);
+ xRetval.resize(8);
// TopLeft
xRetval[0] = Primitive2DReference(
@@ -266,7 +266,7 @@ namespace drawinglayer
getTransform(),
xRetval));
- xRetval = Primitive2DSequence(&xTransformed, 1);
+ xRetval = Primitive2DContainer { xTransformed };
}
return xRetval;
diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index d3538f4..284b91c 100644
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
@@ -62,10 +62,10 @@ namespace drawinglayer
}
// return if there are shadow primitives
- return maShadowPrimitives.hasElements();
+ return !maShadowPrimitives.empty();
}
- Primitive2DSequence Embedded3DPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer Embedded3DPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
// use info to create a yellow 2d rectangle, similar to empty 3d scenes and/or groups
const basegfx::B2DRange aLocal2DRange(getB2DRange(rViewInformation));
@@ -73,7 +73,7 @@ namespace drawinglayer
const basegfx::BColor aYellow(1.0, 1.0, 0.0);
const Primitive2DReference xRef(new PolygonHairlinePrimitive2D(aOutline, aYellow));
- return Primitive2DSequence(&xRef, 1L);
+ return Primitive2DContainer { xRef };
}
Embedded3DPrimitive2D::Embedded3DPrimitive2D(
@@ -132,7 +132,7 @@ namespace drawinglayer
// taken into account
if(impGetShadow3D(rViewInformation))
{
- const basegfx::B2DRange aShadow2DRange(getB2DRangeFromPrimitive2DSequence(maShadowPrimitives, rViewInformation));
+ const basegfx::B2DRange aShadow2DRange(maShadowPrimitives.getB2DRange(rViewInformation));
if(!aShadow2DRange.isEmpty())
{
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index a2d5cf6..6d29e7a 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -25,9 +25,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence EpsPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer EpsPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- Primitive2DSequence xRetval;
+ Primitive2DContainer xRetval;
const GDIMetaFile& rSubstituteContent = getMetaFile();
if( rSubstituteContent.GetActionSize() )
@@ -35,7 +35,7 @@ namespace drawinglayer
// the default decomposition will use the Metafile replacement visualisation.
// To really use the Eps data, a renderer has to know and interpret this primitive
// directly.
- xRetval.realloc(1);
+ xRetval.resize(1);
xRetval[0] = Primitive2DReference(
new MetafilePrimitive2D(
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index 7f506ee..cc7a1a0 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -150,13 +150,14 @@ namespace drawinglayer
}
}
- Primitive2DSequence FillGradientPrimitive2D::createOverlappingFill(
+ Primitive2DContainer FillGradientPrimitive2D::createOverlappingFill(
const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
const basegfx::BColor& rOuterColor,
const basegfx::B2DPolygon& rUnitPolygon) const
{
// prepare return value
- Primitive2DSequence aRetval(rEntries.size() + 1);
+ Primitive2DContainer aRetval;
+ aRetval.resize(rEntries.size() + 1);
// create solid fill with outmost color
aRetval[0] = Primitive2DReference(
@@ -183,13 +184,14 @@ namespace drawinglayer
return aRetval;
}
- Primitive2DSequence FillGradientPrimitive2D::createNonOverlappingFill(
+ Primitive2DContainer FillGradientPrimitive2D::createNonOverlappingFill(
const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
const basegfx::BColor& rOuterColor,
const basegfx::B2DPolygon& rUnitPolygon) const
{
// prepare return value
- Primitive2DSequence aRetval(rEntries.size() + 1);
+ Primitive2DContainer aRetval;
+ aRetval.resize(rEntries.size() + 1);
// get outmost visible range from object
basegfx::B2DRange aOutmostRange(getOutputRange());
@@ -245,7 +247,7 @@ namespace drawinglayer
return aRetval;
}
- Primitive2DSequence FillGradientPrimitive2D::createFill(bool bOverlapping) const
+ Primitive2DContainer FillGradientPrimitive2D::createFill(bool bOverlapping) const
{
// prepare shape of the Unit Polygon
basegfx::B2DPolygon aUnitPolygon;
@@ -282,7 +284,7 @@ namespace drawinglayer
}
}
- Primitive2DSequence FillGradientPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer FillGradientPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// default creates overlapping fill which works with AntiAliasing and without.
// The non-overlapping version does not create single filled polygons, but
@@ -299,7 +301,7 @@ namespace drawinglayer
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
index 0bb39f5..21117e2 100644
--- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
@@ -39,9 +39,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence FillGraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer FillGraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
const attribute::FillGraphicAttribute& rAttribute = getFillGraphic();
if(!rAttribute.isDefault())
@@ -66,10 +66,10 @@ namespace drawinglayer
// get matrices and realloc retval
aTiling.appendTransformations(aMatrices);
- aRetval.realloc(aMatrices.size());
+ aRetval.resize(aMatrices.size());
// prepare content primitive
- const Primitive2DSequence xSeq = create2DDecompositionOfGraphic(
+ const Primitive2DContainer xSeq = create2DDecompositionOfGraphic(
rGraphic,
basegfx::B2DHomMatrix());
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 886c1b2..1c34c114 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -37,9 +37,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence FillHatchPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer FillHatchPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
if(!getFillHatch().isDefault())
{
@@ -105,7 +105,7 @@ namespace drawinglayer
// prepare return value
const bool bFillBackground(getFillHatch().isFillBackground());
- aRetval.realloc(bFillBackground ? aMatrices.size() + 1L : aMatrices.size());
+ aRetval.resize(bFillBackground ? aMatrices.size() + 1L : aMatrices.size());
// evtl. create filled background
if(bFillBackground)
@@ -185,7 +185,7 @@ namespace drawinglayer
return getOutputRange();
}
- Primitive2DSequence FillHatchPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer FillHatchPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
bool bAdaptDistance(0 != getFillHatch().getMinimalDiscreteDistance());
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 4a0607a..d2e9c88 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -32,10 +32,10 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence GraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D&
+ Primitive2DContainer GraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D&
) const
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
if(255L == getGraphicAttr().GetTransparency())
{
@@ -110,7 +110,7 @@ namespace drawinglayer
aTransformedGraphic,
aTransform);
- if(!aRetval.getLength())
+ if(!aRetval.size())
{
// content is invisible, done
return aRetval;
@@ -131,7 +131,7 @@ namespace drawinglayer
basegfx::clamp(aSuppressGraphicAttr.GetGamma(), 0.0, 10.0),
aSuppressGraphicAttr.IsInvert());
- if(!aRetval.getLength())
+ if(!aRetval.size())
{
// content is invisible, done
return aRetval;
@@ -150,7 +150,7 @@ namespace drawinglayer
aRetval,
fTransparency));
- aRetval = Primitive2DSequence(&aUnifiedTransparence, 1);
+ aRetval = Primitive2DContainer { aUnifiedTransparence };
}
}
@@ -179,7 +179,7 @@ namespace drawinglayer
getGraphicAttr().GetRightCrop() * aCropScaleFactor.getX(),
getGraphicAttr().GetBottomCrop() * aCropScaleFactor.getY()));
- aRetval = Primitive2DSequence(&xPrimitive, 1);
+ aRetval = Primitive2DContainer { xPrimitive };
}
return aRetval;
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index be7ff65..a924b3d 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -193,11 +193,11 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence create2DDecompositionOfGraphic(
+ Primitive2DContainer create2DDecompositionOfGraphic(
const Graphic& rGraphic,
const basegfx::B2DHomMatrix& rTransform)
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
switch(rGraphic.GetType())
{
@@ -212,7 +212,7 @@ namespace drawinglayer
{
// create sub-primitives for animated bitmap and the needed animation loop
animation::AnimationEntryLoop aAnimationLoop(aData.loopCount() ? aData.loopCount() : 0xffff);
- Primitive2DSequence aBitmapPrimitives(aData.count());
+ Primitive2DContainer aBitmapPrimitives(aData.count());
for(sal_uInt32 a(0); a < aData.count(); a++)
{
@@ -228,7 +228,7 @@ namespace drawinglayer
aAnimationList.append(aAnimationLoop);
// create and add animated switch primitive
- aRetval.realloc(1);
+ aRetval.resize(1);
aRetval[0] = new AnimatedSwitchPrimitive2D(
aAnimationList,
aBitmapPrimitives,
@@ -256,7 +256,7 @@ namespace drawinglayer
aEmbedSvg = rTransform * aEmbedSvg;
// add Svg primitives embedded
- aRetval.realloc(1);
+ aRetval.resize(1);
aRetval[0] = new TransformPrimitive2D(
aEmbedSvg,
rGraphic.getSvgData()->getPrimitive2DSequence());
@@ -264,7 +264,7 @@ namespace drawinglayer
}
else
{
- aRetval.realloc(1);
+ aRetval.resize(1);
aRetval[0] = new BitmapPrimitive2D(
rGraphic.GetBitmapEx(),
rTransform);
@@ -278,7 +278,7 @@ namespace drawinglayer
// create MetafilePrimitive2D
const GDIMetaFile& rMetafile = rGraphic.GetGDIMetaFile();
- aRetval.realloc(1);
+ aRetval.resize(1);
aRetval[0] = new MetafilePrimitive2D(
rTransform,
rMetafile);
@@ -316,8 +316,8 @@ namespace drawinglayer
return aRetval;
}
- Primitive2DSequence create2DColorModifierEmbeddingsAsNeeded(
- const Primitive2DSequence& rChildren,
+ Primitive2DContainer create2DColorModifierEmbeddingsAsNeeded(
+ const Primitive2DContainer& rChildren,
GraphicDrawMode aGraphicDrawMode,
double fLuminance,
double fContrast,
@@ -327,9 +327,9 @@ namespace drawinglayer
double fGamma,
bool bInvert)
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
- if(!rChildren.getLength())
+ if(!rChildren.size())
{
// no child content, done
return aRetval;
@@ -363,7 +363,7 @@ namespace drawinglayer
basegfx::BColorModifierSharedPtr(
new basegfx::BColorModifier_gray())));
- aRetval = Primitive2DSequence(&aPrimitiveGrey, 1);
+ aRetval = Primitive2DContainer { aPrimitiveGrey };
break;
}
case GRAPHICDRAWMODE_MONO:
@@ -375,7 +375,7 @@ namespace drawinglayer
basegfx::BColorModifierSharedPtr(
new basegfx::BColorModifier_black_and_white(0.5))));
- aRetval = Primitive2DSequence(&aPrimitiveBlackAndWhite, 1);
+ aRetval = Primitive2DContainer { aPrimitiveBlackAndWhite };
break;
}
// coverity[dead_error_begin] - intentional dead case
@@ -410,7 +410,7 @@ namespace drawinglayer
fLuminance,
fContrast))));
- aRetval = Primitive2DSequence(&aPrimitiveRGBLuminannceContrast, 1);
+ aRetval = Primitive2DContainer { aPrimitiveRGBLuminannceContrast };
}
// gamma (boolean)
@@ -423,7 +423,7 @@ namespace drawinglayer
new basegfx::BColorModifier_gamma(
fGamma))));
- aRetval = Primitive2DSequence(&aPrimitiveGamma, 1);
+ aRetval = Primitive2DContainer { aPrimitiveGamma };
}
// invert (boolean)
@@ -435,7 +435,7 @@ namespace drawinglayer
basegfx::BColorModifierSharedPtr(
new basegfx::BColorModifier_invert())));
- aRetval = Primitive2DSequence(&aPrimitiveInvert, 1);
+ aRetval = Primitive2DContainer { aPrimitiveInvert };
}
return aRetval;
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index b83ed34..69ce961 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -35,9 +35,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence GridPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer GridPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
if(!rViewInformation.getViewport().isEmpty() && getWidth() > 0.0 && getHeight() > 0.0)
{
@@ -234,7 +234,7 @@ namespace drawinglayer
const sal_uInt32 nRetvalCount((nCountPoint ? 1 : 0) + (nCountCross ? 1 : 0));
sal_uInt32 nInsertCounter(0);
- aRetval.realloc(nRetvalCount);
+ aRetval.resize(nRetvalCount);
// add PointArrayPrimitive2D if point markers were added
if(nCountPoint)
@@ -319,20 +319,20 @@ namespace drawinglayer
return aUnitRange;
}
- Primitive2DSequence GridPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer GridPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
- if(getBuffered2DDecomposition().hasElements())
+ if(!getBuffered2DDecomposition().empty())
{
if(maLastViewport != rViewInformation.getViewport() || maLastObjectToViewTransformation != rViewInformation.getObjectToViewTransformation())
{
// conditions of last local decomposition have changed, delete
- const_cast< GridPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< GridPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember ViewRange and ViewTransformation
const_cast< GridPrimitive2D* >(this)->maLastObjectToViewTransformation = rViewInformation.getObjectToViewTransformation();
diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index eae9502..6ad6e77 100644
--- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
@@ -30,7 +30,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- GroupPrimitive2D::GroupPrimitive2D( const Primitive2DSequence& rChildren )
+ GroupPrimitive2D::GroupPrimitive2D( const Primitive2DContainer& rChildren )
: BasePrimitive2D(),
maChildren(rChildren)
{
@@ -46,14 +46,14 @@ namespace drawinglayer
{
const GroupPrimitive2D& rCompare = static_cast< const GroupPrimitive2D& >(rPrimitive);
- return (arePrimitive2DSequencesEqual(getChildren(), rCompare.getChildren()));
+ return getChildren() == rCompare.getChildren();
}
return false;
}
/// default: just return children, so all renderers not supporting group will use it's content
- Primitive2DSequence GroupPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer GroupPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
return getChildren();
}
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
index 3962f65..83977cf 100644
--- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
@@ -35,7 +35,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence HelplinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer HelplinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
std::vector< BasePrimitive2D* > aTempPrimitiveTarget;
@@ -130,7 +130,7 @@ namespace drawinglayer
}
// prepare return value
- Primitive2DSequence aRetval(aTempPrimitiveTarget.size());
+ Primitive2DContainer aRetval(aTempPrimitiveTarget.size());
for(size_t a(0); a < aTempPrimitiveTarget.size(); a++)
{
@@ -177,20 +177,20 @@ namespace drawinglayer
return false;
}
- Primitive2DSequence HelplinePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer HelplinePrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
- if(getBuffered2DDecomposition().hasElements())
+ if(!getBuffered2DDecomposition().empty())
{
if(maLastViewport != rViewInformation.getViewport() || maLastObjectToViewTransformation != rViewInformation.getObjectToViewTransformation())
{
// conditions of last local decomposition have changed, delete
- const_cast< HelplinePrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< HelplinePrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember ViewRange and ViewTransformation
const_cast< HelplinePrimitive2D* >(this)->maLastObjectToViewTransformation = rViewInformation.getObjectToViewTransformation();
diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
index 0723b29..e5d9e38 100644
--- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
@@ -31,19 +31,19 @@ namespace drawinglayer
namespace primitive2d
{
HiddenGeometryPrimitive2D::HiddenGeometryPrimitive2D(
- const Primitive2DSequence& rChildren)
+ const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
}
basegfx::B2DRange HiddenGeometryPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
{
- return getB2DRangeFromPrimitive2DSequence(getChildren(), rViewInformation);
+ return getChildren().getB2DRange(rViewInformation);
}
- Primitive2DSequence HiddenGeometryPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer HiddenGeometryPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
// provide unique ID
diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
index e5cb6e8..e7554ed 100644
--- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
@@ -31,7 +31,7 @@ namespace drawinglayer
namespace primitive2d
{
InvertPrimitive2D::InvertPrimitive2D(
- const Primitive2DSequence& rChildren)
+ const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
}
diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
index 1d0bbae..d96ac22 100644
--- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
@@ -36,9 +36,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence MarkerArrayPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer MarkerArrayPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- Primitive2DSequence xRetval;
+ Primitive2DContainer xRetval;
const std::vector< basegfx::B2DPoint >& rPositions = getPositions();
const sal_uInt32 nMarkerCount(rPositions.size());
@@ -57,7 +57,7 @@ namespace drawinglayer
aLogicHalfSize *= 0.5;
// number of primitives is known; realloc accordingly
- xRetval.realloc(nMarkerCount);
+ xRetval.resize(nMarkerCount);
for(sal_uInt32 a(0); a < nMarkerCount; a++)
{
diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
index 530ff00..618c93f 100644
--- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
@@ -32,7 +32,7 @@ namespace drawinglayer
{
MaskPrimitive2D::MaskPrimitive2D(
const basegfx::B2DPolyPolygon& rMask,
- const Primitive2DSequence& rChildren)
+ const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren),
maMask(rMask)
{
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index 1140228..bf21d18 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -34,9 +34,10 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence MediaPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer MediaPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- Primitive2DSequence xRetval(1);
+ Primitive2DContainer xRetval;
+ xRetval.resize(1);
// create background object
basegfx::B2DPolygon aBackgroundPolygon(basegfx::tools::createUnitPolygon());
@@ -51,7 +52,7 @@ namespace drawinglayer
{
const GraphicObject aGraphicObject(maSnapshot);
const GraphicAttr aGraphicAttr;
- xRetval.realloc(2);
+ xRetval.resize(2);
xRetval[0] = xRefBackground;
xRetval[1] = Primitive2DReference(new GraphicPrimitive2D(getTransform(), aGraphicObject, aGraphicAttr));
}
@@ -74,7 +75,7 @@ namespace drawinglayer
// invisible content for HitTest and BoundRect
const Primitive2DReference xHiddenLines(new HiddenGeometryPrimitive2D(xRetval));
- xRetval = Primitive2DSequence(&xHiddenLines, 1);
+ xRetval = Primitive2DContainer { xHiddenLines, };
}
else
{
@@ -86,7 +87,7 @@ namespace drawinglayer
// add transform primitive
const Primitive2DReference aScaled(new TransformPrimitive2D(aTransform, xRetval));
- xRetval = Primitive2DSequence(&aScaled, 1L);
+ xRetval = Primitive2DContainer { aScaled };
}
}
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 4a641d6..167eb71 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -428,10 +428,10 @@ namespace
}
}
- drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence(const PropertyHolder& rPropertyHolder)
+ drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequence(const PropertyHolder& rPropertyHolder)
{
const sal_uInt32 nCount(aTargets.size());
- drawinglayer::primitive2d::Primitive2DSequence xRetval(nCount);
+ drawinglayer::primitive2d::Primitive2DContainer xRetval(nCount);
for(sal_uInt32 a(0); a < nCount; a++)
{
@@ -444,7 +444,7 @@ namespace
// the buffer to not delete them in the destructor.
aTargets.clear();
- if(xRetval.hasElements() && rPropertyHolder.getClipPolyPolygonActive())
+ if(!xRetval.empty() && rPropertyHolder.getClipPolyPolygonActive())
{
const basegfx::B2DPolyPolygon& rClipPolyPolygon = rPropertyHolder.getClipPolyPolygon();
@@ -455,7 +455,7 @@ namespace
rClipPolyPolygon,
xRetval));
- xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xMask, 1);
+ xRetval = drawinglayer::primitive2d::Primitive2DContainer { xMask };
}
}
@@ -538,7 +538,7 @@ namespace drawinglayer
{
protected:
/// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(
+ virtual Primitive2DContainer create2DDecomposition(
const geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -551,7 +551,7 @@ namespace drawinglayer
}
};
- Primitive2DSequence NonOverlappingFillGradientPrimitive2D::create2DDecomposition(
+ Primitive2DContainer NonOverlappingFillGradientPrimitive2D::create2DDecomposition(
const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillGradient().isDefault())
@@ -560,7 +560,7 @@ namespace drawinglayer
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
} // end of namespace primitive2d
@@ -990,7 +990,7 @@ namespace
// MaskPrimitive2D accordingly.
if(rPropertyHolders.Current().getClipPolyPolygonActive() && rTargetHolders.size() > 1)
{
- drawinglayer::primitive2d::Primitive2DSequence aSubContent;
+ drawinglayer::primitive2d::Primitive2DContainer aSubContent;
if(rPropertyHolders.Current().getClipPolyPolygon().count()
&& rTargetHolders.Current().size())
@@ -1001,7 +1001,7 @@ namespace
rTargetHolders.Pop();
- if(aSubContent.hasElements())
+ if(!aSubContent.empty())
{
rTargetHolders.Current().append(
new drawinglayer::primitive2d::GroupPrimitive2D(
@@ -1036,7 +1036,7 @@ namespace
// check if currently active
if(rPropertyHolders.Current().isRasterOpActive() && rTargetHolders.size() > 1)
{
- drawinglayer::primitive2d::Primitive2DSequence aSubContent;
+ drawinglayer::primitive2d::Primitive2DContainer aSubContent;
if(rTargetHolders.Current().size())
{
@@ -1045,7 +1045,7 @@ namespace
rTargetHolders.Pop();
- if(aSubContent.hasElements())
+ if(!aSubContent.empty())
{
if(rPropertyHolders.Current().isRasterOpForceBlack())
{
@@ -1120,7 +1120,7 @@ namespace
if(!rPropertyHolder.getTransformation().isIdentity())
{
const drawinglayer::primitive2d::Primitive2DReference xPrim(pRetval);
- const drawinglayer::primitive2d::Primitive2DSequence xSeq(&xPrim, 1);
+ const drawinglayer::primitive2d::Primitive2DContainer xSeq { xPrim };
pRetval = new drawinglayer::primitive2d::TransformPrimitive2D(
rPropertyHolder.getTransformation(),
@@ -1196,7 +1196,7 @@ namespace
rTarget.append(
new drawinglayer::primitive2d::TransformPrimitive2D(
rProperty.getTransformation(),
- drawinglayer::primitive2d::Primitive2DSequence(&xPrim, 1)));
+ drawinglayer::primitive2d::Primitive2DContainer { xPrim }));
}
}
@@ -1425,7 +1425,7 @@ namespace
aTextTransform.translate(rTextStartPosition.X(), rTextStartPosition.Y());
// prepare Primitive2DSequence, put text in foreground
- drawinglayer::primitive2d::Primitive2DSequence aSequence(2);
+ drawinglayer::primitive2d::Primitive2DContainer aSequence(2);
aSequence[1] = drawinglayer::primitive2d::Primitive2DReference(pResult);
// prepare filled polygon
@@ -1457,7 +1457,7 @@ namespace
rTarget.append(
new drawinglayer::primitive2d::TransformPrimitive2D(
rProperty.getTransformation(),
- drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1)));
+ drawinglayer::primitive2d::Primitive2DContainer { aReference }));
}
}
}
@@ -1575,7 +1575,7 @@ namespace
else
{
// when a transformation is set, embed to it
- drawinglayer::primitive2d::Primitive2DSequence xTargets(aTargetVector.size());
+ drawinglayer::primitive2d::Primitive2DContainer xTargets(aTargetVector.size());
for(size_t a(0); a < aTargetVector.size(); a++)
{
@@ -2116,7 +2116,7 @@ namespace
if(aGDIMetaFile.GetActionSize())
{
// create sub-content
- drawinglayer::primitive2d::Primitive2DSequence xSubContent;
+ drawinglayer::primitive2d::Primitive2DContainer xSubContent;
{
rTargetHolders.Push();
@@ -2132,7 +2132,7 @@ namespace
rTargetHolders.Pop();
}
- if(xSubContent.hasElements())
+ if(!xSubContent.empty())
{
// add with transformation
rTargetHolders.Current().append(
@@ -2299,7 +2299,7 @@ namespace
{
// really a gradient
aRange.transform(rPropertyHolders.Current().getTransformation());
- drawinglayer::primitive2d::Primitive2DSequence xGradient(1);
+ drawinglayer::primitive2d::Primitive2DContainer xGradient(1);
if(rPropertyHolders.Current().isRasterOpInvert())
{
@@ -2356,7 +2356,7 @@ namespace
rTargetHolders.Current().append(
new drawinglayer::primitive2d::MaskPrimitive2D(
aOutline,
- drawinglayer::primitive2d::Primitive2DSequence(&aFillHatch, 1)));
+ drawinglayer::primitive2d::Primitive2DContainer { aFillHatch }));
}
break;
@@ -2859,13 +2859,13 @@ namespace
// create primitives there and get them
createHairlineAndFillPrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current());
- const drawinglayer::primitive2d::Primitive2DSequence aSubContent(
+ const drawinglayer::primitive2d::Primitive2DContainer aSubContent(
rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current()));
// back to old target
rTargetHolders.Pop();
- if(aSubContent.hasElements())
+ if(!aSubContent.empty())
{
rTargetHolders.Current().append(
new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D(
@@ -2967,7 +2967,7 @@ namespace
{
// create the sub-content with no embedding specific to the
// sub-metafile, this seems not to be used.
- drawinglayer::primitive2d::Primitive2DSequence xSubContent;
+ drawinglayer::primitive2d::Primitive2DContainer xSubContent;
{
rTargetHolders.Push();
// #i# for sub-Mteafile contents, do start with new, default render state
@@ -2978,7 +2978,7 @@ namespace
rTargetHolders.Pop();
}
- if(xSubContent.hasElements())
+ if(!xSubContent.empty())
{
// prepare sub-content transform
basegfx::B2DHomMatrix aSubTransform;
@@ -3011,7 +3011,7 @@ namespace
aSubTransform,
xSubContent));
- xSubContent = drawinglayer::primitive2d::Primitive2DSequence(&aEmbeddedTransform, 1);
+ xSubContent = drawinglayer::primitive2d::Primitive2DContainer { aEmbeddedTransform };
}
// check if gradient is a real gradient
@@ -3042,7 +3042,7 @@ namespace
rTargetHolders.Current().append(
new drawinglayer::primitive2d::TransparencePrimitive2D(
xSubContent,
- drawinglayer::primitive2d::Primitive2DSequence(&xTransparence, 1)));
+ drawinglayer::primitive2d::Primitive2DContainer { xTransparence }));
}
}
}
@@ -3176,7 +3176,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence MetafilePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer MetafilePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
// prepare target and porperties; each will have one default entry
TargetHolders aTargetHolders;
@@ -3190,19 +3190,19 @@ namespace drawinglayer
// get the content. There should be only one target, as in the start condition,
// but iterating will be the right thing to do when some push/pop is not closed
- Primitive2DSequence xRetval;
+ Primitive2DContainer xRetval;
while(aTargetHolders.size() > 1)
{
- appendPrimitive2DSequenceToPrimitive2DSequence(xRetval,
+ xRetval.append(
aTargetHolders.Current().getPrimitive2DSequence(aPropertyHolders.Current()));
aTargetHolders.Pop();
}
- appendPrimitive2DSequenceToPrimitive2DSequence(xRetval,
+ xRetval.append(
aTargetHolders.Current().getPrimitive2DSequence(aPropertyHolders.Current()));
- if(xRetval.hasElements())
+ if(!xRetval.empty())
{
// get target size
const Rectangle aMtfTarget(getMetaFile().GetPrefMapMode().GetOrigin(), getMetaFile().GetPrefSize());
@@ -3222,7 +3222,7 @@ namespace drawinglayer
aAdaptedTransform,
xRetval));
- xRetval = Primitive2DSequence(&aEmbeddedTransform, 1);
+ xRetval = Primitive2DContainer { aEmbeddedTransform };
}
return xRetval;
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index 4e37037..f87e271 100644
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
@@ -31,7 +31,7 @@ namespace drawinglayer
namespace primitive2d
{
ModifiedColorPrimitive2D::ModifiedColorPrimitive2D(
- const Primitive2DSequence& rChildren,
+ const Primitive2DContainer& rChildren,
const basegfx::BColorModifierSharedPtr& rColorModifier)
: GroupPrimitive2D(rChildren),
maColorModifier(rColorModifier)
diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
index ea77ada..6046825 100644
--- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
@@ -26,7 +26,7 @@ namespace drawinglayer
namespace primitive2d
{
ObjectInfoPrimitive2D::ObjectInfoPrimitive2D(
- const Primitive2DSequence& rChildren,
+ const Primitive2DContainer& rChildren,
const OUString& rName,
const OUString& rTitle,
const OUString& rDesc)
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index c4fd3f0..bacbd4b 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -35,12 +35,12 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PagePreviewPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer PagePreviewPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- Primitive2DSequence xRetval;
- Primitive2DSequence aContent(getPageContent());
+ Primitive2DContainer xRetval;
+ Primitive2DContainer aContent(getPageContent());
- if(aContent.hasElements()
+ if(!aContent.empty()
&& basegfx::fTools::more(getContentWidth(), 0.0)
&& basegfx::fTools::more(getContentHeight(), 0.0))
{
@@ -53,7 +53,7 @@ namespace drawinglayer
{
// check if content overlaps with target size and needs to be embedded with a
// clipping primitive
- const basegfx::B2DRange aRealContentRange(getB2DRangeFromPrimitive2DSequence(aContent, rViewInformation));
+ const basegfx::B2DRange aRealContentRange(aContent.getB2DRange(rViewInformation));
const basegfx::B2DRange aAllowedContentRange(0.0, 0.0, getContentWidth(), getContentHeight());
if(!aAllowedContentRange.isInside(aRealContentRange))
@@ -62,7 +62,7 @@ namespace drawinglayer
new MaskPrimitive2D(
basegfx::B2DPolyPolygon(
basegfx::tools::createPolygonFromRect(aAllowedContentRange)), aContent));
- aContent = Primitive2DSequence(&xReferenceA, 1);
+ aContent = Primitive2DContainer { xReferenceA };
}
// create a mapping from content to object.
@@ -112,7 +112,7 @@ namespace drawinglayer
// embed in necessary transformation to map from SdrPage to SdrPageObject
const Primitive2DReference xReferenceB(new TransformPrimitive2D(aPageTrans, aContent));
- xRetval = Primitive2DSequence(&xReferenceB, 1);
+ xRetval = Primitive2DContainer { xReferenceB };
}
}
@@ -124,7 +124,7 @@ namespace drawinglayer
const basegfx::B2DHomMatrix& rTransform,
double fContentWidth,
double fContentHeight,
- const Primitive2DSequence& rPageContent,
+ const Primitive2DContainer& rPageContent,
bool bKeepAspectRatio)
: BufferedDecompositionPrimitive2D(),
mxDrawPage(rxDrawPage),
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 19140d9..e2f1bcb 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -36,11 +36,11 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PatternFillPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer PatternFillPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
- if(getChildren().hasElements())
+ if(!getChildren().empty())
{
if(!getReferenceRange().isEmpty() && getReferenceRange().getWidth() > 0.0 && getReferenceRange().getHeight() > 0.0)
{
@@ -56,8 +56,8 @@ namespace drawinglayer
// check if content needs to be clipped
const basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0);
- const basegfx::B2DRange aContentRange(getB2DRangeFromPrimitive2DSequence(getChildren(), rViewInformation));
- Primitive2DSequence aContent(getChildren());
+ const basegfx::B2DRange aContentRange(getChildren().getB2DRange(rViewInformation));
+ Primitive2DContainer aContent(getChildren());
if(!aUnitRange.isInside(aContentRange))
{
@@ -66,11 +66,11 @@ namespace drawinglayer
basegfx::B2DPolyPolygon(basegfx::tools::createPolygonFromRect(aUnitRange)),
aContent));
- aContent = Primitive2DSequence(&xRef, 1);
+ aContent = Primitive2DContainer { xRef };
}
// resize result
- aRetval.realloc(aMatrices.size());
+ aRetval.resize(aMatrices.size());
// create one primitive for each matrix
for(size_t a(0); a < aMatrices.size(); a++)
@@ -92,7 +92,7 @@ namespace drawinglayer
aMaskTransform,
aRetval));
- aRetval = Primitive2DSequence(&xRef, 1);
+ aRetval = Primitive2DContainer { xRef };
}
// embed result in mask
@@ -102,7 +102,7 @@ namespace drawinglayer
getMask(),
aRetval));
- aRetval = Primitive2DSequence(&xRef, 1);
+ aRetval = Primitive2DContainer { xRef };
}
}
@@ -114,7 +114,7 @@ namespace drawinglayer
PatternFillPrimitive2D::PatternFillPrimitive2D(
const basegfx::B2DPolyPolygon& rMask,
- const Primitive2DSequence& rChildren,
+ const Primitive2DContainer& rChildren,
const basegfx::B2DRange& rReferenceRange)
: BufferedDecompositionPrimitive2D(),
maMask(rMask),
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index dfc4aa4..d69efac 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -92,7 +92,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolygonMarkerPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer PolygonMarkerPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
// calculate logic DashLength
const basegfx::B2DVector aDashVector(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(getDiscreteDashLength(), 0.0));
@@ -110,7 +110,7 @@ namespace drawinglayer
basegfx::tools::applyLineDashing(getB2DPolygon(), aDash, &aDashedPolyPolyA, &aDashedPolyPolyB, 2.0 * fLogicDashLength);
// prepare return value
- Primitive2DSequence aRetval(2);
+ Primitive2DContainer aRetval(2);
aRetval[0] = Primitive2DReference(new PolyPolygonHairlinePrimitive2D(aDashedPolyPolyA, getRGBColorA()));
aRetval[1] = Primitive2DReference(new PolyPolygonHairlinePrimitive2D(aDashedPolyPolyB, getRGBColorB()));
@@ -120,7 +120,7 @@ namespace drawinglayer
else
{
const Primitive2DReference xRef(new PolygonHairlinePrimitive2D(getB2DPolygon(), getRGBColorA()));
- return Primitive2DSequence(&xRef, 1L);
+ return Primitive2DContainer { xRef };
}
}
@@ -175,12 +175,12 @@ namespace drawinglayer
return aRetval;
}
- Primitive2DSequence PolygonMarkerPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer PolygonMarkerPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
bool bNeedNewDecomposition(false);
- if(getBuffered2DDecomposition().hasElements())
+ if(!getBuffered2DDecomposition().empty())
{
if(rViewInformation.getInverseObjectToViewTransformation() != maLastInverseObjectToViewTransformation)
{
@@ -191,10 +191,10 @@ namespace drawinglayer
if(bNeedNewDecomposition)
{
// conditions of last local decomposition have changed, delete
- const_cast< PolygonMarkerPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< PolygonMarkerPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember last used InverseObjectToViewTransformation
PolygonMarkerPrimitive2D* pThat = const_cast< PolygonMarkerPrimitive2D* >(this);
@@ -223,7 +223,7 @@ namespace drawinglayer
namespace primitive2d
{
- Primitive2DSequence PolygonStrokePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolygonStrokePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(getB2DPolygon().count())
{
@@ -265,7 +265,7 @@ namespace drawinglayer
}
// prepare return value
- Primitive2DSequence aRetval(aAreaPolyPolygon.count());
+ Primitive2DContainer aRetval(aAreaPolyPolygon.count());
// create primitive
for(sal_uInt32 b(0L); b < aAreaPolyPolygon.count(); b++)
@@ -292,12 +292,12 @@ namespace drawinglayer
aHairLinePolyPolygon,
getLineAttribute().getColor()));
- return Primitive2DSequence(&xRef, 1);
+ return Primitive2DContainer { xRef };
}
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
@@ -408,9 +408,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolygonWavePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolygonWavePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
if(getB2DPolygon().count())
{
@@ -422,13 +422,13 @@ namespace drawinglayer
// create waveline curve
const basegfx::B2DPolygon aWaveline(basegfx::tools::createWaveline(getB2DPolygon(), getWaveWidth(), getWaveHeight()));
const Primitive2DReference xRef(new PolygonStrokePrimitive2D(aWaveline, getLineAttribute(), getStrokeAttribute()));
- aRetval = Primitive2DSequence(&xRef, 1);
+ aRetval = Primitive2DContainer { xRef };
}
else
{
// flat waveline, decompose to simple line primitive
const Primitive2DReference xRef(new PolygonStrokePrimitive2D(getB2DPolygon(), getLineAttribute(), getStrokeAttribute()));
- aRetval = Primitive2DSequence(&xRef, 1);
+ aRetval = Primitive2DContainer { xRef };
}
}
@@ -521,7 +521,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolygonStrokeArrowPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolygonStrokeArrowPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// copy local polygon, it may be changed
basegfx::B2DPolygon aLocalPolygon(getB2DPolygon());
@@ -569,7 +569,7 @@ namespace drawinglayer
}
// prepare return value
- Primitive2DSequence aRetval(1L + (aArrowA.count() ? 1L : 0L) + (aArrowB.count() ? 1L : 0L));
+ Primitive2DContainer aRetval(1L + (aArrowA.count() ? 1L : 0L) + (aArrowB.count() ? 1L : 0L));
sal_uInt32 nInd(0L);
// add shaft
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index ec18be6..adaf4dde 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -42,14 +42,14 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonHairlinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolyPolygonHairlinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
const sal_uInt32 nCount(aPolyPolygon.count());
if(nCount)
{
- Primitive2DSequence aRetval(nCount);
+ Primitive2DContainer aRetval(nCount);
for(sal_uInt32 a(0L); a < nCount; a++)
{
@@ -60,7 +60,7 @@ namespace drawinglayer
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
@@ -102,14 +102,14 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonMarkerPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolyPolygonMarkerPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
const sal_uInt32 nCount(aPolyPolygon.count());
if(nCount)
{
- Primitive2DSequence aRetval(nCount);
+ Primitive2DContainer aRetval(nCount);
for(sal_uInt32 a(0L); a < nCount; a++)
{
@@ -125,7 +125,7 @@ namespace drawinglayer
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
@@ -175,14 +175,14 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonStrokePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolyPolygonStrokePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
const sal_uInt32 nCount(aPolyPolygon.count());
if(nCount)
{
- Primitive2DSequence aRetval(nCount);
+ Primitive2DContainer aRetval(nCount);
for(sal_uInt32 a(0L); a < nCount; a++)
{
@@ -195,7 +195,7 @@ namespace drawinglayer
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
@@ -300,7 +300,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonGradientPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolyPolygonGradientPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillGradient().isDefault())
{
@@ -311,17 +311,17 @@ namespace drawinglayer
getDefinitionRange(),
getFillGradient());
const Primitive2DReference xSubRef(pNewGradient);
- const Primitive2DSequence aSubSequence(&xSubRef, 1L);
+ const Primitive2DContainer aSubSequence { xSubRef };
// create mask primitive
MaskPrimitive2D* pNewMask = new MaskPrimitive2D(getB2DPolyPolygon(), aSubSequence);
const Primitive2DReference xRef(pNewMask);
- return Primitive2DSequence(&xRef, 1);
+ return Primitive2DContainer { xRef };
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
@@ -372,7 +372,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonHatchPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolyPolygonHatchPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillHatch().isDefault())
{
@@ -384,17 +384,17 @@ namespace drawinglayer
getBackgroundColor(),
getFillHatch());
const Primitive2DReference xSubRef(pNewHatch);
- const Primitive2DSequence aSubSequence(&xSubRef, 1L);
+ const Primitive2DContainer aSubSequence { xSubRef };
// create mask primitive
MaskPrimitive2D* pNewMask = new MaskPrimitive2D(getB2DPolyPolygon(), aSubSequence);
const Primitive2DReference xRef(pNewMask);
- return Primitive2DSequence(&xRef, 1);
+ return Primitive2DContainer { xRef };
}
else
{
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
}
@@ -450,7 +450,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonGraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolyPolygonGraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(!getFillGraphic().isDefault())
{
@@ -521,14 +521,14 @@ namespace drawinglayer
const Primitive2DReference xRef(
new MaskPrimitive2D(
getB2DPolyPolygon(),
- Primitive2DSequence(&xSubRef, 1)));
+ Primitive2DContainer { xSubRef }));
- return Primitive2DSequence(&xRef, 1);
+ return Primitive2DContainer { xRef };
}
}
}
- return Primitive2DSequence();
+ return Primitive2DContainer();
}
PolyPolygonGraphicPrimitive2D::PolyPolygonGraphicPrimitive2D(
@@ -578,9 +578,9 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonSelectionPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+ Primitive2DContainer PolyPolygonSelectionPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
- Primitive2DSequence aRetval;
+ Primitive2DContainer aRetval;
if(getTransparence() < 1.0 && getB2DPolyPolygon().count())
{
@@ -592,7 +592,7 @@ namespace drawinglayer
getB2DPolyPolygon(),
getColor()));
- aRetval = Primitive2DSequence(&aFill, 1);
+ aRetval = Primitive2DContainer { aFill };
}
if(getDiscreteGrow() > 0.0)
@@ -605,18 +605,18 @@ namespace drawinglayer
getB2DPolyPolygon(),
aLineAttribute));
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aFatLine);
+ aRetval.push_back(aFatLine);
}
// embed filled to transparency (if used)
- if(aRetval.getLength() && getTransparence() > 0.0)
+ if(!aRetval.empty() && getTransparence() > 0.0)
{
const Primitive2DReference aTrans(
new UnifiedTransparencePrimitive2D(
aRetval,
getTransparence()));
- aRetval = Primitive2DSequence(&aTrans, 1);
+ aRetval = Primitive2DContainer { aTrans };
}
}
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 228b63a..9b44f4e 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -27,7 +27,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence DiscreteMetricDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer DiscreteMetricDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -35,13 +35,13 @@ namespace drawinglayer
const basegfx::B2DVector aDiscreteVector(rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 1.0));
const double fDiscreteUnit(std::min(fabs(aDiscreteVector.getX()), fabs(aDiscreteVector.getY())));
- if(getBuffered2DDecomposition().hasElements() && !basegfx::fTools::equal(fDiscreteUnit, getDiscreteUnit()))
+ if(!getBuffered2DDecomposition().empty() && !basegfx::fTools::equal(fDiscreteUnit, getDiscreteUnit()))
{
// conditions of last local decomposition have changed, delete
- const_cast< DiscreteMetricDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< DiscreteMetricDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember new valid DiscreteUnit
const_cast< DiscreteMetricDependentPrimitive2D* >(this)->updateDiscreteUnit(fDiscreteUnit);
@@ -59,20 +59,20 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence ViewportDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer ViewportDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
// get the current Viewport
const basegfx::B2DRange& rViewport = rViewInformation.getViewport();
- if(getBuffered2DDecomposition().hasElements() && !rViewport.equal(getViewport()))
+ if(!getBuffered2DDecomposition().empty() && !rViewport.equal(getViewport()))
{
// conditions of last local decomposition have changed, delete
- const_cast< ViewportDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< ViewportDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember new valid DiscreteUnit
const_cast< ViewportDependentPrimitive2D* >(this)->maViewport = rViewport;
@@ -90,20 +90,20 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence ViewTransformationDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer ViewTransformationDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
// get the current ViewTransformation
const basegfx::B2DHomMatrix& rViewTransformation = rViewInformation.getViewTransformation();
- if(getBuffered2DDecomposition().hasElements() && rViewTransformation != getViewTransformation())
+ if(!getBuffered2DDecomposition().empty() && rViewTransformation != getViewTransformation())
{
// conditions of last local decomposition have changed, delete
- const_cast< ViewTransformationDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< ViewTransformationDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
- if(!getBuffered2DDecomposition().hasElements())
+ if(getBuffered2DDecomposition().empty())
{
// remember new valid ViewTransformation
const_cast< ViewTransformationDependentPrimitive2D* >(this)->maViewTransformation = rViewTransformation;
@@ -121,29 +121,29 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence ObjectAndViewTransformationDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+ Primitive2DContainer ObjectAndViewTransformationDependentPrimitive2D::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
// get the current ViewTransfromation
const basegfx::B2DHomMatrix& rViewTransformation = rViewInformation.getViewTransformation();
- if(getBuffered2DDecomposition().hasElements() && rViewTransformation != getViewTransformation())
+ if(!getBuffered2DDecomposition().empty() && rViewTransformation != getViewTransformation())
{
// conditions of last local decomposition have changed, delete
- const_cast< ObjectAndViewTransformationDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
+ const_cast< ObjectAndViewTransformationDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DContainer());
}
// get the current ObjectTransformation
const basegfx::B2DHomMatrix& rObjectTransformation = rViewInformation.getObjectTransformation();
- if(getBuffered2DDecomposition().hasElements() && rObjectTransformation != getObjectTransformation())
+ if(!getBuffered2DDecomposition().empty() && rObjectTransformation != getObjectTransformation())
{
// conditions of last local decomposition have changed, delete
- const_cast< ObjectAndViewTransformationDependentPrimitive2D* >(this)->setBuffered2DDecomposition(Primitive2DSequence());
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list