diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-04-03 00:04:27 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-04-03 10:22:34 +0200 |
| commit | 15984a6778f88982f135965a703c1e829fe8325c (patch) | |
| tree | 9860281023b6331c5b853f4f6a2d59008db03614 | |
| parent | 10055ff899ed8f9c205155cd15c6de81cba37471 (diff) | |
Turn defines into constexprs
This allows to see actual values of the WhichIds in IDE easier
Change-Id: I31106459cd262000444175d082eb349ff937488d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91513
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | chart2/source/inc/chartview/ChartSfxItemIds.hxx | 253 | ||||
| -rw-r--r-- | include/editeng/eeitem.hxx | 133 | ||||
| -rw-r--r-- | include/svx/svddef.hxx | 449 | ||||
| -rw-r--r-- | include/svx/xdef.hxx | 110 | ||||
| -rw-r--r-- | sc/inc/scitems.hxx | 222 | ||||
| -rw-r--r-- | sw/inc/hintids.hxx | 503 | ||||
| -rw-r--r-- | sw/source/core/edit/edlingu.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/basflt/fltshell.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 2 |
9 files changed, 871 insertions, 805 deletions
diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index 82e3f0a535f4..7c0e5555f374 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -19,6 +19,8 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_CHARTSFXITEMIDS_HXX #define INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_CHARTSFXITEMIDS_HXX +#include <svl/typedwhich.hxx> + class SvxSizeItem; class SfxIntegerListItem; class SfxBoolItem; @@ -28,164 +30,167 @@ class SfxUInt32Item; class SvxChartIndicateItem; class SvxDoubleItem; class SvxBrushItem; +class SvxChartKindErrorItem; +class SvxChartTextOrderItem; +class SvxChartRegressItem; // SCHATTR // can't this be changed to 0? -#define SCHATTR_START 1 - -#define SCHATTR_DATADESCR_START SCHATTR_START -#define SCHATTR_DATADESCR_SHOW_NUMBER TypedWhichId<SfxBoolItem>(SCHATTR_DATADESCR_START) -#define SCHATTR_DATADESCR_SHOW_PERCENTAGE TypedWhichId<SfxBoolItem>(SCHATTR_DATADESCR_START + 1) -#define SCHATTR_DATADESCR_SHOW_CATEGORY TypedWhichId<SfxBoolItem>(SCHATTR_DATADESCR_START + 2) -#define SCHATTR_DATADESCR_SHOW_SYMBOL TypedWhichId<SfxBoolItem>(SCHATTR_DATADESCR_START + 3) -#define SCHATTR_DATADESCR_WRAP_TEXT TypedWhichId<SfxBoolItem>(SCHATTR_DATADESCR_START + 4) -#define SCHATTR_DATADESCR_SEPARATOR TypedWhichId<SfxStringItem>(SCHATTR_DATADESCR_START + 5) -#define SCHATTR_DATADESCR_PLACEMENT TypedWhichId<SfxInt32Item>(SCHATTR_DATADESCR_START + 6) -#define SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS TypedWhichId<SfxIntegerListItem>(SCHATTR_DATADESCR_START + 7) -#define SCHATTR_DATADESCR_NO_PERCENTVALUE TypedWhichId<SfxBoolItem>(SCHATTR_DATADESCR_START + 8) //percentage values should not be offered -#define SCHATTR_PERCENT_NUMBERFORMAT_VALUE TypedWhichId<SfxUInt32Item>(SCHATTR_DATADESCR_START + 9) -#define SCHATTR_PERCENT_NUMBERFORMAT_SOURCE TypedWhichId<SfxBoolItem>(SCHATTR_DATADESCR_START + 10) -#define SCHATTR_DATADESCR_END SCHATTR_PERCENT_NUMBERFORMAT_SOURCE +constexpr sal_uInt16 SCHATTR_START = 1; + +constexpr sal_uInt16 SCHATTR_DATADESCR_START (SCHATTR_START); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_DATADESCR_SHOW_NUMBER (SCHATTR_DATADESCR_START); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_DATADESCR_SHOW_PERCENTAGE (SCHATTR_DATADESCR_START + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_DATADESCR_SHOW_CATEGORY (SCHATTR_DATADESCR_START + 2); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_DATADESCR_SHOW_SYMBOL (SCHATTR_DATADESCR_START + 3); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_DATADESCR_WRAP_TEXT (SCHATTR_DATADESCR_START + 4); +constexpr TypedWhichId<SfxStringItem> SCHATTR_DATADESCR_SEPARATOR (SCHATTR_DATADESCR_START + 5); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_DATADESCR_PLACEMENT (SCHATTR_DATADESCR_START + 6); +constexpr TypedWhichId<SfxIntegerListItem> SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS (SCHATTR_DATADESCR_START + 7); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_DATADESCR_NO_PERCENTVALUE (SCHATTR_DATADESCR_START + 8); //percentage values should not be offered +constexpr TypedWhichId<SfxUInt32Item> SCHATTR_PERCENT_NUMBERFORMAT_VALUE (SCHATTR_DATADESCR_START + 9); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_DATADESCR_START + 10); +constexpr sal_uInt16 SCHATTR_DATADESCR_END (SCHATTR_PERCENT_NUMBERFORMAT_SOURCE); //legend -#define SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1) -#define SCHATTR_LEGEND_POS TypedWhichId<SfxInt32Item>(SCHATTR_LEGEND_START) -#define SCHATTR_LEGEND_SHOW TypedWhichId<SfxBoolItem>(SCHATTR_LEGEND_START + 1) -#define SCHATTR_LEGEND_NO_OVERLAY TypedWhichId<SfxBoolItem>(SCHATTR_LEGEND_START + 2) -#define SCHATTR_LEGEND_END SCHATTR_LEGEND_NO_OVERLAY +constexpr sal_uInt16 SCHATTR_LEGEND_START (SCHATTR_DATADESCR_END + 1); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_LEGEND_POS (SCHATTR_LEGEND_START); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_LEGEND_SHOW (SCHATTR_LEGEND_START + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_LEGEND_NO_OVERLAY (SCHATTR_LEGEND_START + 2); +constexpr sal_uInt16 SCHATTR_LEGEND_END (SCHATTR_LEGEND_NO_OVERLAY); //text -#define SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1) -#define SCHATTR_TEXT_DEGREES TypedWhichId<SfxInt32Item>(SCHATTR_TEXT_START) -#define SCHATTR_TEXT_STACKED TypedWhichId<SfxBoolItem>(SCHATTR_TEXT_START + 1) -#define SCHATTR_TEXT_END SCHATTR_TEXT_STACKED +constexpr sal_uInt16 SCHATTR_TEXT_START (SCHATTR_LEGEND_END + 1); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_TEXT_DEGREES (SCHATTR_TEXT_START); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_TEXT_STACKED (SCHATTR_TEXT_START + 1); +constexpr sal_uInt16 SCHATTR_TEXT_END (SCHATTR_TEXT_STACKED); // statistic -#define SCHATTR_STAT_START (SCHATTR_TEXT_END + 1) -#define SCHATTR_STAT_AVERAGE TypedWhichId<SfxBoolItem>(SCHATTR_STAT_START) -#define SCHATTR_STAT_KIND_ERROR TypedWhichId<SvxChartKindErrorItem>(SCHATTR_STAT_START + 1) -#define SCHATTR_STAT_PERCENT TypedWhichId<SvxDoubleItem>(SCHATTR_STAT_START + 2) -#define SCHATTR_STAT_BIGERROR TypedWhichId<SvxDoubleItem>(SCHATTR_STAT_START + 3) -#define SCHATTR_STAT_CONSTPLUS TypedWhichId<SvxDoubleItem>(SCHATTR_STAT_START + 4) -#define SCHATTR_STAT_CONSTMINUS TypedWhichId<SvxDoubleItem>(SCHATTR_STAT_START + 5) -#define SCHATTR_STAT_INDICATE TypedWhichId<SvxChartIndicateItem>(SCHATTR_STAT_START + 6) -#define SCHATTR_STAT_RANGE_POS TypedWhichId<SfxStringItem>(SCHATTR_STAT_START + 7) -#define SCHATTR_STAT_RANGE_NEG TypedWhichId<SfxStringItem>(SCHATTR_STAT_START + 8) -#define SCHATTR_STAT_ERRORBAR_TYPE TypedWhichId<SfxBoolItem>(SCHATTR_STAT_START + 9) -#define SCHATTR_STAT_END SCHATTR_STAT_ERRORBAR_TYPE +constexpr sal_uInt16 SCHATTR_STAT_START (SCHATTR_TEXT_END + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STAT_AVERAGE (SCHATTR_STAT_START); +constexpr TypedWhichId<SvxChartKindErrorItem> SCHATTR_STAT_KIND_ERROR (SCHATTR_STAT_START + 1); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_STAT_PERCENT (SCHATTR_STAT_START + 2); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_STAT_BIGERROR (SCHATTR_STAT_START + 3); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_STAT_CONSTPLUS (SCHATTR_STAT_START + 4); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_STAT_CONSTMINUS (SCHATTR_STAT_START + 5); +constexpr TypedWhichId<SvxChartIndicateItem> SCHATTR_STAT_INDICATE (SCHATTR_STAT_START + 6); +constexpr TypedWhichId<SfxStringItem> SCHATTR_STAT_RANGE_POS (SCHATTR_STAT_START + 7); +constexpr TypedWhichId<SfxStringItem> SCHATTR_STAT_RANGE_NEG (SCHATTR_STAT_START + 8); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STAT_ERRORBAR_TYPE (SCHATTR_STAT_START + 9); +constexpr sal_uInt16 SCHATTR_STAT_END (SCHATTR_STAT_ERRORBAR_TYPE); // these attributes are for replacement of enum eChartStyle -#define SCHATTR_STYLE_START ( SCHATTR_STAT_END +1 ) +constexpr sal_uInt16 SCHATTR_STYLE_START (SCHATTR_STAT_END + 1); // for whole chart -#define SCHATTR_STYLE_DEEP TypedWhichId<SfxBoolItem>( SCHATTR_STYLE_START ) -#define SCHATTR_STYLE_3D TypedWhichId<SfxBoolItem>( SCHATTR_STYLE_START + 1 ) -#define SCHATTR_STYLE_VERTICAL TypedWhichId<SfxBoolItem>( SCHATTR_STYLE_START + 2 ) +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STYLE_DEEP (SCHATTR_STYLE_START ); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STYLE_3D (SCHATTR_STYLE_START + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STYLE_VERTICAL (SCHATTR_STYLE_START + 2); // also for series -#define SCHATTR_STYLE_BASETYPE TypedWhichId<SfxInt32Item>( SCHATTR_STYLE_START + 3 )// Line,Area,...,Pie -#define SCHATTR_STYLE_LINES TypedWhichId<SfxBoolItem>( SCHATTR_STYLE_START + 4 )// draw line -#define SCHATTR_STYLE_PERCENT TypedWhichId<SfxBoolItem>( SCHATTR_STYLE_START + 5 ) -#define SCHATTR_STYLE_STACKED TypedWhichId<SfxBoolItem>( SCHATTR_STYLE_START + 6 ) -#define SCHATTR_STYLE_SPLINES TypedWhichId<SfxInt32Item>( SCHATTR_STYLE_START + 7 ) +constexpr TypedWhichId<SfxInt32Item> SCHATTR_STYLE_BASETYPE (SCHATTR_STYLE_START + 3);// Line,Area,...,Pie +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STYLE_LINES (SCHATTR_STYLE_START + 4);// draw line +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STYLE_PERCENT (SCHATTR_STYLE_START + 5); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STYLE_STACKED (SCHATTR_STYLE_START + 6); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_STYLE_SPLINES (SCHATTR_STYLE_START + 7); // also for data point -#define SCHATTR_STYLE_SYMBOL TypedWhichId<SfxInt32Item>( SCHATTR_STYLE_START + 8 ) -#define SCHATTR_STYLE_SHAPE TypedWhichId<SfxInt32Item>( SCHATTR_STYLE_START + 9 ) -#define SCHATTR_STYLE_END ( SCHATTR_STYLE_SHAPE ) +constexpr TypedWhichId<SfxInt32Item> SCHATTR_STYLE_SYMBOL (SCHATTR_STYLE_START + 8); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_STYLE_SHAPE (SCHATTR_STYLE_START + 9); +constexpr sal_uInt16 SCHATTR_STYLE_END (SCHATTR_STYLE_SHAPE ); -#define SCHATTR_AXIS TypedWhichId<SfxInt32Item>(SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS (SCHATTR_STYLE_END + 1); // see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. //Re-mapped: -#define SCHATTR_AXIS_START (SCHATTR_AXIS + 1) +constexpr sal_uInt16 SCHATTR_AXIS_START (SCHATTR_AXIS + 1); //axis scale -#define SCHATTR_AXISTYPE TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_START) -#define SCHATTR_AXIS_REVERSE TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 1) -#define SCHATTR_AXIS_AUTO_MIN TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 2) -#define SCHATTR_AXIS_MIN TypedWhichId<SvxDoubleItem>(SCHATTR_AXIS_START + 3) -#define SCHATTR_AXIS_AUTO_MAX TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 4) -#define SCHATTR_AXIS_MAX TypedWhichId<SvxDoubleItem>(SCHATTR_AXIS_START + 5) -#define SCHATTR_AXIS_AUTO_STEP_MAIN TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 6) -#define SCHATTR_AXIS_STEP_MAIN TypedWhichId<SvxDoubleItem>(SCHATTR_AXIS_START + 7) -#define SCHATTR_AXIS_MAIN_TIME_UNIT TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_START + 8) -#define SCHATTR_AXIS_AUTO_STEP_HELP TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 9) -#define SCHATTR_AXIS_STEP_HELP TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_START + 10) -#define SCHATTR_AXIS_HELP_TIME_UNIT TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_START + 11) -#define SCHATTR_AXIS_AUTO_TIME_RESOLUTION TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 12) -#define SCHATTR_AXIS_TIME_RESOLUTION TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_START + 13) -#define SCHATTR_AXIS_LOGARITHM TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 14) -#define SCHATTR_AXIS_AUTO_DATEAXIS TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 15) -#define SCHATTR_AXIS_ALLOW_DATEAXIS TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 16) -#define SCHATTR_AXIS_AUTO_ORIGIN TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_START + 17) -#define SCHATTR_AXIS_ORIGIN TypedWhichId<SvxDoubleItem>(SCHATTR_AXIS_START + 18) +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXISTYPE (SCHATTR_AXIS_START); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_REVERSE (SCHATTR_AXIS_START + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_AUTO_MIN (SCHATTR_AXIS_START + 2); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_AXIS_MIN (SCHATTR_AXIS_START + 3); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_AUTO_MAX (SCHATTR_AXIS_START + 4); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_AXIS_MAX (SCHATTR_AXIS_START + 5); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_AUTO_STEP_MAIN (SCHATTR_AXIS_START + 6); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_AXIS_STEP_MAIN (SCHATTR_AXIS_START + 7); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_MAIN_TIME_UNIT (SCHATTR_AXIS_START + 8); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_AUTO_STEP_HELP (SCHATTR_AXIS_START + 9); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_STEP_HELP (SCHATTR_AXIS_START + 10); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_HELP_TIME_UNIT (SCHATTR_AXIS_START + 11); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_AUTO_TIME_RESOLUTION (SCHATTR_AXIS_START + 12); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_TIME_RESOLUTION (SCHATTR_AXIS_START + 13); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_LOGARITHM (SCHATTR_AXIS_START + 14); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_AUTO_DATEAXIS (SCHATTR_AXIS_START + 15); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_ALLOW_DATEAXIS (SCHATTR_AXIS_START + 16); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_AUTO_ORIGIN (SCHATTR_AXIS_START + 17); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_AXIS_ORIGIN (SCHATTR_AXIS_START + 18); //axis position -#define SCHATTR_AXIS_POSITION_START (SCHATTR_AXIS_ORIGIN +1) -#define SCHATTR_AXIS_TICKS TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_POSITION_START) -#define SCHATTR_AXIS_HELPTICKS TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_POSITION_START + 1) -#define SCHATTR_AXIS_POSITION TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_POSITION_START + 2) -#define SCHATTR_AXIS_POSITION_VALUE TypedWhichId<SvxDoubleItem>(SCHATTR_AXIS_POSITION_START + 3) -#define SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT TypedWhichId<SfxUInt32Item>(SCHATTR_AXIS_POSITION_START + 4) -#define SCHATTR_AXIS_LABEL_POSITION TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_POSITION_START + 5) -#define SCHATTR_AXIS_MARK_POSITION TypedWhichId<SfxInt32Item>(SCHATTR_AXIS_POSITION_START + 6) +constexpr sal_uInt16 SCHATTR_AXIS_POSITION_START (SCHATTR_AXIS_ORIGIN + 1); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_TICKS (SCHATTR_AXIS_POSITION_START); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_HELPTICKS (SCHATTR_AXIS_POSITION_START + 1); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_POSITION (SCHATTR_AXIS_POSITION_START + 2); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_AXIS_POSITION_VALUE (SCHATTR_AXIS_POSITION_START + 3); +constexpr TypedWhichId<SfxUInt32Item> SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT (SCHATTR_AXIS_POSITION_START + 4); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_LABEL_POSITION (SCHATTR_AXIS_POSITION_START + 5); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_MARK_POSITION (SCHATTR_AXIS_POSITION_START + 6); //axis label -#define SCHATTR_AXIS_LABEL_START (SCHATTR_AXIS_MARK_POSITION +1) -#define SCHATTR_AXIS_SHOWDESCR TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_LABEL_START) -#define SCHATTR_AXIS_LABEL_ORDER TypedWhichId<SvxChartTextOrderItem>(SCHATTR_AXIS_LABEL_START + 1) -#define SCHATTR_AXIS_LABEL_OVERLAP TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_LABEL_START + 2) -#define SCHATTR_AXIS_LABEL_BREAK TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_LABEL_START + 3) -#define SCHATTR_AXIS_LABEL_END SCHATTR_AXIS_LABEL_BREAK +constexpr sal_uInt16 SCHATTR_AXIS_LABEL_START (SCHATTR_AXIS_MARK_POSITION + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_SHOWDESCR (SCHATTR_AXIS_LABEL_START); +constexpr TypedWhichId<SvxChartTextOrderItem> SCHATTR_AXIS_LABEL_ORDER (SCHATTR_AXIS_LABEL_START + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_LABEL_OVERLAP (SCHATTR_AXIS_LABEL_START + 2); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_AXIS_LABEL_BREAK (SCHATTR_AXIS_LABEL_START + 3); +constexpr sal_uInt16 SCHATTR_AXIS_LABEL_END (SCHATTR_AXIS_LABEL_BREAK); -#define SCHATTR_AXIS_END SCHATTR_AXIS_LABEL_END +constexpr sal_uInt16 SCHATTR_AXIS_END (SCHATTR_AXIS_LABEL_END); -#define SCHATTR_SYMBOL_BRUSH TypedWhichId<SvxBrushItem>(SCHATTR_AXIS_END + 1) -#define SCHATTR_STOCK_VOLUME TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_END + 2) -#define SCHATTR_STOCK_UPDOWN TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_END + 3) -#define SCHATTR_SYMBOL_SIZE TypedWhichId<SvxSizeItem>(SCHATTR_AXIS_END + 4) -#define SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY TypedWhichId<SfxBoolItem>(SCHATTR_AXIS_END + 5) +constexpr TypedWhichId<SvxBrushItem> SCHATTR_SYMBOL_BRUSH (SCHATTR_AXIS_END + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STOCK_VOLUME (SCHATTR_AXIS_END + 2); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_STOCK_UPDOWN (SCHATTR_AXIS_END + 3); +constexpr TypedWhichId<SvxSizeItem> SCHATTR_SYMBOL_SIZE (SCHATTR_AXIS_END + 4); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY (SCHATTR_AXIS_END + 5); // non persistent items (binary format) -#define SCHATTR_CHARTTYPE_START (SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY + 1) +constexpr sal_uInt16 SCHATTR_CHARTTYPE_START (SCHATTR_HIDE_DATA_POINT_LEGEND_ENTRY + 1); // new from New Chart -#define SCHATTR_BAR_OVERLAP TypedWhichId<SfxInt32Item>(SCHATTR_CHARTTYPE_START ) -#define SCHATTR_BAR_GAPWIDTH TypedWhichId<SfxInt32Item>(SCHATTR_CHARTTYPE_START + 1) -#define SCHATTR_BAR_CONNECT TypedWhichId<SfxBoolItem>(SCHATTR_CHARTTYPE_START + 2) -#define SCHATTR_NUM_OF_LINES_FOR_BAR TypedWhichId<SfxInt32Item>(SCHATTR_CHARTTYPE_START + 3) -#define SCHATTR_SPLINE_ORDER TypedWhichId<SfxInt32Item>(SCHATTR_CHARTTYPE_START + 4) -#define SCHATTR_SPLINE_RESOLUTION TypedWhichId<SfxInt32Item>(SCHATTR_CHARTTYPE_START + 5) -#define SCHATTR_GROUP_BARS_PER_AXIS TypedWhichId<SfxBoolItem>(SCHATTR_CHARTTYPE_START + 6) -#define SCHATTR_STARTING_ANGLE TypedWhichId<SfxInt32Item>(SCHATTR_CHARTTYPE_START + 7) -#define SCHATTR_CLOCKWISE TypedWhichId<SfxBoolItem>(SCHATTR_CHARTTYPE_START + 8) -#define SCHATTR_MISSING_VALUE_TREATMENT TypedWhichId<SfxInt32Item>(SCHATTR_CHARTTYPE_START + 9) -#define SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS TypedWhichId<SfxIntegerListItem>(SCHATTR_CHARTTYPE_START + 10) -#define SCHATTR_INCLUDE_HIDDEN_CELLS TypedWhichId<SfxBoolItem>(SCHATTR_CHARTTYPE_START + 11) -#define SCHATTR_HIDE_LEGEND_ENTRY TypedWhichId<SfxBoolItem>(SCHATTR_CHARTTYPE_START + 12) - -#define SCHATTR_CHARTTYPE_END SCHATTR_HIDE_LEGEND_ENTRY +constexpr TypedWhichId<SfxInt32Item> SCHATTR_BAR_OVERLAP (SCHATTR_CHARTTYPE_START ); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_BAR_GAPWIDTH (SCHATTR_CHARTTYPE_START + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_BAR_CONNECT (SCHATTR_CHARTTYPE_START + 2); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_NUM_OF_LINES_FOR_BAR (SCHATTR_CHARTTYPE_START + 3); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_SPLINE_ORDER (SCHATTR_CHARTTYPE_START + 4); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_SPLINE_RESOLUTION (SCHATTR_CHARTTYPE_START + 5); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_GROUP_BARS_PER_AXIS (SCHATTR_CHARTTYPE_START + 6); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_STARTING_ANGLE (SCHATTR_CHARTTYPE_START + 7); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_CLOCKWISE (SCHATTR_CHARTTYPE_START + 8); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_MISSING_VALUE_TREATMENT (SCHATTR_CHARTTYPE_START + 9); +constexpr TypedWhichId<SfxIntegerListItem> SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 10); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_INCLUDE_HIDDEN_CELLS (SCHATTR_CHARTTYPE_START + 11); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_HIDE_LEGEND_ENTRY (SCHATTR_CHARTTYPE_START + 12); + +constexpr sal_uInt16 SCHATTR_CHARTTYPE_END (SCHATTR_HIDE_LEGEND_ENTRY); // items for transporting information to dialogs -#define SCHATTR_MISC_START (SCHATTR_CHARTTYPE_END + 1) -#define SCHATTR_AXIS_FOR_ALL_SERIES TypedWhichId<SfxInt32Item>(SCHATTR_MISC_START) -#define SCHATTR_MISC_END SCHATTR_AXIS_FOR_ALL_SERIES +constexpr sal_uInt16 SCHATTR_MISC_START (SCHATTR_CHARTTYPE_END + 1); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_AXIS_FOR_ALL_SERIES (SCHATTR_MISC_START); +constexpr sal_uInt16 SCHATTR_MISC_END (SCHATTR_AXIS_FOR_ALL_SERIES); // regression curve -#define SCHATTR_REGRESSION_START (SCHATTR_MISC_END + 1) -#define SCHATTR_REGRESSION_TYPE TypedWhichId<SvxChartRegressItem>(SCHATTR_REGRESSION_START) -#define SCHATTR_REGRESSION_SHOW_EQUATION TypedWhichId<SfxBoolItem>(SCHATTR_REGRESSION_START + 1) -#define SCHATTR_REGRESSION_SHOW_COEFF TypedWhichId<SfxBoolItem>(SCHATTR_REGRESSION_START + 2) -#define SCHATTR_REGRESSION_DEGREE TypedWhichId<SfxInt32Item>(SCHATTR_REGRESSION_START + 3) -#define SCHATTR_REGRESSION_PERIOD TypedWhichId<SfxInt32Item>(SCHATTR_REGRESSION_START + 4) -#define SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD TypedWhichId<SvxDoubleItem>(SCHATTR_REGRESSION_START + 5) -#define SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD TypedWhichId<SvxDoubleItem>(SCHATTR_REGRESSION_START + 6) -#define SCHATTR_REGRESSION_SET_INTERCEPT TypedWhichId<SfxBoolItem>(SCHATTR_REGRESSION_START + 7) -#define SCHATTR_REGRESSION_INTERCEPT_VALUE TypedWhichId<SvxDoubleItem>(SCHATTR_REGRESSION_START + 8) -#define SCHATTR_REGRESSION_CURVE_NAME TypedWhichId<SfxStringItem>(SCHATTR_REGRESSION_START + 9) -#define SCHATTR_REGRESSION_XNAME TypedWhichId<SfxStringItem>(SCHATTR_REGRESSION_START + 10) -#define SCHATTR_REGRESSION_YNAME TypedWhichId<SfxStringItem>(SCHATTR_REGRESSION_START + 11) -#define SCHATTR_REGRESSION_END SCHATTR_REGRESSION_YNAME - -#define SCHATTR_END SCHATTR_REGRESSION_END +constexpr sal_uInt16 SCHATTR_REGRESSION_START (SCHATTR_MISC_END + 1); +constexpr TypedWhichId<SvxChartRegressItem> SCHATTR_REGRESSION_TYPE (SCHATTR_REGRESSION_START); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_REGRESSION_SHOW_EQUATION (SCHATTR_REGRESSION_START + 1); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_REGRESSION_SHOW_COEFF (SCHATTR_REGRESSION_START + 2); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_REGRESSION_DEGREE (SCHATTR_REGRESSION_START + 3); +constexpr TypedWhichId<SfxInt32Item> SCHATTR_REGRESSION_PERIOD (SCHATTR_REGRESSION_START + 4); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD (SCHATTR_REGRESSION_START + 5); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD (SCHATTR_REGRESSION_START + 6); +constexpr TypedWhichId<SfxBoolItem> SCHATTR_REGRESSION_SET_INTERCEPT (SCHATTR_REGRESSION_START + 7); +constexpr TypedWhichId<SvxDoubleItem> SCHATTR_REGRESSION_INTERCEPT_VALUE (SCHATTR_REGRESSION_START + 8); +constexpr TypedWhichId<SfxStringItem> SCHATTR_REGRESSION_CURVE_NAME (SCHATTR_REGRESSION_START + 9); +constexpr TypedWhichId<SfxStringItem> SCHATTR_REGRESSION_XNAME (SCHATTR_REGRESSION_START + 10); +constexpr TypedWhichId<SfxStringItem> SCHATTR_REGRESSION_YNAME (SCHATTR_REGRESSION_START + 11); +constexpr sal_uInt16 SCHATTR_REGRESSION_END (SCHATTR_REGRESSION_YNAME); + +constexpr sal_uInt16 SCHATTR_END (SCHATTR_REGRESSION_END); // values for Items diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx index 060fa9a6f1a2..667890bf58c4 100644 --- a/include/editeng/eeitem.hxx +++ b/include/editeng/eeitem.hxx @@ -58,6 +58,9 @@ class SvxWeightItem; class SvxWordLineModeItem; class SvxBulletItem; class SvxNumBulletItem; +class SvxJustifyMethodItem; +class SvxVerJustifyItem; +class SfxVoidItem; /* * NOTE: Changes in this file will probably require @@ -65,79 +68,79 @@ class SvxNumBulletItem; * as well. */ -#define EE_ITEMS_START (OWN_ATTR_VALUE_END+1) +constexpr sal_uInt16 EE_ITEMS_START(OWN_ATTR_VALUE_END + 1); // Paragraph attributes: -#define EE_PARA_START (EE_ITEMS_START+0) -#define EE_PARA_WRITINGDIR TypedWhichId<SvxFrameDirectionItem>(EE_PARA_START+0) -#define EE_PARA_XMLATTRIBS TypedWhichId<SvXMLAttrContainerItem>(EE_PARA_START+1) -#define EE_PARA_HANGINGPUNCTUATION TypedWhichId<SvxHangingPunctuationItem>(EE_PARA_START+2) -#define EE_PARA_FORBIDDENRULES TypedWhichId<SvxForbiddenRuleItem>(EE_PARA_START+3) -#define EE_PARA_ASIANCJKSPACING TypedWhichId<SvxScriptSpaceItem>(EE_PARA_START+4) -#define EE_PARA_NUMBULLET TypedWhichId<SvxNumBulletItem>(EE_PARA_START+5) -#define EE_PARA_HYPHENATE TypedWhichId<SfxBoolItem>(EE_PARA_START+6) -#define EE_PARA_HYPHENATE_NO_CAPS TypedWhichId<SfxBoolItem>(EE_PARA_START+7) -#define EE_PARA_BULLETSTATE TypedWhichId<SfxBoolItem>(EE_PARA_START+8) -#define EE_PARA_OUTLLRSPACE TypedWhichId<SvxLRSpaceItem>(EE_PARA_START+9) -#define EE_PARA_OUTLLEVEL TypedWhichId<SfxInt16Item>(EE_PARA_START+10) -#define EE_PARA_BULLET TypedWhichId<SvxBulletItem>(EE_PARA_START+11) -#define EE_PARA_LRSPACE TypedWhichId<SvxLRSpaceItem>(EE_PARA_START+12) -#define EE_PARA_ULSPACE TypedWhichId<SvxULSpaceItem>(EE_PARA_START+13) -#define EE_PARA_SBL TypedWhichId<SvxLineSpacingItem>(EE_PARA_START+14) -#define EE_PARA_JUST TypedWhichId<SvxAdjustItem>(EE_PARA_START+15) -#define EE_PARA_TABS TypedWhichId<SvxTabStopItem>(EE_PARA_START+16) -#define EE_PARA_JUST_METHOD TypedWhichId<SvxJustifyMethodItem>(EE_PARA_START+17) -#define EE_PARA_VER_JUST TypedWhichId<SvxVerJustifyItem>(EE_PARA_START+18) -#define EE_PARA_END (EE_PARA_START+18) +constexpr sal_uInt16 EE_PARA_START (EE_ITEMS_START + 0); +constexpr TypedWhichId<SvxFrameDirectionItem> EE_PARA_WRITINGDIR (EE_PARA_START+0); +constexpr TypedWhichId<SvXMLAttrContainerItem> EE_PARA_XMLATTRIBS (EE_PARA_START+1); +constexpr TypedWhichId<SvxHangingPunctuationItem> EE_PARA_HANGINGPUNCTUATION (EE_PARA_START+2); +constexpr TypedWhichId<SvxForbiddenRuleItem> EE_PARA_FORBIDDENRULES (EE_PARA_START+3); +constexpr TypedWhichId<SvxScriptSpaceItem> EE_PARA_ASIANCJKSPACING (EE_PARA_START+4); +constexpr TypedWhichId<SvxNumBulletItem> EE_PARA_NUMBULLET (EE_PARA_START+5); +constexpr TypedWhichId<SfxBoolItem> EE_PARA_HYPHENATE (EE_PARA_START+6); +constexpr TypedWhichId<SfxBoolItem> EE_PARA_HYPHENATE_NO_CAPS (EE_PARA_START+7); +constexpr TypedWhichId<SfxBoolItem> EE_PARA_BULLETSTATE (EE_PARA_START+8); +constexpr TypedWhichId<SvxLRSpaceItem> EE_PARA_OUTLLRSPACE (EE_PARA_START+9); +constexpr TypedWhichId<SfxInt16Item> EE_PARA_OUTLLEVEL (EE_PARA_START+10); +constexpr TypedWhichId<SvxBulletItem> EE_PARA_BULLET (EE_PARA_START+11); +constexpr TypedWhichId<SvxLRSpaceItem> EE_PARA_LRSPACE (EE_PARA_START+12); +constexpr TypedWhichId<SvxULSpaceItem> EE_PARA_ULSPACE (EE_PARA_START+13); +constexpr TypedWhichId<SvxLineSpacingItem> EE_PARA_SBL (EE_PARA_START+14); +constexpr TypedWhichId<SvxAdjustItem> EE_PARA_JUST (EE_PARA_START+15); +constexpr TypedWhichId<SvxTabStopItem> EE_PARA_TABS (EE_PARA_START+16); +constexpr TypedWhichId<SvxJustifyMethodItem> EE_PARA_JUST_METHOD (EE_PARA_START+17); +constexpr TypedWhichId<SvxVerJustifyItem> EE_PARA_VER_JUST (EE_PARA_START+18); +constexpr sal_uInt16 EE_PARA_END (EE_PARA_START + 18); // Character attributes: -#define EE_CHAR_START (EE_PARA_END+1) -#define EE_CHAR_COLOR TypedWhichId<SvxColorItem>(EE_CHAR_START+0) -#define EE_CHAR_FONTINFO TypedWhichId<SvxFontItem>(EE_CHAR_START+1) -#define EE_CHAR_FONTHEIGHT TypedWhichId<SvxFontHeightItem>(EE_CHAR_START+2) -#define EE_CHAR_FONTWIDTH TypedWhichId<SvxCharScaleWidthItem>(EE_CHAR_START+3) -#define EE_CHAR_WEIGHT TypedWhichId<SvxWeightItem>(EE_CHAR_START+4) -#define EE_CHAR_UNDERLINE TypedWhichId<SvxUnderlineItem>(EE_CHAR_START+5) -#define EE_CHAR_STRIKEOUT TypedWhichId<SvxCrossedOutItem>(EE_CHAR_START+6) -#define EE_CHAR_ITALIC TypedWhichId<SvxPostureItem>(EE_CHAR_START+7) -#define EE_CHAR_OUTLINE TypedWhichId<SvxContourItem>(EE_CHAR_START+8) -#define EE_CHAR_SHADOW TypedWhichId<SvxShadowedItem>(EE_CHAR_START+9) -#define EE_CHAR_ESCAPEMENT TypedWhichId<SvxEscapementItem>(EE_CHAR_START+10) -#define EE_CHAR_PAIRKERNING TypedWhichId<SvxAutoKernItem>(EE_CHAR_START+11) -#define EE_CHAR_KERNING TypedWhichId<SvxKerningItem>(EE_CHAR_START+12) -#define EE_CHAR_WLM TypedWhichId<SvxWordLineModeItem>(EE_CHAR_START+13) -#define EE_CHAR_LANGUAGE TypedWhichId<SvxLanguageItem>(EE_CHAR_START+14) -#define EE_CHAR_LANGUAGE_CJK TypedWhichId<SvxLanguageItem>(EE_CHAR_START+15) -#define EE_CHAR_LANGUAGE_CTL TypedWhichId<SvxLanguageItem>(EE_CHAR_START+16) -#define EE_CHAR_FONTINFO_CJK TypedWhichId<SvxFontItem>(EE_CHAR_START+17) -#define EE_CHAR_FONTINFO_CTL TypedWhichId<SvxFontItem>(EE_CHAR_START+18) -#define EE_CHAR_FONTHEIGHT_CJK TypedWhichId<SvxFontHeightItem>(EE_CHAR_START+19) -#define EE_CHAR_FONTHEIGHT_CTL TypedWhichId<SvxFontHeightItem>(EE_CHAR_START+20) -#define EE_CHAR_WEIGHT_CJK TypedWhichId<SvxWeightItem>(EE_CHAR_START+21) -#define EE_CHAR_WEIGHT_CTL TypedWhichId<SvxWeightItem>(EE_CHAR_START+22) -#define EE_CHAR_ITALIC_CJK TypedWhichId<SvxPostureItem>(EE_CHAR_START+23) -#define EE_CHAR_ITALIC_CTL TypedWhichId<SvxPostureItem>(EE_CHAR_START+24) -#define EE_CHAR_EMPHASISMARK TypedWhichId<SvxEmphasisMarkItem>(EE_CHAR_START+25) -#define EE_CHAR_RELIEF TypedWhichId<SvxCharReliefItem>(EE_CHAR_START+26) -#define EE_CHAR_RUBI_DUMMY TypedWhichId<SfxVoidItem>(EE_CHAR_START+27) -#define EE_CHAR_XMLATTRIBS TypedWhichId<SvXMLAttrContainerItem>(EE_CHAR_START+28) -#define EE_CHAR_OVERLINE TypedWhichId<SvxOverlineItem>(EE_CHAR_START+29) -#define EE_CHAR_CASEMAP TypedWhichId<SvxCaseMapItem>(EE_CHAR_START+30) -#define EE_CHAR_GRABBAG TypedWhichId<SfxGrabBagItem>(EE_CHAR_START+31) -#define EE_CHAR_BKGCOLOR TypedWhichId<SvxBackgroundColorItem>(EE_CHAR_START+32) +constexpr sal_uInt16 EE_CHAR_START (EE_PARA_END + 1); +constexpr TypedWhichId<SvxColorItem> EE_CHAR_COLOR (EE_CHAR_START+0); +constexpr TypedWhichId<SvxFontItem> EE_CHAR_FONTINFO (EE_CHAR_START+1); +constexpr TypedWhichId<SvxFontHeightItem> EE_CHAR_FONTHEIGHT (EE_CHAR_START+2); +constexpr TypedWhichId<SvxCharScaleWidthItem> EE_CHAR_FONTWIDTH (EE_CHAR_START+3); +constexpr TypedWhichId<SvxWeightItem> EE_CHAR_WEIGHT (EE_CHAR_START+4); +constexpr TypedWhichId<SvxUnderlineItem> EE_CHAR_UNDERLINE (EE_CHAR_START+5); +constexpr TypedWhichId<SvxCrossedOutItem> EE_CHAR_STRIKEOUT (EE_CHAR_START+6); +constexpr TypedWhichId<SvxPostureItem> EE_CHAR_ITALIC (EE_CHAR_START+7); +constexpr TypedWhichId<SvxContourItem> EE_CHAR_OUTLINE (EE_CHAR_START+8); +constexpr TypedWhichId<SvxShadowedItem> EE_CHAR_SHADOW (EE_CHAR_START+9); +constexpr TypedWhichId<SvxEscapementItem> EE_CHAR_ESCAPEMENT (EE_CHAR_START+10); +constexpr TypedWhichId<SvxAutoKernItem> EE_CHAR_PAIRKERNING (EE_CHAR_START+11); +constexpr TypedWhichId<SvxKerningItem> EE_CHAR_KERNING (EE_CHAR_START+12); +constexpr TypedWhichId<SvxWordLineModeItem> EE_CHAR_WLM (EE_CHAR_START+13); +constexpr TypedWhichId<SvxLanguageItem> EE_CHAR_LANGUAGE (EE_CHAR_START+14); +constexpr TypedWhichId<SvxLanguageItem> EE_CHAR_LANGUAGE_CJK (EE_CHAR_START+15); +constexpr TypedWhichId<SvxLanguageItem> EE_CHAR_LANGUAGE_CTL (EE_CHAR_START+16); +constexpr TypedWhichId<SvxFontItem> EE_CHAR_FONTINFO_CJK (EE_CHAR_START+17); +constexpr TypedWhichId<SvxFontItem> EE_CHAR_FONTINFO_CTL (EE_CHAR_START+18); +constexpr TypedWhichId<SvxFontHeightItem> EE_CHAR_FONTHEIGHT_CJK (EE_CHAR_START+19); +constexpr TypedWhichId<SvxFontHeightItem> EE_CHAR_FONTHEIGHT_CTL (EE_CHAR_START+20); +constexpr TypedWhichId<SvxWeightItem> EE_CHAR_WEIGHT_CJK (EE_CHAR_START+21); +constexpr TypedWhichId<SvxWeightItem> EE_CHAR_WEIGHT_CTL (EE_CHAR_START+22); +constexpr TypedWhichId<SvxPostureItem> EE_CHAR_ITALIC_CJK (EE_CHAR_START+23); +constexpr TypedWhichId<SvxPostureItem> EE_CHAR_ITALIC_CTL (EE_CHAR_START+24); +constexpr TypedWhichId<SvxEmphasisMarkItem> EE_CHAR_EMPHASISMARK (EE_CHAR_START+25); +constexpr TypedWhichId<SvxCharReliefItem> EE_CHAR_RELIEF (EE_CHAR_START+26); +constexpr TypedWhichId<SfxVoidItem> EE_CHAR_RUBI_DUMMY (EE_CHAR_START+27); +constexpr TypedWhichId<SvXMLAttrContainerItem> EE_CHAR_XMLATTRIBS (EE_CHAR_START+28); +constexpr TypedWhichId<SvxOverlineItem> EE_CHAR_OVERLINE (EE_CHAR_START+29); +constexpr TypedWhichId<SvxCaseMapItem> EE_CHAR_CASEMAP (EE_CHAR_START+30); +constexpr TypedWhichId<SfxGrabBagItem> EE_CHAR_GRABBAG (EE_CHAR_START+31); +constexpr TypedWhichId<SvxBackgroundColorItem> EE_CHAR_BKGCOLOR (EE_CHAR_START+32); -#define EE_CHAR_END (EE_CHAR_START+32) +constexpr sal_uInt16 EE_CHAR_END (EE_CHAR_START + 32); -#define EE_FEATURE_START (EE_CHAR_END+1) -#define EE_FEATURE_TAB (EE_FEATURE_START+0) -#define EE_FEATURE_LINEBR (EE_FEATURE_TAB+1) -#define EE_FEATURE_NOTCONV (EE_FEATURE_LINEBR+1) -#define EE_FEATURE_FIELD (EE_FEATURE_NOTCONV+1) -#define EE_FEATURE_END (EE_FEATURE_FIELD+0) +constexpr sal_uInt16 EE_FEATURE_START (EE_CHAR_END + 1); +constexpr sal_uInt16 EE_FEATURE_TAB (EE_FEATURE_START + 0); +constexpr sal_uInt16 EE_FEATURE_LINEBR (EE_FEATURE_TAB + 1); +constexpr sal_uInt16 EE_FEATURE_NOTCONV (EE_FEATURE_LINEBR + 1); +constexpr sal_uInt16 EE_FEATURE_FIELD (EE_FEATURE_NOTCONV + 1); +constexpr sal_uInt16 EE_FEATURE_END (EE_FEATURE_FIELD + 0); -#define EE_ITEMS_END (EE_FEATURE_END) +constexpr sal_uInt16 EE_ITEMS_END (EE_FEATURE_END); -#define EDITITEMCOUNT ( EE_ITEMS_END - EE_ITEMS_START + 1 ) +constexpr sal_uInt16 EDITITEMCOUNT (EE_ITEMS_END - EE_ITEMS_START + 1); #endif // _ INCLUDED_EDITENG_EEITEM_HXX diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index 54d9130e6be4..d80e4ed486ea 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -169,252 +169,257 @@ class SdrTextAniCountItem; class SdrTextAniStartInsideItem; class SdrTextAniStopInsideItem; class SdrTextAniDelayItem; +class SdrMeasureScaleItem; +class SdrRotateAllItem; +class Svx3DTextureKindItem; +class Svx3DTextureModeItem; +class SvXMLAttrContainerItem; -#define SDRATTR_START XATTR_START /* 1000 */ - /* Pool V4*/ /* Pool V3*/ /* Pool V2*/ -#define SDRATTR_SHADOW_FIRST (XATTR_END + 1) /* 1067 */ /* 1067 */ /* 1050 */ /* Pool V1: 1036 */ -#define SDRATTR_SHADOW TypedWhichId<SdrOnOffItem>(SDRATTR_SHADOW_FIRST+ 0) /* 1067 */ /* 1067 */ /* 1050 */ -#define SDRATTR_SHADOWCOLOR TypedWhichId<XColorItem>(SDRATTR_SHADOW_FIRST+ 1) /* 1068 */ /* 1068 */ /* 1051 */ -#define SDRATTR_SHADOWXDIST TypedWhichId<SdrMetricItem>(SDRATTR_SHADOW_FIRST+ 2) /* 1069 */ /* 1069 */ /* 1052 */ -#define SDRATTR_SHADOWYDIST TypedWhichId<SdrMetricItem>(SDRATTR_SHADOW_FIRST+ 3) /* 1070 */ /* 1070 */ /* 1053 */ -#define SDRATTR_SHADOWTRANSPARENCE TypedWhichId<SdrPercentItem>(SDRATTR_SHADOW_FIRST+ 4) /* 1071 */ /* 1071 */ /* 1054 */ /* Pool V2 */ -#define SDRATTR_SHADOW3D TypedWhichId<SfxVoidItem>(SDRATTR_SHADOW_FIRST+ 5) /* 1072 */ /* 1072 */ /* 1055 */ /* Pool V2 */ -#define SDRATTR_SHADOWPERSP TypedWhichId<SfxVoidItem>(SDRATTR_SHADOW_FIRST+ 6) /* 1073 */ /* 1073 */ /* 1056 */ /* Pool V2 */ -#define SDRATTR_SHADOW_LAST (SDRATTR_SHADOWPERSP) /* 1078 */ /* 1078 */ /* 1061 */ /* Pool V1: 1039 */ +constexpr sal_uInt16 SDRATTR_START (XATTR_START); /* 1000 */ + /* Pool V4*/ /* Pool V3*/ /* Pool V2*/ +constexpr sal_uInt16 SDRATTR_SHADOW_FIRST (XATTR_END + 1); /* 1067 */ /* 1067 */ /* 1050 */ /* Pool V1: 1036 */ +constexpr TypedWhichId<SdrOnOffItem> SDRATTR_SHADOW (SDRATTR_SHADOW_FIRST+ 0); /* 1067 */ /* 1067 */ /* 1050 */ +constexpr TypedWhichId<XColorItem> SDRATTR_SHADOWCOLOR (SDRATTR_SHADOW_FIRST+ 1); /* 1068 */ /* 1068 */ /* 1051 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_SHADOWXDIST (SDRATTR_SHADOW_FIRST+ 2); /* 1069 */ /* 1069 */ /* 1052 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_SHADOWYDIST (SDRATTR_SHADOW_FIRST+ 3); /* 1070 */ /* 1070 */ /* 1053 */ +constexpr TypedWhichId<SdrPercentItem> SDRATTR_SHADOWTRANSPARENCE (SDRATTR_SHADOW_FIRST+ 4); /* 1071 */ /* 1071 */ /* 1054 */ /* Pool V2 */ +constexpr TypedWhichId<SfxVoidItem> SDRATTR_SHADOW3D (SDRATTR_SHADOW_FIRST+ 5); /* 1072 */ /* 1072 */ /* 1055 */ /* Pool V2 */ +constexpr TypedWhichId<SfxVoidItem> SDRATTR_SHADOWPERSP (SDRATTR_SHADOW_FIRST+ 6); /* 1073 */ /* 1073 */ /* 1056 */ /* Pool V2 */ +constexpr sal_uInt16 SDRATTR_SHADOW_LAST (SDRATTR_SHADOWPERSP); /* 1078 */ /* 1078 */ /* 1061 */ /* Pool V1: 1039 */ -#define SDRATTR_CAPTION_FIRST (SDRATTR_SHADOW_LAST + 1) /* 1080 */ /* 1080 */ /* 1063 */ /* Pool V1: 1041 */ -#define SDRATTR_CAPTIONTYPE TypedWhichId<SdrCaptionTypeItem>(SDRATTR_CAPTION_FIRST+ 0) /* 1080 */ /* 1080 */ /* 1063 */ -#define SDRATTR_CAPTIONFIXEDANGLE TypedWhichId<SdrOnOffItem>(SDRATTR_CAPTION_FIRST+ 1) /* 1081 */ /* 1081 */ /* 1064 */ -#define SDRATTR_CAPTIONANGLE TypedWhichId<SdrAngleItem>(SDRATTR_CAPTION_FIRST+ 2) /* 1082 */ /* 1082 */ /* 1065 */ -#define SDRATTR_CAPTIONGAP TypedWhichId<SdrMetricItem>(SDRATTR_CAPTION_FIRST+ 3) /* 1083 */ /* 1083 */ /* 1066 */ -#define SDRATTR_CAPTIONESCDIR TypedWhichId<SdrCaptionEscDirItem>(SDRATTR_CAPTION_FIRST+ 4) /* 1084 */ /* 1084 */ /* 1067 */ -#define SDRATTR_CAPTIONESCISREL TypedWhichId<SdrCaptionEscIsRelItem>(SDRATTR_CAPTION_FIRST+ 5) /* 1085 */ /* 1085 */ /* 1068 */ -#define SDRATTR_CAPTIONESCREL TypedWhichId<SdrCaptionEscRelItem>(SDRATTR_CAPTION_FIRST+ 6) /* 1086 */ /* 1086 */ /* 1069 */ -#define SDRATTR_CAPTIONESCABS TypedWhichId<SdrCaptionEscAbsItem>(SDRATTR_CAPTION_FIRST+ 7) /* 1087 */ /* 1087 */ /* 1070 */ -#define SDRATTR_CAPTIONLINELEN TypedWhichId<SdrCaptionLineLenItem>(SDRATTR_CAPTION_FIRST+ 8) /* 1088 */ /* 1088 */ /* 1071 */ -#define SDRATTR_CAPTIONFITLINELEN TypedWhichId<SdrCaptionFitLineLenItem>(SDRATTR_CAPTION_FIRST+ 9) /* 1089 */ /* 1089 */ /* 1072 */ -#define SDRATTR_CAPTION_LAST (SDRATTR_CAPTIONFITLINELEN) /* 1094 */ /* 1094 */ /* 1077 */ /* Pool V1: 1050 */ +constexpr sal_uInt16 SDRATTR_CAPTION_FIRST (SDRATTR_SHADOW_LAST + 1); /* 1080 */ /* 1080 */ /* 1063 */ /* Pool V1: 1041 */ +constexpr TypedWhichId<SdrCaptionTypeItem> SDRATTR_CAPTIONTYPE (SDRATTR_CAPTION_FIRST+ 0); /* 1080 */ /* 1080 */ /* 1063 */ +constexpr TypedWhichId<SdrOnOffItem> SDRATTR_CAPTIONFIXEDANGLE (SDRATTR_CAPTION_FIRST+ 1); /* 1081 */ /* 1081 */ /* 1064 */ +constexpr TypedWhichId<SdrAngleItem> SDRATTR_CAPTIONANGLE (SDRATTR_CAPTION_FIRST+ 2); /* 1082 */ /* 1082 */ /* 1065 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_CAPTIONGAP (SDRATTR_CAPTION_FIRST+ 3); /* 1083 */ /* 1083 */ /* 1066 */ +constexpr TypedWhichId<SdrCaptionEscDirItem> SDRATTR_CAPTIONESCDIR (SDRATTR_CAPTION_FIRST+ 4); /* 1084 */ /* 1084 */ /* 1067 */ +constexpr TypedWhichId<SdrCaptionEscIsRelItem> SDRATTR_CAPTIONESCISREL (SDRATTR_CAPTION_FIRST+ 5); /* 1085 */ /* 1085 */ /* 1068 */ +constexpr TypedWhichId<SdrCaptionEscRelItem> SDRATTR_CAPTIONESCREL (SDRATTR_CAPTION_FIRST+ 6); /* 1086 */ /* 1086 */ /* 1069 */ +constexpr TypedWhichId<SdrCaptionEscAbsItem> SDRATTR_CAPTIONESCABS (SDRATTR_CAPTION_FIRST+ 7); /* 1087 */ /* 1087 */ /* 1070 */ +constexpr TypedWhichId<SdrCaptionLineLenItem> SDRATTR_CAPTIONLINELEN (SDRATTR_CAPTION_FIRST+ 8); /* 1088 */ /* 1088 */ /* 1071 */ +constexpr TypedWhichId<SdrCaptionFitLineLenItem> SDRATTR_CAPTIONFITLINELEN (SDRATTR_CAPTION_FIRST+ 9); /* 1089 */ /* 1089 */ /* 1072 */ +constexpr sal_uInt16 SDRATTR_CAPTION_LAST (SDRATTR_CAPTIONFITLINELEN); /* 1094 */ /* 1094 */ /* 1077 */ /* Pool V1: 1050 */ -#define SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1) /* 1097 */ /* 1097 */ /* 1080 */ /* Pool V1: 1053 */ -#define SDRATTR_ECKENRADIUS TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST + 0) /* 1097 */ /* 1097 */ /* 1080 long, def=0 */ -#define SDRATTR_TEXT_MINFRAMEHEIGHT TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST + 1) /* 1098 */ /* 1098 */ /* 1081 long, def=0 */ -#define SDRATTR_TEXT_AUTOGROWHEIGHT TypedWhichId<SdrOnOffItem>(SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 sal_Bool, def=sal_True */ -#define SDRATTR_TEXT_FITTOSIZE TypedWhichId<SdrTextFitToSizeTypeItem>(SDRATTR_MISC_FIRST + 3) /* 1100 */ /* 1100 */ /* 1083 enum, def=css::drawing::TextFitToSizeType_NONE */ -#define SDRATTR_TEXT_LEFTDIST TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST + 4) /* 1101 */ /* 1101 */ /* 1084 long, def=0 */ /* Pool V2 */ -#define SDRATTR_TEXT_RIGHTDIST TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST + 5) /* 1102 */ /* 1102 */ /* 1085 long, def=0 */ /* Pool V2 */ -#define SDRATTR_TEXT_UPPERDIST TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST + 6) /* 1103 */ /* 1103 */ /* 1086 long, def=0 */ /* Pool V2 */ -#define SDRATTR_TEXT_LOWERDIST TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST + 7) /* 1104 */ /* 1104 */ /* 1087 long, def=0 */ /* Pool V2 */ -#define SDRATTR_TEXT_VERTADJUST TypedWhichId<SdrTextVertAdjustItem>(SDRATTR_MISC_FIRST + 8) /* 1105 */ /* 1105 */ /* 1088 enum, def=SDRTEXTVERTADJUST_TOP */ /* Pool V2 */ -#define SDRATTR_TEXT_MAXFRAMEHEIGHT TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST + 9) /* 1106 */ /* 1106 */ /* 1089 long, def=0 - Pool V2 */ -#define SDRATTR_TEXT_MINFRAMEWIDTH TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST +10) /* 1107 */ /* 1107 */ /* 1090 long, def=0 - Pool V2 */ -#define SDRATTR_TEXT_MAXFRAMEWIDTH TypedWhichId<SdrMetricItem>(SDRATTR_MISC_FIRST +11) /* 1108 */ /* 1108 */ /* 1091 long, def=0 - Pool V2 */ -#define SDRATTR_TEXT_AUTOGROWWIDTH TypedWhichId<SdrOnOffItem>(SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 sal_Bool, def=sal_False - Pool V2 */ -#define SDRATTR_TEXT_HORZADJUST TypedWhichId<SdrTextHorzAdjustItem>(SDRATTR_MISC_FIRST +13) /* 1110 */ /* 1110 */ /* 1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */ -#define SDRATTR_TEXT_ANIKIND TypedWhichId<SdrTextAniKindItem>(SDRATTR_MISC_FIRST +14) /* 1111 */ /* 1111 */ /* 1094 enum, def=SdrTextAniKind::NONE - Pool V2/V4 */ -#define SDRATTR_TEXT_ANIDIRECTION TypedWhichId<SdrTextAniDirectionItem>(SDRATTR_MISC_FIRST +15) /* 1112 */ /* 1112 */ /* 1095 enum, def=SdrTextAniDirection::Left - Pool V2/V4 */ -#define SDRATTR_TEXT_ANISTARTINSIDE TypedWhichId<SdrTextAniStartInsideItem>(SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 sal_Bool, def=sal_False - Pool V2/V4 */ -#define SDRATTR_TEXT_ANISTOPINSIDE TypedWhichId<SdrTextAniStopInsideItem>(SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 sal_Bool, def=sal_False - Pool V2/V4 */ -#define SDRATTR_TEXT_ANICOUNT TypedWhichId<SdrTextAniCountItem>(SDRATTR_MISC_FIRST +18) /* 1115 */ /* 1115 */ /* 1098 sal_uInt16, def=0 - Pool V2/V4 */ -#define SDRATTR_TEXT_ANIDELAY TypedWhichId<SdrTextAniDelayItem>(SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 sal_uInt16, def=0 - Pool V2/V4 */ -#define SDRATTR_TEXT_ANIAMOUNT TypedWhichId<SdrTextAniAmountItem>(SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 sal_uInt16, def=0 - Pool V2/V4 */ -#define SDRATTR_TEXT_CONTOURFRAME TypedWhichId<SdrOnOffItem>(SDRATTR_MISC_FIRST +21) /* 1118 */ /* 1118 */ /* 1101 */ /* Pool V2 */ -#define SDRATTR_XMLATTRIBUTES TypedWhichId<SvXMLAttrContainerItem>(SDRATTR_MISC_FIRST +22) /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */ -#define SDRATTR_TEXT_USEFIXEDCELLHEIGHT TypedWhichId<SdrTextFixedCellHeightItem>(SDRATTR_MISC_FIRST +23) /* 1121 */ /* 1121 */ /* 1104 */ /* Pool V2 */ -#define SDRATTR_TEXT_WORDWRAP TypedWhichId<SdrOnOffItem>(SDRATTR_MISC_FIRST +24) /* 1122 */ /* 1122 */ /* 1105 */ /* Pool V2 */ -#define SDRATTR_TEXT_CHAINNEXTNAME TypedWhichId<SfxStringItem>(SDRATTR_MISC_FIRST +25) /* 1123 */ /* 1123 */ /* 1106 */ /* Pool V2 */ -#define SDRATTR_MISC_LAST (SDRATTR_TEXT_CHAINNEXTNAME) /* 1125 */ /* 1125 */ /* 1108 */ /* Pool V1: 1056 */ +constexpr sal_uInt16 SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1); /* 1097 */ /* 1097 */ /* 1080 */ /* Pool V1: 1053 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_ECKENRADIUS (SDRATTR_MISC_FIRST + 0); /* 1097 */ /* 1097 */ /* 1080 long, def=0 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1); /* 1098 */ /* 1098 */ /* 1081 long, def=0 */ +constexpr TypedWhichId<SdrOnOffItem> SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2); /* 1099 */ /* 1099 */ /* 1082 sal_Bool, def=sal_True */ +constexpr TypedWhichId<SdrTextFitToSizeTypeItem> SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3); /* 1100 */ /* 1100 */ /* 1083 enum, def=css::drawing::TextFitToSizeType_NONE */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_LEFTDIST (SDRATTR_MISC_FIRST + 4); /* 1101 */ /* 1101 */ /* 1084 long, def=0 */ /* Pool V2 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_RIGHTDIST (SDRATTR_MISC_FIRST + 5); /* 1102 */ /* 1102 */ /* 1085 long, def=0 */ /* Pool V2 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_UPPERDIST (SDRATTR_MISC_FIRST + 6); /* 1103 */ /* 1103 */ /* 1086 long, def=0 */ /* Pool V2 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_LOWERDIST (SDRATTR_MISC_FIRST + 7); /* 1104 */ /* 1104 */ /* 1087 long, def=0 */ /* Pool V2 */ +constexpr TypedWhichId<SdrTextVertAdjustItem> SDRATTR_TEXT_VERTADJUST (SDRATTR_MISC_FIRST + 8); /* 1105 */ /* 1105 */ /* 1088 enum, def=SDRTEXTVERTADJUST_TOP */ /* Pool V2 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_MAXFRAMEHEIGHT (SDRATTR_MISC_FIRST + 9); /* 1106 */ /* 1106 */ /* 1089 long, def=0 - Pool V2 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_MINFRAMEWIDTH (SDRATTR_MISC_FIRST +10); /* 1107 */ /* 1107 */ /* 1090 long, def=0 - Pool V2 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_MAXFRAMEWIDTH (SDRATTR_MISC_FIRST +11); /* 1108 */ /* 1108 */ /* 1091 long, def=0 - Pool V2 */ +constexpr TypedWhichId<SdrOnOffItem> SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12); /* 1109 */ /* 1109 */ /* 1092 sal_Bool, def=sal_False - Pool V2 */ +constexpr TypedWhichId<SdrTextHorzAdjustItem> SDRATTR_TEXT_HORZADJUST (SDRATTR_MISC_FIRST +13); /* 1110 */ /* 1110 */ /* 1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */ +constexpr TypedWhichId<SdrTextAniKindItem> SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14); /* 1111 */ /* 1111 */ /* 1094 enum, def=SdrTextAniKind::NONE - Pool V2/V4 */ +constexpr TypedWhichId<SdrTextAniDirectionItem> SDRATTR_TEXT_ANIDIRECTION (SDRATTR_MISC_FIRST +15); /* 1112 */ /* 1112 */ /* 1095 enum, def=SdrTextAniDirection::Left - Pool V2/V4 */ +constexpr TypedWhichId<SdrTextAniStartInsideItem> SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16); /* 1113 */ /* 1113 */ /* 1096 sal_Bool, def=sal_False - Pool V2/V4 */ +constexpr TypedWhichId<SdrTextAniStopInsideItem> SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17); /* 1114 */ /* 1114 */ /* 1097 sal_Bool, def=sal_False - Pool V2/V4 */ +constexpr TypedWhichId<SdrTextAniCountItem> SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18); /* 1115 */ /* 1115 */ /* 1098 sal_uInt16, def=0 - Pool V2/V4 */ +constexpr TypedWhichId<SdrTextAniDelayItem> SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19); /* 1116 */ /* 1116 */ /* 1099 sal_uInt16, def=0 - Pool V2/V4 */ +constexpr TypedWhichId<SdrTextAniAmountItem> SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20); /* 1117 */ /* 1117 */ /* 1100 sal_uInt16, def=0 - Pool V2/V4 */ +constexpr TypedWhichId<SdrOnOffItem> SDRATTR_TEXT_CONTOURFRAME (SDRATTR_MISC_FIRST +21); /* 1118 */ /* 1118 */ /* 1101 */ /* Pool V2 */ +constexpr TypedWhichId<SvXMLAttrContainerItem> SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +22); /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */ +constexpr TypedWhichId<SdrTextFixedCellHeightItem> SDRATTR_TEXT_USEFIXEDCELLHEIGHT (SDRATTR_MISC_FIRST +23); /* 1121 */ /* 1121 */ /* 1104 */ /* Pool V2 */ +constexpr TypedWhichId<SdrOnOffItem> SDRATTR_TEXT_WORDWRAP (SDRATTR_MISC_FIRST +24); /* 1122 */ /* 1122 */ /* 1105 */ /* Pool V2 */ +constexpr TypedWhichId<SfxStringItem> SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST +25); /* 1123 */ /* 1123 */ /* 1106 */ /* Pool V2 */ +constexpr sal_uInt16 SDRATTR_MISC_LAST (SDRATTR_TEXT_CHAINNEXTNAME); /* 1125 */ /* 1125 */ /* 1108 */ /* Pool V1: 1056 */ -#define SDRATTR_EDGE_FIRST (SDRATTR_MISC_LAST + 1) /* 1127 */ /* Pool V4 */ -#define SDRATTR_EDGEKIND TypedWhichId<SdrEdgeKindItem>(SDRATTR_EDGE_FIRST + 0) /* 1127 */ /* Pool V4 */ -#define SDRATTR_EDGENODE1HORZDIST TypedWhichId<SdrEdgeNode1HorzDistItem>(SDRATTR_EDGE_FIRST + 1) /* 1128 */ /* Pool V4 */ -#define SDRATTR_EDGENODE1VERTDIST TypedWhichId<SdrEdgeNode1VertDistItem>(SDRATTR_EDGE_FIRST + 2) /* 1129 */ /* Pool V4 */ -#define SDRATTR_EDGENODE2HORZDIST TypedWhichId<SdrEdgeNode2HorzDistItem>(SDRATTR_EDGE_FIRST + 3) /* 1130 */ /* Pool V4 */ -#define SDRATTR_EDGENODE2VERTDIST TypedWhichId<SdrEdgeNode2VertDistItem>(SDRATTR_EDGE_FIRST + 4) /* 1131 */ /* Pool V4 */ -#define SDRATTR_EDGENODE1GLUEDIST TypedWhichId<SdrEdgeNode1GlueDistItem>(SDRATTR_EDGE_FIRST + 5) /* 1132 */ /* Pool V4 */ -#define SDRATTR_EDGENODE2GLUEDIST TypedWhichId<SdrEdgeNode2GlueDistItem>(SDRATTR_EDGE_FIRST + 6) /* 1133 */ /* Pool V4 */ -#define SDRATTR_EDGELINEDELTACOUNT TypedWhichId<SdrEdgeLineDeltaCountItem>(SDRATTR_EDGE_FIRST + 7) /* 1134 */ /* Pool V4 */ -#define SDRATTR_EDGELINE1DELTA TypedWhichId<SdrMetricItem>(SDRATTR_EDGE_FIRST + 8) /* 1135 */ /* Pool V4 */ -#define SDRATTR_EDGELINE2DELTA TypedWhichId<SdrMetricItem>(SDRATTR_EDGE_FIRST + 9) /* 1136 */ /* Pool V4 */ -#define SDRATTR_EDGELINE3DELTA TypedWhichId<SdrMetricItem>(SDRATTR_EDGE_FIRST +10) /* 1137 */ /* Pool V4 */ -#define SDRATTR_EDGE_LAST (SDRATTR_EDGELINE3DELTA) /* 1145 */ /* Pool V4 */ +constexpr sal_uInt16 SDRATTR_EDGE_FIRST (SDRATTR_MISC_LAST + 1); /* 1127 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeKindItem> SDRATTR_EDGEKIND (SDRATTR_EDGE_FIRST + 0); /* 1127 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeNode1HorzDistItem> SDRATTR_EDGENODE1HORZDIST (SDRATTR_EDGE_FIRST + 1); /* 1128 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeNode1VertDistItem> SDRATTR_EDGENODE1VERTDIST (SDRATTR_EDGE_FIRST + 2); /* 1129 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeNode2HorzDistItem> SDRATTR_EDGENODE2HORZDIST (SDRATTR_EDGE_FIRST + 3); /* 1130 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeNode2VertDistItem> SDRATTR_EDGENODE2VERTDIST (SDRATTR_EDGE_FIRST + 4); /* 1131 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeNode1GlueDistItem> SDRATTR_EDGENODE1GLUEDIST (SDRATTR_EDGE_FIRST + 5); /* 1132 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeNode2GlueDistItem> SDRATTR_EDGENODE2GLUEDIST (SDRATTR_EDGE_FIRST + 6); /* 1133 */ /* Pool V4 */ +constexpr TypedWhichId<SdrEdgeLineDeltaCountItem> SDRATTR_EDGELINEDELTACOUNT (SDRATTR_EDGE_FIRST + 7); /* 1134 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_EDGELINE1DELTA (SDRATTR_EDGE_FIRST + 8); /* 1135 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_EDGELINE2DELTA (SDRATTR_EDGE_FIRST + 9); /* 1136 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_EDGELINE3DELTA (SDRATTR_EDGE_FIRST +10); /* 1137 */ /* Pool V4 */ +constexpr sal_uInt16 SDRATTR_EDGE_LAST (SDRATTR_EDGELINE3DELTA); /* 1145 */ /* Pool V4 */ -#define SDRATTR_MEASURE_FIRST (SDRATTR_EDGE_LAST + 1) /* 1147 */ /* Pool V4 */ -#define SDRATTR_MEASUREKIND TypedWhichId<SdrMeasureKindItem>(SDRATTR_MEASURE_FIRST+ 0) /* 1147 */ /* Pool V4 */ -#define SDRATTR_MEASURETEXTHPOS TypedWhichId<SdrMeasureTextHPosItem>(SDRATTR_MEASURE_FIRST+ 1) /* 1148 */ /* Pool V4 */ -#define SDRATTR_MEASURETEXTVPOS TypedWhichId<SdrMeasureTextVPosItem>(SDRATTR_MEASURE_FIRST+ 2) /* 1149 */ /* Pool V4 */ -#define SDRATTR_MEASURELINEDIST TypedWhichId<SdrMetricItem>(SDRATTR_MEASURE_FIRST+ 3) /* 1150 */ /* Pool V4 */ -#define SDRATTR_MEASUREHELPLINEOVERHANG TypedWhichId<SdrMetricItem>(SDRATTR_MEASURE_FIRST+ 4) /* 1151 */ /* Pool V4 */ -#define SDRATTR_MEASUREHELPLINEDIST TypedWhichId<SdrMetricItem>(SDRATTR_MEASURE_FIRST+ 5) /* 1152 */ /* Pool V4 */ -#define SDRATTR_MEASUREHELPLINE1LEN TypedWhichId<SdrMetricItem>(SDRATTR_MEASURE_FIRST+ 6) /* 1153 */ /* Pool V4 */ -#define SDRATTR_MEASUREHELPLINE2LEN TypedWhichId<SdrMetricItem>(SDRATTR_MEASURE_FIRST+ 7) /* 1154 */ /* Pool V4 */ -#define SDRATTR_MEASUREBELOWREFEDGE TypedWhichId<SdrMeasureBelowRefEdgeItem>(SDRATTR_MEASURE_FIRST+ 8) /* 1155 */ /* Pool V4 */ -#define SDRATTR_MEASURETEXTROTA90 TypedWhichId<SdrMeasureTextRota90Item>(SDRATTR_MEASURE_FIRST+ 9)/* 1156 */ /* Pool V4 */ -#define SDRATTR_MEASURETEXTUPSIDEDOWN TypedWhichId<SdrYesNoItem>(SDRATTR_MEASURE_FIRST+10) /* 1157 */ /* Pool V4 */ -#define SDRATTR_MEASUREOVERHANG TypedWhichId<SdrMeasureOverhangItem>(SDRATTR_MEASURE_FIRST+11) /* 1158 */ /* Pool V4 */ -#define SDRATTR_MEASUREUNIT TypedWhichId<SdrMeasureUnitItem>(SDRATTR_MEASURE_FIRST+12) /* 1159 */ /* Pool V4 */ -#define SDRATTR_MEASURESCALE TypedWhichId<SdrMeasureScaleItem>(SDRATTR_MEASURE_FIRST+13) /* 1160 */ /* Pool V4 */ -#define SDRATTR_MEASURESHOWUNIT TypedWhichId<SdrYesNoItem>(SDRATTR_MEASURE_FIRST+14) /* 1161 */ /* Pool V4 */ -#define SDRATTR_MEASUREFORMATSTRING TypedWhichId<SdrMeasureFormatStringItem>(SDRATTR_MEASURE_FIRST+15) /* 1162 */ /* Pool V4 */ -#define SDRATTR_MEASURETEXTAUTOANGLE TypedWhichId<SdrMeasureTextAutoAngleItem>(SDRATTR_MEASURE_FIRST+16) /* 1163 */ /* Pool V4, Correction 25-9-1996 */ -#define SDRATTR_MEASURETEXTAUTOANGLEVIEW TypedWhichId<SdrAngleItem>(SDRATTR_MEASURE_FIRST+17) /* 1164 */ /* Pool V4, Correction 25-9-1996 */ -#define SDRATTR_MEASURETEXTISFIXEDANGLE TypedWhichId<SdrMeasureTextIsFixedAngleItem>(SDRATTR_MEASURE_FIRST+18) /* 1165 */ /* Pool V4, Correction 25-9-1996 */ -#define SDRATTR_MEASURETEXTFIXEDANGLE TypedWhichId<SdrMeasureTextFixedAngleItem>(SDRATTR_MEASURE_FIRST+19) /* 1166 */ /* Pool V4, Correction 25-9-1996 */ -#define SDRATTR_MEASUREDECIMALPLACES TypedWhichId<SdrMeasureDecimalPlacesItem>(SDRATTR_MEASURE_FIRST+20) /* 1167 */ /* Pool V4 */ -#define SDRATTR_MEASURE_LAST (SDRATTR_MEASUREDECIMALPLACES) /* 1170 */ /* Pool V4 */ +constexpr sal_uInt16 SDRATTR_MEASURE_FIRST (SDRATTR_EDGE_LAST + 1); /* 1147 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureKindItem> SDRATTR_MEASUREKIND (SDRATTR_MEASURE_FIRST+ 0); /* 1147 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureTextHPosItem> SDRATTR_MEASURETEXTHPOS (SDRATTR_MEASURE_FIRST+ 1); /* 1148 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureTextVPosItem> SDRATTR_MEASURETEXTVPOS (SDRATTR_MEASURE_FIRST+ 2); /* 1149 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_MEASURELINEDIST (SDRATTR_MEASURE_FIRST+ 3); /* 1150 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_MEASUREHELPLINEOVERHANG (SDRATTR_MEASURE_FIRST+ 4); /* 1151 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_MEASUREHELPLINEDIST (SDRATTR_MEASURE_FIRST+ 5); /* 1152 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_MEASUREHELPLINE1LEN (SDRATTR_MEASURE_FIRST+ 6); /* 1153 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMetricItem> SDRATTR_MEASUREHELPLINE2LEN (SDRATTR_MEASURE_FIRST+ 7); /* 1154 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureBelowRefEdgeItem> SDRATTR_MEASUREBELOWREFEDGE (SDRATTR_MEASURE_FIRST+ 8); /* 1155 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureTextRota90Item> SDRATTR_MEASURETEXTROTA90 (SDRATTR_MEASURE_FIRST+ 9); /* 1156 */ /* Pool V4 */ +constexpr TypedWhichId<SdrYesNoItem> SDRATTR_MEASURETEXTUPSIDEDOWN (SDRATTR_MEASURE_FIRST+10); /* 1157 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureOverhangItem> SDRATTR_MEASUREOVERHANG (SDRATTR_MEASURE_FIRST+11); /* 1158 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureUnitItem> SDRATTR_MEASUREUNIT (SDRATTR_MEASURE_FIRST+12); /* 1159 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureScaleItem> SDRATTR_MEASURESCALE (SDRATTR_MEASURE_FIRST+13); /* 1160 */ /* Pool V4 */ +constexpr TypedWhichId<SdrYesNoItem> SDRATTR_MEASURESHOWUNIT (SDRATTR_MEASURE_FIRST+14); /* 1161 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureFormatStringItem> SDRATTR_MEASUREFORMATSTRING (SDRATTR_MEASURE_FIRST+15); /* 1162 */ /* Pool V4 */ +constexpr TypedWhichId<SdrMeasureTextAutoAngleItem> SDRATTR_MEASURETEXTAUTOANGLE (SDRATTR_MEASURE_FIRST+16); /* 1163 */ /* Pool V4, Correction 25-9-1996 */ +constexpr TypedWhichId<SdrAngleItem> SDRATTR_MEASURETEXTAUTOANGLEVIEW (SDRATTR_MEASURE_FIRST+17); /* 1164 */ /* Pool V4, Correction 25-9-1996 */ +constexpr TypedWhichId<SdrMeasureTextIsFixedAngleItem> SDRATTR_MEASURETEXTISFIXEDANGLE (SDRATTR_MEASURE_FIRST+18); /* 1165 */ /* Pool V4, Correction 25-9-1996 */ +constexpr TypedWhichId<SdrMeasureTextFixedAngleItem> SDRATTR_MEASURETEXTFIXEDANGLE (SDRATTR_MEASURE_FIRST+19); /* 1166 */ /* Pool V4, Correction 25-9-1996 */ +constexpr TypedWhichId<SdrMeasureDecimalPlacesItem> SDRATTR_MEASUREDECIMALPLACES (SDRATTR_MEASURE_FIRST+20); /* 1167 */ /* Pool V4 */ +constexpr sal_uInt16 SDRATTR_MEASURE_LAST (SDRATTR_MEASUREDECIMALPLACES); /* 1170 */ /* Pool V4 */ -#define SDRATTR_CIRC_FIRST (SDRATTR_MEASURE_LAST+ 1) /* 1172 */ /* Pool V4+ */ -#define SDRATTR_CIRCKIND TypedWhichId<SdrCircKindItem>(SDRATTR_CIRC_FIRST+ 0) /* 1172 */ /* Pool V4+ */ -#define SDRATTR_CIRCSTARTANGLE TypedWhichId<SdrAngleItem>(SDRATTR_CIRC_FIRST+ 1) /* 1173 */ /* Pool V4+ */ -#define SDRATTR_CIRCENDANGLE TypedWhichId<SdrAngleItem>(SDRATTR_CIRC_FIRST+ 2) /* 1174 */ /* Pool V4+ */ -#define SDRATTR_CIRC_LAST (SDRATTR_CIRCENDANGLE) /* 1178 */ /* Pool V4+ */ +constexpr sal_uInt16 SDRATTR_CIRC_FIRST (SDRATTR_MEASURE_LAST+ 1); /* 1172 */ /* Pool V4+ */ +constexpr TypedWhichId<SdrCircKindItem> SDRATTR_CIRCKIND (SDRATTR_CIRC_FIRST+ 0); /* 1172 */ /* Pool V4+ */ +constexpr TypedWhichId<SdrAngleItem> SDRATTR_CIRCSTARTANGLE (SDRATTR_CIRC_FIRST+ 1); /* 1173 */ /* Pool V4+ */ +constexpr TypedWhichId<SdrAngleItem> SDRATTR_CIRCENDANGLE (SDRATTR_CIRC_FIRST+ 2); /* 1174 */ /* Pool V4+ */ +constexpr sal_uInt16 SDRATTR_CIRC_LAST (SDRATTR_CIRCENDANGLE); /* 1178 */ /* Pool V4+ */ // Only for Interfacing, not yet implemented. / * + * V4 / -#define SDRATTR_NOTPERSIST_FIRST (SDRATTR_CIRC_LAST + 1) /* 1180 */ /* 1172 */ /* 1127 */ /* 1110 */ /* Pool V1: 1058 */ -#define SDRATTR_OBJMOVEPROTECT TypedWhichId<SdrYesNoItem>(SDRATTR_NOTPERSIST_FIRST+ 0) /* 1180 sal_Bool, def=sal_False */ -#define SDRATTR_OBJSIZEPROTECT TypedWhichId<SdrYesNoItem>(SDRATTR_NOTPERSIST_FIRST+ 1) /* 1181 sal_Bool, def=sal_False */ -#define SDRATTR_OBJPRINTABLE TypedWhichId<SdrObjPrintableItem>(SDRATTR_NOTPERSIST_FIRST+ 2) /* 1182 sal_Bool, def=sal_True */ -#define SDRATTR_LAYERID TypedWhichId<SdrLayerIdItem>(SDRATTR_NOTPERSIST_FIRST+ 3) /* 1183 sal_uInt16, def=0 */ -#define SDRATTR_LAYERNAME TypedWhichId<SdrLayerNameItem>(SDRATTR_NOTPERSIST_FIRST+ 4) /* 1184 String, def="" */ -#define SDRATTR_OBJECTNAME TypedWhichId<SfxStringItem>(SDRATTR_NOTPERSIST_FIRST+ 5) /* 1185 String, def="" */ -#define SDRATTR_ALLPOSITIONX TypedWhichId<SdrAllPositionXItem>(SDRATTR_NOTPERSIST_FIRST+ 6) /* 1186 long, def=0 */ -#define SDRATTR_ALLPOSITIONY TypedWhichId<SdrAllPositionYItem>(SDRATTR_NOTPERSIST_FIRST+ 7) /* 1187 long, def=0 */ -#define SDRATTR_ALLSIZEWIDTH TypedWhichId<SdrAllSizeWidthItem>(SDRATTR_NOTPERSIST_FIRST+ 8) /* 1188 long, def=0 */ -#define SDRATTR_ALLSIZEHEIGHT TypedWhichId<SdrAllSizeHeightItem>(SDRATTR_NOTPERSIST_FIRST+ 9) /* 1189 long, def=0 */ -#define SDRATTR_ONEPOSITIONX TypedWhichId<SdrOnePositionXItem>(SDRATTR_NOTPERSIST_FIRST+10) /* 1190 long, def=0 */ -#define SDRATTR_ONEPOSITIONY TypedWhichId<SdrOnePositionYItem>(SDRATTR_NOTPERSIST_FIRST+11) /* 1191 long, def=0 */ -#define SDRATTR_ONESIZEWIDTH TypedWhichId<SdrOneSizeWidthItem>(SDRATTR_NOTPERSIST_FIRST+12) /* 1192 long, def=0 */ -#define SDRATTR_ONESIZEHEIGHT TypedWhichId<SdrOneSizeHeightItem>(SDRATTR_NOTPERSIST_FIRST+13) /* 1193 long, def=0 */ -#define SDRATTR_LOGICSIZEWIDTH TypedWhichId<SdrLogicSizeWidthItem>(SDRATTR_NOTPERSIST_FIRST+14) /* 1194 long, def=0 */ -#define SDRATTR_LOGICSIZEHEIGHT TypedWhichId<SdrLogicSizeHeightItem>(SDRATTR_NOTPERSIST_FIRST+15) /* 1195 long, def=0 */ -#define SDRATTR_ROTATEANGLE TypedWhichId<SdrAngleItem>(SDRATTR_NOTPERSIST_FIRST+16) /* 1196 long, def=0 */ -#define SDRATTR_SHEARANGLE TypedWhichId<SdrShearAngleItem>(SDRATTR_NOTPERSIST_FIRST+17) /* 1197 long, def=0 */ -#define SDRATTR_MOVEX TypedWhichId<SdrMoveXItem>(SDRATTR_NOTPERSIST_FIRST+18) /* 1198 long, def=0 */ -#define SDRATTR_MOVEY TypedWhichId<SdrMoveYItem>(SDRATTR_NOTPERSIST_FIRST+19) /* 1199 long, def=0 */ -#define SDRATTR_RESIZEXONE TypedWhichId<SdrResizeXOneItem>(SDRATTR_NOTPERSIST_FIRST+20) /* 1200 long, def=0 */ -#define SDRATTR_RESIZEYONE TypedWhichId<SdrResizeYOneItem>(SDRATTR_NOTPERSIST_FIRST+21) /* 1201 long, def=0 */ -#define SDRATTR_ROTATEONE TypedWhichId<SdrRotateOneItem>(SDRATTR_NOTPERSIST_FIRST+22) /* 1202 long, def=0 */ -#define SDRATTR_HORZSHEARONE TypedWhichId<SdrHorzShearOneItem>(SDRATTR_NOTPERSIST_FIRST+23) /* 1203 long, def=0 */ -#define SDRATTR_VERTSHEARONE TypedWhichId<SdrVertShearOneItem>(SDRATTR_NOTPERSIST_FIRST+24) /* 1204 long, def=0 */ -#define SDRATTR_RESIZEXALL TypedWhichId<SdrResizeXAllItem>(SDRATTR_NOTPERSIST_FIRST+25) /* 1205 long, def=0 */ -#define SDRATTR_RESIZEYALL TypedWhichId<SdrResizeYAllItem>(SDRATTR_NOTPERSIST_FIRST+26) /* 1206 long, def=0 */ -#define SDRATTR_ROTATEALL TypedWhichId<SdrRotateAllItem>(SDRATTR_NOTPERSIST_FIRST+27) /* 1207 long, def=0 */ -#define SDRATTR_HORZSHEARALL TypedWhichId<SdrHorzShearAllItem>(SDRATTR_NOTPERSIST_FIRST+28) /* 1208 long, def=0 */ -#define SDRATTR_VERTSHEARALL TypedWhichId<SdrVertShearAllItem>(SDRATTR_NOTPERSIST_FIRST+29) /* 1209 long, def=0 */ -#define SDRATTR_TRANSFORMREF1X TypedWhichId<SdrTransformRef1XItem>(SDRATTR_NOTPERSIST_FIRST+30) /* 1210 long, def=0 */ -#define SDRATTR_TRANSFORMREF1Y TypedWhichId<SdrTransformRef1YItem>(SDRATTR_NOTPERSIST_FIRST+31) /* 1211 long, def=0 */ -#define SDRATTR_TRANSFORMREF2X TypedWhichId<SdrTransformRef2XItem>(SDRATTR_NOTPERSIST_FIRST+32) /* 1212 long, def=0 */ -#define SDRATTR_TRANSFORMREF2Y TypedWhichId<SdrTransformRef2YItem>(SDRATTR_NOTPERSIST_FIRST+33) /* 1213 long, def=0 */ -#define SDRATTR_TEXTDIRECTION TypedWhichId<SvxWritingModeItem>(SDRATTR_NOTPERSIST_FIRST+34) /* 1214 V4+++ long, def=0 */ -#define SDRATTR_OBJVISIBLE TypedWhichId<SdrObjVisibleItem>(SDRATTR_NOTPERSIST_FIRST+35) -#define SDRATTR_NOTPERSIST_LAST (SDRATTR_OBJVISIBLE) /* 1228 V4+++*/ /* 1213*/ /* 1085 */ /* 1040 */ /* 1123 */ /* Pool V1: 1065 */ +constexpr sal_uInt16 SDRATTR_NOTPERSIST_FIRST (SDRATTR_CIRC_LAST + 1); /* 1180 */ /* 1172 */ /* 1127 */ /* 1110 */ /* Pool V1: 1058 */ +constexpr TypedWhichId<SdrYesNoItem> SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0); /* 1180 sal_Bool, def=sal_False */ +constexpr TypedWhichId<SdrYesNoItem> SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1); /* 1181 sal_Bool, def=sal_False */ +constexpr TypedWhichId<SdrObjPrintableItem> SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2); /* 1182 sal_Bool, def=sal_True */ +constexpr TypedWhichId<SdrLayerIdItem> SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3); /* 1183 sal_uInt16, def=0 */ +constexpr TypedWhichId<SdrLayerNameItem> SDRATTR_LAYERNAME (SDRATTR_NOTPERSIST_FIRST+ 4); /* 1184 String, def="" */ +constexpr TypedWhichId<SfxStringItem> SDRATTR_OBJECTNAME (SDRATTR_NOTPERSIST_FIRST+ 5); /* 1185 String, def="" */ +constexpr TypedWhichId<SdrAllPositionXItem> SDRATTR_ALLPOSITIONX (SDRATTR_NOTPERSIST_FIRST+ 6); /* 1186 long, def=0 */ +constexpr TypedWhichId<SdrAllPositionYItem> SDRATTR_ALLPOSITIONY (SDRATTR_NOTPERSIST_FIRST+ 7); /* 1187 long, def=0 */ +constexpr TypedWhichId<SdrAllSizeWidthItem> SDRATTR_ALLSIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+ 8); /* 1188 long, def=0 */ +constexpr TypedWhichId<SdrAllSizeHeightItem> SDRATTR_ALLSIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+ 9); /* 1189 long, def=0 */ +constexpr TypedWhichId<SdrOnePositionXItem> SDRATTR_ONEPOSITIONX (SDRATTR_NOTPERSIST_FIRST+10); /* 1190 long, def=0 */ +constexpr TypedWhichId<SdrOnePositionYItem> SDRATTR_ONEPOSITIONY (SDRATTR_NOTPERSIST_FIRST+11); /* 1191 long, def=0 */ +constexpr TypedWhichId<SdrOneSizeWidthItem> SDRATTR_ONESIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+12); /* 1192 long, def=0 */ +constexpr TypedWhichId<SdrOneSizeHeightItem> SDRATTR_ONESIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+13); /* 1193 long, def=0 */ +constexpr TypedWhichId<SdrLogicSizeWidthItem> SDRATTR_LOGICSIZEWIDTH (SDRATTR_NOTPERSIST_FIRST+14); /* 1194 long, def=0 */ +constexpr TypedWhichId<SdrLogicSizeHeightItem> SDRATTR_LOGICSIZEHEIGHT (SDRATTR_NOTPERSIST_FIRST+15); /* 1195 long, def=0 */ +constexpr TypedWhichId<SdrAngleItem> SDRATTR_ROTATEANGLE (SDRATTR_NOTPERSIST_FIRST+16); /* 1196 long, def=0 */ +constexpr TypedWhichId<SdrShearAngleItem> SDRATTR_SHEARANGLE (SDRATTR_NOTPERSIST_FIRST+17); /* 1197 long, def=0 */ +constexpr TypedWhichId<SdrMoveXItem> SDRATTR_MOVEX (SDRATTR_NOTPERSIST_FIRST+18); /* 1198 long, def=0 */ +constexpr TypedWhichId<SdrMoveYItem> SDRATTR_MOVEY (SDRATTR_NOTPERSIST_FIRST+19); /* 1199 long, def=0 */ +constexpr TypedWhichId<SdrResizeXOneItem> SDRATTR_RESIZEXONE (SDRATTR_NOTPERSIST_FIRST+20); /* 1200 long, def=0 */ +constexpr TypedWhichId<SdrResizeYOneItem> SDRATTR_RESIZEYONE (SDRATTR_NOTPERSIST_FIRST+21); /* 1201 long, def=0 */ +constexpr TypedWhichId<SdrRotateOneItem> SDRATTR_ROTATEONE (SDRATTR_NOTPERSIST_FIRST+22); /* 1202 long, def=0 */ +constexpr TypedWhichId<SdrHorzShearOneItem> SDRATTR_HORZSHEARONE (SDRATTR_NOTPERSIST_FIRST+23); /* 1203 long, def=0 */ +constexpr TypedWhichId<SdrVertShearOneItem> SDRATTR_VERTSHEARONE (SDRATTR_NOTPERSIST_FIRST+24); /* 1204 long, def=0 */ +constexpr TypedWhichId<SdrResizeXAllItem> SDRATTR_RESIZEXALL (SDRATTR_NOTPERSIST_FIRST+25); /* 1205 long, def=0 */ +constexpr TypedWhichId<SdrResizeYAllItem> SDRATTR_RESIZEYALL (SDRATTR_NOTPERSIST_FIRST+26); /* 1206 long, def=0 */ +constexpr TypedWhichId<SdrRotateAllItem> SDRATTR_ROTATEALL (SDRATTR_NOTPERSIST_FIRST+27); /* 1207 long, def=0 */ +constexpr TypedWhichId<SdrHorzShearAllItem> SDRATTR_HORZSHEARALL (SDRATTR_NOTPERSIST_FIRST+28); /* 1208 long, def=0 */ +constexpr TypedWhichId<SdrVertShearAllItem> SDRATTR_VERTSHEARALL (SDRATTR_NOTPERSIST_FIRST+29); /* 1209 long, def=0 */ +constexpr TypedWhichId<SdrTransformRef1XItem> SDRATTR_TRANSFORMREF1X (SDRATTR_NOTPERSIST_FIRST+30); /* 1210 long, def=0 */ +constexpr TypedWhichId<SdrTransformRef1YItem> SDRATTR_TRANSFORMREF1Y (SDRATTR_NOTPERSIST_FIRST+31); /* 1211 long, def=0 */ +constexpr TypedWhichId<SdrTransformRef2XItem> SDRATTR_TRANSFORMREF2X (SDRATTR_NOTPERSIST_FIRST+32); /* 1212 long, def=0 */ +constexpr TypedWhichId<SdrTransformRef2YItem> SDRATTR_TRANSFORMREF2Y (SDRATTR_NOTPERSIST_FIRST+33); /* 1213 long, def=0 */ +constexpr TypedWhichId<SvxWritingModeItem> SDRATTR_TEXTDIRECTION (SDRATTR_NOTPERSIST_FIRST+34); /* 1214 V4+++ long, def=0 */ +constexpr TypedWhichId<SdrObjVisibleItem> SDRATTR_OBJVISIBLE (SDRATTR_NOTPERSIST_FIRST+35); +constexpr sal_uInt16 SDRATTR_NOTPERSIST_LAST (SDRATTR_OBJVISIBLE); /* 1228 V4+++*/ /* 1213*/ /* 1085 */ /* 1040 */ /* 1123 */ /* Pool V1: 1065 */ // no SetItem for this -#define SDRATTR_GRAF_FIRST (SDRATTR_NOTPERSIST_LAST+1) /* 1229 V4+++*/ -#define SDRATTR_GRAFRED TypedWhichId<SdrGrafRedItem>(SDRATTR_GRAF_FIRST+0) /* 1229 V4+++*/ -#define SDRATTR_GRAFGREEN TypedWhichId<SdrGrafGreenItem>(SDRATTR_GRAF_FIRST+1) /* 1230 V4+++*/ -#define SDRATTR_GRAFBLUE TypedWhichId<SdrGrafBlueItem>(SDRATTR_GRAF_FIRST+2) /* 1231 V4+++*/ -#define SDRATTR_GRAFLUMINANCE TypedWhichId<SdrGrafLuminanceItem>(SDRATTR_GRAF_FIRST+3) /* 1232 V4+++*/ -#define SDRATTR_GRAFCONTRAST TypedWhichId<SdrGrafContrastItem>(SDRATTR_GRAF_FIRST+4) /* 1233 V4+++*/ -#define SDRATTR_GRAFGAMMA TypedWhichId<SdrGrafGamma100Item>(SDRATTR_GRAF_FIRST+5) /* 1234 V4+++*/ -#define SDRATTR_GRAFTRANSPARENCE TypedWhichId<SdrGrafTransparenceItem>(SDRATTR_GRAF_FIRST+6) /* 1235 V4+++*/ -#define SDRATTR_GRAFINVERT TypedWhichId<SdrGrafInvertItem>(SDRATTR_GRAF_FIRST+7) /* 1236 V4+++*/ -#define SDRATTR_GRAFMODE TypedWhichId<SdrGrafModeItem>(SDRATTR_GRAF_FIRST+8) /* 1237 V4+++*/ -#define SDRATTR_GRAFCROP TypedWhichId<SdrGrafCropItem>(SDRATTR_GRAF_FIRST+9) /* 1238 V4+++*/ -#define SDRATTR_GRAF_LAST (SDRATTR_GRAFCROP) /* 1242 V4+++*/ +constexpr sal_uInt16 SDRATTR_GRAF_FIRST (SDRATTR_NOTPERSIST_LAST+1); /* 1229 V4+++*/ +constexpr TypedWhichId<SdrGrafRedItem> SDRATTR_GRAFRED (SDRATTR_GRAF_FIRST+0); /* 1229 V4+++*/ +constexpr TypedWhichId<SdrGrafGreenItem> SDRATTR_GRAFGREEN (SDRATTR_GRAF_FIRST+1); /* 1230 V4+++*/ +constexpr TypedWhichId<SdrGrafBlueItem> SDRATTR_GRAFBLUE (SDRATTR_GRAF_FIRST+2); /* 1231 V4+++*/ +constexpr TypedWhichId<SdrGrafLuminanceItem> SDRATTR_GRAFLUMINANCE (SDRATTR_GRAF_FIRST+3); /* 1232 V4+++*/ +constexpr TypedWhichId<SdrGrafContrastItem> SDRATTR_GRAFCONTRAST (SDRATTR_GRAF_FIRST+4); /* 1233 V4+++*/ +constexpr TypedWhichId<SdrGrafGamma100Item> SDRATTR_GRAFGAMMA (SDRATTR_GRAF_FIRST+5); /* 1234 V4+++*/ +constexpr TypedWhichId<SdrGrafTransparenceItem> SDRATTR_GRAFTRANSPARENCE (SDRATTR_GRAF_FIRST+6); /* 1235 V4+++*/ +constexpr TypedWhichId<SdrGrafInvertItem> SDRATTR_GRAFINVERT (SDRATTR_GRAF_FIRST+7); /* 1236 V4+++*/ +constexpr TypedWhichId<SdrGrafModeItem> SDRATTR_GRAFMODE (SDRATTR_GRAF_FIRST+8); /* 1237 V4+++*/ +constexpr TypedWhichId<SdrGrafCropItem> SDRATTR_GRAFCROP (SDRATTR_GRAF_FIRST+9); /* 1238 V4+++*/ +constexpr sal_uInt16 SDRATTR_GRAF_LAST (SDRATTR_GRAFCROP); /* 1242 V4+++*/ -#define SDRATTR_3D_FIRST (SDRATTR_GRAF_LAST + 1) /* 1244 V4+++*/ +constexpr sal_uInt16 SDRATTR_3D_FIRST (SDRATTR_GRAF_LAST + 1); /* 1244 V4+++*/ -#define SDRATTR_3DOBJ_FIRST (SDRATTR_3D_FIRST) /* 1244 V4+++*/ -#define SDRATTR_3DOBJ_PERCENT_DIAGONAL TypedWhichId<SfxUInt16Item>(SDRATTR_3DOBJ_FIRST + 0) /* 1244 V4+++*/ -#define SDRATTR_3DOBJ_BACKSCALE TypedWhichId<SfxUInt16Item>(SDRATTR_3DOBJ_FIRST + 1) /* 1245 V4+++*/ -#define SDRATTR_3DOBJ_DEPTH TypedWhichId<SfxUInt32Item>(SDRATTR_3DOBJ_FIRST + 2) /* 1246 V4+++*/ -#define SDRATTR_3DOBJ_HORZ_SEGS TypedWhichId<SfxUInt32Item>(SDRATTR_3DOBJ_FIRST + 3) /* 1247 V4+++*/ -#define SDRATTR_3DOBJ_VERT_SEGS TypedWhichId<SfxUInt32Item>(SDRATTR_3DOBJ_FIRST + 4) /* 1248 V4+++*/ -#define SDRATTR_3DOBJ_END_ANGLE TypedWhichId<SfxUInt32Item>(SDRATTR_3DOBJ_FIRST + 5) /* 1249 V4+++*/ -#define SDRATTR_3DOBJ_DOUBLE_SIDED TypedWhichId<SfxBoolItem>(SDRATTR_3DOBJ_FIRST + 6) /* 1250 V4+++*/ -#define SDRATTR_3DOBJ_NORMALS_KIND TypedWhichId<Svx3DNormalsKindItem>(SDRATTR_3DOBJ_FIRST + 7) /* 1251 V4+++*/ -#define SDRATTR_3DOBJ_NORMALS_INVERT TypedWhichId<SfxBoolItem>(SDRATTR_3DOBJ_FIRST + 8) /* 1252 V4+++*/ -#define SDRATTR_3DOBJ_TEXTURE_PROJ_X TypedWhichId<Svx3DTextureProjectionXItem>(SDRATTR_3DOBJ_FIRST + 9) /* 1253 V4+++*/ -#define SDRATTR_3DOBJ_TEXTURE_PROJ_Y TypedWhichId<Svx3DTextureProjectionYItem>(SDRATTR_3DOBJ_FIRST + 10) /* 1254 V4+++*/ -#define SDRATTR_3DOBJ_SHADOW_3D TypedWhichId<SfxBoolItem>(SDRATTR_3DOBJ_FIRST + 11) /* 1255 V4+++*/ -#define SDRATTR_3DOBJ_MAT_COLOR TypedWhichId<SvxColorItem>(SDRATTR_3DOBJ_FIRST + 12) /* 1256 V4+++*/ -#define SDRATTR_3DOBJ_MAT_EMISSION TypedWhichId<SvxColorItem>(SDRATTR_3DOBJ_FIRST + 13) /* 1257 V4+++*/ -#define SDRATTR_3DOBJ_MAT_SPECULAR TypedWhichId<SvxColorItem>(SDRATTR_3DOBJ_FIRST + 14) /* 1258 V4+++*/ -#define SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY TypedWhichId<SfxUInt16Item>(SDRATTR_3DOBJ_FIRST + 15) /* 1259 V4+++*/ -#define SDRATTR_3DOBJ_TEXTURE_KIND TypedWhichId<Svx3DTextureKindItem>(SDRATTR_3DOBJ_FIRST + 16) /* 1260 V4+++*/ -#define SDRATTR_3DOBJ_TEXTURE_MODE TypedWhichId<Svx3DTextureModeItem>(SDRATTR_3DOBJ_FIRST + 17) /* 1261 V4+++*/ -#define SDRATTR_3DOBJ_TEXTURE_FILTER TypedWhichId<SfxBoolItem>(SDRATTR_3DOBJ_FIRST + 18) /* 1262 V4+++*/ +constexpr sal_uInt16 SDRATTR_3DOBJ_FIRST (SDRATTR_3D_FIRST); /* 1244 V4+++*/ +constexpr TypedWhichId<SfxUInt16Item> SDRATTR_3DOBJ_PERCENT_DIAGONAL (SDRATTR_3DOBJ_FIRST + 0); /* 1244 V4+++*/ +constexpr TypedWhichId<SfxUInt16Item> SDRATTR_3DOBJ_BACKSCALE (SDRATTR_3DOBJ_FIRST + 1); /* 1245 V4+++*/ +constexpr TypedWhichId<SfxUInt32Item> SDRATTR_3DOBJ_DEPTH (SDRATTR_3DOBJ_FIRST + 2); /* 1246 V4+++*/ +constexpr TypedWhichId<SfxUInt32Item> SDRATTR_3DOBJ_HORZ_SEGS (SDRATTR_3DOBJ_FIRST + 3); /* 1247 V4+++*/ +constexpr TypedWhichId<SfxUInt32Item> SDRATTR_3DOBJ_VERT_SEGS (SDRATTR_3DOBJ_FIRST + 4); /* 1248 V4+++*/ +constexpr TypedWhichId<SfxUInt32Item> SDRATTR_3DOBJ_END_ANGLE (SDRATTR_3DOBJ_FIRST + 5); /* 1249 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DOBJ_DOUBLE_SIDED (SDRATTR_3DOBJ_FIRST + 6); /* 1250 V4+++*/ +constexpr TypedWhichId<Svx3DNormalsKindItem> SDRATTR_3DOBJ_NORMALS_KIND (SDRATTR_3DOBJ_FIRST + 7); /* 1251 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DOBJ_NORMALS_INVERT (SDRATTR_3DOBJ_FIRST + 8); /* 1252 V4+++*/ +constexpr TypedWhichId<Svx3DTextureProjectionXItem> SDRATTR_3DOBJ_TEXTURE_PROJ_X (SDRATTR_3DOBJ_FIRST + 9); /* 1253 V4+++*/ +constexpr TypedWhichId<Svx3DTextureProjectionYItem> SDRATTR_3DOBJ_TEXTURE_PROJ_Y (SDRATTR_3DOBJ_FIRST + 10); /* 1254 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DOBJ_SHADOW_3D (SDRATTR_3DOBJ_FIRST + 11); /* 1255 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DOBJ_MAT_COLOR (SDRATTR_3DOBJ_FIRST + 12); /* 1256 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DOBJ_MAT_EMISSION (SDRATTR_3DOBJ_FIRST + 13); /* 1257 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DOBJ_MAT_SPECULAR (SDRATTR_3DOBJ_FIRST + 14); /* 1258 V4+++*/ +constexpr TypedWhichId<SfxUInt16Item> SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY (SDRATTR_3DOBJ_FIRST + 15); /* 1259 V4+++*/ +constexpr TypedWhichId<Svx3DTextureKindItem> SDRATTR_3DOBJ_TEXTURE_KIND (SDRATTR_3DOBJ_FIRST + 16); /* 1260 V4+++*/ +constexpr TypedWhichId<Svx3DTextureModeItem> SDRATTR_3DOBJ_TEXTURE_MODE (SDRATTR_3DOBJ_FIRST + 17); /* 1261 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DOBJ_TEXTURE_FILTER (SDRATTR_3DOBJ_FIRST + 18); /* 1262 V4+++*/ // #107245# New items for 3d objects use former range SDRATTR_3DOBJ_RESERVED_01 // up to SDRATTR_3DOBJ_RESERVED_05 -#define SDRATTR_3DOBJ_SMOOTH_NORMALS TypedWhichId<Svx3DSmoothNormalsItem>(SDRATTR_3DOBJ_FIRST + 19) /* 1263 V4+++*/ -#define SDRATTR_3DOBJ_SMOOTH_LIDS TypedWhichId<Svx3DSmoothLidsItem>(SDRATTR_3DOBJ_FIRST + 20) /* 1264 V4+++*/ -#define SDRATTR_3DOBJ_CHARACTER_MODE TypedWhichId<Svx3DCharacterModeItem>(SDRATTR_3DOBJ_FIRST + 21) /* 1265 V4+++*/ -#define SDRATTR_3DOBJ_CLOSE_FRONT TypedWhichId<Svx3DCloseFrontItem>(SDRATTR_3DOBJ_FIRST + 22) /* 1266 V4+++*/ -#define SDRATTR_3DOBJ_CLOSE_BACK TypedWhichId<Svx3DCloseBackItem>(SDRATTR_3DOBJ_FIRST + 23) /* 1267 V4+++*/ +constexpr TypedWhichId<Svx3DSmoothNormalsItem> SDRATTR_3DOBJ_SMOOTH_NORMALS (SDRATTR_3DOBJ_FIRST + 19); /* 1263 V4+++*/ +constexpr TypedWhichId<Svx3DSmoothLidsItem> SDRATTR_3DOBJ_SMOOTH_LIDS (SDRATTR_3DOBJ_FIRST + 20); /* 1264 V4+++*/ +constexpr TypedWhichId<Svx3DCharacterModeItem> SDRATTR_3DOBJ_CHARACTER_MODE (SDRATTR_3DOBJ_FIRST + 21); /* 1265 V4+++*/ +constexpr TypedWhichId<Svx3DCloseFrontItem> SDRATTR_3DOBJ_CLOSE_FRONT (SDRATTR_3DOBJ_FIRST + 22); /* 1266 V4+++*/ +constexpr TypedWhichId<Svx3DCloseBackItem> SDRATTR_3DOBJ_CLOSE_BACK (SDRATTR_3DOBJ_FIRST + 23); /* 1267 V4+++*/ // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry -#define SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY TypedWhichId<Svx3DReducedLineGeometryItem>(SDRATTR_3DOBJ_FIRST + 24) /* 1268 V4+++*/ +constexpr TypedWhichId<Svx3DReducedLineGeometryItem> SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY (SDRATTR_3DOBJ_FIRST + 24); /* 1268 V4+++*/ -#define SDRATTR_3DOBJ_LAST (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY) /* 1282 V4+++*/ +constexpr sal_uInt16 SDRATTR_3DOBJ_LAST (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY); /* 1282 V4+++*/ -#define SDRATTR_3DSCENE_FIRST (SDRATTR_3DOBJ_LAST + 1) /* 1283 V4+++*/ -#define SDRATTR_3DSCENE_PERSPECTIVE TypedWhichId<Svx3DPerspectiveItem>(SDRATTR_3DSCENE_FIRST + 0) /* 1283 V4+++*/ -#define SDRATTR_3DSCENE_DISTANCE TypedWhichId<SfxUInt32Item>(SDRATTR_3DSCENE_FIRST + 1) /* 1284 V4+++*/ -#define SDRATTR_3DSCENE_FOCAL_LENGTH TypedWhichId<SfxUInt32Item>(SDRATTR_3DSCENE_FIRST + 2) /* 1285 V4+++*/ -#define SDRATTR_3DSCENE_TWO_SIDED_LIGHTING TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 3) /* 1286 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_1 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 4) /* 1287 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_2 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 5) /* 1288 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_3 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 6) /* 1289 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_4 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 7) /* 1290 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_5 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 8) /* 1291 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_6 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 9) /* 1292 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_7 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 10) /* 1293 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTCOLOR_8 TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 11) /* 1294 V4+++*/ -#define SDRATTR_3DSCENE_AMBIENTCOLOR TypedWhichId<SvxColorItem>(SDRATTR_3DSCENE_FIRST + 12) /* 1295 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_1 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 13) /* 1296 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_2 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 14) /* 1297 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_3 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 15) /* 1298 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_4 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 16) /* 1299 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_5 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 17) /* 1300 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_6 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 18) /* 1301 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_7 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 19) /* 1302 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTON_8 TypedWhichId<SfxBoolItem>(SDRATTR_3DSCENE_FIRST + 20) /* 1303 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_1 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 21) /* 1304 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_2 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 22) /* 1305 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_3 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 23) /* 1306 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_4 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 24) /* 1307 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_5 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 25) /* 1308 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_6 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 26) /* 1309 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_7 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 27) /* 1310 V4+++*/ -#define SDRATTR_3DSCENE_LIGHTDIRECTION_8 TypedWhichId<SvxB3DVectorItem>(SDRATTR_3DSCENE_FIRST + 28) /* 1311 V4+++*/ -#define SDRATTR_3DSCENE_SHADOW_SLANT TypedWhichId<SfxUInt16Item>(SDRATTR_3DSCENE_FIRST + 29) /* 1312 V4+++*/ -#define SDRATTR_3DSCENE_SHADE_MODE TypedWhichId<Svx3DShadeModeItem>(SDRATTR_3DSCENE_FIRST + 30) /* 1313 V4+++*/ -#define SDRATTR_3DSCENE_LAST (SDRATTR_3DSCENE_SHADE_MODE) /* 1333 V4+++*/ -#define SDRATTR_3D_LAST (SDRATTR_3DSCENE_LAST) /* 1333 V4+++*/ +constexpr sal_uInt16 SDRATTR_3DSCENE_FIRST (SDRATTR_3DOBJ_LAST + 1); /* 1283 V4+++*/ +constexpr TypedWhichId<Svx3DPerspectiveItem> SDRATTR_3DSCENE_PERSPECTIVE (SDRATTR_3DSCENE_FIRST + 0); /* 1283 V4+++*/ +constexpr TypedWhichId<SfxUInt32Item> SDRATTR_3DSCENE_DISTANCE (SDRATTR_3DSCENE_FIRST + 1); /* 1284 V4+++*/ +constexpr TypedWhichId<SfxUInt32Item> SDRATTR_3DSCENE_FOCAL_LENGTH (SDRATTR_3DSCENE_FIRST + 2); /* 1285 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_TWO_SIDED_LIGHTING (SDRATTR_3DSCENE_FIRST + 3); /* 1286 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_1 (SDRATTR_3DSCENE_FIRST + 4); /* 1287 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_2 (SDRATTR_3DSCENE_FIRST + 5); /* 1288 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_3 (SDRATTR_3DSCENE_FIRST + 6); /* 1289 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_4 (SDRATTR_3DSCENE_FIRST + 7); /* 1290 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_5 (SDRATTR_3DSCENE_FIRST + 8); /* 1291 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_6 (SDRATTR_3DSCENE_FIRST + 9); /* 1292 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_7 (SDRATTR_3DSCENE_FIRST + 10); /* 1293 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_LIGHTCOLOR_8 (SDRATTR_3DSCENE_FIRST + 11); /* 1294 V4+++*/ +constexpr TypedWhichId<SvxColorItem> SDRATTR_3DSCENE_AMBIENTCOLOR (SDRATTR_3DSCENE_FIRST + 12); /* 1295 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_1 (SDRATTR_3DSCENE_FIRST + 13); /* 1296 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_2 (SDRATTR_3DSCENE_FIRST + 14); /* 1297 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_3 (SDRATTR_3DSCENE_FIRST + 15); /* 1298 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_4 (SDRATTR_3DSCENE_FIRST + 16); /* 1299 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_5 (SDRATTR_3DSCENE_FIRST + 17); /* 1300 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_6 (SDRATTR_3DSCENE_FIRST + 18); /* 1301 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_7 (SDRATTR_3DSCENE_FIRST + 19); /* 1302 V4+++*/ +constexpr TypedWhichId<SfxBoolItem> SDRATTR_3DSCENE_LIGHTON_8 (SDRATTR_3DSCENE_FIRST + 20); /* 1303 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_1 (SDRATTR_3DSCENE_FIRST + 21); /* 1304 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_2 (SDRATTR_3DSCENE_FIRST + 22); /* 1305 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_3 (SDRATTR_3DSCENE_FIRST + 23); /* 1306 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_4 (SDRATTR_3DSCENE_FIRST + 24); /* 1307 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_5 (SDRATTR_3DSCENE_FIRST + 25); /* 1308 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_6 (SDRATTR_3DSCENE_FIRST + 26); /* 1309 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_7 (SDRATTR_3DSCENE_FIRST + 27); /* 1310 V4+++*/ +constexpr TypedWhichId<SvxB3DVectorItem> SDRATTR_3DSCENE_LIGHTDIRECTION_8 (SDRATTR_3DSCENE_FIRST + 28); /* 1311 V4+++*/ +constexpr TypedWhichId<SfxUInt16Item> SDRATTR_3DSCENE_SHADOW_SLANT (SDRATTR_3DSCENE_FIRST + 29); /* 1312 V4+++*/ +constexpr TypedWhichId<Svx3DShadeModeItem> SDRATTR_3DSCENE_SHADE_MODE (SDRATTR_3DSCENE_FIRST + 30); /* 1313 V4+++*/ +constexpr sal_uInt16 SDRATTR_3DSCENE_LAST (SDRATTR_3DSCENE_SHADE_MODE); /* 1333 V4+++*/ +constexpr sal_uInt16 SDRATTR_3D_LAST (SDRATTR_3DSCENE_LAST); /* 1333 V4+++*/ -#define SDRATTR_CUSTOMSHAPE_FIRST (SDRATTR_3D_LAST + 1) /* 1334 V4+++*/ -#define SDRATTR_CUSTOMSHAPE_ENGINE TypedWhichId<SfxStringItem>(SDRATTR_CUSTOMSHAPE_FIRST + 0) /* 1334 V4+++*/ -#define SDRATTR_CUSTOMSHAPE_DATA TypedWhichId<SfxStringItem>(SDRATTR_CUSTOMSHAPE_FIRST + 1) /* 1335 V4+++*/ -#define SDRATTR_CUSTOMSHAPE_GEOMETRY TypedWhichId<SdrCustomShapeGeometryItem>(SDRATTR_CUSTOMSHAPE_FIRST + 2) /* 1336 V4+++*/ -#define SDRATTR_CUSTOMSHAPE_LAST (SDRATTR_CUSTOMSHAPE_GEOMETRY) /* 1357 V4+++*/ +constexpr sal_uInt16 SDRATTR_CUSTOMSHAPE_FIRST (SDRATTR_3D_LAST + 1); /* 1334 V4+++*/ +constexpr TypedWhichId<SfxStringItem> SDRATTR_CUSTOMSHAPE_ENGINE (SDRATTR_CUSTOMSHAPE_FIRST + 0); /* 1334 V4+++*/ +constexpr TypedWhichId<SfxStringItem> SDRATTR_CUSTOMSHAPE_DATA (SDRATTR_CUSTOMSHAPE_FIRST + 1); /* 1335 V4+++*/ +constexpr TypedWhichId<SdrCustomShapeGeometryItem> SDRATTR_CUSTOMSHAPE_GEOMETRY (SDRATTR_CUSTOMSHAPE_FIRST + 2); /* 1336 V4+++*/ +constexpr sal_uInt16 SDRATTR_CUSTOMSHAPE_LAST (SDRATTR_CUSTOMSHAPE_GEOMETRY); /* 1357 V4+++*/ -#define SDRATTR_TABLE_FIRST (SDRATTR_CUSTOMSHAPE_LAST+1) -#define SDRATTR_TABLE_BORDER TypedWhichId<SvxBoxItem>(SDRATTR_TABLE_FIRST+0) -#define SDRATTR_TABLE_BORDER_INNER TypedWhichId<SvxBoxInfoItem>(SDRATTR_TABLE_FIRST+1) -#define SDRATTR_TABLE_BORDER_TLBR TypedWhichId<SvxLineItem>(SDRATTR_TABLE_FIRST+2) -#define SDRATTR_TABLE_BORDER_BLTR TypedWhichId<SvxLineItem>(SDRATTR_TABLE_FIRST+3) -#define SDRATTR_TABLE_TEXT_ROTATION TypedWhichId<SvxTextRotateItem>(SDRATTR_TABLE_FIRST+4) -#define SDRATTR_TABLE_LAST (SDRATTR_TABLE_TEXT_ROTATION) +constexpr sal_uInt16 SDRATTR_TABLE_FIRST (SDRATTR_CUSTOMSHAPE_LAST+1); +constexpr TypedWhichId<SvxBoxItem> SDRATTR_TABLE_BORDER (SDRATTR_TABLE_FIRST+0); +constexpr TypedWhichId<SvxBoxInfoItem> SDRATTR_TABLE_BORDER_INNER (SDRATTR_TABLE_FIRST+1); +constexpr TypedWhichId<SvxLineItem> SDRATTR_TABLE_BORDER_TLBR (SDRATTR_TABLE_FIRST+2); +constexpr TypedWhichId<SvxLineItem> SDRATTR_TABLE_BORDER_BLTR (SDRATTR_TABLE_FIRST+3); +constexpr TypedWhichId<SvxTextRotateItem> SDRATTR_TABLE_TEXT_ROTATION (SDRATTR_TABLE_FIRST+4); +constexpr sal_uInt16 SDRATTR_TABLE_LAST (SDRATTR_TABLE_TEXT_ROTATION); -#define SDRATTR_GLOW_FIRST (SDRATTR_TABLE_LAST+1) -#define SDRATTR_GLOW TypedWhichId<SdrOnOffItem>(SDRATTR_GLOW_FIRST+0) -#define SDRATTR_GLOW_RAD TypedWhichId<SdrMetricItem>(SDRATTR_GLOW_FIRST+1) -#define SDRATTR_GLOW_COLOR TypedWhichId<XColorItem>(SDRATTR_GLOW_FIRST+2) -#define SDRATTR_GLOW_LAST (SDRATTR_GLOW_COLOR) +constexpr sal_uInt16 SDRATTR_GLOW_FIRST (SDRATTR_TABLE_LAST+1); +constexpr TypedWhichId<SdrOnOffItem> SDRATTR_GLOW (SDRATTR_GLOW_FIRST+0); +constexpr TypedWhichId<SdrMetricItem> SDRATTR_GLOW_RAD (SDRATTR_GLOW_FIRST+1); +constexpr TypedWhichId<XColorItem> SDRATTR_GLOW_COLOR (SDRATTR_GLOW_FIRST+2); +constexpr sal_uInt16 SDRATTR_GLOW_LAST (SDRATTR_GLOW_COLOR); -#define SDRATTR_END SDRATTR_GLOW_LAST /* 1357 */ /* 1333 V4+++*/ /* 1243 V4+++*/ /*1213*/ /*1085*/ /*1040*/ /*Pool V2: 1123,V1: 1065 */ +constexpr sal_uInt16 SDRATTR_END (SDRATTR_GLOW_LAST); /* 1357 */ /* 1333 V4+++*/ /* 1243 V4+++*/ /*1213*/ /*1085*/ /*1040*/ /*Pool V2: 1123,V1: 1065 */ #endif // INCLUDED_SVX_SVDDEF_HXX diff --git a/include/svx/xdef.hxx b/include/svx/xdef.hxx index 2a3a3b4396f8..e7740ee15ddc 100644 --- a/include/svx/xdef.hxx +++ b/include/svx/xdef.hxx @@ -84,65 +84,65 @@ class XSecondaryFillColorItem; #define COL_DEFAULT_SHAPE_FILLING ::Color(0x729fcf) // light blue 2 #define COL_DEFAULT_SHAPE_STROKE ::Color(0x3465a4) // dark blue 1 -constexpr auto XATTR_START = 1000; +constexpr sal_uInt16 XATTR_START = 1000; -constexpr auto XATTR_LINE_FIRST = XATTR_START; /* V3: 1000 V2: 1000 */ -#define XATTR_LINESTYLE TypedWhichId<XLineStyleItem>(XATTR_LINE_FIRST) -#define XATTR_LINEDASH TypedWhichId<XLineDashItem>(XATTR_LINE_FIRST + 1) /* V3: 1001 V2: 1001 */ -#define XATTR_LINEWIDTH TypedWhichId<XLineWidthItem>(XATTR_LINE_FIRST + 2) /* V3: 1002 V2: 1002 */ -#define XATTR_LINECOLOR TypedWhichId<XLineColorItem>(XATTR_LINE_FIRST + 3) /* V3: 1003 V2: 1003 */ -#define XATTR_LINESTART TypedWhichId<XLineStartItem>(XATTR_LINE_FIRST + 4) /* V3: 1004 V2: 1004 */ -#define XATTR_LINEEND TypedWhichId<XLineEndItem>(XATTR_LINE_FIRST + 5) /* V3: 1005 V2: 1005 */ -#define XATTR_LINESTARTWIDTH TypedWhichId<XLineStartWidthItem>(XATTR_LINE_FIRST + 6) /* V3: 1006 V2: 1006 */ -#define XATTR_LINEENDWIDTH TypedWhichId<XLineEndWidthItem>(XATTR_LINE_FIRST + 7) /* V3: 1007 V2: 1007 */ -#define XATTR_LINESTARTCENTER TypedWhichId<XLineStartCenterItem>(XATTR_LINE_FIRST + 8) /* V3: 1008 V2: 1008 */ -#define XATTR_LINEENDCENTER TypedWhichId<XLineEndCenterItem>(XATTR_LINE_FIRST + 9) /* V3: 1009 V2: 1009 */ -#define XATTR_LINETRANSPARENCE TypedWhichId<XLineTransparenceItem>(XATTR_LINE_FIRST + 10) /* V3: 1010 V2: 1010 */ -#define XATTR_LINEJOINT TypedWhichId<XLineJointItem>(XATTR_LINE_FIRST + 11) /* V3: 1011 V2: 1011 */ -#define XATTR_LINECAP TypedWhichId<XLineCapItem>(XATTR_LINE_FIRST + 12) /* V3: 1012 */ -#define XATTR_LINE_LAST XATTR_LINECAP -#define XATTRSET_LINE TypedWhichId<XLineAttrSetItem>(XATTR_LINE_LAST + 1) /* V3: 1017 V2: 1017 */ +constexpr sal_uInt16 XATTR_LINE_FIRST (XATTR_START); /* V3: 1000 V2: 1000 */ +constexpr TypedWhichId<XLineStyleItem> XATTR_LINESTYLE (XATTR_LINE_FIRST); +constexpr TypedWhichId<XLineDashItem> XATTR_LINEDASH (XATTR_LINE_FIRST + 1); /* V3: 1001 V2: 1001 */ +constexpr TypedWhichId<XLineWidthItem> XATTR_LINEWIDTH (XATTR_LINE_FIRST + 2); /* V3: 1002 V2: 1002 */ +constexpr TypedWhichId<XLineColorItem> XATTR_LINECOLOR (XATTR_LINE_FIRST + 3); /* V3: 1003 V2: 1003 */ +constexpr TypedWhichId<XLineStartItem> XATTR_LINESTART (XATTR_LINE_FIRST + 4); /* V3: 1004 V2: 1004 */ +constexpr TypedWhichId<XLineEndItem> XATTR_LINEEND (XATTR_LINE_FIRST + 5); /* V3: 1005 V2: 1005 */ +constexpr TypedWhichId<XLineStartWidthItem> XATTR_LINESTARTWIDTH (XATTR_LINE_FIRST + 6); /* V3: 1006 V2: 1006 */ +constexpr TypedWhichId<XLineEndWidthItem> XATTR_LINEENDWIDTH (XATTR_LINE_FIRST + 7); /* V3: 1007 V2: 1007 */ +constexpr TypedWhichId<XLineStartCenterItem> XATTR_LINESTARTCENTER (XATTR_LINE_FIRST + 8); /* V3: 1008 V2: 1008 */ +constexpr TypedWhichId<XLineEndCenterItem> XATTR_LINEENDCENTER (XATTR_LINE_FIRST + 9); /* V3: 1009 V2: 1009 */ +constexpr TypedWhichId<XLineTransparenceItem> XATTR_LINETRANSPARENCE (XATTR_LINE_FIRST + 10); /* V3: 1010 V2: 1010 */ +constexpr TypedWhichId<XLineJointItem> XATTR_LINEJOINT (XATTR_LINE_FIRST + 11); /* V3: 1011 V2: 1011 */ +constexpr TypedWhichId<XLineCapItem> XATTR_LINECAP (XATTR_LINE_FIRST + 12); /* V3: 1012 */ +constexpr sal_uInt16 XATTR_LINE_LAST (XATTR_LINECAP); +constexpr TypedWhichId<XLineAttrSetItem> XATTRSET_LINE (XATTR_LINE_LAST + 1); /* V3: 1017 V2: 1017 */ -constexpr sal_uInt16 XATTR_FILL_FIRST = XATTRSET_LINE + 1; /* V3: 1018 V2: 1018 */ -#define XATTR_FILLSTYLE TypedWhichId<XFillStyleItem>(XATTR_FILL_FIRST) -#define XATTR_FILLCOLOR TypedWhichId<XFillColorItem>(XATTR_FILL_FIRST + 1) /* V3: 1019 V2: 1019 */ -#define XATTR_FILLGRADIENT TypedWhichId<XFillGradientItem>(XATTR_FILL_FIRST + 2) /* V3: 1020 V2: 1020 */ -#define XATTR_FILLHATCH TypedWhichId<XFillHatchItem>(XATTR_FILL_FIRST + 3) /* V3: 1021 V2: 1021 */ -#define XATTR_FILLBITMAP TypedWhichId<XFillBitmapItem>(XATTR_FILL_FIRST + 4) /* V3: 1022 V2: 1022 */ -#define XATTR_FILLTRANSPARENCE TypedWhichId<XFillTransparenceItem>(XATTR_FILL_FIRST + 5) /* V3: 1023 V2: 1023 */ -#define XATTR_GRADIENTSTEPCOUNT TypedWhichId<XGradientStepCountItem>(XATTR_FILL_FIRST + 6) /* V3: 1024 V2: 1024 */ -#define XATTR_FILLBMP_TILE TypedWhichId<XFillBmpTileItem>(XATTR_FILL_FIRST + 7) /* V3: 1025 V2: 1025 */ -#define XATTR_FILLBMP_POS TypedWhichId<XFillBmpPosItem>(XATTR_FILL_FIRST + 8) /* V3: 1026 V2: 1026 */ -#define XATTR_FILLBMP_SIZEX TypedWhichId<SfxMetricItem>(XATTR_FILL_FIRST + 9) /* V3: 1027 V2: 1027 */ -#define XATTR_FILLBMP_SIZEY TypedWhichId<XFillBmpSizeYItem>(XATTR_FILL_FIRST + 10) /* V3: 1028 V2: 1028 */ -#define XATTR_FILLFLOATTRANSPARENCE TypedWhichId<XFillFloatTransparenceItem>(XATTR_FILL_FIRST + 11) /* V3: 1029 V2: 1029 */ -#define XATTR_SECONDARYFILLCOLOR TypedWhichId<XSecondaryFillColorItem>(XATTR_FILL_FIRST + 12) /* V3: 1030 */ -#define XATTR_FILLBMP_SIZELOG TypedWhichId<XFillBmpSizeLogItem>(XATTR_FILL_FIRST + 13) /* V3: 1031 */ -#define XATTR_FILLBMP_TILEOFFSETX TypedWhichId<XFillBmpTileOffsetXItem>(XATTR_FILL_FIRST + 14) /* V3: 1032 */ -#define XATTR_FILLBMP_TILEOFFSETY TypedWhichId<XFillBmpTileOffsetYItem>(XATTR_FILL_FIRST + 15) /* V3: 1033 */ -#define XATTR_FILLBMP_STRETCH TypedWhichId<XFillBmpStretchItem>(XATTR_FILL_FIRST + 16) /* V3: 1034 */ -#define XATTR_FILLBMP_POSOFFSETX TypedWhichId<XFillBmpPosOffsetXItem>(XATTR_FILL_FIRST + 17) /* V3: 1041 */ -#define XATTR_FILLBMP_POSOFFSETY TypedWhichId<XFillBmpPosOffsetYItem>(XATTR_FILL_FIRST + 18) /* V3: 1042 */ -#define XATTR_FILLBACKGROUND TypedWhichId<XFillBackgroundItem>(XATTR_FILL_FIRST + 19) /* V3: 1043 */ -constexpr sal_uInt16 XATTR_FILL_LAST = XATTR_FILLBACKGROUND; -#define XATTRSET_FILL TypedWhichId<XFillAttrSetItem>(XATTR_FILL_LAST + 1) /* V3: 1047 V2: 1030 */ +constexpr sal_uInt16 XATTR_FILL_FIRST (XATTRSET_LINE + 1); /* V3: 1018 V2: 1018 */ +constexpr TypedWhichId<XFillStyleItem> XATTR_FILLSTYLE (XATTR_FILL_FIRST); +constexpr TypedWhichId<XFillColorItem> XATTR_FILLCOLOR (XATTR_FILL_FIRST + 1); /* V3: 1019 V2: 1019 */ +constexpr TypedWhichId<XFillGradientItem> XATTR_FILLGRADIENT (XATTR_FILL_FIRST + 2); /* V3: 1020 V2: 1020 */ +constexpr TypedWhichId<XFillHatchItem> XATTR_FILLHATCH (XATTR_FILL_FIRST + 3); /* V3: 1021 V2: 1021 */ +constexpr TypedWhichId<XFillBitmapItem> XATTR_FILLBITMAP (XATTR_FILL_FIRST + 4); /* V3: 1022 V2: 1022 */ +constexpr TypedWhichId<XFillTransparenceItem> XATTR_FILLTRANSPARENCE (XATTR_FILL_FIRST + 5); /* V3: 1023 V2: 1023 */ +constexpr TypedWhichId<XGradientStepCountItem> XATTR_GRADIENTSTEPCOUNT (XATTR_FILL_FIRST + 6); /* V3: 1024 V2: 1024 */ +constexpr TypedWhichId<XFillBmpTileItem> XATTR_FILLBMP_TILE (XATTR_FILL_FIRST + 7); /* V3: 1025 V2: 1025 */ +constexpr TypedWhichId<XFillBmpPosItem> XATTR_FILLBMP_POS (XATTR_FILL_FIRST + 8); /* V3: 1026 V2: 1026 */ +constexpr TypedWhichId<SfxMetricItem> XATTR_FILLBMP_SIZEX (XATTR_FILL_FIRST + 9); /* V3: 1027 V2: 1027 */ +constexpr TypedWhichId<XFillBmpSizeYItem> XATTR_FILLBMP_SIZEY (XATTR_FILL_FIRST + 10); /* V3: 1028 V2: 1028 */ +constexpr TypedWhichId<XFillFloatTransparenceItem> XATTR_FILLFLOATTRANSPARENCE (XATTR_FILL_FIRST + 11); /* V3: 1029 V2: 1029 */ +constexpr TypedWhichId<XSecondaryFillColorItem> XATTR_SECONDARYFILLCOLOR (XATTR_FILL_FIRST + 12); /* V3: 1030 */ +constexpr TypedWhichId<XFillBmpSizeLogItem> XATTR_FILLBMP_SIZELOG (XATTR_FILL_FIRST + 13); /* V3: 1031 */ +constexpr TypedWhichId<XFillBmpTileOffsetXItem> XATTR_FILLBMP_TILEOFFSETX (XATTR_FILL_FIRST + 14); /* V3: 1032 */ +constexpr TypedWhichId<XFillBmpTileOffsetYItem> XATTR_FILLBMP_TILEOFFSETY (XATTR_FILL_FIRST + 15); /* V3: 1033 */ +constexpr TypedWhichId<XFillBmpStretchItem> XATTR_FILLBMP_STRETCH (XATTR_FILL_FIRST + 16); /* V3: 1034 */ +constexpr TypedWhichId<XFillBmpPosOffsetXItem> XATTR_FILLBMP_POSOFFSETX (XATTR_FILL_FIRST + 17); /* V3: 1041 */ +constexpr TypedWhichId<XFillBmpPosOffsetYItem> XATTR_FILLBMP_POSOFFSETY (XATTR_FILL_FIRST + 18); /* V3: 1042 */ +constexpr TypedWhichId<XFillBackgroundItem> XATTR_FILLBACKGROUND (XATTR_FILL_FIRST + 19); /* V3: 1043 */ +constexpr sal_uInt16 XATTR_FILL_LAST (XATTR_FILLBACKGROUND); +constexpr TypedWhichId<XFillAttrSetItem> XATTRSET_FILL (XATTR_FILL_LAST + 1); /* V3: 1047 V2: 1030 */ -constexpr auto XATTR_TEXT_FIRST = XATTRSET_FILL + 1; -#define XATTR_FORMTXTSTYLE TypedWhichId<XFormTextStyleItem>(XATTR_TEXT_FIRST) /* V3: 1048 V2: 1031 */ -#define XATTR_FORMTXTADJUST TypedWhichId<XFormTextAdjustItem>(XATTR_TEXT_FIRST + 1) /* V3: 1049 V2: 1032 */ -#define XATTR_FORMTXTDISTANCE TypedWhichId<XFormTextDistanceItem>(XATTR_TEXT_FIRST + 2) /* V3: 1050 V2: 1033 */ -#define XATTR_FORMTXTSTART TypedWhichId<XFormTextStartItem>(XATTR_TEXT_FIRST + 3) /* V3: 1051 V2: 1034 */ -#define XATTR_FORMTXTMIRROR TypedWhichId<XFormTextMirrorItem>(XATTR_TEXT_FIRST + 4) /* V3: 1052 V2: 1035 */ -#define XATTR_FORMTXTOUTLINE TypedWhichId<XFormTextOutlineItem>(XATTR_TEXT_FIRST + 5) /* V3: 1053 V2: 1036 */ -#define XATTR_FORMTXTSHADOW TypedWhichId<XFormTextShadowItem>(XATTR_TEXT_FIRST + 6) /* V3: 1054 V2: 1037 */ -#define XATTR_FORMTXTSHDWCOLOR TypedWhichId<XFormTextShadowColorItem>(XATTR_TEXT_FIRST + 7) /* V3: 1055 V2: 1038 */ -#define XATTR_FORMTXTSHDWXVAL TypedWhichId<XFormTextShadowXValItem>(XATTR_TEXT_FIRST + 8) /* V3: 1056 V2: 1039 */ -#define XATTR_FORMTXTSHDWYVAL TypedWhichId<XFormTextShadowYValItem>(XATTR_TEXT_FIRST + 9) /* V3: 1057 V2: 1040 */ -#define XATTR_FORMTXTHIDEFORM TypedWhichId<XFormTextHideFormItem>(XATTR_TEXT_FIRST + 10) /* V3: 1059 V2: 1042 */ -#define XATTR_FORMTXTSHDWTRANSP TypedWhichId<XFormTextShadowTranspItem>(XATTR_TEXT_FIRST + 11) /* V3: 1060 V2: 1043 */ -#define XATTR_TEXT_LAST XATTR_FORMTXTSHDWTRANSP +constexpr sal_uInt16 XATTR_TEXT_FIRST (XATTRSET_FILL + 1); +constexpr TypedWhichId<XFormTextStyleItem> XATTR_FORMTXTSTYLE (XATTR_TEXT_FIRST); /* V3: 1048 V2: 1031 */ +constexpr TypedWhichId<XFormTextAdjustItem> XATTR_FORMTXTADJUST (XATTR_TEXT_FIRST + 1); /* V3: 1049 V2: 1032 */ +constexpr TypedWhichId<XFormTextDistanceItem> XATTR_FORMTXTDISTANCE (XATTR_TEXT_FIRST + 2); /* V3: 1050 V2: 1033 */ +constexpr TypedWhichId<XFormTextStartItem> XATTR_FORMTXTSTART (XATTR_TEXT_FIRST + 3); /* V3: 1051 V2: 1034 */ +constexpr TypedWhichId<XFormTextMirrorItem> XATTR_FORMTXTMIRROR (XATTR_TEXT_FIRST + 4); /* V3: 1052 V2: 1035 */ +constexpr TypedWhichId<XFormTextOutlineItem> XATTR_FORMTXTOUTLINE (XATTR_TEXT_FIRST + 5); /* V3: 1053 V2: 1036 */ +constexpr TypedWhichId<XFormTextShadowItem> XATTR_FORMTXTSHADOW (XATTR_TEXT_FIRST + 6); /* V3: 1054 V2: 1037 */ +constexpr TypedWhichId<XFormTextShadowColorItem> XATTR_FORMTXTSHDWCOLOR (XATTR_TEXT_FIRST + 7); /* V3: 1055 V2: 1038 */ +constexpr TypedWhichId<XFormTextShadowXValItem> XATTR_FORMTXTSHDWXVAL (XATTR_TEXT_FIRST + 8); /* V3: 1056 V2: 1039 */ +constexpr TypedWhichId<XFormTextShadowYValItem> XATTR_FORMTXTSHDWYVAL (XATTR_TEXT_FIRST + 9); /* V3: 1057 V2: 1040 */ +constexpr TypedWhichId<XFormTextHideFormItem> XATTR_FORMTXTHIDEFORM (XATTR_TEXT_FIRST + 10); /* V3: 1059 V2: 1042 */ +constexpr TypedWhichId<XFormTextShadowTranspItem> XATTR_FORMTXTSHDWTRANSP (XATTR_TEXT_FIRST + 11); /* V3: 1060 V2: 1043 */ +constexpr sal_uInt16 XATTR_TEXT_LAST (XATTR_FORMTXTSHDWTRANSP); -#define XATTR_END XATTR_TEXT_LAST +constexpr sal_uInt16 XATTR_END = XATTR_TEXT_LAST; #endif diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index 1ec7dd019f8a..55609f751774 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -57,6 +57,24 @@ class SvxLineItem; class SvxRotateModeItem; class SfxStringItem; class SvxSizeItem; +class SvxJustifyMethodItem; +class SvxMarginItem; +class SvxPaperBinItem; +class ScHyphenateCell; +class SfxUInt32Item; +class ScIndentItem; +class ScShrinkToFitCell; +class ScMergeAttr; +class ScMergeFlagAttr; +class ScProtectionAttr; +class SvxBoxInfoItem; +class ScPatternAttr; +class SvxPageItem; +class ScViewObjectModeItem; +class SfxUInt16Item; +class ScPageHFItem; +class ScPageScaleToItem; +class SvxSetItem; // EditEngine is not allowed to define its own ITEMID's #define INCLUDED_EDITENG_EEITEMID_HXX @@ -82,109 +100,109 @@ class SvxSizeItem; // Item-IDs for attributes: -#define ATTR_STARTINDEX 100 // begin of attributes - -#define ATTR_PATTERN_START 100 // begin of cell-attribute-pattern - -#define ATTR_FONT TypedWhichId<SvxFontItem>(100) // begin of cell-attributes -#define ATTR_FONT_HEIGHT TypedWhichId<SvxFontHeightItem>(101) -#define ATTR_FONT_WEIGHT TypedWhichId<SvxWeightItem>(102) -#define ATTR_FONT_POSTURE TypedWhichId<SvxPostureItem>(103) -#define ATTR_FONT_UNDERLINE TypedWhichId<SvxUnderlineItem>(104) -#define ATTR_FONT_OVERLINE TypedWhichId<SvxOverlineItem>(105) -#define ATTR_FONT_CROSSEDOUT TypedWhichId<SvxCrossedOutItem>(106) -#define ATTR_FONT_CONTOUR TypedWhichId<SvxContourItem>(107) -#define ATTR_FONT_SHADOWED TypedWhichId<SvxShadowedItem>(108) -#define ATTR_FONT_COLOR TypedWhichId<SvxColorItem>(109) -#define ATTR_FONT_LANGUAGE TypedWhichId<SvxLanguageItem>(110) -#define ATTR_CJK_FONT TypedWhichId<SvxFontItem>(111) -#define ATTR_CJK_FONT_HEIGHT TypedWhichId<SvxFontHeightItem>(112) -#define ATTR_CJK_FONT_WEIGHT TypedWhichId<SvxWeightItem>(113) -#define ATTR_CJK_FONT_POSTURE TypedWhichId<SvxPostureItem>(114) -#define ATTR_CJK_FONT_LANGUAGE TypedWhichId<SvxLanguageItem>(115) -#define ATTR_CTL_FONT TypedWhichId<SvxFontItem>(116) -#define ATTR_CTL_FONT_HEIGHT TypedWhichId<SvxFontHeightItem>(117) -#define ATTR_CTL_FONT_WEIGHT TypedWhichId<SvxWeightItem>(118) -#define ATTR_CTL_FONT_POSTURE TypedWhichId<SvxPostureItem>(119) -#define ATTR_CTL_FONT_LANGUAGE TypedWhichId<SvxLanguageItem>(120) -#define ATTR_FONT_EMPHASISMARK TypedWhichId<SvxEmphasisMarkItem>(121) -#define ATTR_USERDEF TypedWhichId<SvXMLAttrContainerItem>(122) // not saved in binary files -#define ATTR_FONT_WORDLINE TypedWhichId<SvxWordLineModeItem>(123) -#define ATTR_FONT_RELIEF TypedWhichId<SvxCharReliefItem>(124) -#define ATTR_HYPHENATE TypedWhichId<ScHyphenateCell>(125) -#define ATTR_SCRIPTSPACE TypedWhichId<SvxScriptSpaceItem>(126) -#define ATTR_HANGPUNCTUATION TypedWhichId<SvxHangingPunctuationItem>(127) -#define ATTR_FORBIDDEN_RULES TypedWhichId<SvxForbiddenRuleItem>(128) -#define ATTR_HOR_JUSTIFY TypedWhichId<SvxHorJustifyItem>(129) -#define ATTR_HOR_JUSTIFY_METHOD TypedWhichId<SvxJustifyMethodItem>(130) -#define ATTR_INDENT TypedWhichId<ScIndentItem>(131) -#define ATTR_VER_JUSTIFY TypedWhichId<SvxVerJustifyItem>(132) -#define ATTR_VER_JUSTIFY_METHOD TypedWhichId<SvxJustifyMethodItem>(133) -#define ATTR_STACKED TypedWhichId<ScVerticalStackCell>(134) -#define ATTR_ROTATE_VALUE TypedWhichId<ScRotateValueItem>(135) -#define ATTR_ROTATE_MODE TypedWhichId<SvxRotateModeItem>(136) -#define ATTR_VERTICAL_ASIAN TypedWhichId<SfxBoolItem>(137) -#define ATTR_WRITINGDIR TypedWhichId<SvxFrameDirectionItem>(138) -#define ATTR_LINEBREAK TypedWhichId<ScLineBreakCell>(139) -#define ATTR_SHRINKTOFIT TypedWhichId<ScShrinkToFitCell>(140) -#define ATTR_BORDER_TLBR TypedWhichId<SvxLineItem>(141) -#define ATTR_BORDER_BLTR TypedWhichId<SvxLineItem>(142) -#define ATTR_MARGIN TypedWhichId<SvxMarginItem>(143) -#define ATTR_MERGE TypedWhichId<ScMergeAttr>(144) -#define ATTR_MERGE_FLAG TypedWhichId<ScMergeFlagAttr>(145) -#define ATTR_VALUE_FORMAT TypedWhichId<SfxUInt32Item>(146) -#define ATTR_LANGUAGE_FORMAT TypedWhichId<SvxLanguageItem>(147) -#define ATTR_BACKGROUND TypedWhichId<SvxBrushItem>(148) -#define ATTR_PROTECTION TypedWhichId<ScProtectionAttr>(149) -#define ATTR_BORDER TypedWhichId<SvxBoxItem>(150) -#define ATTR_BORDER_INNER TypedWhichId<SvxBoxInfoItem>(151) // inside, because of template-EditDialog -#define ATTR_SHADOW TypedWhichId<SvxShadowItem>(152) -#define ATTR_VALIDDATA TypedWhichId<SfxUInt32Item>(153) -#define ATTR_CONDITIONAL TypedWhichId<ScCondFormatItem>(154) -#define ATTR_HYPERLINK TypedWhichId<SfxStringItem>(155) - -#define ATTR_PATTERN_END 155 // end cell-attribute-pattern - -#define ATTR_PATTERN TypedWhichId<ScPatternAttr>(156) +constexpr sal_uInt16 ATTR_STARTINDEX(100); // begin of attributes + +constexpr sal_uInt16 ATTR_PATTERN_START(100); // begin of cell-attribute-pattern + +constexpr TypedWhichId<SvxFontItem> ATTR_FONT (100); // begin of cell-attributes +constexpr TypedWhichId<SvxFontHeightItem> ATTR_FONT_HEIGHT (101); +constexpr TypedWhichId<SvxWeightItem> ATTR_FONT_WEIGHT (102); +constexpr TypedWhichId<SvxPostureItem> ATTR_FONT_POSTURE (103); +constexpr TypedWhichId<SvxUnderlineItem> ATTR_FONT_UNDERLINE (104); +constexpr TypedWhichId<SvxOverlineItem> ATTR_FONT_OVERLINE (105); +constexpr TypedWhichId<SvxCrossedOutItem> ATTR_FONT_CROSSEDOUT (106); +constexpr TypedWhichId<SvxContourItem> ATTR_FONT_CONTOUR (107); +constexpr TypedWhichId<SvxShadowedItem> ATTR_FONT_SHADOWED (108); +constexpr TypedWhichId<SvxColorItem> ATTR_FONT_COLOR (109); +constexpr TypedWhichId<SvxLanguageItem> ATTR_FONT_LANGUAGE (110); +constexpr TypedWhichId<SvxFontItem> ATTR_CJK_FONT (111); +constexpr TypedWhichId<SvxFontHeightItem> ATTR_CJK_FONT_HEIGHT (112); +constexpr TypedWhichId<SvxWeightItem> ATTR_CJK_FONT_WEIGHT (113); +constexpr TypedWhichId<SvxPostureItem> ATTR_CJK_FONT_POSTURE (114); +constexpr TypedWhichId<SvxLanguageItem> ATTR_CJK_FONT_LANGUAGE (115); +constexpr TypedWhichId<SvxFontItem> ATTR_CTL_FONT (116); +constexpr TypedWhichId<SvxFontHeightItem> ATTR_CTL_FONT_HEIGHT (117); +constexpr TypedWhichId<SvxWeightItem> ATTR_CTL_FONT_WEIGHT (118); +constexpr TypedWhichId<SvxPostureItem> ATTR_CTL_FONT_POSTURE (119); +constexpr TypedWhichId<SvxLanguageItem> ATTR_CTL_FONT_LANGUAGE (120); +constexpr TypedWhichId<SvxEmphasisMarkItem> ATTR_FONT_EMPHASISMARK (121); +constexpr TypedWhichId<SvXMLAttrContainerItem> ATTR_USERDEF (122); // not saved in binary files +constexpr TypedWhichId<SvxWordLineModeItem> ATTR_FONT_WORDLINE (123); +constexpr TypedWhichId<SvxCharReliefItem> ATTR_FONT_RELIEF (124); +constexpr TypedWhichId<ScHyphenateCell> ATTR_HYPHENATE (125); +constexpr TypedWhichId<SvxScriptSpaceItem> ATTR_SCRIPTSPACE (126); +constexpr TypedWhichId<SvxHangingPunctuationItem> ATTR_HANGPUNCTUATION (127); +constexpr TypedWhichId<SvxForbiddenRuleItem> ATTR_FORBIDDEN_RULES (128); +constexpr TypedWhichId<SvxHorJustifyItem> ATTR_HOR_JUSTIFY (129); +constexpr TypedWhichId<SvxJustifyMethodItem> ATTR_HOR_JUSTIFY_METHOD (130); +constexpr TypedWhichId<ScIndentItem> ATTR_INDENT (131); +constexpr TypedWhichId<SvxVerJustifyItem> ATTR_VER_JUSTIFY (132); +constexpr TypedWhichId<SvxJustifyMethodItem> ATTR_VER_JUSTIFY_METHOD (133); +constexpr TypedWhichId<ScVerticalStackCell> ATTR_STACKED (134); +constexpr TypedWhichId<ScRotateValueItem> ATTR_ROTATE_VALUE (135); +constexpr TypedWhichId<SvxRotateModeItem> ATTR_ROTATE_MODE (136); +constexpr TypedWhichId<SfxBoolItem> ATTR_VERTICAL_ASIAN (137); +constexpr TypedWhichId<SvxFrameDirectionItem> ATTR_WRITINGDIR (138); +constexpr TypedWhichId<ScLineBreakCell> ATTR_LINEBREAK (139); +constexpr TypedWhichId<ScShrinkToFitCell> ATTR_SHRINKTOFIT (140); +constexpr TypedWhichId<SvxLineItem> ATTR_BORDER_TLBR (141); +constexpr TypedWhichId<SvxLineItem> ATTR_BORDER_BLTR (142); +constexpr TypedWhichId<SvxMarginItem> ATTR_MARGIN (143); +constexpr TypedWhichId<ScMergeAttr> ATTR_MERGE (144); +constexpr TypedWhichId<ScMergeFlagAttr> ATTR_MERGE_FLAG (145); +constexpr TypedWhichId<SfxUInt32Item> ATTR_VALUE_FORMAT (146); +constexpr TypedWhichId<SvxLanguageItem> ATTR_LANGUAGE_FORMAT (147); +constexpr TypedWhichId<SvxBrushItem> ATTR_BACKGROUND (148); +constexpr TypedWhichId<ScProtectionAttr> ATTR_PROTECTION (149); +constexpr TypedWhichId<SvxBoxItem> ATTR_BORDER (150); +constexpr TypedWhichId<SvxBoxInfoItem> ATTR_BORDER_INNER (151); // inside, because of template-EditDialog +constexpr TypedWhichId<SvxShadowItem> ATTR_SHADOW (152); +constexpr TypedWhichId<SfxUInt32Item> ATTR_VALIDDATA (153); +constexpr TypedWhichId<ScCondFormatItem> ATTR_CONDITIONAL (154); +constexpr TypedWhichId<SfxStringItem> ATTR_HYPERLINK (155); + +constexpr sal_uInt16 ATTR_PATTERN_END(155); // end cell-attribute-pattern + +constexpr TypedWhichId<ScPatternAttr> ATTR_PATTERN (156); // page attributes -#define ATTR_LRSPACE TypedWhichId<SvxLRSpaceItem>(157) // editor: PageDesc-TabPage -#define ATTR_ULSPACE TypedWhichId<SvxULSpaceItem>(158) -#define ATTR_PAGE TypedWhichId<SvxPageItem>(159) -#define ATTR_PAGE_PAPERBIN TypedWhichId<SvxPaperBinItem>(160) -#define ATTR_PAGE_SIZE TypedWhichId<SvxSizeItem>(161) -#define ATTR_PAGE_HORCENTER TypedWhichId<SfxBoolItem>(162) -#define ATTR_PAGE_VERCENTER TypedWhichId<SfxBoolItem>(163) - -#define ATTR_PAGE_ON TypedWhichId<SfxBoolItem>(164) // editor: header/footer-page -#define ATTR_PAGE_DYNAMIC TypedWhichId<SfxBoolItem>(165) -#define ATTR_PAGE_SHARED TypedWhichId<SfxBoolItem>(166) - -#define ATTR_PAGE_NOTES TypedWhichId<SfxBoolItem>(167) // editor: table -#define ATTR_PAGE_GRID TypedWhichId<SfxBoolItem>(168) -#define ATTR_PAGE_HEADERS TypedWhichId<SfxBoolItem>(169) -#define ATTR_PAGE_CHARTS TypedWhichId<ScViewObjectModeItem>(170) -#define ATTR_PAGE_OBJECTS TypedWhichId<ScViewObjectModeItem>(171) -#define ATTR_PAGE_DRAWINGS TypedWhichId<ScViewObjectModeItem>(172) -#define ATTR_PAGE_TOPDOWN TypedWhichId<SfxBoolItem>(173) -#define ATTR_PAGE_SCALE TypedWhichId<SfxUInt16Item>(174) -#define ATTR_PAGE_SCALETOPAGES TypedWhichId<SfxUInt16Item>(175) -#define ATTR_PAGE_FIRSTPAGENO TypedWhichId<SfxUInt16Item>(176) - -#define ATTR_PAGE_HEADERLEFT TypedWhichId<ScPageHFItem>(177) // contents of header/ -#define ATTR_PAGE_FOOTERLEFT TypedWhichId<ScPageHFItem>(178) // footer (left) -#define ATTR_PAGE_HEADERRIGHT TypedWhichId<ScPageHFItem>(179) // contents of header/ -#define ATTR_PAGE_FOOTERRIGHT TypedWhichId<ScPageHFItem>(180) // footer (right) -#define ATTR_PAGE_HEADERSET TypedWhichId<SvxSetItem>(181) // the corresponding sets -#define ATTR_PAGE_FOOTERSET TypedWhichId<SvxSetItem>(182) - -#define ATTR_PAGE_FORMULAS TypedWhichId<SfxBoolItem>(183) -#define ATTR_PAGE_NULLVALS TypedWhichId<SfxBoolItem>(184) - -#define ATTR_PAGE_SCALETO TypedWhichId<ScPageScaleToItem>(185) // #i8868# scale printout to width/height - -#define ATTR_HIDDEN TypedWhichId<SfxBoolItem>(186) - -#define ATTR_ENDINDEX ATTR_HIDDEN // end of pool-range +constexpr TypedWhichId<SvxLRSpaceItem> ATTR_LRSPACE (157); // editor: PageDesc-TabPage +constexpr TypedWhichId<SvxULSpaceItem> ATTR_ULSPACE (158); +constexpr TypedWhichId<SvxPageItem> ATTR_PAGE (159); +constexpr TypedWhichId<SvxPaperBinItem> ATTR_PAGE_PAPERBIN (160); +constexpr TypedWhichId<SvxSizeItem> ATTR_PAGE_SIZE (161); +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_HORCENTER (162); +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_VERCENTER (163); + +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_ON (164); // editor: header/footer-page +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_DYNAMIC (165); +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_SHARED (166); + +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_NOTES (167); // editor: table +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_GRID (168); +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_HEADERS (169); +constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_CHARTS (170); +constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_OBJECTS (171); +constexpr TypedWhichId<ScViewObjectModeItem> ATTR_PAGE_DRAWINGS (172); +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_TOPDOWN (173); +constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_SCALE (174); +constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_SCALETOPAGES (175); +constexpr TypedWhichId<SfxUInt16Item> ATTR_PAGE_FIRSTPAGENO (176); + +constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERLEFT (177); // contents of header/ +constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERLEFT (178); // footer (left) +constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_HEADERRIGHT (179); // contents of header/ +constexpr TypedWhichId<ScPageHFItem> ATTR_PAGE_FOOTERRIGHT (180); // footer (right) +constexpr TypedWhichId<SvxSetItem> ATTR_PAGE_HEADERSET (181); // the corresponding sets +constexpr TypedWhichId<SvxSetItem> ATTR_PAGE_FOOTERSET (182); + +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_FORMULAS (183); +constexpr TypedWhichId<SfxBoolItem> ATTR_PAGE_NULLVALS (184); + +constexpr TypedWhichId<ScPageScaleToItem> ATTR_PAGE_SCALETO (185); // #i8868# scale printout to width/height + +constexpr TypedWhichId<SfxBoolItem> ATTR_HIDDEN (186); + +constexpr sal_uInt16 ATTR_ENDINDEX(ATTR_HIDDEN); // end of pool-range // Dummy Slot-IDs for dialogs diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 8128e234d628..f8b05e9a080c 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -130,6 +130,40 @@ class SwTableBoxNumFormat; class SwTextGridItem; class SwTransparencyGrf; class SwFormatRuby; +class SwInsText; +class SwDelChr; +class SwDelText; +class SwRefMarkFieldUpdate; +class SwTableFormulaUpdate; +class SwAutoFormatGetDocNode; +class SwCondCollCondChg; +class SwVirtPageNumInfo; +class SwFindNearestNode; +class SwStringMsgPoolItem; +class SwFltAnchor; +class SwFltTOX; +class SwFltRedline; +class SwFltRDFMark; +class SwCharFormat; +class SwConditionTextFormatColl; +class SwDrawFrameFormat; +class SwFlyFrameFormat; +class SwFormatField; +class SwFormatFootnote; +class SwFormatRefMark; +class SwGrfFormatColl; +class SwTextFormatColl; +class SwTOXMark; +class CntUInt16Item; +class SwFormatFillOrder; +class SwFormatHeader; +class SwFormatFooter; +class SwFormatContent; +class SvxMacroItem; +class SwTableBoxFormula; +class SwTableBoxValue; +class SwFrameFormat; +class SfxVoidItem; // For SwTextHints without end index the following char is added: @@ -152,63 +186,62 @@ class SwFormatRuby; * Enums for the hints */ -#define HINT_BEGIN 1 +constexpr sal_uInt16 HINT_BEGIN = 1; -#define POOLATTR_BEGIN HINT_BEGIN -#define POOLATTR_END RES_UNKNOWNATR_END +constexpr sal_uInt16 POOLATTR_BEGIN(HINT_BEGIN); // Ranges for the IDs of the format-attributes. // Which-values for character-format attributes. -#define RES_CHRATR_BEGIN HINT_BEGIN -#define RES_CHRATR_CASEMAP TypedWhichId<SvxCaseMapItem>(RES_CHRATR_BEGIN) // 1 -#define RES_CHRATR_CHARSETCOLOR TypedWhichId<SvxColorItem>(2) -#define RES_CHRATR_COLOR TypedWhichId<SvxColorItem>(3) -#define RES_CHRATR_CONTOUR TypedWhichId<SvxContourItem>(4) -#define RES_CHRATR_CROSSEDOUT TypedWhichId<SvxCrossedOutItem>(5) -#define RES_CHRATR_ESCAPEMENT TypedWhichId<SvxEscapementItem>(6) -#define RES_CHRATR_FONT TypedWhichId<SvxFontItem>(7) -#define RES_CHRATR_FONTSIZE TypedWhichId<SvxFontHeightItem>(8) -#define RES_CHRATR_KERNING TypedWhichId<SvxKerningItem>(9) -#define RES_CHRATR_LANGUAGE TypedWhichId<SvxLanguageItem>(10) -#define RES_CHRATR_POSTURE TypedWhichId<SvxPostureItem>(11) -#define RES_CHRATR_UNUSED1 TypedWhichId<SfxVoidItem>(12) -#define RES_CHRATR_SHADOWED TypedWhichId<SvxShadowedItem>(13) -#define RES_CHRATR_UNDERLINE TypedWhichId<SvxUnderlineItem>(14) -#define RES_CHRATR_WEIGHT TypedWhichId<SvxWeightItem>(15) -#define RES_CHRATR_WORDLINEMODE TypedWhichId<SvxWordLineModeItem>(16) -#define RES_CHRATR_AUTOKERN TypedWhichId<SvxAutoKernItem>(17) -#define RES_CHRATR_BLINK TypedWhichId<SvxBlinkItem>(18) -#define RES_CHRATR_NOHYPHEN TypedWhichId<SvxNoHyphenItem>(19) -#define RES_CHRATR_UNUSED2 TypedWhichId<SfxVoidItem>(20) -#define RES_CHRATR_BACKGROUND TypedWhichId<SvxBrushItem>(21) -#define RES_CHRATR_CJK_FONT TypedWhichId<SvxFontItem>(22) -#define RES_CHRATR_CJK_FONTSIZE TypedWhichId<SvxFontHeightItem>(23) -#define RES_CHRATR_CJK_LANGUAGE TypedWhichId<SvxLanguageItem>(24) -#define RES_CHRATR_CJK_POSTURE TypedWhichId<SvxPostureItem>(25) -#define RES_CHRATR_CJK_WEIGHT TypedWhichId<SvxWeightItem>(26) -#define RES_CHRATR_CTL_FONT TypedWhichId<SvxFontItem>(27) -#define RES_CHRATR_CTL_FONTSIZE TypedWhichId<SvxFontHeightItem>(28) -#define RES_CHRATR_CTL_LANGUAGE TypedWhichId<SvxLanguageItem>(29) -#define RES_CHRATR_CTL_POSTURE TypedWhichId<SvxPostureItem>(30) -#define RES_CHRATR_CTL_WEIGHT TypedWhichId<SvxWeightItem>(31) -#define RES_CHRATR_ROTATE TypedWhichId<SvxCharRotateItem>(32) -#define RES_CHRATR_EMPHASIS_MARK TypedWhichId<SvxEmphasisMarkItem>(33) -#define RES_CHRATR_TWO_LINES TypedWhichId<SvxTwoLinesItem>(34) -#define RES_CHRATR_SCALEW TypedWhichId<SvxCharScaleWidthItem>(35) -#define RES_CHRATR_RELIEF TypedWhichId<SvxCharReliefItem>(36) -#define RES_CHRATR_HIDDEN TypedWhichId<SvxCharHiddenItem>(37) -#define RES_CHRATR_OVERLINE TypedWhichId<SvxOverlineItem>(38) -#define RES_CHRATR_RSID TypedWhichId<SvxRsidItem>(39) -#define RES_CHRATR_BOX TypedWhichId<SvxBoxItem>(40) -#define RES_CHRATR_SHADOW TypedWhichId<SvxShadowItem>(41) -#define RES_CHRATR_HIGHLIGHT TypedWhichId<SvxBrushItem>(42) -#define RES_CHRATR_GRABBAG TypedWhichId<SfxGrabBagItem>(43) -#define RES_CHRATR_BIDIRTL TypedWhichId<SfxInt16Item>(44) -#define RES_CHRATR_IDCTHINT TypedWhichId<SfxInt16Item>(45) -#define RES_CHRATR_END (46) +constexpr sal_uInt16 RES_CHRATR_BEGIN(HINT_BEGIN); +constexpr TypedWhichId<SvxCaseMapItem> RES_CHRATR_CASEMAP (RES_CHRATR_BEGIN); // 1 +constexpr TypedWhichId<SvxColorItem> RES_CHRATR_CHARSETCOLOR (2); +constexpr TypedWhichId<SvxColorItem> RES_CHRATR_COLOR (3); +constexpr TypedWhichId<SvxContourItem> RES_CHRATR_CONTOUR (4); +constexpr TypedWhichId<SvxCrossedOutItem> RES_CHRATR_CROSSEDOUT (5); +constexpr TypedWhichId<SvxEscapementItem> RES_CHRATR_ESCAPEMENT (6); +constexpr TypedWhichId<SvxFontItem> RES_CHRATR_FONT (7); +constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_FONTSIZE (8); +constexpr TypedWhichId<SvxKerningItem> RES_CHRATR_KERNING (9); +constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_LANGUAGE (10); +constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_POSTURE (11); +constexpr TypedWhichId<SfxVoidItem> RES_CHRATR_UNUSED1 (12); +constexpr TypedWhichId<SvxShadowedItem> RES_CHRATR_SHADOWED (13); +constexpr TypedWhichId<SvxUnderlineItem> RES_CHRATR_UNDERLINE (14); +constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_WEIGHT (15); +constexpr TypedWhichId<SvxWordLineModeItem> RES_CHRATR_WORDLINEMODE (16); +constexpr TypedWhichId<SvxAutoKernItem> RES_CHRATR_AUTOKERN (17); +constexpr TypedWhichId<SvxBlinkItem> RES_CHRATR_BLINK (18); +constexpr TypedWhichId<SvxNoHyphenItem> RES_CHRATR_NOHYPHEN (19); +constexpr TypedWhichId<SfxVoidItem> RES_CHRATR_UNUSED2 (20); +constexpr TypedWhichId<SvxBrushItem> RES_CHRATR_BACKGROUND (21); +constexpr TypedWhichId<SvxFontItem> RES_CHRATR_CJK_FONT (22); +constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_CJK_FONTSIZE (23); +constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_CJK_LANGUAGE (24); +constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_CJK_POSTURE (25); +constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_CJK_WEIGHT (26); +constexpr TypedWhichId<SvxFontItem> RES_CHRATR_CTL_FONT (27); +constexpr TypedWhichId<SvxFontHeightItem> RES_CHRATR_CTL_FONTSIZE (28); +constexpr TypedWhichId<SvxLanguageItem> RES_CHRATR_CTL_LANGUAGE (29); +constexpr TypedWhichId<SvxPostureItem> RES_CHRATR_CTL_POSTURE (30); +constexpr TypedWhichId<SvxWeightItem> RES_CHRATR_CTL_WEIGHT (31); +constexpr TypedWhichId<SvxCharRotateItem> RES_CHRATR_ROTATE (32); +constexpr TypedWhichId<SvxEmphasisMarkItem> RES_CHRATR_EMPHASIS_MARK (33); +constexpr TypedWhichId<SvxTwoLinesItem> RES_CHRATR_TWO_LINES (34); +constexpr TypedWhichId<SvxCharScaleWidthItem> RES_CHRATR_SCALEW (35); +constexpr TypedWhichId<SvxCharReliefItem> RES_CHRATR_RELIEF (36); +constexpr TypedWhichId<SvxCharHiddenItem> RES_CHRATR_HIDDEN (37); +constexpr TypedWhichId<SvxOverlineItem> RES_CHRATR_OVERLINE (38); +constexpr TypedWhichId<SvxRsidItem> RES_CHRATR_RSID (39); +constexpr TypedWhichId<SvxBoxItem> RES_CHRATR_BOX (40); +constexpr TypedWhichId<SvxShadowItem> RES_CHRATR_SHADOW (41); +constexpr TypedWhichId<SvxBrushItem> RES_CHRATR_HIGHLIGHT (42); +constexpr TypedWhichId<SfxGrabBagItem> RES_CHRATR_GRABBAG (43); +constexpr TypedWhichId<SfxInt16Item> RES_CHRATR_BIDIRTL (44); +constexpr TypedWhichId<SfxInt16Item> RES_CHRATR_IDCTHINT (45); +constexpr sal_uInt16 RES_CHRATR_END(46); // this Attribute used only in a TextNodes SwpAttr-Array -#define RES_TXTATR_BEGIN RES_CHRATR_END +constexpr sal_uInt16 RES_TXTATR_BEGIN(RES_CHRATR_END); /** text attributes with start and end. #i105453#: @@ -226,208 +259,210 @@ class SwFormatRuby; - INETFMT should precede CJK_RUBY (for UNO API it does not matter...) - META and METAFIELD must precede CJK_RUBY and INETFMT */ -#define RES_TXTATR_WITHEND_BEGIN RES_TXTATR_BEGIN -#define RES_TXTATR_REFMARK TypedWhichId<SwFormatRefMark>(RES_TXTATR_WITHEND_BEGIN) // 46 -#define RES_TXTATR_TOXMARK TypedWhichId<SwTOXMark>(47) -#define RES_TXTATR_META TypedWhichId<SwFormatMeta>(48) -#define RES_TXTATR_METAFIELD TypedWhichId<SwFormatMeta>(49) -#define RES_TXTATR_AUTOFMT TypedWhichId<SwFormatAutoFormat>(50) -#define RES_TXTATR_INETFMT TypedWhichId<SwFormatINetFormat>(51) -#define RES_TXTATR_CHARFMT TypedWhichId<SwFormatCharFormat>(52) -#define RES_TXTATR_CJK_RUBY TypedWhichId<SwFormatRuby>(53) -#define RES_TXTATR_UNKNOWN_CONTAINER TypedWhichId<SvXMLAttrContainerItem>(54) -#define RES_TXTATR_INPUTFIELD TypedWhichId<SwFormatField>(55) -#define RES_TXTATR_WITHEND_END 56 +constexpr sal_uInt16 RES_TXTATR_WITHEND_BEGIN(RES_TXTATR_BEGIN); +constexpr TypedWhichId<SwFormatRefMark> RES_TXTATR_REFMARK (RES_TXTATR_WITHEND_BEGIN); // 46 +constexpr TypedWhichId<SwTOXMark> RES_TXTATR_TOXMARK (47); +constexpr TypedWhichId<SwFormatMeta> RES_TXTATR_META (48); +constexpr TypedWhichId<SwFormatMeta> RES_TXTATR_METAFIELD (49); +constexpr TypedWhichId<SwFormatAutoFormat> RES_TXTATR_AUTOFMT (50); +constexpr TypedWhichId<SwFormatINetFormat> RES_TXTATR_INETFMT (51); +constexpr TypedWhichId<SwFormatCharFormat> RES_TXTATR_CHARFMT (52); +constexpr TypedWhichId<SwFormatRuby> RES_TXTATR_CJK_RUBY (53); +constexpr TypedWhichId<SvXMLAttrContainerItem> RES_TXTATR_UNKNOWN_CONTAINER (54); +constexpr TypedWhichId<SwFormatField> RES_TXTATR_INPUTFIELD (55); +constexpr sal_uInt16 RES_TXTATR_WITHEND_END(56); // all TextAttributes without an end -#define RES_TXTATR_NOEND_BEGIN RES_TXTATR_WITHEND_END -#define RES_TXTATR_FIELD TypedWhichId<SwFormatField>(RES_TXTATR_NOEND_BEGIN) // 56 -#define RES_TXTATR_FLYCNT TypedWhichId<SwFormatFlyCnt>(57) -#define RES_TXTATR_FTN TypedWhichId<SwFormatFootnote>(58) -#define RES_TXTATR_ANNOTATION TypedWhichId<SwFormatField>(59) -#define RES_TXTATR_DUMMY3 TypedWhichId<SfxBoolItem>(60) -#define RES_TXTATR_DUMMY1 TypedWhichId<SfxBoolItem>(61) -#define RES_TXTATR_DUMMY2 TypedWhichId<SfxBoolItem>(62) -#define RES_TXTATR_NOEND_END 63 -#define RES_TXTATR_END RES_TXTATR_NOEND_END - -#define RES_PARATR_BEGIN RES_TXTATR_END -#define RES_PARATR_LINESPACING TypedWhichId<SvxLineSpacingItem>(RES_PARATR_BEGIN) // 63 -#define RES_PARATR_ADJUST TypedWhichId<SvxAdjustItem>(64) -#define RES_PARATR_SPLIT TypedWhichId<SvxFormatSplitItem>(65) -#define RES_PARATR_ORPHANS TypedWhichId<SvxOrphansItem>(66) -#define RES_PARATR_WIDOWS TypedWhichId<SvxWidowsItem>(67) -#define RES_PARATR_TABSTOP TypedWhichId<SvxTabStopItem>(68) -#define RES_PARATR_HYPHENZONE TypedWhichId<SvxHyphenZoneItem>(69) -#define RES_PARATR_DROP TypedWhichId<SwFormatDrop>(70) -#define RES_PARATR_REGISTER TypedWhichId<SwRegisterItem>(71) -#define RES_PARATR_NUMRULE TypedWhichId<SwNumRuleItem>(72) -#define RES_PARATR_SCRIPTSPACE TypedWhichId<SvxScriptSpaceItem>(73) -#define RES_PARATR_HANGINGPUNCTUATION TypedWhichId<SvxHangingPunctuationItem>(74) -#define RES_PARATR_FORBIDDEN_RULES TypedWhichId<SvxForbiddenRuleItem>(75) -#define RES_PARATR_VERTALIGN TypedWhichId<SvxParaVertAlignItem>(76) -#define RES_PARATR_SNAPTOGRID TypedWhichId<SvxParaGridItem>(77) -#define RES_PARATR_CONNECT_BORDER TypedWhichId<SwParaConnectBorderItem>(78) -#define RES_PARATR_OUTLINELEVEL TypedWhichId<SfxUInt16Item>(79) -#define RES_PARATR_RSID TypedWhichId<SvxRsidItem>(80) -#define RES_PARATR_GRABBAG TypedWhichId<SfxGrabBagItem>(81) -#define RES_PARATR_END (82) +constexpr sal_uInt16 RES_TXTATR_NOEND_BEGIN(RES_TXTATR_WITHEND_END); +constexpr TypedWhichId<SwFormatField> RES_TXTATR_FIELD (RES_TXTATR_NOEND_BEGIN); // 56 +constexpr TypedWhichId<SwFormatFlyCnt> RES_TXTATR_FLYCNT (57); +constexpr TypedWhichId<SwFormatFootnote> RES_TXTATR_FTN (58); +constexpr TypedWhichId<SwFormatField> RES_TXTATR_ANNOTATION (59); +constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY3 (60); +constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY1 (61); +constexpr TypedWhichId<SfxBoolItem> RES_TXTATR_DUMMY2 (62); +constexpr sal_uInt16 RES_TXTATR_NOEND_END(63); +constexpr sal_uInt16 RES_TXTATR_END(RES_TXTATR_NOEND_END); + +constexpr sal_uInt16 RES_PARATR_BEGIN(RES_TXTATR_END); +constexpr TypedWhichId<SvxLineSpacingItem> RES_PARATR_LINESPACING (RES_PARATR_BEGIN); // 63 +constexpr TypedWhichId<SvxAdjustItem> RES_PARATR_ADJUST (64); +constexpr TypedWhichId<SvxFormatSplitItem> RES_PARATR_SPLIT (65); +constexpr TypedWhichId<SvxOrphansItem> RES_PARATR_ORPHANS (66); +constexpr TypedWhichId<SvxWidowsItem> RES_PARATR_WIDOWS (67); +constexpr TypedWhichId<SvxTabStopItem> RES_PARATR_TABSTOP (68); +constexpr TypedWhichId<SvxHyphenZoneItem> RES_PARATR_HYPHENZONE (69); +constexpr TypedWhichId<SwFormatDrop> RES_PARATR_DROP (70); +constexpr TypedWhichId<SwRegisterItem> RES_PARATR_REGISTER (71); +constexpr TypedWhichId<SwNumRuleItem> RES_PARATR_NUMRULE (72); +constexpr TypedWhichId<SvxScriptSpaceItem> RES_PARATR_SCRIPTSPACE (73); +constexpr TypedWhichId<SvxHangingPunctuationItem> RES_PARATR_HANGINGPUNCTUATION (74); +constexpr TypedWhichId<SvxForbiddenRuleItem> RES_PARATR_FORBIDDEN_RULES (75); +constexpr TypedWhichId<SvxParaVertAlignItem> RES_PARATR_VERTALIGN (76); +constexpr TypedWhichId<SvxParaGridItem> RES_PARATR_SNAPTOGRID (77); +constexpr TypedWhichId<SwParaConnectBorderItem> RES_PARATR_CONNECT_BORDER (78); +constexpr TypedWhichId<SfxUInt16Item> RES_PARATR_OUTLINELEVEL (79); +constexpr TypedWhichId<SvxRsidItem> RES_PARATR_RSID (80); +constexpr TypedWhichId<SfxGrabBagItem> RES_PARATR_GRABBAG (81); +constexpr sal_uInt16 RES_PARATR_END(82); // list attributes for paragraphs. // intentionally these list attributes are not contained in paragraph styles -#define RES_PARATR_LIST_BEGIN RES_PARATR_END -#define RES_PARATR_LIST_ID TypedWhichId<SfxStringItem>(RES_PARATR_LIST_BEGIN) // 82 -#define RES_PARATR_LIST_LEVEL TypedWhichId<SfxInt16Item>(83) -#define RES_PARATR_LIST_ISRESTART TypedWhichId<SfxBoolItem>(84) -#define RES_PARATR_LIST_RESTARTVALUE TypedWhichId<SfxInt16Item>(85) -#define RES_PARATR_LIST_ISCOUNTED TypedWhichId<SfxBoolItem>(86) -#define RES_PARATR_LIST_AUTOFMT TypedWhichId<SwFormatAutoFormat>(87)//TypedWhichId<SfxSetItem>(87) -#define RES_PARATR_LIST_END (88) - -#define RES_FRMATR_BEGIN RES_PARATR_LIST_END -#define RES_FILL_ORDER TypedWhichId<SwFormatFillOrder>(RES_FRMATR_BEGIN) -#define RES_FRM_SIZE TypedWhichId<SwFormatFrameSize>(89) -#define RES_PAPER_BIN TypedWhichId<SvxPaperBinItem>(90) -#define RES_LR_SPACE TypedWhichId<SvxLRSpaceItem>(91) -#define RES_UL_SPACE TypedWhichId<SvxULSpaceItem>(92) -#define RES_PAGEDESC TypedWhichId<SwFormatPageDesc>(93) -#define RES_BREAK TypedWhichId<SvxFormatBreakItem>(94) -#define RES_CNTNT TypedWhichId<SwFormatContent>(95) -#define RES_HEADER TypedWhichId<SwFormatHeader>(96) -#define RES_FOOTER TypedWhichId<SwFormatFooter>(97) -#define RES_PRINT TypedWhichId<SvxPrintItem>(98) -#define RES_OPAQUE TypedWhichId<SvxOpaqueItem>(99) -#define RES_PROTECT TypedWhichId<SvxProtectItem>(100) -#define RES_SURROUND TypedWhichId<SwFormatSurround>(101) -#define RES_VERT_ORIENT TypedWhichId<SwFormatVertOrient>(102) -#define RES_HORI_ORIENT TypedWhichId<SwFormatHoriOrient>(103) -#define RES_ANCHOR TypedWhichId<SwFormatAnchor>(104) -#define RES_BACKGROUND TypedWhichId<SvxBrushItem>(105) -#define RES_BOX TypedWhichId<SvxBoxItem>(106) -#define RES_SHADOW TypedWhichId<SvxShadowItem>(107) -#define RES_FRMMACRO TypedWhichId<SvxMacroItem>(108) -#define RES_COL TypedWhichId<SwFormatCol>(109) -#define RES_KEEP TypedWhichId<SvxFormatKeepItem>(110) -#define RES_URL TypedWhichId<SwFormatURL>(111) -#define RES_EDIT_IN_READONLY TypedWhichId<SwFormatEditInReadonly>(112) -#define RES_LAYOUT_SPLIT TypedWhichId<SwFormatLayoutSplit>(113) -#define RES_CHAIN TypedWhichId<SwFormatChain>(114) -#define RES_TEXTGRID TypedWhichId<SwTextGridItem>(115) -#define RES_LINENUMBER TypedWhichId<SwFormatLineNumber>(116) -#define RES_FTN_AT_TXTEND TypedWhichId<SwFormatFootnoteAtTextEnd>(117) -#define RES_END_AT_TXTEND TypedWhichId<SwFormatEndAtTextEnd>(118) -#define RES_COLUMNBALANCE TypedWhichId<SwFormatNoBalancedColumns>(119) -#define RES_FRAMEDIR TypedWhichId<SvxFrameDirectionItem>(120) -#define RES_HEADER_FOOTER_EAT_SPACING TypedWhichId<SwHeaderAndFooterEatSpacingItem>(121) -#define RES_ROW_SPLIT TypedWhichId<SwFormatRowSplit>(122) -#define RES_FOLLOW_TEXT_FLOW TypedWhichId<SwFormatFollowTextFlow>(123) -#define RES_COLLAPSING_BORDERS TypedWhichId<SfxBoolItem>(124) -#define RES_WRAP_INFLUENCE_ON_OBJPOS TypedWhichId<SwFormatWrapInfluenceOnObjPos>(125) -#define RES_AUTO_STYLE TypedWhichId<SwFormatAutoFormat>(126) -#define RES_FRMATR_STYLE_NAME TypedWhichId<SfxStringItem>(127) -#define RES_FRMATR_CONDITIONAL_STYLE_NAME TypedWhichId<SfxStringItem>(128) -#define RES_FRMATR_GRABBAG TypedWhichId<SfxGrabBagItem>(129) -#define RES_TEXT_VERT_ADJUST TypedWhichId<SdrTextVertAdjustItem>(130) -#define RES_FRMATR_END 131 - -#define RES_GRFATR_BEGIN RES_FRMATR_END -#define RES_GRFATR_MIRRORGRF TypedWhichId<SwMirrorGrf>(RES_GRFATR_BEGIN) // 131 -#define RES_GRFATR_CROPGRF TypedWhichId<SwCropGrf>(132) - -#define RES_GRFATR_ROTATION TypedWhichId<SwRotationGrf>(133) -#define RES_GRFATR_LUMINANCE TypedWhichId<SwLuminanceGrf>(134) -#define RES_GRFATR_CONTRAST TypedWhichId<SwContrastGrf>(135) -#define RES_GRFATR_CHANNELR TypedWhichId<SwChannelRGrf>(136) -#define RES_GRFATR_CHANNELG TypedWhichId<SwChannelGGrf>(137) -#define RES_GRFATR_CHANNELB TypedWhichId<SwChannelBGrf>(138) -#define RES_GRFATR_GAMMA TypedWhichId<SwGammaGrf>(139) -#define RES_GRFATR_INVERT TypedWhichId<SwInvertGrf>(140) -#define RES_GRFATR_TRANSPARENCY TypedWhichId<SwTransparencyGrf>(141) -#define RES_GRFATR_DRAWMODE TypedWhichId<SwDrawModeGrf>(142) - -#define RES_GRFATR_DUMMY1 TypedWhichId<SfxBoolItem>(143) -#define RES_GRFATR_DUMMY2 TypedWhichId<SfxBoolItem>(144) -#define RES_GRFATR_DUMMY3 TypedWhichId<SfxBoolItem>(145) -#define RES_GRFATR_DUMMY4 TypedWhichId<SfxBoolItem>(146) -#define RES_GRFATR_DUMMY5 TypedWhichId<SfxBoolItem>(147) -#define RES_GRFATR_END (148) - -#define RES_BOXATR_BEGIN RES_GRFATR_END -#define RES_BOXATR_FORMAT TypedWhichId<SwTableBoxNumFormat>(RES_BOXATR_BEGIN) // 148 -#define RES_BOXATR_FORMULA TypedWhichId<SwTableBoxFormula>(149) -#define RES_BOXATR_VALUE TypedWhichId<SwTableBoxValue>(150) -#define RES_BOXATR_END (151) - -#define RES_UNKNOWNATR_BEGIN RES_BOXATR_END -#define RES_UNKNOWNATR_CONTAINER TypedWhichId<SvXMLAttrContainerItem>(RES_UNKNOWNATR_BEGIN)// 151 -#define RES_UNKNOWNATR_END (152) +constexpr sal_uInt16 RES_PARATR_LIST_BEGIN(RES_PARATR_END); +constexpr TypedWhichId<SfxStringItem> RES_PARATR_LIST_ID (RES_PARATR_LIST_BEGIN); // 82 +constexpr TypedWhichId<SfxInt16Item> RES_PARATR_LIST_LEVEL (83); +constexpr TypedWhichId<SfxBoolItem> RES_PARATR_LIST_ISRESTART (84); +constexpr TypedWhichId<SfxInt16Item> RES_PARATR_LIST_RESTARTVALUE (85); +constexpr TypedWhichId<SfxBoolItem> RES_PARATR_LIST_ISCOUNTED (86); +constexpr TypedWhichId<SwFormatAutoFormat> RES_PARATR_LIST_AUTOFMT (87);//TypedWhichId<SfxSetItem>(87) +constexpr sal_uInt16 RES_PARATR_LIST_END(88); + +constexpr sal_uInt16 RES_FRMATR_BEGIN(RES_PARATR_LIST_END); +constexpr TypedWhichId<SwFormatFillOrder> RES_FILL_ORDER (RES_FRMATR_BEGIN); +constexpr TypedWhichId<SwFormatFrameSize> RES_FRM_SIZE (89); +constexpr TypedWhichId<SvxPaperBinItem> RES_PAPER_BIN (90); +constexpr TypedWhichId<SvxLRSpaceItem> RES_LR_SPACE (91); +constexpr TypedWhichId<SvxULSpaceItem> RES_UL_SPACE (92); +constexpr TypedWhichId<SwFormatPageDesc> RES_PAGEDESC (93); +constexpr TypedWhichId<SvxFormatBreakItem> RES_BREAK (94); +constexpr TypedWhichId<SwFormatContent> RES_CNTNT (95); +constexpr TypedWhichId<SwFormatHeader> RES_HEADER (96); +constexpr TypedWhichId<SwFormatFooter> RES_FOOTER (97); +constexpr TypedWhichId<SvxPrintItem> RES_PRINT (98); +constexpr TypedWhichId<SvxOpaqueItem> RES_OPAQUE (99); +constexpr TypedWhichId<SvxProtectItem> RES_PROTECT (100); +constexpr TypedWhichId<SwFormatSurround> RES_SURROUND (101); +constexpr TypedWhichId<SwFormatVertOrient> RES_VERT_ORIENT (102); +constexpr TypedWhichId<SwFormatHoriOrient> RES_HORI_ORIENT (103); +constexpr TypedWhichId<SwFormatAnchor> RES_ANCHOR (104); +constexpr TypedWhichId<SvxBrushItem> RES_BACKGROUND (105); +constexpr TypedWhichId<SvxBoxItem> RES_BOX (106); +constexpr TypedWhichId<SvxShadowItem> RES_SHADOW (107); +constexpr TypedWhichId<SvxMacroItem> RES_FRMMACRO (108); +constexpr TypedWhichId<SwFormatCol> RES_COL (109); +constexpr TypedWhichId<SvxFormatKeepItem> RES_KEEP (110); +constexpr TypedWhichId<SwFormatURL> RES_URL (111); +constexpr TypedWhichId<SwFormatEditInReadonly> RES_EDIT_IN_READONLY (112); +constexpr TypedWhichId<SwFormatLayoutSplit> RES_LAYOUT_SPLIT (113); +constexpr TypedWhichId<SwFormatChain> RES_CHAIN (114); +constexpr TypedWhichId<SwTextGridItem> RES_TEXTGRID (115); +constexpr TypedWhichId<SwFormatLineNumber> RES_LINENUMBER (116); +constexpr TypedWhichId<SwFormatFootnoteAtTextEnd> RES_FTN_AT_TXTEND (117); +constexpr TypedWhichId<SwFormatEndAtTextEnd> RES_END_AT_TXTEND (118); +constexpr TypedWhichId<SwFormatNoBalancedColumns> RES_COLUMNBALANCE (119); +constexpr TypedWhichId<SvxFrameDirectionItem> RES_FRAMEDIR (120); +constexpr TypedWhichId<SwHeaderAndFooterEatSpacingItem> RES_HEADER_FOOTER_EAT_SPACING (121); +constexpr TypedWhichId<SwFormatRowSplit> RES_ROW_SPLIT (122); +constexpr TypedWhichId<SwFormatFollowTextFlow> RES_FOLLOW_TEXT_FLOW (123); +constexpr TypedWhichId<SfxBoolItem> RES_COLLAPSING_BORDERS (124); +constexpr TypedWhichId<SwFormatWrapInfluenceOnObjPos> RES_WRAP_INFLUENCE_ON_OBJPOS (125); +constexpr TypedWhichId<SwFormatAutoFormat> RES_AUTO_STYLE (126); +constexpr TypedWhichId<SfxStringItem> RES_FRMATR_STYLE_NAME (127); +constexpr TypedWhichId<SfxStringItem> RES_FRMATR_CONDITIONAL_STYLE_NAME (128); +constexpr TypedWhichId<SfxGrabBagItem> RES_FRMATR_GRABBAG (129); +constexpr TypedWhichId<SdrTextVertAdjustItem> RES_TEXT_VERT_ADJUST (130); +constexpr sal_uInt16 RES_FRMATR_END(131); + +constexpr sal_uInt16 RES_GRFATR_BEGIN(RES_FRMATR_END); +constexpr TypedWhichId<SwMirrorGrf> RES_GRFATR_MIRRORGRF (RES_GRFATR_BEGIN); // 131 +constexpr TypedWhichId<SwCropGrf> RES_GRFATR_CROPGRF (132); + +constexpr TypedWhichId<SwRotationGrf> RES_GRFATR_ROTATION (133); +constexpr TypedWhichId<SwLuminanceGrf> RES_GRFATR_LUMINANCE (134); +constexpr TypedWhichId<SwContrastGrf> RES_GRFATR_CONTRAST (135); +constexpr TypedWhichId<SwChannelRGrf> RES_GRFATR_CHANNELR (136); +constexpr TypedWhichId<SwChannelGGrf> RES_GRFATR_CHANNELG (137); +constexpr TypedWhichId<SwChannelBGrf> RES_GRFATR_CHANNELB (138); +constexpr TypedWhichId<SwGammaGrf> RES_GRFATR_GAMMA (139); +constexpr TypedWhichId<SwInvertGrf> RES_GRFATR_INVERT (140); +constexpr TypedWhichId<SwTransparencyGrf> RES_GRFATR_TRANSPARENCY (141); +constexpr TypedWhichId<SwDrawModeGrf> RES_GRFATR_DRAWMODE (142); + +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY1 (143); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY2 (144); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY3 (145); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY4 (146); +constexpr TypedWhichId<SfxBoolItem> RES_GRFATR_DUMMY5 (147); +constexpr sal_uInt16 RES_GRFATR_END(148); + +constexpr sal_uInt16 RES_BOXATR_BEGIN(RES_GRFATR_END); +constexpr TypedWhichId<SwTableBoxNumFormat> RES_BOXATR_FORMAT (RES_BOXATR_BEGIN); // 148 +constexpr TypedWhichId<SwTableBoxFormula> RES_BOXATR_FORMULA (149); +constexpr TypedWhichId<SwTableBoxValue> RES_BOXATR_VALUE (150); +constexpr sal_uInt16 RES_BOXATR_END(151); + +constexpr sal_uInt16 RES_UNKNOWNATR_BEGIN(RES_BOXATR_END); +constexpr TypedWhichId<SvXMLAttrContainerItem> RES_UNKNOWNATR_CONTAINER (RES_UNKNOWNATR_BEGIN);// 151 +constexpr sal_uInt16 RES_UNKNOWNATR_END(152); + +constexpr sal_uInt16 POOLATTR_END(RES_UNKNOWNATR_END); // Format IDs -#define RES_FMT_BEGIN RES_UNKNOWNATR_END -#define RES_CHRFMT TypedWhichId<SwCharFormat>(RES_FMT_BEGIN) // 152 -#define RES_FRMFMT TypedWhichId<SwFrameFormat>(153) -#define RES_FLYFRMFMT TypedWhichId<SwFlyFrameFormat>(154) -#define RES_TXTFMTCOLL TypedWhichId<SwTextFormatColl>(155) -#define RES_GRFFMTCOLL TypedWhichId<SwGrfFormatColl>(156) -#define RES_DRAWFRMFMT TypedWhichId<SwDrawFrameFormat>(157) -#define RES_CONDTXTFMTCOLL TypedWhichId<SwConditionTextFormatColl>(158) -#define RES_FMT_END 159 +constexpr sal_uInt16 RES_FMT_BEGIN(RES_UNKNOWNATR_END); +constexpr TypedWhichId<SwCharFormat> RES_CHRFMT (RES_FMT_BEGIN); // 152 +constexpr TypedWhichId<SwFrameFormat> RES_FRMFMT (153); +constexpr TypedWhichId<SwFlyFrameFormat> RES_FLYFRMFMT (154); +constexpr TypedWhichId<SwTextFormatColl> RES_TXTFMTCOLL (155); +constexpr TypedWhichId<SwGrfFormatColl> RES_GRFFMTCOLL (156); +constexpr TypedWhichId<SwDrawFrameFormat> RES_DRAWFRMFMT (157); +constexpr TypedWhichId<SwConditionTextFormatColl> RES_CONDTXTFMTCOLL (158); +constexpr sal_uInt16 RES_FMT_END(159); // ID's for Messages in the Formats -#define RES_MSG_BEGIN RES_FMT_END -#define RES_OBJECTDYING TypedWhichId<SwPtrMsgPoolItem>(RES_MSG_BEGIN) // 159 -#define RES_FMT_CHG TypedWhichId<SwFormatChg>(160) -#define RES_ATTRSET_CHG TypedWhichId<SwAttrSetChg>(161) -#define RES_INS_TXT TypedWhichId<SwInsText>(162) -#define RES_DEL_CHR TypedWhichId<SwDelChr>(163) -#define RES_DEL_TXT TypedWhichId<SwDelText>(164) -#define RES_UPDATE_ATTR TypedWhichId<SwUpdateAttr>(165) -#define RES_REFMARKFLD_UPDATE TypedWhichId<SwRefMarkFieldUpdate>(166) -#define RES_DOCPOS_UPDATE TypedWhichId<SwDocPosUpdate>(167) -#define RES_TABLEFML_UPDATE TypedWhichId<SwTableFormulaUpdate>(168) -#define RES_UPDATEDDETBL TypedWhichId<SwMsgPoolItem>(169) -#define RES_TBLHEADLINECHG TypedWhichId<SwMsgPoolItem>(170) -#define RES_AUTOFMT_DOCNODE TypedWhichId<SwAutoFormatGetDocNode>(171) -#define RES_SECTION_HIDDEN TypedWhichId<SwMsgPoolItem>(172) -#define RES_SECTION_NOT_HIDDEN TypedWhichId<SwMsgPoolItem>(173) -#define RES_GRAPHIC_ARRIVED TypedWhichId<SwMsgPoolItem>(174) -#define RES_GRAPHIC_PIECE_ARRIVED TypedWhichId<SwMsgPoolItem>(175) -#define RES_HIDDENPARA_PRINT TypedWhichId<SwMsgPoolItem>(176) -#define RES_CONDCOLL_CONDCHG TypedWhichId<SwCondCollCondChg>(177) -#define RES_VIRTPAGENUM_INFO TypedWhichId<SwVirtPageNumInfo>(178) -#define RES_REMOVE_UNO_OBJECT TypedWhichId<SwPtrMsgPoolItem>(179) -#define RES_GRF_REREAD_AND_INCACHE TypedWhichId<SwMsgPoolItem>(180) +constexpr sal_uInt16 RES_MSG_BEGIN(RES_FMT_END); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_OBJECTDYING (RES_MSG_BEGIN); // 159 +constexpr TypedWhichId<SwFormatChg> RES_FMT_CHG (160); +constexpr TypedWhichId<SwAttrSetChg> RES_ATTRSET_CHG (161); +constexpr TypedWhichId<SwInsText> RES_INS_TXT (162); +constexpr TypedWhichId<SwDelChr> RES_DEL_CHR (163); +constexpr TypedWhichId<SwDelText> RES_DEL_TXT (164); +constexpr TypedWhichId<SwUpdateAttr> RES_UPDATE_ATTR (165); +constexpr TypedWhichId<SwRefMarkFieldUpdate> RES_REFMARKFLD_UPDATE (166); +constexpr TypedWhichId<SwDocPosUpdate> RES_DOCPOS_UPDATE (167); +constexpr TypedWhichId<SwTableFormulaUpdate> RES_TABLEFML_UPDATE (168); +constexpr TypedWhichId<SwMsgPoolItem> RES_UPDATEDDETBL (169); +constexpr TypedWhichId<SwMsgPoolItem> RES_TBLHEADLINECHG (170); +constexpr TypedWhichId<SwAutoFormatGetDocNode> RES_AUTOFMT_DOCNODE (171); +constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_HIDDEN (172); +constexpr TypedWhichId<SwMsgPoolItem> RES_SECTION_NOT_HIDDEN (173); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_ARRIVED (174); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_PIECE_ARRIVED (175); +constexpr TypedWhichId<SwMsgPoolItem> RES_HIDDENPARA_PRINT (176); +constexpr TypedWhichId<SwCondCollCondChg> RES_CONDCOLL_CONDCHG (177); +constexpr TypedWhichId<SwVirtPageNumInfo> RES_VIRTPAGENUM_INFO (178); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_REMOVE_UNO_OBJECT (179); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRF_REREAD_AND_INCACHE (180); // empty -#define RES_FINDNEARESTNODE TypedWhichId<SwFindNearestNode>(182) -#define RES_CONTENT_VISIBLE TypedWhichId<SwPtrMsgPoolItem>(183) -#define RES_GRAPHIC_SWAPIN TypedWhichId<SwMsgPoolItem>(184) -#define RES_NAME_CHANGED TypedWhichId<SwStringMsgPoolItem>(185) -#define RES_TITLE_CHANGED TypedWhichId<SwStringMsgPoolItem>(186) -#define RES_DESCRIPTION_CHANGED TypedWhichId<SwStringMsgPoolItem>(187) -#define RES_LINKED_GRAPHIC_STREAM_ARRIVED TypedWhichId<SwMsgPoolItem>(187) -#define RES_MSG_END (188) +constexpr TypedWhichId<SwFindNearestNode> RES_FINDNEARESTNODE (182); +constexpr TypedWhichId<SwPtrMsgPoolItem> RES_CONTENT_VISIBLE (183); +constexpr TypedWhichId<SwMsgPoolItem> RES_GRAPHIC_SWAPIN (184); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_NAME_CHANGED (185); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_TITLE_CHANGED (186); +constexpr TypedWhichId<SwStringMsgPoolItem> RES_DESCRIPTION_CHANGED (187); +constexpr TypedWhichId<SwMsgPoolItem> RES_LINKED_GRAPHIC_STREAM_ARRIVED (187); +constexpr sal_uInt16 RES_MSG_END(188); // An ID for the RTF-reader. The stylesheets are treated like attributes, // i.e. there is a StyleSheet-attribute. To avoid collision with other // Which()-values, the value is listed here. (The help system too defines // new attributes!) -#define RES_FLTRATTR_BEGIN RES_MSG_END -#define RES_FLTR_BOOKMARK TypedWhichId<SfxStringItem>(RES_FLTRATTR_BEGIN) -#define RES_FLTR_ANCHOR TypedWhichId<SwFltAnchor>(189) -#define RES_FLTR_NUMRULE TypedWhichId<SfxStringItem>(190) -#define RES_FLTR_TOX TypedWhichId<SwFltTOX>(191) -#define RES_FLTR_REDLINE TypedWhichId<SwFltRedline>(192) -#define RES_FLTR_ANNOTATIONMARK TypedWhichId<CntUInt16Item>(193) -#define RES_FLTR_RDFMARK TypedWhichId<SwFltRDFMark>(194) -#define RES_FLTRATTR_END 195 +constexpr sal_uInt16 RES_FLTRATTR_BEGIN(RES_MSG_END); +constexpr TypedWhichId<SfxStringItem> RES_FLTR_BOOKMARK (RES_FLTRATTR_BEGIN); +constexpr TypedWhichId<SwFltAnchor> RES_FLTR_ANCHOR (189); +constexpr TypedWhichId<SfxStringItem> RES_FLTR_NUMRULE (190); +constexpr TypedWhichId<SwFltTOX> RES_FLTR_TOX (191); +constexpr TypedWhichId<SwFltRedline> RES_FLTR_REDLINE (192); +constexpr TypedWhichId<CntUInt16Item> RES_FLTR_ANNOTATIONMARK (193); +constexpr TypedWhichId<SwFltRDFMark> RES_FLTR_RDFMARK (194); +constexpr sal_uInt16 RES_FLTRATTR_END(195); -#define RES_TBX_DUMMY RES_FLTRATTR_END + 1 +constexpr sal_uInt16 RES_TBX_DUMMY(RES_FLTRATTR_END + 1); -#define HINT_END RES_TBX_DUMMY +constexpr sal_uInt16 HINT_END(RES_TBX_DUMMY); // Error recognition!! -#define INVALID_HINT HINT_END -#define RES_WHICHHINT_END HINT_END +constexpr sal_uInt16 INVALID_HINT(HINT_END); +constexpr sal_uInt16 RES_WHICHHINT_END(HINT_END); inline bool isATR(const sal_uInt16 nWhich) { diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index a7abd1b50687..d50f1aefbfde 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -1613,7 +1613,7 @@ void SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > const & xAl pCursor->GetMark()->nContent.GetIndex() ); const sal_uInt16 nWhich = pTextAttr ? pTextAttr->Which() - : static_cast<sal_uInt16>(RES_TXTATR_END); + : RES_TXTATR_END; switch (nWhich) { case RES_TXTATR_FIELD: diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 9659b75e573a..cd890e204cd8 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -356,7 +356,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, OSL_ENSURE(!nAttrId || (POOLATTR_BEGIN <= nAttrId && POOLATTR_END > nAttrId) || - (RES_FLTRATTR_BEGIN <= nAttrId && o3tl::make_unsigned(RES_FLTRATTR_END) > nAttrId), + (RES_FLTRATTR_BEGIN <= nAttrId && RES_FLTRATTR_END > nAttrId), "Wrong id for attribute"); auto aI = m_Entries.begin(); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 7633aab677fd..ddf0347ab3b9 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -449,7 +449,7 @@ void MSWordStyles::SetStyleDefaults( const SwFormat& rFormat, bool bPap ) { const SwModify* pOldMod = m_rExport.m_pOutFormatNode; m_rExport.m_pOutFormatNode = &rFormat; - bool aFlags[ static_cast< sal_uInt16 >(RES_FRMATR_END) - RES_CHRATR_BEGIN ]; + bool aFlags[ RES_FRMATR_END - RES_CHRATR_BEGIN ]; sal_uInt16 nStt, nEnd, n; if( bPap ) { |