diff options
24 files changed, 112 insertions, 112 deletions
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 9600ca627442..7610e3eee420 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -295,7 +295,7 @@ private: void Initialize(); void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); - void SetEscapement_Impl( sal_uInt16 nEsc ); + void SetEscapement_Impl( SvxEscapement nEsc ); DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 2684039e004e..99563d6a9afb 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2715,16 +2715,16 @@ void SvxCharPositionPage::UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscPro } -void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) +void SvxCharPositionPage::SetEscapement_Impl( SvxEscapement nEsc ) { - SvxEscapementItem aEscItm( (SvxEscapement)nEsc, SID_ATTR_CHAR_ESCAPEMENT ); + SvxEscapementItem aEscItm( nEsc, SID_ATTR_CHAR_ESCAPEMENT ); - if ( SVX_ESCAPEMENT_SUPERSCRIPT == nEsc ) + if ( SvxEscapement::Superscript == nEsc ) { aEscItm.GetEsc() = m_nSuperEsc; aEscItm.GetProportionalHeight() = m_nSuperProp; } - else if ( SVX_ESCAPEMENT_SUBSCRIPT == nEsc ) + else if ( SvxEscapement::Subscript == nEsc ) { aEscItm.GetEsc() = m_nSubEsc; aEscItm.GetProportionalHeight() = m_nSubProp; @@ -2735,7 +2735,7 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) m_pHighLowMF->SetValue( aEscItm.GetEsc() * nFac ); m_pFontSizeMF->SetValue( aEscItm.GetProportionalHeight() ); - if ( SVX_ESCAPEMENT_OFF == nEsc ) + if ( SvxEscapement::Off == nEsc ) { m_pHighLowFT->Disable(); m_pHighLowMF->Disable(); @@ -2764,12 +2764,12 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) { - sal_uInt16 nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL + SvxEscapement nEsc = SvxEscapement::Off; // also when pBtn == NULL if ( m_pHighPosBtn == pBtn ) - nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; + nEsc = SvxEscapement::Superscript; else if ( m_pLowPosBtn == pBtn ) - nEsc = SVX_ESCAPEMENT_SUBSCRIPT; + nEsc = SvxEscapement::Subscript; SetEscapement_Impl( nEsc ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index c6ab046ddc8b..e76b527d0469 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2238,7 +2238,7 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const sal_uInt16 SvxEscapementItem::GetValueCount() const { - return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 + return (sal_uInt16)SvxEscapement::End; // SvxEscapement::Subscript + 1 } @@ -2265,7 +2265,7 @@ bool SvxEscapementItem::GetPresentation OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" ); + DBG_ASSERT( nPos < (sal_uInt16)SvxEscapement::End, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); } @@ -2273,10 +2273,10 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const sal_uInt16 SvxEscapementItem::GetEnumValue() const { if ( nEsc < 0 ) - return SVX_ESCAPEMENT_SUBSCRIPT; + return (sal_uInt16)SvxEscapement::Subscript; else if ( nEsc > 0 ) - return SVX_ESCAPEMENT_SUPERSCRIPT; - return SVX_ESCAPEMENT_OFF; + return (sal_uInt16)SvxEscapement::Superscript; + return (sal_uInt16)SvxEscapement::Off; } diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index fce2049d9ae3..ededc66730cb 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -237,12 +237,12 @@ namespace frm EscapementHandler::EscapementHandler( AttributeId _nAttributeId ) :AttributeHandler( _nAttributeId, EE_CHAR_ESCAPEMENT ) - ,m_eEscapement( SVX_ESCAPEMENT_OFF ) + ,m_eEscapement( SvxEscapement::Off ) { switch ( getAttribute() ) { - case SID_SET_SUPER_SCRIPT : m_eEscapement = SVX_ESCAPEMENT_SUPERSCRIPT; break; - case SID_SET_SUB_SCRIPT : m_eEscapement = SVX_ESCAPEMENT_SUBSCRIPT; break; + case SID_SET_SUPER_SCRIPT : m_eEscapement = SvxEscapement::Superscript; break; + case SID_SET_SUB_SCRIPT : m_eEscapement = SvxEscapement::Subscript; break; default: OSL_FAIL( "EscapementHandler::EscapementHandler: invalid slot!" ); break; @@ -264,7 +264,7 @@ namespace frm (void)_pAdditionalArg; bool bIsChecked = getCheckState( _rCurrentAttribs ) == eChecked; - _rNewAttribs.Put( SvxEscapementItem( bIsChecked ? SVX_ESCAPEMENT_OFF : m_eEscapement, getWhich() ) ); + _rNewAttribs.Put( SvxEscapementItem( bIsChecked ? SvxEscapement::Off : m_eEscapement, getWhich() ) ); } SlotHandler::SlotHandler( AttributeId _nAttributeId, WhichId _nWhichId ) diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 516fd8a8290a..e7aab1305f9f 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -67,13 +67,13 @@ public: inline void SetEscapement( const SvxEscapement eNew ) { - if( SVX_ESCAPEMENT_OFF == eNew ) + if( SvxEscapement::Off == eNew ) { nEsc = 0; nProp = 100; } else - if( SVX_ESCAPEMENT_SUPERSCRIPT == eNew ) + if( SvxEscapement::Superscript == eNew ) { nEsc = DFLT_ESC_SUPER; nProp = DFLT_ESC_PROP; diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index e624f574100e..7c8530ce9899 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -30,12 +30,12 @@ enum SvxCaseMap SVX_CASEMAP_END }; -enum SvxEscapement +enum class SvxEscapement { - SVX_ESCAPEMENT_OFF, - SVX_ESCAPEMENT_SUPERSCRIPT, - SVX_ESCAPEMENT_SUBSCRIPT, - SVX_ESCAPEMENT_END + Off, + Superscript, + Subscript, + End }; enum SvxShadowLocation diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 016b8e63e1ce..bef1af0c0952 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -170,7 +170,7 @@ void setSuffixCell( aEngine.SetEditTextObjectPool(rDoc.GetEditPool()); SfxItemSet aAttr = aEngine.GetEmptyItemSet(); - aAttr.Put( SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT)); + aAttr.Put( SvxEscapementItem( SvxEscapement::Superscript, EE_CHAR_ESCAPEMENT)); aEngine.SetText( aValue ); aEngine.QuickInsertText( aOrdinalSuffix, diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 933227a116a9..9c4d1c22fc76 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -886,9 +886,9 @@ static const char* lcl_ToVerticalAlignmentRun( SvxEscapement eEscapement, bool& bHaveAlignment = true; switch( eEscapement ) { - case SVX_ESCAPEMENT_SUPERSCRIPT: return "superscript"; - case SVX_ESCAPEMENT_SUBSCRIPT: return "subscript"; - case SVX_ESCAPEMENT_OFF: + case SvxEscapement::Superscript: return "superscript"; + case SvxEscapement::Subscript: return "subscript"; + case SvxEscapement::Off: default: bHaveAlignment = false; return "baseline"; } } diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index d6b0014fdf9f..90870ec23da9 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -286,11 +286,11 @@ FontLineStyle XclFontData::GetScUnderline() const SvxEscapement XclFontData::GetScEscapement() const { - SvxEscapement eScEscapem = SVX_ESCAPEMENT_OFF; + SvxEscapement eScEscapem = SvxEscapement::Off; switch( mnEscapem ) { - case EXC_FONTESC_SUPER: eScEscapem = SVX_ESCAPEMENT_SUPERSCRIPT; break; - case EXC_FONTESC_SUB: eScEscapem = SVX_ESCAPEMENT_SUBSCRIPT; break; + case EXC_FONTESC_SUPER: eScEscapem = SvxEscapement::Superscript; break; + case EXC_FONTESC_SUB: eScEscapem = SvxEscapement::Subscript; break; } return eScEscapem; } @@ -710,7 +710,7 @@ void XclFontPropSetHelper::WriteFontProperties( lclWriteChartFont( rPropSet, maHlpChCmplx, maHlpChCmplxNoName, rFontData, bHasCmplx ); // font escapement - if( rFontData.GetScEscapement() != SVX_ESCAPEMENT_OFF ) + if( rFontData.GetScEscapement() != SvxEscapement::Off ) { maHlpChEscapement.InitializeWrite(); maHlpChEscapement << rFontData.GetApiEscapement() << EXC_API_ESC_HEIGHT; diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 572947236fd9..456e2a5560d0 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -960,11 +960,11 @@ void Font::fillToItemSet( SfxItemSet& rItemSet, bool bEditEngineText, bool bSkip } if( maUsedFlags.mbEscapementUsed ) { - SvxEscapement eScEscapem = SVX_ESCAPEMENT_OFF; + SvxEscapement eScEscapem = SvxEscapement::Off; if ( maApiData.mnEscapement == API_ESCAPE_SUPERSCRIPT ) - eScEscapem = SVX_ESCAPEMENT_SUPERSCRIPT; + eScEscapem = SvxEscapement::Superscript; else if ( maApiData.mnEscapement == API_ESCAPE_SUBSCRIPT ) - eScEscapem = SVX_ESCAPEMENT_SUBSCRIPT; + eScEscapem = SvxEscapement::Subscript; if( bEditEngineText ) { // #TODO handle EscapementHeight diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index da9bb2f23753..d9dd73e40844 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -183,7 +183,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu if ( nId == EE_CHAR_ESCAPEMENT ) // Super-/Subscript always via EE { if ( (SvxEscapement)static_cast<const SvxEscapementItem*>(pItem)->GetEnumValue() - != SVX_ESCAPEMENT_OFF ) + != SvxEscapement::Off ) bSimple = false; } } diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 6c6165bdc2ac..3e428457f632 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -720,10 +720,10 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Superscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT ); + aItem.SetEscapement( SvxEscapement::Superscript ); aNewAttr.Put( aItem ); } break; @@ -734,10 +734,10 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Subscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT ); + aItem.SetEscapement( SvxEscapement::Subscript ); aNewAttr.Put( aItem ); } break; @@ -1096,9 +1096,9 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) + if( eEsc == SvxEscapement::Superscript ) rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); - else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) + else if( eEsc == SvxEscapement::Subscript ) rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); // Unterstreichung diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 182f8eaf3159..63b82daedbb3 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2328,9 +2328,9 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE SfxItemSet aAttr = aEngine.GetEmptyItemSet(); aEngine.SetText(aStr); if( nValue < 0 ) // Subscript - aAttr.Put( SvxEscapementItem( SVX_ESCAPEMENT_SUBSCRIPT, EE_CHAR_ESCAPEMENT ) ); + aAttr.Put( SvxEscapementItem( SvxEscapement::Subscript, EE_CHAR_ESCAPEMENT ) ); else // Superscript - aAttr.Put( SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT ) ); + aAttr.Put( SvxEscapementItem( SvxEscapement::Superscript, EE_CHAR_ESCAPEMENT ) ); aEngine.QuickSetAttribs(aAttr, ESelection(0, 0, 0, aStr.getLength())); // The cell will own the text object instance. diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 50a8ff76b6c8..5782387e0787 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -1035,8 +1035,8 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) { SvxEscapement eOld = (SvxEscapement) static_cast<const SvxEscapementItem&>( pEditView->GetAttribs().Get(EE_CHAR_ESCAPEMENT)).GetEnumValue(); - SvxEscapement eNew = (eOld == SVX_ESCAPEMENT_SUPERSCRIPT) ? - SVX_ESCAPEMENT_OFF : SVX_ESCAPEMENT_SUPERSCRIPT; + SvxEscapement eNew = (eOld == SvxEscapement::Superscript) ? + SvxEscapement::Off : SvxEscapement::Superscript; aSet.Put( SvxEscapementItem( eNew, EE_CHAR_ESCAPEMENT ) ); rBindings.Invalidate( nSlot ); } @@ -1045,8 +1045,8 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) { SvxEscapement eOld = (SvxEscapement) static_cast<const SvxEscapementItem&>( pEditView->GetAttribs().Get(EE_CHAR_ESCAPEMENT)).GetEnumValue(); - SvxEscapement eNew = (eOld == SVX_ESCAPEMENT_SUBSCRIPT) ? - SVX_ESCAPEMENT_OFF : SVX_ESCAPEMENT_SUBSCRIPT; + SvxEscapement eNew = (eOld == SvxEscapement::Subscript) ? + SvxEscapement::Off : SvxEscapement::Subscript; aSet.Put( SvxEscapementItem( eNew, EE_CHAR_ESCAPEMENT ) ); rBindings.Invalidate( nSlot ); } @@ -1158,11 +1158,11 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aAttribs.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) + if( eEsc == SvxEscapement::Superscript ) { rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); } - else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) + else if( eEsc == SvxEscapement::Subscript ) { rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 237a451c007e..0a0de09320b3 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -583,9 +583,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) + if( eEsc == SvxEscapement::Superscript ) rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); - else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) + else if( eEsc == SvxEscapement::Subscript ) rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 07ef59768610..d2d33463e47c 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -536,10 +536,10 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Superscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT ); + aItem.SetEscapement( SvxEscapement::Superscript ); aNewAttr.Put( aItem ); } break; @@ -549,10 +549,10 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Subscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT ); + aItem.SetEscapement( SvxEscapement::Subscript ); aNewAttr.Put( aItem ); } break; @@ -661,10 +661,10 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Superscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT ); + aItem.SetEscapement( SvxEscapement::Superscript ); aNewAttr.Put( aItem ); rReq.Done( aNewAttr ); pArgs = rReq.GetArgs(); @@ -675,10 +675,10 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Subscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT ); + aItem.SetEscapement( SvxEscapement::Subscript ); aNewAttr.Put( aItem ); rReq.Done( aNewAttr ); pArgs = rReq.GetArgs(); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index abe829c7fc37..db985f2db4eb 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -3039,10 +3039,10 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT ); SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Subscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT ); + aItem.SetEscapement( SvxEscapement::Subscript ); aNewAttr.Put( aItem ); } break; @@ -3051,10 +3051,10 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT ); SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Superscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT ); + aItem.SetEscapement( SvxEscapement::Superscript ); aNewAttr.Put( aItem ); } break; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 15bb40e9aa6c..e75001f347ba 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -724,11 +724,11 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>( pSet->Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) + if( eEsc == SvxEscapement::Superscript ) { rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); } - else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) + else if( eEsc == SvxEscapement::Subscript ) { rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index da8a62ab65c7..8b0c40a8922e 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3139,8 +3139,7 @@ bool SwTextNode::GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx, if( !sExpand.isEmpty() ) { ++aDestIdx; // insert behind - SvxEscapementItem aItem( - SVX_ESCAPEMENT_SUPERSCRIPT ); + SvxEscapementItem aItem( SvxEscapement::Superscript, RES_CHRATR_ESCAPEMENT ); rDestNd.InsertItem( aItem, aDestIdx.GetIndex(), diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index a842c8f437a8..1a116fc84c44 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1223,11 +1223,11 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem ) switch( (const SvxEscapement) static_cast<const SvxEscapementItem&>(rItem).GetEnumValue() ) { - case SVX_ESCAPEMENT_SUPERSCRIPT: - case SVX_ESCAPEMENT_SUBSCRIPT: + case SvxEscapement::Superscript: + case SvxEscapement::Subscript: eState = HTML_ON_VALUE; break; - case SVX_ESCAPEMENT_OFF: + case SvxEscapement::Off: eState = HTML_OFF_VALUE; break; default: @@ -2812,8 +2812,8 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char *pStr = nullptr; switch( eEscape ) { - case SVX_ESCAPEMENT_SUPERSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_superscript; break; - case SVX_ESCAPEMENT_SUBSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_subscript; break; + case SvxEscapement::Superscript: pStr = OOO_STRING_SVTOOLS_HTML_superscript; break; + case SvxEscapement::Subscript: pStr = OOO_STRING_SVTOOLS_HTML_subscript; break; default: ; } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 397bead2b84c..206d55089c66 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3915,7 +3915,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt) bMustWrite = static_cast< const SvxCrossedOutItem& >(rHt).GetStrikeout() != STRIKEOUT_NONE; break; case RES_CHRATR_ESCAPEMENT: - bMustWrite = static_cast< const SvxEscapementItem& >(rHt).GetEscapement() != SVX_ESCAPEMENT_OFF; + bMustWrite = static_cast< const SvxEscapementItem& >(rHt).GetEscapement() != SvxEscapement::Off; break; case RES_CHRATR_FONT: bMustWrite = true; diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 8fff09ef6d3e..09883893c315 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -362,10 +362,10 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Superscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT ); + aItem.SetEscapement( SvxEscapement::Superscript ); aNewAttr.Put( aItem ); } break; @@ -375,10 +375,10 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Subscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT ); + aItem.SetEscapement( SvxEscapement::Subscript ); aNewAttr.Put( aItem ); } break; @@ -726,14 +726,14 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) case FN_SET_SUPER_SCRIPT: case FN_SET_SUB_SCRIPT: { - sal_uInt16 nEsc; + SvxEscapement nEsc; if (nWhich==FN_SET_SUPER_SCRIPT) - nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; + nEsc = SvxEscapement::Superscript; else - nEsc = SVX_ESCAPEMENT_SUBSCRIPT; + nEsc = SvxEscapement::Subscript; const SfxPoolItem *pEscItem = &aEditAttr.Get( EE_CHAR_ESCAPEMENT ); - if( nEsc == static_cast<const SvxEscapementItem*>(pEscItem)->GetEnumValue() ) + if( nEsc == static_cast<const SvxEscapementItem*>(pEscItem)->GetEscapement() ) rSet.Put( SfxBoolItem( nWhich, true )); else rSet.InvalidateItem( nWhich ); diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index a894e3b98324..08a2ea217712 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -293,10 +293,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Superscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT ); + aItem.SetEscapement( SvxEscapement::Superscript ); aNewAttr.Put( aItem ); } break; @@ -306,10 +306,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>( aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); - if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - aItem.SetEscapement( SVX_ESCAPEMENT_OFF ); + if( eEsc == SvxEscapement::Subscript ) + aItem.SetEscapement( SvxEscapement::Off ); else - aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT ); + aItem.SetEscapement( SvxEscapement::Subscript ); aNewAttr.Put( aItem ); } break; @@ -594,7 +594,8 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) SfxItemSet aEditAttr( pOLV->GetAttribs() ); const SfxPoolItem *pAdjust = nullptr, *pLSpace = nullptr, *pEscItem = nullptr; - int eAdjust, nLSpace, nEsc; + int eAdjust, nLSpace; + SvxEscapement nEsc; while(nWhich) { @@ -721,9 +722,9 @@ ASK_LINESPACE: } break; - case FN_SET_SUPER_SCRIPT: nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; + case FN_SET_SUPER_SCRIPT: nEsc = SvxEscapement::Superscript; goto ASK_ESCAPE; - case FN_SET_SUB_SCRIPT: nEsc = SVX_ESCAPEMENT_SUBSCRIPT; + case FN_SET_SUB_SCRIPT: nEsc = SvxEscapement::Subscript; goto ASK_ESCAPE; ASK_ESCAPE: { @@ -731,7 +732,7 @@ ASK_ESCAPE: pEscItem = &aEditAttr.Get( EE_CHAR_ESCAPEMENT ); if( nEsc == static_cast<const SvxEscapementItem*>( - pEscItem)->GetEnumValue() ) + pEscItem)->GetEscapement() ) bFlag = true; else nSlotId = 0; diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index bbc78e62a899..64d6370f4751 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -86,7 +86,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) case FN_SET_SUB_SCRIPT: case FN_SET_SUPER_SCRIPT: { - SvxEscapement eEscape = SVX_ESCAPEMENT_SUBSCRIPT; + SvxEscapement eEscape = SvxEscapement::Subscript; switch (eState) { case STATE_TOGGLE: @@ -94,11 +94,11 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) short nTmpEsc = static_cast<const SvxEscapementItem&>( aSet.Get( RES_CHRATR_ESCAPEMENT )).GetEsc(); eEscape = nWhich == FN_SET_SUPER_SCRIPT ? - SVX_ESCAPEMENT_SUPERSCRIPT: - SVX_ESCAPEMENT_SUBSCRIPT; + SvxEscapement::Superscript: + SvxEscapement::Subscript; if( (nWhich == FN_SET_SUB_SCRIPT && nTmpEsc < 0) || (nWhich == FN_SET_SUPER_SCRIPT && nTmpEsc > 0) ) - eEscape = SVX_ESCAPEMENT_OFF; + eEscape = SvxEscapement::Off; SfxBindings& rBind = GetView().GetViewFrame()->GetBindings(); if( nWhich == FN_SET_SUB_SCRIPT ) @@ -112,17 +112,17 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) break; case STATE_ON: eEscape = nWhich == FN_SET_SUPER_SCRIPT ? - SVX_ESCAPEMENT_SUPERSCRIPT: - SVX_ESCAPEMENT_SUBSCRIPT; + SvxEscapement::Superscript: + SvxEscapement::Subscript; break; case STATE_OFF: - eEscape = SVX_ESCAPEMENT_OFF; + eEscape = SvxEscapement::Off; break; } SvxEscapementItem aEscape( eEscape, RES_CHRATR_ESCAPEMENT ); - if(eEscape == SVX_ESCAPEMENT_SUPERSCRIPT) + if(eEscape == SvxEscapement::Superscript) aEscape.GetEsc() = DFLT_ESC_AUTO_SUPER; - else if(eEscape == SVX_ESCAPEMENT_SUBSCRIPT) + else if(eEscape == SvxEscapement::Subscript) aEscape.GetEsc() = DFLT_ESC_AUTO_SUB; rSh.SetAttrItem( aEscape ); rReq.AppendItem( aEscape ); |