summaryrefslogtreecommitdiff
path: root/svx/source/sdr
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-07-19 11:04:45 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-07-19 16:33:01 +0200
commitb1668edf7fa3ad8c32bcc4d73821770f2df011ca (patch)
treecb93a00ca59f770e616668af15fdc6a50e1627a1 /svx/source/sdr
parent5b3c530016927d3e91e3124e124f7b428ab285ac (diff)
Move svl::Items to include/svl/whichranges.hxx, and unify its usage
... in WhichRangesContainer and SfxItemSet ctors. Now it's not needed to explicitly use 'value' in WhichRangesContainer's ctor, or create an instance for use in SfxItemSet ctor (svl::Items is already defined as a template value of corresponding type). Instead of WhichRangesContainer Foo(svl::Items<1, 2>::value); SfxItemSet Bar(rItemPool, svl::Items<1, 2>{}); now use: WhichRangesContainer Foo(svl::Items<1, 2>); SfxItemSet Bar(rItemPool, svl::Items<1, 2>); Change-Id: I4681d952b6442732025e5a26768098878907a238 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119157 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source/sdr')
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx2
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx2
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx2
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dcompoundproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx2
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx2
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx4
12 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 2dfd9e819981..cfdd2ebb97a7 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -130,7 +130,7 @@ namespace sdr::properties
svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
- SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST>{});
+ SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST>);
}
AttributeProperties::AttributeProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index d073aa91b91e..8a579a0509e7 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -40,7 +40,7 @@ namespace sdr::properties
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// Range from SdrTextObj:
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
}
CaptionProperties::CaptionProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index dab008ff6957..058a45e5249d 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -44,7 +44,7 @@ namespace sdr::properties
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// Range from SdrTextObj:
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
}
CircleProperties::CircleProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index 97063011f79c..7da10e21f213 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -41,7 +41,7 @@ namespace sdr::properties
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// Range from SdrTextObj:
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
}
ConnectorProperties::ConnectorProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 771c76183280..8b6466cfa995 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -74,7 +74,7 @@ namespace sdr::properties
SDRATTR_GLOW_FIRST, SDRATTR_SOFTEDGE_LAST,
SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// Range from SdrTextObj:
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
}
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 d20d75f4f8cf..186bebab6d7e 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -176,7 +176,7 @@ namespace sdr::properties
const SfxPoolItem *pPoolItem;
std::vector< sal_uInt16 > aPostItemChangeList;
bool bDidChange(false);
- SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), svl::Items<SDRATTR_START, EE_ITEMS_END>{});
+ SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), svl::Items<SDRATTR_START, EE_ITEMS_END>);
// give a hint to STL_Vector
aPostItemChangeList.reserve(rSet.Count());
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index 8b6d1f5f60e2..e3fe78e47679 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -56,7 +56,7 @@ namespace sdr::properties
GetObjectItemSet();
// add filtered scene properties (SDRATTR_3DSCENE_) to local itemset
- SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>{});
+ SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>);
aSet.Put(pScene->GetProperties().GetObjectItemSet());
mxItemSet->Put(aSet);
}
@@ -77,7 +77,7 @@ namespace sdr::properties
GetObjectItemSet();
// Generate filtered scene properties (SDRATTR_3DSCENE_) itemset
- SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>{});
+ SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>);
aSet.Put(rSet);
if(bClearAllItems)
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index 393b3c9f072c..9d291ddd3c1d 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -38,7 +38,7 @@ namespace sdr::properties
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
// ranges from E3dObject, contains object and scene because of GetMergedItemSet()
- SDRATTR_3D_FIRST, SDRATTR_3D_LAST>{});
+ SDRATTR_3D_FIRST, SDRATTR_3D_LAST>);
}
E3dProperties::E3dProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 7635f32f806d..f04bc4b88236 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -53,7 +53,7 @@ namespace sdr::properties
if(mxItemSet)
{
// filter for SDRATTR_3DSCENE_ items, only keep those items
- SfxItemSet aNew(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>{});
+ SfxItemSet aNew(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>);
aNew.Put(*mxItemSet);
mxItemSet->ClearItem();
mxItemSet->Put(aNew);
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 78ca9a83bd23..dd59a41a1be7 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -71,7 +71,7 @@ namespace sdr::properties
SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// range from SdrTextObj
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
}
GraphicProperties::GraphicProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index e503c5710810..08e2009af0ae 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -50,7 +50,7 @@ namespace sdr::properties
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// Range from SdrTextObj:
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
}
MeasureProperties::MeasureProperties(SdrObject& rObj)
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 9161cbde2f52..062ef79d4420 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -57,7 +57,7 @@ namespace sdr::properties
SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST,
// range from SdrTextObj
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
}
TextProperties::TextProperties(SdrObject& rObj)
@@ -478,7 +478,7 @@ namespace sdr::properties
if(bHasURL)
{
- SfxItemSet aColorSet(*aSet.GetPool(), svl::Items<EE_CHAR_COLOR, EE_CHAR_COLOR>{} );
+ SfxItemSet aColorSet(*aSet.GetPool(), svl::Items<EE_CHAR_COLOR, EE_CHAR_COLOR> );
aColorSet.Put(aSet, false);
ESelection aSel(nPara, 0);