diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-09 09:47:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-09 09:46:53 +0000 |
commit | c8a93253e43e81e5dbc89937f2a21ca75e0582bc (patch) | |
tree | c5ebf27b0f2a5ece4846bf2e0cd0a09815f105e0 /reportdesign/source | |
parent | 9885a4f10f6b900a2a870e5fe691c4a465522b75 (diff) |
remove unused NOT_POOLABLE enum value
and simplify the resulting SfxItemInfo field down to a single bool
Change-Id: I73e24e83d39afc7660ac85872ba96bc790713cb2
Reviewed-on: https://gerrit.libreoffice.org/23058
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign/source')
-rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 74 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 60 |
2 files changed, 67 insertions, 67 deletions
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 0feab73edb01..a070c7e9d10c 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -603,46 +603,46 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep // UNO->ItemSet static SfxItemInfo aItemInfos[] = { - { 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 }, + { SID_ATTR_CHAR_FONT, true }, + { SID_ATTR_CHAR_FONTHEIGHT, true }, + { SID_ATTR_CHAR_LANGUAGE, true }, + { SID_ATTR_CHAR_POSTURE, true }, + { SID_ATTR_CHAR_WEIGHT, true }, + { SID_ATTR_CHAR_SHADOWED, true }, + { SID_ATTR_CHAR_WORDLINEMODE, true }, + { SID_ATTR_CHAR_CONTOUR, true }, + { SID_ATTR_CHAR_STRIKEOUT, true }, + { SID_ATTR_CHAR_UNDERLINE, true }, + { SID_ATTR_CHAR_COLOR, true }, + { SID_ATTR_CHAR_KERNING, true }, + { SID_ATTR_CHAR_CASEMAP, true }, + { SID_ATTR_CHAR_ESCAPEMENT, true }, + { SID_ATTR_CHAR_FONTLIST, true }, + { SID_ATTR_CHAR_AUTOKERN, true }, + { SID_COLOR_TABLE, true }, + { SID_ATTR_FLASH, true }, + { SID_ATTR_CHAR_EMPHASISMARK, true }, + { SID_ATTR_CHAR_TWO_LINES, true }, + { SID_ATTR_CHAR_ROTATED, true }, + { SID_ATTR_CHAR_SCALEWIDTH, true }, + { SID_ATTR_CHAR_RELIEF, true }, + { SID_ATTR_CHAR_HIDDEN, true }, + { SID_ATTR_BRUSH, true }, + { SID_ATTR_ALIGN_HOR_JUSTIFY, true }, + { SID_ATTR_ALIGN_VER_JUSTIFY, true }, // Asian - { 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 }, + { SID_ATTR_CHAR_CJK_FONT, true }, + { SID_ATTR_CHAR_CJK_FONTHEIGHT, true }, + { SID_ATTR_CHAR_CJK_LANGUAGE, true }, + { SID_ATTR_CHAR_CJK_POSTURE, true }, + { SID_ATTR_CHAR_CJK_WEIGHT, true }, // Complex - { 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 } + { SID_ATTR_CHAR_CTL_FONT, true }, + { SID_ATTR_CHAR_CTL_FONTHEIGHT, true }, + { SID_ATTR_CHAR_CTL_LANGUAGE, true }, + { SID_ATTR_CHAR_CTL_POSTURE, true }, + { SID_ATTR_CHAR_CTL_WEIGHT, true } }; vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); ::std::unique_ptr<FontList> pFontList(new FontList( pParent )); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 5498e5308852..ca02bc52473a 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2352,35 +2352,35 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ // UNO->ItemSet static SfxItemInfo aItemInfos[] = { - { 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 } + { SID_ATTR_LRSPACE, true }, + { SID_ATTR_ULSPACE, true }, + { SID_ATTR_PAGE, true }, + { SID_ATTR_PAGE_SIZE, true }, + { SID_ENUM_PAGE_MODE, true }, + { SID_PAPER_START, true }, + { SID_PAPER_END, true }, + { SID_ATTR_BRUSH, true }, + { XATTR_FILLSTYLE, true }, + { XATTR_FILLCOLOR, true }, + { XATTR_FILLGRADIENT, true }, + { XATTR_FILLHATCH, true }, + { XATTR_FILLBITMAP, true }, + { XATTR_FILLTRANSPARENCE, true }, + { XATTR_GRADIENTSTEPCOUNT, true }, + { XATTR_FILLBMP_TILE, true }, + { XATTR_FILLBMP_POS, true }, + { XATTR_FILLBMP_SIZEX, true }, + { XATTR_FILLBMP_SIZEY, true }, + { XATTR_FILLBMP_SIZELOG, true }, + { XATTR_FILLBMP_TILEOFFSETX, true }, + { XATTR_FILLBMP_TILEOFFSETY, true }, + { XATTR_FILLBMP_STRETCH, true }, + { XATTR_FILLBMP_POSOFFSETX, true }, + { XATTR_FILLBMP_POSOFFSETY, true }, + { XATTR_FILLFLOATTRANSPARENCE, true }, + { XATTR_SECONDARYFILLCOLOR, true }, + { XATTR_FILLBACKGROUND, true }, + { SID_ATTR_METRIC, true } }; MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); @@ -4221,7 +4221,7 @@ void OReportController::openZoomDialog() { static SfxItemInfo aItemInfos[] = { - { SID_ATTR_ZOOM, SfxItemPoolFlags::POOLABLE } + { SID_ATTR_ZOOM, true } }; SfxPoolItem* pDefaults[] = { |