summaryrefslogtreecommitdiff
path: root/svx/source/sdr
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/sdr')
-rw-r--r--svx/source/sdr/primitive2d/sdrprimitivetools.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx13
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx3
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx3
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx3
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx3
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx3
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx3
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx3
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx3
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx3
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx3
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx3
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx3
-rw-r--r--svx/source/sdr/properties/textproperties.cxx3
15 files changed, 20 insertions, 35 deletions
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index e46c426191af..e71fe38fd6dc 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -19,7 +19,6 @@
#include <sdr/primitive2d/sdrprimitivetools.hxx>
#include <osl/mutex.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/lazydelete.hxx>
#include <vcl/BitmapTools.hxx>
@@ -57,7 +56,7 @@ namespace drawinglayer
BitmapEx aBitmap = vcl::bitmap::CreateFromData(cross, 3, 3, 12, 32);
// create and exchange at aRetVal
- aRetVal.set(o3tl::make_unique<BitmapEx>(aBitmap));
+ aRetVal.set(std::make_unique<BitmapEx>(aBitmap));
}
return aRetVal.get() ? *aRetVal.get() : BitmapEx();
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 805a65a676d6..00a5aa89c17c 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -31,7 +31,6 @@
#include <svx/svdmodel.hxx>
#include <svx/svdoutl.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
@@ -281,7 +280,7 @@ namespace drawinglayer
std::unique_ptr<SdrTextPrimitive2D> SdrContourTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return o3tl::make_unique<SdrContourTextPrimitive2D>(
+ return std::make_unique<SdrContourTextPrimitive2D>(
getSdrText(),
getOutlinerParaObject(),
getUnitPolyPolygon(),
@@ -336,7 +335,7 @@ namespace drawinglayer
basegfx::B2DPolyPolygon aNewPolyPolygon(getPathPolyPolygon());
aNewPolyPolygon.transform(rTransform);
- return o3tl::make_unique<SdrPathTextPrimitive2D>(
+ return std::make_unique<SdrPathTextPrimitive2D>(
getSdrText(),
getOutlinerParaObject(),
aNewPolyPolygon,
@@ -406,7 +405,7 @@ namespace drawinglayer
std::unique_ptr<SdrTextPrimitive2D> SdrBlockTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return o3tl::make_unique<SdrBlockTextPrimitive2D>(
+ return std::make_unique<SdrBlockTextPrimitive2D>(
getSdrText(),
getOutlinerParaObject(),
rTransform * getTextRangeTransform(),
@@ -464,7 +463,7 @@ namespace drawinglayer
std::unique_ptr<SdrTextPrimitive2D> SdrAutoFitTextPrimitive2D::createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const
{
- return o3tl::make_unique<SdrAutoFitTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap());
+ return std::make_unique<SdrAutoFitTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap());
}
// provide unique ID
@@ -508,7 +507,7 @@ namespace drawinglayer
std::unique_ptr<SdrTextPrimitive2D> SdrChainedTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return o3tl::make_unique<SdrChainedTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform());
+ return std::make_unique<SdrChainedTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform());
}
// provide unique ID
@@ -555,7 +554,7 @@ namespace drawinglayer
std::unique_ptr<SdrTextPrimitive2D> SdrStretchTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const
{
- return o3tl::make_unique<SdrStretchTextPrimitive2D>(
+ return std::make_unique<SdrStretchTextPrimitive2D>(
getSdrText(),
getOutlinerParaObject(),
rTransform * getTextRangeTransform(),
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 6a706aca8c24..7e9d500d8719 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -21,7 +21,6 @@
#include <utility>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/attributeproperties.hxx>
#include <sdr/properties/itemsettools.hxx>
#include <tools/debug.hxx>
@@ -133,7 +132,7 @@ namespace sdr
// create a new itemset
std::unique_ptr<SfxItemSet> AttributeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(rPool,
+ return std::make_unique<SfxItemSet>(rPool,
// ranges from SdrAttrObj
svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 301b804e4bc6..431f9a39bd16 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/captionproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -35,7 +34,7 @@ namespace sdr
// create a new itemset
std::unique_ptr<SfxItemSet> CaptionProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(
+ return std::make_unique<SfxItemSet>(
rPool,
svl::Items<
// Ranges from SdrAttrObj, SdrCaptionObj:
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index ba874bb4ca4d..1a89ac8a014d 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/circleproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -37,7 +36,7 @@ namespace sdr
// create a new itemset
std::unique_ptr<SfxItemSet> CircleProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(
+ return std::make_unique<SfxItemSet>(
rPool,
svl::Items<
// Ranges from SdrAttrObj, SdrCircObj
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index e8e63311916b..12629b001482 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/connectorproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -35,7 +34,7 @@ namespace sdr
// create a new itemset
std::unique_ptr<SfxItemSet> ConnectorProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(
+ return std::make_unique<SfxItemSet>(
rPool,
svl::Items<
// Ranges from SdrAttrObj, SdrEdgeObj:
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 849681f8d915..a51fb7359b6c 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/customshapeproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -64,7 +63,7 @@ namespace sdr
std::unique_ptr<SfxItemSet> CustomShapeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(
+ return std::make_unique<SfxItemSet>(
rPool,
svl::Items<
// Ranges from SdrAttrObj:
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 063205ff405c..28c25ca68212 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <svx/sdr/properties/defaultproperties.hxx>
#include <sdr/properties/itemsettools.hxx>
#include <svl/itemset.hxx>
@@ -41,7 +40,7 @@ namespace sdr
std::unique_ptr<SfxItemSet> DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// Basic implementation; Basic object has NO attributes
- return o3tl::make_unique<SfxItemSet>(rPool);
+ return std::make_unique<SfxItemSet>(rPool);
}
DefaultProperties::DefaultProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index a86421656d26..21737a40b58f 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/e3dproperties.hxx>
#include <svl/itemset.hxx>
#include <svx/svddef.hxx>
@@ -33,7 +32,7 @@ namespace sdr
// create a new itemset
std::unique_ptr<SfxItemSet> E3dProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(rPool,
+ return std::make_unique<SfxItemSet>(rPool,
// ranges from SdrAttrObj
svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index 3193ec882364..8c32d6c97dcf 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/emptyproperties.hxx>
#include <svl/itemset.hxx>
#include <svx/svddef.hxx>
@@ -37,7 +36,7 @@ namespace sdr
{
// Basic implementation; Basic object has NO attributes
assert(!"EmptyProperties::CreateObjectSpecificItemSet() should never be called");
- return o3tl::make_unique<SfxItemSet>(rPool);
+ return std::make_unique<SfxItemSet>(rPool);
}
EmptyProperties::EmptyProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 0ef07cfd8c5e..7693c54ef66f 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/graphicproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -52,7 +51,7 @@ namespace sdr
// create a new itemset
std::unique_ptr<SfxItemSet> GraphicProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(rPool,
+ return std::make_unique<SfxItemSet>(rPool,
// range from SdrAttrObj
svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 410e2c641f48..b5be536ede5b 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/groupproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/whiter.hxx>
@@ -40,7 +39,7 @@ namespace sdr
// Groups have in principle no ItemSet. To support methods like
// GetMergedItemSet() the local one is used. Thus, all items in the pool
// may be used and a pool itemset is created.
- return o3tl::make_unique<SfxItemSet>(rPool);
+ return std::make_unique<SfxItemSet>(rPool);
}
GroupProperties::GroupProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 38d0d73fcd23..95887ab7e311 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/measureproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -41,7 +40,7 @@ namespace sdr
// create a new itemset
std::unique_ptr<SfxItemSet> MeasureProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(
+ return std::make_unique<SfxItemSet>(
rPool,
svl::Items<
// Ranges from SdrAttrObj, SdrMeasureObj:
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 9e4706fcf72d..66278b2d2b40 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/pageproperties.hxx>
#include <svl/itemset.hxx>
#include <svx/svdobj.hxx>
@@ -36,7 +35,7 @@ namespace sdr
std::unique_ptr<SfxItemSet> PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// override to legally return a valid ItemSet
- return o3tl::make_unique<SfxItemSet>(rPool);
+ return std::make_unique<SfxItemSet>(rPool);
}
PageProperties::PageProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index e65995f92371..25de1b505eb4 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <sdr/properties/textproperties.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -47,7 +46,7 @@ namespace sdr
{
std::unique_ptr<SfxItemSet> TextProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return o3tl::make_unique<SfxItemSet>(rPool,
+ return std::make_unique<SfxItemSet>(rPool,
// range from SdrAttrObj
svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
generated by cgit (git 2.34.1) at 2025-01-04 08:41:17 +0000