From fe73ed7c79b96eaa5aa84314a07ae11f188575a1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 13 Apr 2015 16:01:31 +0200 Subject: convert SFX_ITEM constants to scoped enum Change-Id: Ief8c30c356ba947727c5ab70092042816a0db99e Reviewed-on: https://gerrit.libreoffice.org/15302 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- reportdesign/source/ui/misc/UITools.cxx | 74 +++++++++++----------- reportdesign/source/ui/report/ReportController.cxx | 60 +++++++++--------- 2 files changed, 67 insertions(+), 67 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 41cc15eaf948..01533c7520ee 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -604,46 +604,46 @@ bool openCharDialog( const uno::Reference& _rxRep // UNO->ItemSet static SfxItemInfo aItemInfos[] = { - { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_KERNING, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_ESCAPEMENT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_FONTLIST, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_AUTOKERN, SFX_ITEM_POOLABLE }, - { SID_COLOR_TABLE, SFX_ITEM_POOLABLE }, - { SID_ATTR_FLASH, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_TWO_LINES, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_ROTATED, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_HIDDEN, SFX_ITEM_POOLABLE }, - { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, - { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, - { SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE }, + { SID_ATTR_CHAR_FONT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_FONTHEIGHT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_LANGUAGE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_POSTURE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_WEIGHT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_SHADOWED, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_WORDLINEMODE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CONTOUR, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_STRIKEOUT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_UNDERLINE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_COLOR, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_KERNING, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CASEMAP, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_ESCAPEMENT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_FONTLIST, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_AUTOKERN, SfxItemPoolFlags::POOLABLE }, + { SID_COLOR_TABLE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_FLASH, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_EMPHASISMARK, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_TWO_LINES, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_ROTATED, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_SCALEWIDTH, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_RELIEF, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_HIDDEN, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_BRUSH, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_ALIGN_HOR_JUSTIFY, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_ALIGN_VER_JUSTIFY, SfxItemPoolFlags::POOLABLE }, // Asian - { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, + { SID_ATTR_CHAR_CJK_FONT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CJK_FONTHEIGHT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CJK_LANGUAGE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CJK_POSTURE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CJK_WEIGHT, SfxItemPoolFlags::POOLABLE }, // Complex - { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, - { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE } + { SID_ATTR_CHAR_CTL_FONT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CTL_FONTHEIGHT, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CTL_LANGUAGE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CTL_POSTURE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_CHAR_CTL_WEIGHT, SfxItemPoolFlags::POOLABLE } }; vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); ::std::unique_ptr pFontList(new FontList( pParent )); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index b02d01f85c3c..6733961ffb77 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2364,35 +2364,35 @@ void OReportController::openPageDialog(const uno::Reference& _ // UNO->ItemSet static SfxItemInfo aItemInfos[] = { - { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, - { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, - { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, - { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, - { SID_ENUM_PAGE_MODE, SFX_ITEM_POOLABLE }, - { SID_PAPER_START, SFX_ITEM_POOLABLE }, - { SID_PAPER_END, SFX_ITEM_POOLABLE }, - { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, - { XATTR_FILLSTYLE, SFX_ITEM_POOLABLE }, - { XATTR_FILLCOLOR, SFX_ITEM_POOLABLE }, - { XATTR_FILLGRADIENT, SFX_ITEM_POOLABLE }, - { XATTR_FILLHATCH, SFX_ITEM_POOLABLE }, - { XATTR_FILLBITMAP, SFX_ITEM_POOLABLE }, - { XATTR_FILLTRANSPARENCE, SFX_ITEM_POOLABLE }, - { XATTR_GRADIENTSTEPCOUNT, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_TILE, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_POS, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_SIZEX, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_SIZEY, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_SIZELOG, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_TILEOFFSETX, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_TILEOFFSETY, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_STRETCH, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_POSOFFSETX, SFX_ITEM_POOLABLE }, - { XATTR_FILLBMP_POSOFFSETY, SFX_ITEM_POOLABLE }, - { XATTR_FILLFLOATTRANSPARENCE, SFX_ITEM_POOLABLE }, - { XATTR_SECONDARYFILLCOLOR, SFX_ITEM_POOLABLE }, - { XATTR_FILLBACKGROUND, SFX_ITEM_POOLABLE }, - { SID_ATTR_METRIC, SFX_ITEM_POOLABLE } + { SID_ATTR_LRSPACE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_ULSPACE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_PAGE, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_PAGE_SIZE, SfxItemPoolFlags::POOLABLE }, + { SID_ENUM_PAGE_MODE, SfxItemPoolFlags::POOLABLE }, + { SID_PAPER_START, SfxItemPoolFlags::POOLABLE }, + { SID_PAPER_END, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_BRUSH, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLSTYLE, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLCOLOR, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLGRADIENT, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLHATCH, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBITMAP, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLTRANSPARENCE, SfxItemPoolFlags::POOLABLE }, + { XATTR_GRADIENTSTEPCOUNT, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_TILE, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_POS, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_SIZEX, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_SIZEY, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_SIZELOG, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_TILEOFFSETX, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_TILEOFFSETY, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_STRETCH, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_POSOFFSETX, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBMP_POSOFFSETY, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLFLOATTRANSPARENCE, SfxItemPoolFlags::POOLABLE }, + { XATTR_SECONDARYFILLCOLOR, SfxItemPoolFlags::POOLABLE }, + { XATTR_FILLBACKGROUND, SfxItemPoolFlags::POOLABLE }, + { SID_ATTR_METRIC, SfxItemPoolFlags::POOLABLE } }; MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); @@ -4240,7 +4240,7 @@ void OReportController::openZoomDialog() { static SfxItemInfo aItemInfos[] = { - { SID_ATTR_ZOOM, SFX_ITEM_POOLABLE } + { SID_ATTR_ZOOM, SfxItemPoolFlags::POOLABLE } }; SfxPoolItem* pDefaults[] = { -- cgit