summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx15
-rw-r--r--svx/source/sdr/primitive2d/sdrdecompositiontools.cxx46
-rw-r--r--svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx4
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx24
-rw-r--r--svx/source/xml/xmlgrhlp.cxx8
5 files changed, 49 insertions, 48 deletions
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index c35e6b2daff7..8a9f25b9b243 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -29,6 +29,7 @@
#include <sdr/attribute/sdrformtextattribute.hxx>
#include <tools/weakbase.h>
#include <svx/sdtaitm.hxx>
+#include <rtl/ref.hxx>
// predefines
@@ -93,7 +94,7 @@ namespace drawinglayer::primitive2d
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
// transformed clone operator
- virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0;
+ virtual rtl::Reference<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0;
};
} // end of namespace drawinglayer::primitive2d
@@ -127,7 +128,7 @@ namespace drawinglayer::primitive2d
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
+ virtual rtl::Reference<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -164,7 +165,7 @@ namespace drawinglayer::primitive2d
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
+ virtual rtl::Reference<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -217,7 +218,7 @@ namespace drawinglayer::primitive2d
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
+ virtual rtl::Reference<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -253,7 +254,7 @@ namespace drawinglayer::primitive2d
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
+ virtual rtl::Reference<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -288,7 +289,7 @@ namespace drawinglayer::primitive2d
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const override;
+ virtual rtl::Reference<SdrTextPrimitive2D> createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -321,7 +322,7 @@ namespace drawinglayer::primitive2d
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
+ virtual rtl::Reference<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index dd256654a8af..ad8814a974f0 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -198,7 +198,7 @@ namespace drawinglayer::primitive2d
bool bWordWrap)
{
basegfx::B2DHomMatrix aAnchorTransform(rObjectTransform);
- std::unique_ptr<SdrTextPrimitive2D> pNew;
+ rtl::Reference<SdrTextPrimitive2D> pNew;
if(rText.isContour())
{
@@ -226,20 +226,20 @@ namespace drawinglayer::primitive2d
0.0 != aScale.getY() ? 1.0 / aScale.getY() : 1.0));
// create with unit polygon
- pNew.reset(new SdrContourTextPrimitive2D(
+ pNew = new SdrContourTextPrimitive2D(
&rText.getSdrText(),
rText.getOutlinerParaObject(),
aScaledUnitPolyPolygon,
- rObjectTransform));
+ rObjectTransform);
}
else
{
// create with unit polygon
- pNew.reset(new SdrContourTextPrimitive2D(
+ pNew = new SdrContourTextPrimitive2D(
&rText.getSdrText(),
rText.getOutlinerParaObject(),
rUnitPolyPolygon,
- rObjectTransform));
+ rObjectTransform);
}
}
else if(!rText.getSdrFormTextAttribute().isDefault())
@@ -247,11 +247,11 @@ namespace drawinglayer::primitive2d
// text on path, use scaled polygon
basegfx::B2DPolyPolygon aScaledPolyPolygon(rUnitPolyPolygon);
aScaledPolyPolygon.transform(rObjectTransform);
- pNew.reset(new SdrPathTextPrimitive2D(
+ pNew = new SdrPathTextPrimitive2D(
&rText.getSdrText(),
rText.getOutlinerParaObject(),
aScaledPolyPolygon,
- rText.getSdrFormTextAttribute()));
+ rText.getSdrFormTextAttribute());
}
else
{
@@ -325,32 +325,32 @@ namespace drawinglayer::primitive2d
if(rText.isFitToSize())
{
// stretched text in range
- pNew.reset(new SdrStretchTextPrimitive2D(
+ pNew = new SdrStretchTextPrimitive2D(
&rText.getSdrText(),
rText.getOutlinerParaObject(),
aAnchorTransform,
- rText.isFixedCellHeight()));
+ rText.isFixedCellHeight());
}
else if(rText.isAutoFit())
{
// isotropically scaled text in range
- pNew.reset(new SdrAutoFitTextPrimitive2D(
+ pNew = new SdrAutoFitTextPrimitive2D(
&rText.getSdrText(),
rText.getOutlinerParaObject(),
aAnchorTransform,
- bWordWrap));
+ bWordWrap);
}
else if( rText.isChainable() && !rText.isInEditMode() )
{
- pNew.reset(new SdrChainedTextPrimitive2D(
+ pNew = new SdrChainedTextPrimitive2D(
&rText.getSdrText(),
rText.getOutlinerParaObject(),
- aAnchorTransform ));
+ aAnchorTransform );
}
else // text in range
{
// build new primitive
- pNew.reset(new SdrBlockTextPrimitive2D(
+ pNew = new SdrBlockTextPrimitive2D(
&rText.getSdrText(),
rText.getOutlinerParaObject(),
aAnchorTransform,
@@ -359,7 +359,7 @@ namespace drawinglayer::primitive2d
rText.isFixedCellHeight(),
rText.isScroll(),
bCellText,
- bWordWrap));
+ bWordWrap);
}
}
@@ -374,7 +374,7 @@ namespace drawinglayer::primitive2d
if(0.0 != aAnimationList.getDuration())
{
// create content sequence
- const Primitive2DReference xRefA(pNew.release());
+ const Primitive2DReference xRefA(pNew.get());
const Primitive2DContainer aContent { xRefA };
// create and add animated switch primitive
@@ -383,7 +383,7 @@ namespace drawinglayer::primitive2d
else
{
// add to decomposition
- return Primitive2DReference(pNew.release());
+ return Primitive2DReference(pNew.get());
}
}
@@ -408,9 +408,9 @@ namespace drawinglayer::primitive2d
aISRT.invert();
// bring the primitive back to scaled only and get scaled range, create new clone for this
- std::unique_ptr<SdrTextPrimitive2D> pNew2 = pNew->createTransformedClone(aISRT);
+ rtl::Reference<SdrTextPrimitive2D> pNew2 = pNew->createTransformedClone(aISRT);
OSL_ENSURE(pNew2, "createTextPrimitive: Could not create transformed clone of text primitive (!)");
- pNew = std::move(pNew2);
+ pNew = pNew2.get();
// create neutral geometry::ViewInformation2D for local range and decompose calls. This is okay
// since the decompose is view-independent
@@ -464,7 +464,7 @@ namespace drawinglayer::primitive2d
// pNew to aNewPrimitiveSequence)
Primitive2DContainer aAnimSequence;
pNew->get2DDecomposition(aAnimSequence, aViewInformation2D);
- pNew.reset();
+ pNew.clear();
// create a new animatedInterpolatePrimitive and add it
std::vector< basegfx::B2DHomMatrix > aMatrixStack;
@@ -482,7 +482,7 @@ namespace drawinglayer::primitive2d
else
{
// add to decomposition
- return Primitive2DReference(pNew.release());
+ return Primitive2DReference(pNew.get());
}
}
}
@@ -492,7 +492,7 @@ namespace drawinglayer::primitive2d
// #i97628#
// encapsulate with TextHierarchyEditPrimitive2D to allow renderers
// to suppress actively edited content if needed
- const Primitive2DReference xRefA(pNew.release());
+ const Primitive2DReference xRefA(pNew.get());
const Primitive2DContainer aContent { xRefA };
// create and add TextHierarchyEditPrimitive2D primitive
@@ -501,7 +501,7 @@ namespace drawinglayer::primitive2d
else
{
// add to decomposition
- return Primitive2DReference(pNew.release());
+ return pNew.get();
}
}
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 0b037e5fa74b..aa9ca030fe41 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -413,12 +413,12 @@ namespace drawinglayer::primitive2d
aChange *= aObjectMatrix;
// apply to existing text primitive
- std::unique_ptr<SdrTextPrimitive2D> pNewBlockText = xBlockText->createTransformedClone(aChange);
+ rtl::Reference<SdrTextPrimitive2D> pNewBlockText = xBlockText->createTransformedClone(aChange);
OSL_ENSURE(pNewBlockText, "SdrMeasurePrimitive2D::create2DDecomposition: Could not create transformed clone of text primitive (!)");
xBlockText.clear();
// add to local primitives
- aRetval.push_back(Primitive2DReference(pNewBlockText.release()));
+ aRetval.push_back(pNewBlockText.get());
}
// add shadow
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 75744d7cad81..59a1551d9ca8 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -271,9 +271,9 @@ namespace drawinglayer::primitive2d
return false;
}
- std::unique_ptr<SdrTextPrimitive2D> SdrContourTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
+ rtl::Reference<SdrTextPrimitive2D> SdrContourTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return std::make_unique<SdrContourTextPrimitive2D>(
+ return new SdrContourTextPrimitive2D(
getSdrText(),
getOutlinerParaObject(),
getUnitPolyPolygon(),
@@ -317,12 +317,12 @@ namespace drawinglayer::primitive2d
return false;
}
- std::unique_ptr<SdrTextPrimitive2D> SdrPathTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
+ rtl::Reference<SdrTextPrimitive2D> SdrPathTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
basegfx::B2DPolyPolygon aNewPolyPolygon(getPathPolyPolygon());
aNewPolyPolygon.transform(rTransform);
- return std::make_unique<SdrPathTextPrimitive2D>(
+ return new SdrPathTextPrimitive2D(
getSdrText(),
getOutlinerParaObject(),
aNewPolyPolygon,
@@ -381,9 +381,9 @@ namespace drawinglayer::primitive2d
return false;
}
- std::unique_ptr<SdrTextPrimitive2D> SdrBlockTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
+ rtl::Reference<SdrTextPrimitive2D> SdrBlockTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return std::make_unique<SdrBlockTextPrimitive2D>(
+ return new SdrBlockTextPrimitive2D(
getSdrText(),
getOutlinerParaObject(),
rTransform * getTextRangeTransform(),
@@ -432,9 +432,9 @@ namespace drawinglayer::primitive2d
return false;
}
- std::unique_ptr<SdrTextPrimitive2D> SdrAutoFitTextPrimitive2D::createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const
+ rtl::Reference<SdrTextPrimitive2D> SdrAutoFitTextPrimitive2D::createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const
{
- return std::make_unique<SdrAutoFitTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap());
+ return new SdrAutoFitTextPrimitive2D(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap());
}
// provide unique ID
@@ -471,9 +471,9 @@ namespace drawinglayer::primitive2d
return false;
}
- std::unique_ptr<SdrTextPrimitive2D> SdrChainedTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
+ rtl::Reference<SdrTextPrimitive2D> SdrChainedTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return std::make_unique<SdrChainedTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform());
+ return new SdrChainedTextPrimitive2D(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform());
}
// provide unique ID
@@ -512,9 +512,9 @@ namespace drawinglayer::primitive2d
return false;
}
- std::unique_ptr<SdrTextPrimitive2D> SdrStretchTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
+ rtl::Reference<SdrTextPrimitive2D> SdrStretchTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return std::make_unique<SdrStretchTextPrimitive2D>(
+ return new SdrStretchTextPrimitive2D(
getSdrText(),
getOutlinerParaObject(),
rTransform * getTextRangeTransform(),
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index cefa978ff29b..42e8eb4a12e0 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -840,12 +840,12 @@ uno::Reference<io::XInputStream> SAL_CALL SvXMLGraphicHelper::createInputStream(
if (SvXMLGraphicHelperMode::Write == meCreateMode)
{
OUString sMimeType = comphelper::GraphicMimeTypeHelper::GetMimeTypeForExtension(OUStringToOString(maOutputMimeType, RTL_TEXTENCODING_ASCII_US));
- std::unique_ptr<GraphicInputStream> pInputStream(new GraphicInputStream(aGraphicObject, sMimeType));
+ rtl::Reference<GraphicInputStream> pInputStream(new GraphicInputStream(aGraphicObject, sMimeType));
// We release the pointer from unique_ptr and assign it to the input stream return type.
// In case the stream doesn't exists, unique_ptr will delete the pointer when we go out of scope.
if (pInputStream->exists())
- xInputStream = pInputStream.release();
+ xInputStream = pInputStream.get();
}
return xInputStream;
@@ -864,11 +864,11 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
if( SvXMLGraphicHelperMode::Read == meCreateMode )
{
- std::unique_ptr<SvXMLGraphicOutputStream> pOutputStream(new SvXMLGraphicOutputStream);
+ rtl::Reference<SvXMLGraphicOutputStream> pOutputStream(new SvXMLGraphicOutputStream);
if( pOutputStream->Exists() )
{
- xRet = pOutputStream.release();
+ xRet = pOutputStream.get();
maGrfStms.push_back( xRet );
}
}
generated by cgit (git 2.34.1) at 2024-07-13 22:47:31 +0000