summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/docvw')
-rw-r--r--sw/source/uibase/docvw/AnchorOverlayObject.cxx26
-rw-r--r--sw/source/uibase/docvw/AnchorOverlayObject.hxx2
-rw-r--r--sw/source/uibase/docvw/DashedLine.cxx6
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx8
-rw-r--r--sw/source/uibase/docvw/OverlayRanges.cxx10
-rw-r--r--sw/source/uibase/docvw/OverlayRanges.hxx2
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx8
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.cxx16
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.hxx2
9 files changed, 40 insertions, 40 deletions
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index 67f4e3bcda9e..9adf4699f6f3 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -52,7 +52,7 @@ private:
bool mbLineSolid : 1;
protected:
- virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
+ virtual drawinglayer::primitive2d::Primitive2DContainer create2DDecomposition(
const drawinglayer::geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -90,10 +90,10 @@ public:
DeclPrimitive2DIDBlock()
};
-drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecomposition(
+drawinglayer::primitive2d::Primitive2DContainer AnchorPrimitive::create2DDecomposition(
const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/) const
{
- drawinglayer::primitive2d::Primitive2DSequence aRetval;
+ drawinglayer::primitive2d::Primitive2DContainer aRetval;
if ( AS_TRI == maAnchorState ||
AS_ALL == maAnchorState ||
@@ -105,7 +105,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
basegfx::B2DPolyPolygon(getTriangle()),
getColor()));
- drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aTriangle);
+ aRetval.push_back(aTriangle);
}
// prepare view-independent LineWidth and color
@@ -124,7 +124,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
getLine(),
aLineAttribute));
- drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aSolidLine);
+ aRetval.push_back(aSolidLine);
}
else
{
@@ -145,11 +145,11 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
aLineAttribute,
aStrokeAttribute));
- drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aStrokedLine);
+ aRetval.push_back(aStrokedLine);
}
}
- if(aRetval.hasElements() && getShadow())
+ if(!aRetval.empty() && getShadow())
{
// shadow is only for triangle and line start, and in upper left
// and lower right direction, in different colors
@@ -162,7 +162,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
aDarkerColor.clamp();
// create shadow sequence
- drawinglayer::primitive2d::Primitive2DSequence aShadows(2);
+ drawinglayer::primitive2d::Primitive2DContainer aShadows(2);
basegfx::B2DHomMatrix aTransform;
aTransform.set(0, 2, -getDiscreteUnit());
@@ -184,10 +184,10 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
aRetval));
// add shadow before geometry to make it be proccessed first
- const drawinglayer::primitive2d::Primitive2DSequence aTemporary(aRetval);
+ const drawinglayer::primitive2d::Primitive2DContainer aTemporary(aRetval);
aRetval = aShadows;
- drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(aRetval, aTemporary);
+ aRetval.append(aTemporary);
}
if ( AS_ALL == maAnchorState ||
@@ -200,7 +200,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
getLineTop(),
aLineAttribute));
- drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aLineTop);
+ aRetval.push_back(aLineTop);
}
return aRetval;
@@ -339,7 +339,7 @@ void AnchorOverlayObject::implResetGeometry()
maLineTop.clear();
}
-drawinglayer::primitive2d::Primitive2DSequence AnchorOverlayObject::createOverlayObjectPrimitive2DSequence()
+drawinglayer::primitive2d::Primitive2DContainer AnchorOverlayObject::createOverlayObjectPrimitive2DSequence()
{
implEnsureGeometry();
@@ -354,7 +354,7 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorOverlayObject::createOverla
getShadowedEffect(),
getLineSolid()) );
- return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
+ return drawinglayer::primitive2d::Primitive2DContainer { aReference };
}
void AnchorOverlayObject::SetAllPosition( const basegfx::B2DPoint& rPoint1,
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index 5c9d611d88ef..9492aef5c0f5 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -100,7 +100,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
void implResetGeometry();
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
private:
// object's geometry
diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx
index 6b766f8e79d5..7da108fb6dcc 100644
--- a/sw/source/uibase/docvw/DashedLine.cxx
+++ b/sw/source/uibase/docvw/DashedLine.cxx
@@ -46,7 +46,7 @@ void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
aPolygon.append(aStart);
aPolygon.append(aEnd);
- drawinglayer::primitive2d::Primitive2DSequence aSeq(1);
+ drawinglayer::primitive2d::Primitive2DContainer aSeq(1);
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
@@ -77,7 +77,7 @@ void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
aStrokePattern.push_back(3);
aStrokePattern.push_back(3);
- aSeq.realloc(2);
+ aSeq.resize(2);
}
// Compute the dashed line primitive
@@ -87,7 +87,7 @@ void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
drawinglayer::attribute::LineAttribute(m_pColorFn().getBColor()),
drawinglayer::attribute::StrokeAttribute(aStrokePattern));
- aSeq[aSeq.getLength() - 1] = drawinglayer::primitive2d::Primitive2DReference(pLine);
+ aSeq[aSeq.size() - 1] = drawinglayer::primitive2d::Primitive2DReference(pLine);
pProcessor->process(aSeq);
}
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 18b746b25977..25f706049841 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -260,7 +260,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
SetMapMode(MapMode(MAP_PIXEL));
const Rectangle aRect(Rectangle(Point(0, 0), rRenderContext.PixelToLogic(GetSizePixel())));
- drawinglayer::primitive2d::Primitive2DSequence aSeq(3);
+ drawinglayer::primitive2d::Primitive2DContainer aSeq(3);
B2DPolygon aPolygon = lcl_GetPolygon(aRect, m_bIsHeader);
@@ -355,8 +355,8 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
if (Application::GetSettings().GetStyleSettings().GetHighContrastMode())
aSignColor = Color(COL_WHITE).getBColor();
- aSeq.realloc(aSeq.getLength() + 1);
- aSeq[aSeq.getLength() - 1] = drawinglayer::primitive2d::Primitive2DReference(
+ aSeq.resize(aSeq.size() + 1);
+ aSeq[aSeq.size() - 1] = drawinglayer::primitive2d::Primitive2DReference(
new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
B2DPolyPolygon(aSign), aSignColor));
@@ -366,7 +366,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
// TODO Ghost it all if needed
- drawinglayer::primitive2d::Primitive2DSequence aGhostedSeq(1);
+ drawinglayer::primitive2d::Primitive2DContainer aGhostedSeq(1);
double nFadeRate = double(m_nFadeRate) / 100.0;
const basegfx::BColorModifierSharedPtr aBColorModifier(
diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx
index 2f0c4c9e083e..a04b813c5357 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -59,11 +59,11 @@ namespace sw
{
namespace overlay
{
- drawinglayer::primitive2d::Primitive2DSequence OverlayRanges::createOverlayObjectPrimitive2DSequence()
+ drawinglayer::primitive2d::Primitive2DContainer OverlayRanges::createOverlayObjectPrimitive2DSequence()
{
const sal_uInt32 nCount(getRanges().size());
- drawinglayer::primitive2d::Primitive2DSequence aRetval;
- aRetval.realloc(nCount);
+ drawinglayer::primitive2d::Primitive2DContainer aRetval;
+ aRetval.resize(nCount);
for ( sal_uInt32 a = 0; a < nCount; ++a )
{
const basegfx::BColor aRGBColor(getBaseColor().getBColor());
@@ -91,13 +91,13 @@ namespace sw
aPolyPolygon,
aRGBColor));
- aRetval.realloc(2);
+ aRetval.resize(2);
aRetval[0] = aUnifiedTransparence;
aRetval[1] = aOutline;
}
else
{
- aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aUnifiedTransparence, 1);
+ aRetval = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparence };
}
return aRetval;
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index 521e0a78d033..53dde2ddce06 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -40,7 +40,7 @@ namespace sw
bool mbShowSolidBorder;
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
public:
static OverlayRanges* CreateOverlayRange(
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 7a74b1cfa914..f0f056d4b255 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -159,7 +159,7 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
bool bRtl = AllSettings::GetLayoutRTL();
- drawinglayer::primitive2d::Primitive2DSequence aSeq(3);
+ drawinglayer::primitive2d::Primitive2DContainer aSeq(3);
B2DRectangle aBRect(double(aRect.Left()), double(aRect.Top()),
double(aRect.Right()), double(aRect.Bottom()));
B2DPolygon aPolygon = createPolygonFromRect(aBRect, 3.0 / BUTTON_WIDTH, 3.0 / BUTTON_HEIGHT);
@@ -195,11 +195,11 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
if (Application::GetSettings().GetStyleSettings().GetHighContrastMode())
aTriangleColor = Color(COL_WHITE).getBColor();
- aSeq.realloc(aSeq.getLength() + 1);
- aSeq[aSeq.getLength() - 1].set( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
+ aSeq.resize(aSeq.size() + 1);
+ aSeq[aSeq.size() - 1].set( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
B2DPolyPolygon(aTriangle), aTriangleColor));
- css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aGhostedSeq(1);
+ drawinglayer::primitive2d::Primitive2DContainer aGhostedSeq(1);
double nFadeRate = double(m_nFadeRate) / 100.0;
const basegfx::BColorModifierSharedPtr aBColorModifier(
new basegfx::BColorModifier_interpolate(Color(COL_WHITE).getBColor(),
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index c4700f9baa67..f95efcf22937 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -44,7 +44,7 @@ private:
ShadowState maShadowState;
protected:
- virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition(
+ virtual drawinglayer::primitive2d::Primitive2DContainer create2DDecomposition(
const drawinglayer::geometry::ViewInformation2D& rViewInformation) const override;
public:
@@ -68,11 +68,11 @@ public:
DeclPrimitive2DIDBlock()
};
-drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecomposition(
+drawinglayer::primitive2d::Primitive2DContainer ShadowPrimitive::create2DDecomposition(
const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/) const
{
// get logic sizes in object coordinate system
- drawinglayer::primitive2d::Primitive2DSequence xRetval;
+ drawinglayer::primitive2d::Primitive2DContainer xRetval;
basegfx::B2DRange aRange(getBasePosition());
switch(maShadowState)
@@ -95,7 +95,7 @@ drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecompos
aRange,
aFillGradientAttribute));
- xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+ xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
break;
}
case SS_VIEW:
@@ -116,7 +116,7 @@ drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecompos
aRange,
aFillGradientAttribute));
- xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+ xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
break;
}
case SS_EDIT:
@@ -137,7 +137,7 @@ drawinglayer::primitive2d::Primitive2DSequence ShadowPrimitive::create2DDecompos
aRange,
aFillGradientAttribute));
- xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+ xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
break;
}
default:
@@ -216,13 +216,13 @@ ShadowOverlayObject::~ShadowOverlayObject()
{
}
-drawinglayer::primitive2d::Primitive2DSequence ShadowOverlayObject::createOverlayObjectPrimitive2DSequence()
+drawinglayer::primitive2d::Primitive2DContainer ShadowOverlayObject::createOverlayObjectPrimitive2DSequence()
{
const drawinglayer::primitive2d::Primitive2DReference aReference(
new ShadowPrimitive( getBasePosition(),
GetSecondPosition(),
GetShadowState() ) );
- return drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
+ return drawinglayer::primitive2d::Primitive2DContainer { aReference };
}
void ShadowOverlayObject::SetShadowState(ShadowState aState)
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index c42e1a67c2e6..68481aa401c0 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -37,7 +37,7 @@ class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
{
protected:
// geometry creation for OverlayObject
- virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() override;
+ virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
private:
basegfx::B2DPoint maSecondPosition;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 17:04:51 +0000