1 files changed, 20 insertions, 38 deletions
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 94ff0ef49d20..6737aba40f67 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -43,44 +43,26 @@
 
 // static ----------------------------------------------------------------
 
-const sal_uInt16 SvxPositionSizeTabPage::pPosSizeRanges[] =
-{
-    SID_ATTR_TRANSFORM_POS_X,
-    SID_ATTR_TRANSFORM_POS_Y,
-    SID_ATTR_TRANSFORM_PROTECT_POS,
-    SID_ATTR_TRANSFORM_PROTECT_POS,
-    SID_ATTR_TRANSFORM_INTERN,
-    SID_ATTR_TRANSFORM_INTERN,
-    SID_ATTR_TRANSFORM_ANCHOR,
-    SID_ATTR_TRANSFORM_VERT_ORIENT,
-    SID_ATTR_TRANSFORM_WIDTH,
-    SID_ATTR_TRANSFORM_SIZE_POINT,
-    SID_ATTR_TRANSFORM_PROTECT_POS,
-    SID_ATTR_TRANSFORM_INTERN,
-    SID_ATTR_TRANSFORM_AUTOWIDTH,
-    SID_ATTR_TRANSFORM_AUTOHEIGHT,
-    0
-};
-
-const sal_uInt16 SvxAngleTabPage::pAngleRanges[] =
-{
-    SID_ATTR_TRANSFORM_ROT_X,
-    SID_ATTR_TRANSFORM_ANGLE,
-    SID_ATTR_TRANSFORM_INTERN,
-    SID_ATTR_TRANSFORM_INTERN,
-    0
-};
-
-const sal_uInt16 SvxSlantTabPage::pSlantRanges[] =
-{
-    SDRATTR_CORNER_RADIUS,
-    SDRATTR_CORNER_RADIUS,
-    SID_ATTR_TRANSFORM_SHEAR,
-    SID_ATTR_TRANSFORM_SHEAR_VERTICAL,
-    SID_ATTR_TRANSFORM_INTERN,
-    SID_ATTR_TRANSFORM_INTERN,
-    0
-};
+const WhichRangesContainer SvxPositionSizeTabPage::pPosSizeRanges(svl::Items<
+    SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_POS_Y,
+    SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_PROTECT_POS,
+    SID_ATTR_TRANSFORM_INTERN, SID_ATTR_TRANSFORM_INTERN,
+    SID_ATTR_TRANSFORM_ANCHOR, SID_ATTR_TRANSFORM_VERT_ORIENT,
+    SID_ATTR_TRANSFORM_WIDTH, SID_ATTR_TRANSFORM_SIZE_POINT,
+    SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_INTERN,
+    SID_ATTR_TRANSFORM_AUTOWIDTH, SID_ATTR_TRANSFORM_AUTOHEIGHT
+>::value);
+
+const WhichRangesContainer SvxAngleTabPage::pAngleRanges(svl::Items<
+    SID_ATTR_TRANSFORM_ROT_X, SID_ATTR_TRANSFORM_ANGLE,
+    SID_ATTR_TRANSFORM_INTERN, SID_ATTR_TRANSFORM_INTERN
+>::value);
+
+const WhichRangesContainer SvxSlantTabPage::pSlantRanges(svl::Items<
+    SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS,
+    SID_ATTR_TRANSFORM_SHEAR, SID_ATTR_TRANSFORM_SHEAR_VERTICAL,
+    SID_ATTR_TRANSFORM_INTERN, SID_ATTR_TRANSFORM_INTERN
+>::value);
 
 /*************************************************************************
 |*