diff options
53 files changed, 159 insertions, 177 deletions
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index abfffe1b6355..73d8598a6dd2 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -306,7 +306,7 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const } if( m_pLB_TextDirection->GetSelectedEntryCount() > 0 ) - rOutAttrs->Put( SvxFrameDirectionItem( m_pLB_TextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR.Which() ) ); + rOutAttrs->Put( SvxFrameDirectionItem( m_pLB_TextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR ) ); if( m_pDC_Dial->IsVisible() ) { diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 7fdeb8ffea7d..3df8869364be 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -149,7 +149,7 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs ) rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, m_pCbShowDescription->IsChecked() ) ); if( m_pLbTextDirection->GetSelectedEntryCount() > 0 ) - rOutAttrs->Put( SvxFrameDirectionItem( m_pLbTextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR.Which() ) ); + rOutAttrs->Put( SvxFrameDirectionItem( m_pLbTextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR ) ); return true; } diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index 8c0e7310081d..554235d17343 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -63,7 +63,7 @@ bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs) m_aLegendPositionResources.writeToItemSet(*rOutAttrs); if( m_pLbTextDirection->GetSelectedEntryCount() > 0 ) - rOutAttrs->Put( SvxFrameDirectionItem( m_pLbTextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR.Which() ) ); + rOutAttrs->Put( SvxFrameDirectionItem( m_pLbTextDirection->GetSelectEntryValue(), EE_PARA_WRITINGDIR ) ); return true; } diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 05537d931c8a..ae304b22d24e 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -96,7 +96,7 @@ bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs) rOutAttrs->Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); SvxFrameDirection aDirection( m_pLbTextDirection->GetSelectEntryValue() ); - rOutAttrs->Put( SvxFrameDirectionItem( aDirection, EE_PARA_WRITINGDIR.Which() ) ); + rOutAttrs->Put( SvxFrameDirectionItem( aDirection, EE_PARA_WRITINGDIR ) ); return true; } diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 7810f28e4b3c..062b4b173b3e 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -56,9 +56,9 @@ ItemPropertyMapType & lcl_GetCharacterPropertyPropertyMap() {EE_CHAR_OUTLINE, {"CharContoured", 0}}, {EE_CHAR_EMPHASISMARK, {"CharEmphasis", 0}}, - {EE_PARA_WRITINGDIR.Which(), {"WritingMode", 0}}, + {EE_PARA_WRITINGDIR, {"WritingMode", 0}}, - {EE_PARA_ASIANCJKSPACING.Which(), {"ParaIsCharacterDistance", 0}}}; + {EE_PARA_ASIANCJKSPACING, {"ParaIsCharacterDistance", 0}}}; return aCharacterPropertyMap; } @@ -296,8 +296,8 @@ void CharacterPropertyItemConverter::FillSpecialItem( } break; - case EE_PARA_FORBIDDENRULES.Which(): - case EE_PARA_HANGINGPUNCTUATION.Which(): + case EE_PARA_FORBIDDENRULES: + case EE_PARA_HANGINGPUNCTUATION: rOutItemSet.DisableItem( nWhichId ); break; } diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index 3c3d4fd2a1a1..b8c85f61c046 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -82,7 +82,7 @@ const sal_uInt16 nDataLabelWhichPairs[] = SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, - EE_PARA_WRITINGDIR.Which(),EE_PARA_WRITINGDIR.Which(), + EE_PARA_WRITINGDIR,EE_PARA_WRITINGDIR, 0 }; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 7dc5a3d8e99a..49f1670e9f37 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1538,7 +1538,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw if( nWritingMode != -1 && nWritingMode != text::WritingMode2::PAGE ) { if( pDrawModelWrapper.get() ) - pDrawModelWrapper->GetItemPool().SetPoolDefaultItem(SvxFrameDirectionItem(static_cast<SvxFrameDirection>(nWritingMode), EE_PARA_WRITINGDIR.Which()) ); + pDrawModelWrapper->GetItemPool().SetPoolDefaultItem(SvxFrameDirectionItem(static_cast<SvxFrameDirection>(nWritingMode), EE_PARA_WRITINGDIR) ); } } catch( const uno::Exception& ex ) diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 100517b08de1..ab87a0769172 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -63,7 +63,7 @@ DrawModelWrapper::DrawModelWrapper() SfxItemPool* pMasterPool = &GetItemPool(); pMasterPool->SetDefaultMetric(MapUnit::Map100thMM); - pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE.Which(), true) ); + pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, true) ); pMasterPool->SetPoolDefaultItem(makeSvx3DPercentDiagonalItem (5)); SfxItemPool* pPool = pMasterPool; diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index 542b6d319982..a46330c9badf 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -177,7 +177,7 @@ public: template<class T> const T& GetItem( TypedWhichId<T> nWhich ) const { - return static_cast<const T&>(GetItem(nWhich.Which())); + return static_cast<const T&>(GetItem(sal_uInt16(nWhich))); } bool HasItem( sal_uInt16 nWhich ) const; }; diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 40eaab64d1bb..c93477eb7309 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -64,12 +64,12 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) OStringBuffer aDebStr; switch ( rItem.Which() ) { - case EE_PARA_WRITINGDIR.Which(): + case EE_PARA_WRITINGDIR: aDebStr.append("WritingDir="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxFrameDirectionItem&>(rItem).GetValue())); break; - case EE_PARA_OUTLLRSPACE.Which(): - case EE_PARA_LRSPACE.Which(): + case EE_PARA_OUTLLRSPACE: + case EE_PARA_LRSPACE: aDebStr.append("FI="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst())); aDebStr.append(", LI="); @@ -77,7 +77,7 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) aDebStr.append(", RI="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetRight())); break; - case EE_PARA_NUMBULLET.Which(): + case EE_PARA_NUMBULLET: aDebStr.append("NumItem "); for ( sal_uInt16 nLevel = 0; nLevel < 3; nLevel++ ) { @@ -106,15 +106,15 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) } } break; - case EE_PARA_BULLETSTATE.Which(): + case EE_PARA_BULLETSTATE: aDebStr.append("ShowBullet="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SfxBoolItem&>(rItem).GetValue())); break; - case EE_PARA_HYPHENATE.Which(): + case EE_PARA_HYPHENATE: aDebStr.append("Hyphenate="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SfxBoolItem&>(rItem).GetValue())); break; - case EE_PARA_OUTLLEVEL.Which(): + case EE_PARA_OUTLLEVEL: aDebStr.append("Level="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SfxInt16Item&>(rItem).GetValue())); break; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 56219c85196e..8db5de5780d8 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -825,7 +825,7 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit switch ( rPoolItem.Which() ) { - case EE_PARA_LRSPACE.Which(): + case EE_PARA_LRSPACE: { assert(dynamic_cast<const SvxLRSpaceItem *>(&rPoolItem) != nullptr); SvxLRSpaceItem& rItem = static_cast<SvxLRSpaceItem&>(rPoolItem); @@ -2271,7 +2271,7 @@ EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, bool bKeepEndingAttribs ) ContentAttribs aContentAttribs( aPaM.GetNode()->GetContentAttribs() ); // for a new paragraph we like to have the bullet/numbering visible by default - aContentAttribs.GetItems().Put( SfxBoolItem( EE_PARA_BULLETSTATE.Which(), true) ); + aContentAttribs.GetItems().Put( SfxBoolItem( EE_PARA_BULLETSTATE, true) ); // ContentNode constructor copies also the paragraph attributes ContentNode* pNode = new ContentNode( aStr, aContentAttribs ); diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index 80a6bed5723e..a7f74bf2701f 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -94,18 +94,18 @@ DefItems::DefItems() // Paragraph attributes: SvxNumRule aDefaultNumRule( SvxNumRuleFlags::NONE, 0, false ); - rDefItems[0] = new SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR.Which() ); + rDefItems[0] = new SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR ); rDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS ); - rDefItems[2] = new SvxHangingPunctuationItem(false, EE_PARA_HANGINGPUNCTUATION.Which()); - rDefItems[3] = new SvxForbiddenRuleItem(true, EE_PARA_FORBIDDENRULES.Which()); - rDefItems[4] = new SvxScriptSpaceItem( true, EE_PARA_ASIANCJKSPACING.Which() ); - rDefItems[5] = new SvxNumBulletItem( aDefaultNumRule, EE_PARA_NUMBULLET.Which() ); - rDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE.Which(), false ); - rDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE.Which(), true ); - rDefItems[8] = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE.Which() ); - rDefItems[9] = new SfxInt16Item( EE_PARA_OUTLLEVEL.Which(), -1 ); - rDefItems[10] = new SvxBulletItem( EE_PARA_BULLET.Which() ); - rDefItems[11] = new SvxLRSpaceItem( EE_PARA_LRSPACE.Which() ); + rDefItems[2] = new SvxHangingPunctuationItem(false, EE_PARA_HANGINGPUNCTUATION); + rDefItems[3] = new SvxForbiddenRuleItem(true, EE_PARA_FORBIDDENRULES); + rDefItems[4] = new SvxScriptSpaceItem( true, EE_PARA_ASIANCJKSPACING ); + rDefItems[5] = new SvxNumBulletItem( aDefaultNumRule, EE_PARA_NUMBULLET ); + rDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, false ); + rDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE, true ); + rDefItems[8] = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE ); + rDefItems[9] = new SfxInt16Item( EE_PARA_OUTLLEVEL, -1 ); + rDefItems[10] = new SvxBulletItem( EE_PARA_BULLET ); + rDefItems[11] = new SvxLRSpaceItem( EE_PARA_LRSPACE ); rDefItems[12] = new SvxULSpaceItem( EE_PARA_ULSPACE ); rDefItems[13] = new SvxLineSpacingItem( 0, EE_PARA_SBL ); rDefItems[14] = new SvxAdjustItem( SvxAdjust::Left, EE_PARA_JUST ); diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 5f81f3709c2f..428e76cc5e32 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -433,7 +433,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) for ( sal_Int32 n = nStartNode; n <= nEndNode; n++ ) { ContentNode* pNode = mpEditEngine->GetEditDoc().GetObject( n ); - pNode->GetContentAttribs().GetItems().Put( SfxInt16Item( EE_PARA_OUTLLEVEL.Which(), nOutlLevel ) ); + pNode->GetContentAttribs().GetItems().Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nOutlLevel ) ); } } } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 56e27e67b5b4..d9ec9a17136a 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -855,7 +855,7 @@ public: template<class T> const T& GetParaAttrib( sal_Int32 nPara, TypedWhichId<T> nWhich ) const { - return static_cast<const T&>(GetParaAttrib(nPara, nWhich.Which())); + return static_cast<const T&>(GetParaAttrib(nPara, sal_uInt16(nWhich))); } tools::Rectangle PaMtoEditCursor( EditPaM aPaM, GetCursorFlags nFlags = GetCursorFlags::NONE ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1019cc0b84fc..6b82c0b658d6 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -673,7 +673,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_uInt16 nWhich = rItem.Which(); switch ( nWhich ) { - case EE_PARA_WRITINGDIR.Which(): + case EE_PARA_WRITINGDIR: { const SvxFrameDirectionItem& rWritingMode = static_cast<const SvxFrameDirectionItem&>(rItem); if ( rWritingMode.GetValue() == SvxFrameDirection::Horizontal_RL_TB ) @@ -682,7 +682,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, rOutput.WriteCharPtr( "\\ltrpar" ); } break; - case EE_PARA_OUTLLEVEL.Which(): + case EE_PARA_OUTLLEVEL: { sal_Int32 nLevel = static_cast<const SfxInt16Item&>(rItem).GetValue(); if( nLevel >= 0 ) @@ -692,8 +692,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, } } break; - case EE_PARA_OUTLLRSPACE.Which(): - case EE_PARA_LRSPACE.Which(): + case EE_PARA_OUTLLRSPACE: + case EE_PARA_LRSPACE: { rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI ); sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst(); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 6ef469e64c3e..341d84984d55 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -726,7 +726,7 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUnd bool bUndo = bCreateUndo && IsUndoEnabled(); SfxItemSet aAttrs( pEditEngine->GetParaAttribs( nPara ) ); - aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL.Which(), nDepth ) ); + aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nDepth ) ); pEditEngine->SetParaAttribs( nPara, aAttrs ); ImplCheckNumBulletItem( nPara ); ImplCalcBulletText( nPara, false, false ); diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index a83110ee3876..4e24d2023c70 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -878,7 +878,7 @@ void OutlinerView::ToggleBullets() { SfxItemSet aAttrs( pOwner->GetParaAttribs( nPara ) ); SvxNumRule aNewNumRule( *pDefaultBulletNumRule ); - aAttrs.Put( SvxNumBulletItem( aNewNumRule, EE_PARA_NUMBULLET.Which() ) ); + aAttrs.Put( SvxNumBulletItem( aNewNumRule, EE_PARA_NUMBULLET ) ); pOwner->SetParaAttribs( nPara, aAttrs ); } } @@ -1013,7 +1013,7 @@ void OutlinerView::ApplyBulletsNumbering( const SfxItemSet& rAttrs = pOwner->GetParaAttribs(nPara); SfxItemSet aAttrs(rAttrs); - aAttrs.Put(SfxBoolItem(EE_PARA_BULLETSTATE.Which(), true)); + aAttrs.Put(SfxBoolItem(EE_PARA_BULLETSTATE, true)); // apply new numbering rule if ( pNewNumRule ) @@ -1083,7 +1083,7 @@ void OutlinerView::ApplyBulletsNumbering( } } - aAttrs.Put(SvxNumBulletItem(aNewRule, EE_PARA_NUMBULLET.Which())); + aAttrs.Put(SvxNumBulletItem(aNewRule, EE_PARA_NUMBULLET)); } } pOwner->SetParaAttribs(nPara, aAttrs); @@ -1132,10 +1132,10 @@ void OutlinerView::SwitchOffBulletsNumbering( pOwner->SetDepth( pPara, -1 ); const SfxItemSet& rAttrs = pOwner->GetParaAttribs( nPara ); - if (rAttrs.GetItemState( EE_PARA_BULLETSTATE.Which() ) == SfxItemState::SET) + if (rAttrs.GetItemState( EE_PARA_BULLETSTATE ) == SfxItemState::SET) { SfxItemSet aAttrs(rAttrs); - aAttrs.ClearItem( EE_PARA_BULLETSTATE.Which() ); + aAttrs.ClearItem( EE_PARA_BULLETSTATE ); pOwner->SetParaAttribs( nPara, aAttrs ); } } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index eb745a27f4c9..4902128db4ee 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -506,7 +506,7 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertySimpleEnt } break; - case EE_PARA_NUMBULLET.Which(): + case EE_PARA_NUMBULLET: { uno::Reference< container::XIndexReplace > xRule; return !aValue.hasValue() || ((aValue >>= xRule) && !xRule.is()); @@ -557,12 +557,12 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertySimpleEnt } } break; - case EE_PARA_BULLETSTATE.Which(): + case EE_PARA_BULLETSTATE: { bool bBullet = true; if( aValue >>= bBullet ) { - SfxBoolItem aItem( EE_PARA_BULLETSTATE.Which(), bBullet ); + SfxBoolItem aItem( EE_PARA_BULLETSTATE, bBullet ); rNewSet.Put(aItem); return true; } @@ -678,7 +678,7 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet const & rSet, cons } break; - case EE_PARA_NUMBULLET.Which(): + case EE_PARA_NUMBULLET: { SfxItemState eState = rSet.GetItemState( EE_PARA_NUMBULLET ); if( eState != SfxItemState::SET && eState != SfxItemState::DEFAULT) @@ -719,7 +719,7 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet const & rSet, cons } break; - case EE_PARA_BULLETSTATE.Which(): + case EE_PARA_BULLETSTATE: { bool bState = false; SfxItemState eState = rSet.GetItemState( EE_PARA_BULLETSTATE ); diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index b3ffd98b675b..1ada3a700339 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -281,9 +281,9 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, - { OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET.Which(), cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, - { OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE.Which(),cppu::UnoType<bool>::get(), 0, 0 }, - { OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL.Which(), ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }, + { OUString(UNO_NAME_NUMBERING_LEVEL), EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, SVX_UNOEDIT_PARA_PROPERTIES, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 63f152418418..25be4f0f04f6 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1532,7 +1532,7 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const break; } } - rSet.Put( SvxFrameDirectionItem( bVerticalText ? SvxFrameDirection::Vertical_RL_TB : SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR.Which() ) ); + rSet.Put( SvxFrameDirectionItem( bVerticalText ? SvxFrameDirection::Vertical_RL_TB : SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR ) ); rSet.Put( SdrTextVertAdjustItem( eTVA ) ); rSet.Put( SdrTextHorzAdjustItem( eTHA ) ); @@ -3661,7 +3661,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) SfxItemSet aParagraphAttribs( rOutliner.GetEmptyItemSet() ); if ( !aSelection.nStartPos ) - aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE.Which(), false ) ); + aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, false ) ); aSelection.nStartPos = 0; rOutliner.QuickSetAttribs( aParagraphAttribs, aSelection ); nParaIndex++; @@ -4469,7 +4469,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r if ( bIsRTL ) { SfxItemSet aSet2( rOutliner.GetParaAttribs( i ) ); - aSet2.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR.Which() ) ); + aSet2.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR ) ); rOutliner.SetParaAttribs( i, aSet2 ); bCreateNewParaObject = true; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 78ee76593663..c8a34061a990 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1090,7 +1090,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi bAutoGrowHeight = bFitShapeToText; } } - pTObj->SetMergedItem( SvxFrameDirectionItem( bVerticalText ? SvxFrameDirection::Vertical_RL_TB : SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR.Which() ) ); + pTObj->SetMergedItem( SvxFrameDirectionItem( bVerticalText ? SvxFrameDirection::Vertical_RL_TB : SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR ) ); //Autofit text only if there is no auto grow height and width //See fdo#41245 @@ -2329,11 +2329,11 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* sal_uInt32 nIsBullet2 = 0; //, nInstance = nDestinationInstance != 0xffffffff ? nDestinationInstance : pTextObj->GetInstance(); pPara->GetAttrib( PPT_ParaAttr_BulletOn, nIsBullet2, nDestinationInstance ); if ( !nIsBullet2 ) - aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE.Which(), false ) ); + aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, false ) ); if ( !aSelection.nStartPos ) // in PPT empty paragraphs never gets a bullet { - aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE.Which(), false ) ); + aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, false ) ); } aSelection.nStartPos = 0; rOutliner.QuickSetAttribs( aParagraphAttribs, aSelection ); @@ -4396,7 +4396,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd aRule.SetLevel( 0, aNumberFormat ); } } - mpNumBulletItem[ i ] = new SvxNumBulletItem( aRule, EE_PARA_NUMBULLET.Which() ); + mpNumBulletItem[ i ] = new SvxNumBulletItem( aRule, EE_PARA_NUMBULLET ); } } @@ -6231,7 +6231,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& GetAttrib(PPT_ParaAttr_BulletOfs, _nBulletOfs, nDestinationInstance); if ( !nIsBullet2 ) { - SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE.Which() ); + SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); sal_uInt16 nAbsLSpace = (sal_uInt16)( ( _nTextOfs * 2540 ) / 576 ); sal_uInt16 nFirstLineOffset = nAbsLSpace - (sal_uInt16)( ( _nBulletOfs * 2540 ) / 576 ); aLRSpaceItem.SetLeft( nAbsLSpace ); @@ -6240,7 +6240,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& } else { - SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE.Which() ); + SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); aLRSpaceItem.SetLeft( 0 ); aLRSpaceItem.SetTextFirstLineOfstValue( 0 ); rSet.Put( aLRSpaceItem ); @@ -6255,12 +6255,12 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& } if ( GetAttrib( PPT_ParaAttr_AsianLB_1, nVal, nDestinationInstance ) ) - rSet.Put(SvxForbiddenRuleItem(nVal != 0, EE_PARA_FORBIDDENRULES.Which())); + rSet.Put(SvxForbiddenRuleItem(nVal != 0, EE_PARA_FORBIDDENRULES)); if ( GetAttrib( PPT_ParaAttr_AsianLB_3, nVal, nDestinationInstance ) ) - rSet.Put(SvxHangingPunctuationItem(nVal != 0, EE_PARA_HANGINGPUNCTUATION.Which())); + rSet.Put(SvxHangingPunctuationItem(nVal != 0, EE_PARA_HANGINGPUNCTUATION)); if ( GetAttrib( PPT_ParaAttr_BiDi, nVal, nDestinationInstance ) ) - rSet.Put( SvxFrameDirectionItem( nVal == 1 ? SvxFrameDirection::Horizontal_RL_TB : SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR.Which() ) ); + rSet.Put( SvxFrameDirectionItem( nVal == 1 ? SvxFrameDirection::Horizontal_RL_TB : SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR ) ); // LineSpacing PPTPortionObj* pPortion = First(); diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 6ea84eab3ebd..84d3464e571c 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -369,7 +369,7 @@ namespace frm } ParagraphDirectionHandler::ParagraphDirectionHandler( AttributeId _nAttributeId ) - :AttributeHandler( _nAttributeId, EE_PARA_WRITINGDIR.Which() ) + :AttributeHandler( _nAttributeId, EE_PARA_WRITINGDIR ) ,m_eParagraphDirection( SvxFrameDirection::Horizontal_LR_TB ) ,m_eDefaultAdjustment( SvxAdjust::Right ) ,m_eOppositeDefaultAdjustment( SvxAdjust::Left ) diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 4f0be32b9dee..b426c4cdae0b 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -323,7 +323,7 @@ public: template<class T> const T& GetParaAttrib( sal_Int32 nPara, TypedWhichId<T> nWhich ) { - return static_cast<const T&>(GetParaAttrib(nPara, nWhich.Which())); + return static_cast<const T&>(GetParaAttrib(nPara, sal_uInt16(nWhich))); } vcl::Font GetStandardFont( sal_Int32 nPara ); diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index d55a5da31123..321fa2ad5826 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -70,8 +70,8 @@ class SvxItemPropertySet; #define WID_PARAISNUMBERINGRESTART OWN_ATTR_VALUE_START+4 #define SVX_UNOEDIT_NUMBERING_PROPERTIE \ - {OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET.Which(), cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, \ - {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE.Which(),cppu::UnoType<bool>::get(), 0, 0 } + {OUString(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, \ + {OUString(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 } #define SVX_UNOEDIT_OUTLINER_PROPERTIES \ SVX_UNOEDIT_NUMBERING_PROPERTIE, \ @@ -138,18 +138,18 @@ class SvxItemPropertySet; #define SVX_UNOEDIT_PARA_PROPERTIES \ {OUString(UNO_NAME_EDIT_PARA_ADJUST), EE_PARA_JUST, ::cppu::UnoType<sal_Int16>::get(), 0, MID_PARA_ADJUST }, \ {OUString(UNO_NAME_EDIT_PARA_BMARGIN), EE_PARA_ULSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \ - {OUString(UNO_NAME_EDIT_PARA_IS_HYPHEN), EE_PARA_HYPHENATE.Which(), ::cppu::UnoType<bool>::get(), 0, 0 }, \ + {OUString(UNO_NAME_EDIT_PARA_IS_HYPHEN), EE_PARA_HYPHENATE, ::cppu::UnoType<bool>::get(), 0, 0 }, \ {OUString(UNO_NAME_EDIT_PARA_LASTLINEADJ), EE_PARA_JUST, ::cppu::UnoType<sal_Int16>::get(), 0, MID_LAST_LINE_ADJUST }, \ - {OUString(UNO_NAME_EDIT_PARA_LMARGIN), EE_PARA_LRSPACE.Which(), ::cppu::UnoType<sal_Int32>::get(), 0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \ + {OUString(UNO_NAME_EDIT_PARA_LMARGIN), EE_PARA_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \ {OUString(UNO_NAME_EDIT_PARA_LINESPACING), EE_PARA_SBL, cppu::UnoType<css::style::LineSpacing>::get(), 0, CONVERT_TWIPS}, \ - {OUString(UNO_NAME_EDIT_PARA_RMARGIN), EE_PARA_LRSPACE.Which(), ::cppu::UnoType<sal_Int32>::get(), 0, MID_R_MARGIN|SFX_METRIC_ITEM }, \ + {OUString(UNO_NAME_EDIT_PARA_RMARGIN), EE_PARA_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_R_MARGIN|SFX_METRIC_ITEM }, \ {OUString(UNO_NAME_EDIT_PARA_TAPSTOPS), EE_PARA_TABS, cppu::UnoType<css::uno::Sequence< css::style::TabStop >>::get(), 0, 0 }, \ {OUString(UNO_NAME_EDIT_PARA_TMARGIN), EE_PARA_ULSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_UP_MARGIN|SFX_METRIC_ITEM },\ - {OUString(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE.Which(), ::cppu::UnoType<sal_Int32>::get(), 0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \ - {OUString(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION.Which(), cppu::UnoType<bool>::get(), 0 ,0 }, \ - {OUString(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING.Which(), cppu::UnoType<bool>::get(), 0 ,0 }, \ - {OUString(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES), EE_PARA_FORBIDDENRULES.Which(), cppu::UnoType<bool>::get(), 0 ,0 },\ - {OUString("WritingMode"), EE_PARA_WRITINGDIR.Which(), ::cppu::UnoType<sal_Int16>::get(), 0, 0 } + {OUString(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \ + {OUString(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION, cppu::UnoType<bool>::get(), 0 ,0 }, \ + {OUString(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING, cppu::UnoType<bool>::get(), 0 ,0 }, \ + {OUString(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES), EE_PARA_FORBIDDENRULES, cppu::UnoType<bool>::get(), 0 ,0 },\ + {OUString("WritingMode"), EE_PARA_WRITINGDIR, ::cppu::UnoType<sal_Int16>::get(), 0, 0 } class SvxEditSource; class SvxTextForwarder; diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 22ea12cf4e24..f4f5d86f3a08 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -105,7 +105,7 @@ public: const SfxPoolItem* GetPoolDefaultItem( sal_uInt16 nWhich ) const; template<class T> const T* GetPoolDefaultItem( TypedWhichId<T> nWhich ) const - { return static_cast<const T*>(GetPoolDefaultItem(nWhich.Which())); } + { return static_cast<const T*>(GetPoolDefaultItem(sal_uInt16(nWhich))); } void ResetPoolDefaultItem( sal_uInt16 nWhich ); @@ -155,17 +155,17 @@ public: const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; template<class T> const T& GetDefaultItem( TypedWhichId<T> nWhich ) const - { return static_cast<const T&>(GetDefaultItem(nWhich.Which())); } + { return static_cast<const T&>(GetDefaultItem(sal_uInt16(nWhich))); } bool CheckItemInPool(const SfxPoolItem *) const; const SfxPoolItem * GetItem2(sal_uInt16 nWhich, sal_uInt32 nSurrogate) const; template<class T> const T* GetItem2( TypedWhichId<T> nWhich, sal_uInt32 nSurrogate ) const - { return dynamic_cast<const T*>(GetItem2(nWhich.Which(), nSurrogate)); } + { return dynamic_cast<const T*>(GetItem2(sal_uInt16(nWhich), nSurrogate)); } const SfxPoolItem * GetItem2Default(sal_uInt16 nWhich) const; template<class T> const T* GetItem2Default( TypedWhichId<T> nWhich ) const - { return static_cast<const T*>(GetItem2Default(nWhich.Which())); } + { return static_cast<const T*>(GetItem2Default(sal_uInt16(nWhich))); } sal_uInt32 GetItemCount2(sal_uInt16 nWhich) const; @@ -184,8 +184,6 @@ public: { return IsItemPoolable( rItem.Which() ); } void SetItemInfos( const SfxItemInfo *pInfos ); sal_uInt16 GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const; - template<class T> sal_uInt16 GetWhich( TypedWhichId<T> nSlot, bool bDeep = true ) const - { return GetWhich(nSlot.Which(), bDeep); } sal_uInt16 GetSlotId( sal_uInt16 nWhich ) const; sal_uInt16 GetTrueWhich( sal_uInt16 nSlot, bool bDeep = true ) const; sal_uInt16 GetTrueSlotId( sal_uInt16 nWhich ) const; diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 3254263c38ab..9291fd430421 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -135,7 +135,7 @@ public: template<class T> const T& Get( TypedWhichId<T> nWhich, bool bSrchInParent = true ) const { - return static_cast<const T&>(Get(nWhich.Which(), bSrchInParent)); + return static_cast<const T&>(Get(sal_uInt16(nWhich), bSrchInParent)); } /** This method eases accessing single Items in the SfxItemSet. @@ -157,7 +157,7 @@ public: } template<class T> const T* GetItem( TypedWhichId<T> nWhich, bool bSearchInParent = true ) const { - const SfxPoolItem* pItem = GetItem(nWhich.Which(), bSearchInParent); + const SfxPoolItem* pItem = GetItem(sal_uInt16(nWhich), bSearchInParent); const T* pCastedItem = dynamic_cast<const T*>(pItem); assert(!pItem || pCastedItem); // if it exists, must have the correct type @@ -181,23 +181,12 @@ public: SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true, const SfxPoolItem **ppItem = nullptr ) const; - template<class T> - SfxItemState GetItemState( TypedWhichId<T> nWhich, - bool bSrchInParent = true, - const SfxPoolItem **ppItem = nullptr ) const - { return GetItemState(nWhich.Which(), bSrchInParent, ppItem); } bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = nullptr) const; void DisableItem(sal_uInt16 nWhich); - template<class T> void DisableItem( TypedWhichId<T> nWhich ) - { DisableItem(nWhich.Which()); } void InvalidateItem( sal_uInt16 nWhich ); - template<class T> void InvalidateItem( TypedWhichId<T> nWhich ) - { InvalidateItem(nWhich.Which()); } sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); - template<class T> sal_uInt16 ClearItem( TypedWhichId<T> nWhich ) - { return ClearItem(nWhich.Which()); } void ClearInvalidItems(); void InvalidateAllItems(); // HACK(via nWhich = 0) ??? diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 2d5a6f567c0b..1f49b16400a5 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -150,10 +150,6 @@ public: assert(m_nRefCount==0); m_nWhich = nId; } - template<class T> void SetWhich( TypedWhichId<T> nId ) - { - SetWhich(nId.Which()); - } sal_uInt16 Which() const { return m_nWhich; } virtual bool operator==( const SfxPoolItem& ) const = 0; bool operator!=( const SfxPoolItem& rItem ) const @@ -180,7 +176,7 @@ public: SfxPoolItem* CloneSetWhich( sal_uInt16 nNewWhich ) const; template<class T> T* CloneSetWhich( TypedWhichId<T> nId ) const { - return static_cast<T*>(CloneSetWhich(nId.Which())); + return static_cast<T*>(CloneSetWhich(sal_uInt16(nId))); } sal_uInt32 GetRefCount() const { return m_nRefCount; } diff --git a/include/svl/typedwhich.hxx b/include/svl/typedwhich.hxx index c9cb3d8e3667..2c2141250d02 100644 --- a/include/svl/typedwhich.hxx +++ b/include/svl/typedwhich.hxx @@ -23,27 +23,26 @@ public: : mnWhich(nWhich) { } - constexpr sal_uInt16 Which() const { return mnWhich; } - //constexpr operator sal_uInt16() const { return mnWhich; } + constexpr operator sal_uInt16() const { return mnWhich; } private: sal_uInt16 const mnWhich; }; template <class T> constexpr bool operator==(sal_uInt16 lhs, TypedWhichId<T> const& rhs) { - return lhs == rhs.Which(); + return lhs == sal_uInt16(rhs); } template <class T> constexpr bool operator!=(sal_uInt16 lhs, TypedWhichId<T> const& rhs) { - return lhs != rhs.Which(); + return lhs != sal_uInt16(rhs); } template <class T> constexpr bool operator==(TypedWhichId<T> const& lhs, sal_uInt16 rhs) { - return lhs.Which() == rhs; + return sal_uInt16(lhs) == rhs; } template <class T> constexpr bool operator!=(TypedWhichId<T> const& lhs, sal_uInt16 rhs) { - return lhs.Which() != rhs; + return sal_uInt16(lhs) != rhs; } #endif // INCLUDED_SVL_TYPEDWHICH_HXX diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index af4f7ec72e21..2a7c629a05d3 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -585,7 +585,7 @@ public: template<class T> const T& GetMergedItem( TypedWhichId<T> nWhich ) const { - return static_cast<const T&>(GetMergedItem(nWhich.Which())); + return static_cast<const T&>(GetMergedItem(sal_uInt16(nWhich))); } // syntactical sugar for ItemSet accesses diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index b0e709b67dfa..103093b1741f 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -265,7 +265,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : SetScaleUnit(MapUnit::Map100thMM); SfxItemPool& rPool = GetItemPool(); rPool.SetDefaultMetric(MapUnit::Map100thMM); - SvxFrameDirectionItem aModeItem( SvxFrameDirection::Environment, EE_PARA_WRITINGDIR.Which() ); + SvxFrameDirectionItem aModeItem( SvxFrameDirection::Environment, EE_PARA_WRITINGDIR ); rPool.SetPoolDefaultItem( aModeItem ); // #i33700# @@ -278,7 +278,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : if (MsLangId::isKorean(eOfficeLanguage) || eOfficeLanguage == LANGUAGE_JAPANESE) { // secondary is edit engine pool - rPool.GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING.Which() ) ); + rPool.GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING ) ); } rPool.FreezeIdRanges(); // the pool is also used directly diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index b5fe55473f73..8238ea0b18e2 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -763,21 +763,21 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r rEditSet.Put( SvxPostureItem ( eCtlItalic, EE_CHAR_ITALIC_CTL ) ); rEditSet.Put( SvxContourItem ( bOutline, EE_CHAR_OUTLINE ) ); rEditSet.Put( SvxShadowedItem ( bShadow, EE_CHAR_SHADOW ) ); - rEditSet.Put( SvxForbiddenRuleItem(bForbidden, EE_PARA_FORBIDDENRULES.Which()) ); + rEditSet.Put( SvxForbiddenRuleItem(bForbidden, EE_PARA_FORBIDDENRULES) ); rEditSet.Put( SvxEmphasisMarkItem( eEmphasis, EE_CHAR_EMPHASISMARK ) ); rEditSet.Put( SvxCharReliefItem( eRelief, EE_CHAR_RELIEF ) ); rEditSet.Put( SvxLanguageItem ( eLang, EE_CHAR_LANGUAGE ) ); rEditSet.Put( SvxLanguageItem ( eCjkLang, EE_CHAR_LANGUAGE_CJK ) ); rEditSet.Put( SvxLanguageItem ( eCtlLang, EE_CHAR_LANGUAGE_CTL ) ); - rEditSet.Put( SfxBoolItem ( EE_PARA_HYPHENATE.Which(), bHyphenate ) ); - rEditSet.Put( SvxFrameDirectionItem( eDirection, EE_PARA_WRITINGDIR.Which() ) ); + rEditSet.Put( SfxBoolItem ( EE_PARA_HYPHENATE, bHyphenate ) ); + rEditSet.Put( SvxFrameDirectionItem( eDirection, EE_PARA_WRITINGDIR ) ); // Script spacing is always off. // The cell attribute isn't used here as long as there is no UI to set it // (don't evaluate attributes that can't be changed). // If a locale-dependent default is needed, it has to go into the cell // style, like the fonts. - rEditSet.Put( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING.Which() ) ); + rEditSet.Put( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING ) ); } void ScPatternAttr::FillEditItemSet( SfxItemSet* pEditSet, const SfxItemSet* pCondSet ) const diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 71524d74dc9d..bd5293e9b1c3 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1203,7 +1203,7 @@ void ScTextWnd::InitEditEngine() EditEngine::SetFontInfoInItemSet( *pSet, aTextFont ); lcl_ExtendEditFontAttribs( *pSet ); // turn off script spacing to match DrawText output - pSet->Put( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING.Which() ) ); + pSet->Put( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING ) ); if ( bIsRTL ) lcl_ModifyRTLDefaults( *pSet ); mpEditEngine->SetDefaults( pSet ); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index a6e7e99db274..95122e1c9e0d 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -450,9 +450,9 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(SID_ENABLE_HYPHENATION); if( pItem ) { - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE.Which(), EE_PARA_HYPHENATE.Which()>{} ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); bool bValue = pItem->GetValue(); - aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE.Which(), bValue ) ); + aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); pView->SetAttributes( aSet ); } rReq.Done(); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index f9a66daf5e88..597c26df9493 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -924,8 +924,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) sal_uInt16 nId = SID_ATTR_PARA_LRSPACE; const SvxLRSpaceItem& rItem = static_cast<const SvxLRSpaceItem&>( pArgs->Get( nId )); - SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which()>{} ); - nId = EE_PARA_LRSPACE.Which(); + SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + nId = EE_PARA_LRSPACE; SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(), rItem.GetRight(), rItem.GetTextLeft(), rItem.GetTextFirstLineOfst(), nId ); diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index bc0e8f35bff0..28050513064b 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -107,9 +107,9 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(SID_ENABLE_HYPHENATION); if( pItem ) { - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE.Which(), EE_PARA_HYPHENATE.Which()>{} ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); bool bValue = pItem->GetValue(); - aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE.Which(), bValue ) ); + aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); pView->SetAttributes( aSet ); } rReq.Done(); @@ -163,12 +163,12 @@ void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) case SID_ATTR_PARA_RIGHT_TO_LEFT: { SfxItemSet aAttr( pView->GetModel()->GetItemPool(), - svl::Items<EE_PARA_WRITINGDIR.Which(), EE_PARA_WRITINGDIR.Which(), + svl::Items<EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, EE_PARA_JUST, EE_PARA_JUST>{} ); bool bLeft = ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT ); aAttr.Put( SvxFrameDirectionItem( bLeft ? SvxFrameDirection::Horizontal_LR_TB : SvxFrameDirection::Horizontal_RL_TB, - EE_PARA_WRITINGDIR.Which() ) ); + EE_PARA_WRITINGDIR ) ); aAttr.Put( SvxAdjustItem( bLeft ? SvxAdjust::Left : SvxAdjust::Right, EE_PARA_JUST ) ); diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 772a60df0df4..12236ffdac7f 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1703,7 +1703,7 @@ void ScPrintFunc::MakeEditEngine() //! there's no way to set the background for note pages pEditDefaults->ClearItem( EE_CHAR_COLOR ); if (ScGlobal::IsSystemRTL()) - pEditDefaults->Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR.Which() ) ); + pEditDefaults->Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR ) ); } pEditEngine->SetData( aFieldData ); // Set page count etc. diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index c6ad5a56fba5..ff30462fc3c9 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -241,7 +241,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // for korean and japanese languages we have a different default for apply spacing between asian, latin and ctl text if (MsLangId::isKorean(eRealCTLLanguage) || (LANGUAGE_JAPANESE == eRealCTLLanguage)) { - GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING.Which() ) ); + GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING ) ); } // Set DefTab and SpellOptions for the SD module diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 3c12d11e64c8..4fc6bba2d5d7 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -218,7 +218,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(SvxColorItem(Color(COL_AUTO), EE_CHAR_COLOR )); // Paragraph attributes (Edit Engine) - rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE.Which())); + rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE)); rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE)); rISet.Put( makeSdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default @@ -233,7 +233,7 @@ void SdDrawDocument::CreateLayoutTemplates() // Bullet // BulletItem and BulletFont for title and outline - SvxBulletItem aBulletItem(EE_PARA_BULLET.Which()); + SvxBulletItem aBulletItem(EE_PARA_BULLET); // Identical in all layers aBulletItem.SetStyle(SvxBulletStyle::BULLET); aBulletItem.SetStart(1); @@ -352,7 +352,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); - SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE.Which() ); + SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE ); aLRSpaceItem.SetTextFirstLineOfst(600); // Indentation of first line: 6mm; right: 0 pISet->Put(aLRSpaceItem); @@ -411,7 +411,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(SvxFontHeightItem(1270, 100, EE_CHAR_FONTHEIGHT )); // 36 pt - SvxLRSpaceItem aLRSpItem( 200, 200, 0, 0, EE_PARA_LRSPACE.Which()); + SvxLRSpaceItem aLRSpItem( 200, 200, 0, 0, EE_PARA_LRSPACE); pISet->Put( aLRSpItem ); // Indentation of first line: 0 mm; left and right: 2 mm pISet->Put(SvxULSpaceItem(100, 100, EE_PARA_ULSPACE )); // Paragraph margin above/below: 1 mm @@ -578,7 +578,7 @@ void SdDrawDocument::CreateDefaultCellStyles() rISet.Put(SvxColorItem(Color(COL_AUTO), EE_CHAR_COLOR )); // Paragraph attributes (Edit Engine) - rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE.Which())); + rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE)); rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE)); rISet.Put( makeSdrTextLeftDistItem( 250 ) ); @@ -1188,7 +1188,7 @@ void SdDrawDocument::RenameLayoutTemplate(const OUString& rOldLayoutName, const void SdDrawDocument::SetTextDefaults() const { // BulletItem and BulletFont for Title and Outline - SvxBulletItem aBulletItem(EE_PARA_BULLET.Which()); + SvxBulletItem aBulletItem(EE_PARA_BULLET); vcl::Font aBulletFont( SdStyleSheetPool::GetBulletFont() ); aBulletFont.SetFontSize(Size(0,846)); // 24 pt aBulletItem.SetFont(aBulletFont); @@ -1221,7 +1221,7 @@ void SdDrawDocument::SetTextDefaults() const aNumRule.SetLevel( i, aNumberFormat ); } - SvxNumBulletItem aNumBulletItem( aNumRule, EE_PARA_NUMBULLET.Which() ); + SvxNumBulletItem aNumBulletItem( aNumRule, EE_PARA_NUMBULLET ); pItemPool->SetPoolDefaultItem( aNumBulletItem ); } @@ -1262,7 +1262,7 @@ void SdDrawDocument::SetDefaultWritingMode(css::text::WritingMode eMode ) return; } - SvxFrameDirectionItem aModeItem( nVal, EE_PARA_WRITINGDIR.Which() ); + SvxFrameDirectionItem aModeItem( nVal, EE_PARA_WRITINGDIR ); pItemPool->SetPoolDefaultItem( aModeItem ); SvxAdjustItem aAdjust( SvxAdjust::Left, EE_PARA_JUST ); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 7870627411c5..9654035413aa 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2149,7 +2149,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P } // Remove LRSpace item - SfxItemSet aSet(pModel->GetPool(), svl::Items<EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which()>{} ); + SfxItemSet aSet(pModel->GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); aSet.Put(pNewObj->GetMergedItemSet()); @@ -2187,7 +2187,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P pNewObj->SetEmptyPresObj(false); // reset left indent - SfxItemSet aSet(pModel->GetPool(), svl::Items<EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which()>{} ); + SfxItemSet aSet(pModel->GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); aSet.Put(pNewObj->GetMergedItemSet()); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index df43cb8c0535..6283edca1486 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -210,7 +210,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool OUString aName(STR_LAYOUT_OUTLINE); OUString aHelpFile; - SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE.Which() ); + SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE ); SvxULSpaceItem aSvxULSpaceItem( EE_PARA_ULSPACE ); for( sal_Int32 nLevel = 1; nLevel < 10; nLevel++) @@ -459,7 +459,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool rNotesSet.Put( SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF) ); rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) ); rNotesSet.Put( SvxBackgroundColorItem( Color(COL_AUTO), EE_CHAR_BKGCOLOR ) ); - rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE.Which() ) ); + rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) ); // #i16874# enable kerning by default but only for new documents rNotesSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) ); @@ -1106,7 +1106,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumRule.SetLevel( i, aNumberFormat ); } - rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET.Which() ) ); + rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) ); static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SfxHintId::DataChanged ) ); } break; @@ -1138,7 +1138,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumRule.SetLevel(i, aFrmt); } - rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET.Which() ) ); + rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) ); static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SfxHintId::DataChanged ) ); } } @@ -1163,7 +1163,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumRule.SetLevel( i, aNumberFormat ); } - rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET.Which() ) ); + rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) ); static_cast<SfxStyleSheet*>(pSheet)->Broadcast(SfxHint( SfxHintId::DataChanged ) ); } break; diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 0f1fe5824910..a691b0667970 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -120,7 +120,7 @@ OutlineBulletDlg::OutlineBulletDlg( SvxNumRule aNewRule( *pRule ); aNewRule.SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS ); - SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET.Which() ); + SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aInputSet.Put(aNewItem); } } diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 4565e0b5e81f..5ef3fb1800fc 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -351,7 +351,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u SvxNumRule aNewRule( *pLclRule ); aNewRule.SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS ); - SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET.Which() ); + SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aNewAttr.Put(aNewItem); } } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 059ff5e61102..fa14378f2da0 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -218,7 +218,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) {SID_ATTR_BORDER_SHADOW, SID_ATTR_BORDER_SHADOW}, {XATTR_FILL_FIRST, XATTR_FILL_LAST}, {SID_ATTR_PAGE_COLOR,SID_ATTR_PAGE_FILLSTYLE}, - {EE_PARA_WRITINGDIR.Which(), EE_PARA_WRITINGDIR.Which()}}); + {EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR}}); // Retrieve additional data for dialog @@ -229,7 +229,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) aNewAttr.Put( SvxFrameDirectionItem( mpDoc->GetDefaultWritingMode() == css::text::WritingMode_RL_TB ? SvxFrameDirection::Horizontal_RL_TB : SvxFrameDirection::Horizontal_LR_TB, - EE_PARA_WRITINGDIR.Which() ) ); + EE_PARA_WRITINGDIR ) ); // Retrieve page-data for dialog diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 191cd65c362f..ff7eaa096ea8 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -420,7 +420,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if(pFirstStyleSheet) { - pFirstStyleSheet->GetItemSet().Put( SvxNumBulletItem( aRule, EE_PARA_NUMBULLET.Which() )); + pFirstStyleSheet->GetItemSet().Put( SvxNumBulletItem( aRule, EE_PARA_NUMBULLET )); SdStyleSheet* pRealSheet = static_cast<SdStyleSheet*>(pFirstStyleSheet)->GetRealStyleSheet(); pRealSheet->Broadcast(SfxHint(SfxHintId::DataChanged)); } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 6e539965659e..945b5b856660 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -266,7 +266,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SvxLRSpaceItem aLRSpace = static_cast<const SvxLRSpaceItem&>(pArgs->Get( GetPool().GetWhich(SID_ATTR_PARA_LRSPACE))); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which()>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); aLRSpace.SetWhich( EE_PARA_LRSPACE ); aEditAttr.Put( aLRSpace ); @@ -278,11 +278,11 @@ void TextObjectBar::Execute( SfxRequest &rReq ) case SID_HANGING_INDENT: { - SfxItemSet aLRSpaceSet( GetPool(), svl::Items<EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which()>{} ); + SfxItemSet aLRSpaceSet( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); mpView->GetAttributes( aLRSpaceSet ); SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( EE_PARA_LRSPACE ) ); - SvxLRSpaceItem aNewMargin( EE_PARA_LRSPACE.Which() ); + SvxLRSpaceItem aNewMargin( EE_PARA_LRSPACE ); aNewMargin.SetTextLeft( aParaMargin.GetTextLeft() + aParaMargin.GetTextFirstLineOfst() ); aNewMargin.SetRight( aParaMargin.GetRight() ); aNewMargin.SetTextFirstLineOfst( ( aParaMargin.GetTextFirstLineOfst() ) * (-1) ); @@ -394,7 +394,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) aNewRule.SetLevel(nLevel, aFmt); } - pFirstStyleSheet->GetItemSet().Put(SvxNumBulletItem(aNewRule, EE_PARA_NUMBULLET.Which())); + pFirstStyleSheet->GetItemSet().Put(SvxNumBulletItem(aNewRule, EE_PARA_NUMBULLET)); SdStyleSheet::BroadcastSdStyleSheetChange(pFirstStyleSheet, PO_OUTLINE_1, pSSPool); } @@ -601,13 +601,13 @@ void TextObjectBar::Execute( SfxRequest &rReq ) if( bLeftToRight ) { - aNewAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR.Which() ) ); + aNewAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR ) ); if( nAdjust == SvxAdjust::Right ) aNewAttr.Put( SvxAdjustItem( SvxAdjust::Left, EE_PARA_JUST ) ); } else { - aNewAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR.Which() ) ); + aNewAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR ) ); if( nAdjust == SvxAdjust::Left ) aNewAttr.Put( SvxAdjustItem( SvxAdjust::Right, EE_PARA_JUST ) ); } diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index b98e4acddda6..6e327c690ae1 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -669,16 +669,16 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( pItem ) { - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE.Which(), EE_PARA_HYPHENATE.Which()>{} ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); bool bValue = pItem->GetValue(); - aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE.Which(), bValue ) ); + aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } else // only for testing purpose { OSL_FAIL(" no value for hyphenation!"); - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE.Which(), EE_PARA_HYPHENATE.Which()>{} ); - aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE.Which(), true ) ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); + aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, true ) ); mpDrawView->SetAttributes( aSet ); } rReq.Done(); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index b2e9d1c2330d..109a83061684 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -742,7 +742,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) SvxLRSpaceItem aLRSpace = static_cast<const SvxLRSpaceItem&>(pArgs->Get( GetPool().GetWhich(SID_ATTR_PARA_LRSPACE))); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which()>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); aLRSpace.SetWhich( EE_PARA_LRSPACE ); aEditAttr.Put( aLRSpace ); @@ -760,9 +760,9 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) static const sal_uInt16 aWhichTable[]= { - EE_PARA_OUTLLEVEL.Which(), EE_PARA_OUTLLEVEL.Which(), - EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which(), - EE_PARA_NUMBULLET.Which(), EE_PARA_NUMBULLET.Which(), + EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL, + EE_PARA_LRSPACE, EE_PARA_LRSPACE, + EE_PARA_NUMBULLET, EE_PARA_NUMBULLET, 0, 0 }; @@ -770,7 +770,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) aWhichTable ); mpDrawView->GetAttributes( aEditAttr ); - nId = EE_PARA_LRSPACE.Which(); + nId = EE_PARA_LRSPACE; SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(), rItem.GetRight(), rItem.GetTextLeft(), rItem.GetTextFirstLineOfst(), nId ); @@ -832,7 +832,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) // only put lrSpace item SfxItemSet aEditAttrReduced( GetDoc()->GetPool(), - svl::Items<EE_PARA_LRSPACE.Which(), EE_PARA_LRSPACE.Which()>{} ); + svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); aEditAttrReduced.Put( aLRSpaceItem ); mpDrawView->SetAttributes( aEditAttrReduced ); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 97c74ad2a011..67d509d913c7 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -86,7 +86,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie , mbFirstPaint(true) , mpProgress(nullptr) , maDocColor( COL_WHITE ) -, maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE.Which() ) +, maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE ) { bool bInitOutliner = false; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index e46103b4c40a..82a6e67db3cc 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -951,7 +951,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& SvxNumRule aNewRule( *pRule ); aNewRule.SetFeatureFlag( SvxNumRuleFlags::NO_NUMBERS ); - SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET.Which() ); + SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET ); aNewAttr.Put(aNewItem); } } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 4d6bddb01fbc..1bde1afca7f0 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -565,12 +565,12 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) case SDRATTR_GRAFMODE : pResId = SIP_SA_GRAFMODE;break; case SDRATTR_GRAFCROP : pResId = SIP_SA_GRAFCROP;break; - case EE_PARA_HYPHENATE.Which() : pResId = SIP_EE_PARA_HYPHENATE;break; - case EE_PARA_BULLETSTATE.Which(): pResId = SIP_EE_PARA_BULLETSTATE;break; - case EE_PARA_OUTLLRSPACE.Which(): pResId = SIP_EE_PARA_OUTLLRSPACE;break; - case EE_PARA_OUTLLEVEL.Which() : pResId = SIP_EE_PARA_OUTLLEVEL;break; - case EE_PARA_BULLET.Which() : pResId = SIP_EE_PARA_BULLET;break; - case EE_PARA_LRSPACE.Which() : pResId = SIP_EE_PARA_LRSPACE;break; + case EE_PARA_HYPHENATE : pResId = SIP_EE_PARA_HYPHENATE;break; + case EE_PARA_BULLETSTATE: pResId = SIP_EE_PARA_BULLETSTATE;break; + case EE_PARA_OUTLLRSPACE: pResId = SIP_EE_PARA_OUTLLRSPACE;break; + case EE_PARA_OUTLLEVEL : pResId = SIP_EE_PARA_OUTLLEVEL;break; + case EE_PARA_BULLET : pResId = SIP_EE_PARA_BULLET;break; + case EE_PARA_LRSPACE : pResId = SIP_EE_PARA_LRSPACE;break; case EE_PARA_ULSPACE : pResId = SIP_EE_PARA_ULSPACE;break; case EE_PARA_SBL : pResId = SIP_EE_PARA_SBL;break; case EE_PARA_JUST : pResId = SIP_EE_PARA_JUST;break; diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index e65dd89523ac..48234bd84ae0 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -575,7 +575,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) SfxItemSet aAttr( *aNewAttr.GetPool(), svl::Items< - EE_PARA_WRITINGDIR.Which(), EE_PARA_WRITINGDIR.Which(), + EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, EE_PARA_JUST, EE_PARA_JUST>{}); SvxAdjust nAdjust = SvxAdjust::Left; @@ -584,13 +584,13 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) if( bLeftToRight ) { - aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR.Which() ) ); + aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR ) ); if( nAdjust == SvxAdjust::Right ) aAttr.Put( SvxAdjustItem( SvxAdjust::Left, EE_PARA_JUST ) ); } else { - aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR.Which() ) ); + aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR ) ); if( nAdjust == SvxAdjust::Left ) aAttr.Put( SvxAdjustItem( SvxAdjust::Right, EE_PARA_JUST ) ); } diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 4c11e1cecb62..b414398e3d0d 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -536,7 +536,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) SfxItemSet aAttr( *aNewAttr.GetPool(), svl::Items< - EE_PARA_WRITINGDIR.Which(), EE_PARA_WRITINGDIR.Which(), + EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, EE_PARA_JUST, EE_PARA_JUST>{}); SvxAdjust nAdjust = SvxAdjust::Left; @@ -545,13 +545,13 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) if( bLeftToRight ) { - aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR.Which() ) ); + aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_LR_TB, EE_PARA_WRITINGDIR ) ); if( nAdjust == SvxAdjust::Right ) aAttr.Put( SvxAdjustItem( SvxAdjust::Left, EE_PARA_JUST ) ); } else { - aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR.Which() ) ); + aAttr.Put( SvxFrameDirectionItem( SvxFrameDirection::Horizontal_RL_TB, EE_PARA_WRITINGDIR ) ); if( nAdjust == SvxAdjust::Left ) aAttr.Put( SvxAdjustItem( SvxAdjust::Right, EE_PARA_JUST ) ); } diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index b06dc59965bf..04e2bcdfa32b 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -752,7 +752,7 @@ bool SwView::IsDrawTextHyphenate() bool bHyphenate = false; SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool(), - svl::Items<EE_PARA_HYPHENATE.Which(), EE_PARA_HYPHENATE.Which()>{} ); + svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); if( pSdrView->GetAttributes( aNewAttr ) && aNewAttr.GetItemState( EE_PARA_HYPHENATE ) >= SfxItemState::DEFAULT ) bHyphenate = aNewAttr.Get( EE_PARA_HYPHENATE ).GetValue(); @@ -765,8 +765,8 @@ void SwView::HyphenateDrawText() SdrView *pSdrView = m_pWrtShell->GetDrawView(); bool bHyphenate = IsDrawTextHyphenate(); - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE.Which(), EE_PARA_HYPHENATE.Which()>{} ); - aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE.Which(), !bHyphenate ) ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); + aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, !bHyphenate ) ); pSdrView->SetAttributes( aSet ); GetViewFrame()->GetBindings().Invalidate(FN_HYPHENATE_OPT_DLG); } |