summaryrefslogtreecommitdiffstats
path: root/svx/source
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-10-23 16:43:51 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-11-04 12:30:37 -0500
commitb5f6358c0bf3befd1a40ea993a246d50ee5304bf (patch)
tree7422663001abdabcca60bdaf8e94d4f4ef42ef5b /svx/source
parentModify the tick iterator strategy to use fewer ticks. (diff)
downloadcore-b5f6358c0bf3befd1a40ea993a246d50ee5304bf.tar.gz
core-b5f6358c0bf3befd1a40ea993a246d50ee5304bf.zip
CreateObjectSpecificItemSet to return a pointer, not a reference.
I hope the reason is obvious.... Change-Id: Ibe30038991b4916a6af230043176f09bd9952ff9
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx8
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx6
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx6
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx6
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx6
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx6
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx6
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx6
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx6
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx4
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx6
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx6
-rw-r--r--svx/source/sdr/properties/textproperties.cxx6
-rw-r--r--svx/source/table/cell.cxx8
-rw-r--r--svx/source/table/svdotable.cxx8
15 files changed, 47 insertions, 47 deletions
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 98d10aa673e3..33ca83a0c9a9 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -112,9 +112,9 @@ namespace sdr
}
// create a new itemset
- SfxItemSet& AttributeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* AttributeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// ranges from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -122,7 +122,7 @@ namespace sdr
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
// end
- 0, 0));
+ 0, 0);
}
AttributeProperties::AttributeProperties(SdrObject& rObj)
@@ -421,7 +421,7 @@ namespace sdr
pItemSet = pItemSet->GetParent();
}
- SfxItemSet* pNewSet = &CreateObjectSpecificItemSet(pNewModel->GetItemPool());
+ SfxItemSet* pNewSet = CreateObjectSpecificItemSet(pNewModel->GetItemPool());
std::vector<const SfxItemSet*>::reverse_iterator riter;
for (riter = aSetList.rbegin(); riter != aSetList.rend(); ++riter)
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 288069e8f186..b1fd15c9b737 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -31,9 +31,9 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& CaptionProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* CaptionProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -47,7 +47,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
CaptionProperties::CaptionProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 79441e9c6708..af9aaf623365 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -33,9 +33,9 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& CircleProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* CircleProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -49,7 +49,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
CircleProperties::CircleProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index 5797a4830b44..122034324811 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -31,9 +31,9 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& ConnectorProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* ConnectorProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -47,7 +47,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
ConnectorProperties::ConnectorProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index afb4b68f032a..2c8b111136ad 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -60,9 +60,9 @@ namespace sdr
}
}
- SfxItemSet& CustomShapeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* CustomShapeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// ranges from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -82,7 +82,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
bool CustomShapeProperties::AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem ) const
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index c6f09bd5bb7f..4bbf384afbd7 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -34,10 +34,10 @@ namespace sdr
{
namespace properties
{
- SfxItemSet& DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// Basic implementation; Basic object has NO attributes
- return *(new SfxItemSet(rPool));
+ return new SfxItemSet(rPool);
}
DefaultProperties::DefaultProperties(SdrObject& rObj)
@@ -81,7 +81,7 @@ namespace sdr
{
if(!mpItemSet)
{
- ((DefaultProperties*)this)->mpItemSet = &(((DefaultProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
+ ((DefaultProperties*)this)->mpItemSet = ((DefaultProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool());
((DefaultProperties*)this)->ForceDefaultAttributes();
}
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index 73dbbd50a33d..8b8ffde8dde8 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -29,9 +29,9 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& E3dProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* E3dProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// ranges from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -42,7 +42,7 @@ namespace sdr
SDRATTR_3D_FIRST, SDRATTR_3D_LAST,
// end
- 0, 0));
+ 0, 0);
}
E3dProperties::E3dProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index 350abd7e0e56..7d28a7dc4feb 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -31,11 +31,11 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& EmptyProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* EmptyProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// Basic implementation; Basic object has NO attributes
DBG_ASSERT(false, "EmptyProperties::CreateObjectSpecificItemSet() should never be called");
- return *(new SfxItemSet(rPool));
+ return new SfxItemSet(rPool);
}
EmptyProperties::EmptyProperties(SdrObject& rObj)
@@ -71,7 +71,7 @@ namespace sdr
{
if(!mpEmptyItemSet)
{
- ((EmptyProperties*)this)->mpEmptyItemSet = &(((EmptyProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
+ ((EmptyProperties*)this)->mpEmptyItemSet = ((EmptyProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool());
}
DBG_ASSERT(mpEmptyItemSet, "Could not create an SfxItemSet(!)");
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index b327a403c646..8dac8e14558e 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -32,9 +32,9 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& GraphicProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* GraphicProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -48,7 +48,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
GraphicProperties::GraphicProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 90133ad52f01..3e8f6155caeb 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -33,12 +33,12 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& GroupProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* GroupProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// 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 *(new SfxItemSet(rPool));
+ return new SfxItemSet(rPool);
}
GroupProperties::GroupProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 7082ff5bc6e4..cf700c00810f 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -38,9 +38,9 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& MeasureProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* MeasureProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -54,7 +54,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
MeasureProperties::MeasureProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index fd8a71d75467..bb09f9e602ba 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -29,10 +29,10 @@ namespace sdr
namespace properties
{
// create a new itemset
- SfxItemSet& PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// overloaded to legally return a valid ItemSet
- return *(new SfxItemSet(rPool));
+ return new SfxItemSet(rPool);
}
PageProperties::PageProperties(SdrObject& rObj)
@@ -60,7 +60,7 @@ namespace sdr
{
if(!mpEmptyItemSet)
{
- ((PageProperties*)this)->mpEmptyItemSet = &(((PageProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
+ ((PageProperties*)this)->mpEmptyItemSet = ((PageProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool());
}
DBG_ASSERT(mpEmptyItemSet, "Could not create an SfxItemSet(!)");
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 96552fd6aa0d..b80833fd892d 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -42,9 +42,9 @@ namespace sdr
{
namespace properties
{
- SfxItemSet& TextProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* TextProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -55,7 +55,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
TextProperties::TextProperties(SdrObject& rObj)
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index d681cb33b0fa..e81370c144bb 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -147,7 +147,7 @@ namespace sdr
{
protected:
// create a new itemset
- SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
+ SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
const svx::ITextProvider& getTextProvider() const SAL_OVERRIDE;
@@ -179,9 +179,9 @@ namespace sdr
};
// create a new itemset
- SfxItemSet& CellProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+ SfxItemSet* CellProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -195,7 +195,7 @@ namespace sdr
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
const svx::ITextProvider& CellProperties::getTextProvider() const
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 77cdc42586ad..0079467b1e37 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -85,7 +85,7 @@ class TableProperties : public TextProperties
{
protected:
// create a new itemset
- SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
+ SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
public:
// basic constructor
@@ -131,9 +131,9 @@ void TableProperties::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNe
}
// create a new itemset
-SfxItemSet& TableProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
+SfxItemSet* TableProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- return *(new SfxItemSet(rPool,
+ return new SfxItemSet(rPool,
// range from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
@@ -147,7 +147,7 @@ SfxItemSet& TableProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
EE_ITEMS_START, EE_ITEMS_END,
// end
- 0, 0));
+ 0, 0);
}
class TableObjectGeoData : public SdrTextObjGeoData