From 5ec1b04b9bfe949316c67b1282f7f8fa066c3b60 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Dec 2016 14:59:51 +0200 Subject: convert EnumContext::Application to scoped enum Change-Id: Ia289a7b63bf8797085315218785e2a2a4c45d232 Reviewed-on: https://gerrit.libreoffice.org/32230 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- .../sidebar/ContextChangeEventMultiplexer.cxx | 2 +- svx/source/sidebar/line/LinePropertyPanel.cxx | 6 +- .../sidebar/paragraph/ParaLineSpacingControl.cxx | 22 ++-- svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 118 ++++++++++----------- svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 48 ++++----- .../sidebar/possize/PosSizePropertyPanel.cxx | 52 ++++----- svx/source/sidebar/text/TextPropertyPanel.cxx | 30 +++--- 7 files changed, 139 insertions(+), 139 deletions(-) (limited to 'svx/source') diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index f8dbc13110f2..43a15143e53e 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -76,7 +76,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( // Ignore it. } return vcl::EnumContext::GetApplicationName( - vcl::EnumContext::Application_None); + vcl::EnumContext::Application::NONE); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 45396bc00a21..e3f26039ff7d 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -188,9 +188,9 @@ void LinePropertyPanel::HandleContextChange( switch(maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_Calc, Context_DrawLine): - case CombinedEnumContext(Application_DrawImpress, Context_DrawLine): - case CombinedEnumContext(Application_WriterVariants, Context_Draw): + case CombinedEnumContext(Application::Calc, Context_DrawLine): + case CombinedEnumContext(Application::DrawImpress, Context_DrawLine): + case CombinedEnumContext(Application::WriterVariants, Context_Draw): // TODO : Implement DrawLine context in Writer bShowArrows = true; break; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 46ca5b89fcd8..3ee1dd4e50a3 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -213,14 +213,14 @@ void ParaLineSpacingControl::Initialize() { switch (currentContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_DrawImpress, Context_Table): - case CombinedEnumContext(Application_DrawImpress, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): - case CombinedEnumContext(Application_Calc, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_Annotation): + case CombinedEnumContext(Application::DrawImpress, Context_Table): + case CombinedEnumContext(Application::DrawImpress, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::Calc, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_Annotation): { mpLineDist->RemoveEntry(LLINESPACE_FIX); } @@ -230,9 +230,9 @@ void ParaLineSpacingControl::Initialize() { switch (currentContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Table): { mpLineDist->InsertEntry(OUString("Fixed"), LLINESPACE_FIX); } diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 65a203fc36a9..13e96ce3404c 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -82,59 +82,59 @@ void ParaPropertyPanel::HandleContextChange ( maContext = rContext; switch (maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_Calc, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_DrawText): + case CombinedEnumContext(Application::Calc, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_DrawText): mpTBxVertAlign->Show(); mpTBxBackColor->Hide(); mpTBxNumBullet->Hide(); ReSize(false); break; - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): - case CombinedEnumContext(Application_DrawImpress, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_Table): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::DrawImpress, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_Table): mpTBxVertAlign->Show(); mpTBxBackColor->Hide(); mpTBxNumBullet->Show(); ReSize(true); break; - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Text): mpTBxVertAlign->Hide(); mpTBxBackColor->Show(); mpTBxNumBullet->Show(); ReSize(true); break; - case CombinedEnumContext(Application_WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Table): mpTBxVertAlign->Show(); mpTBxBackColor->Show(); mpTBxNumBullet->Show(); ReSize(true); break; - case CombinedEnumContext(Application_WriterVariants, Context_Annotation): + case CombinedEnumContext(Application::WriterVariants, Context_Annotation): mpTBxVertAlign->Hide(); mpTBxBackColor->Hide(); mpTBxNumBullet->Hide(); ReSize(false); break; - case CombinedEnumContext(Application_Calc, Context_EditCell): - case CombinedEnumContext(Application_Calc, Context_Cell): - case CombinedEnumContext(Application_Calc, Context_Pivot): - case CombinedEnumContext(Application_DrawImpress, Context_Text): - case CombinedEnumContext(Application_DrawImpress, Context_OutlineText): + case CombinedEnumContext(Application::Calc, Context_EditCell): + case CombinedEnumContext(Application::Calc, Context_Cell): + case CombinedEnumContext(Application::Calc, Context_Pivot): + case CombinedEnumContext(Application::DrawImpress, Context_Text): + case CombinedEnumContext(Application::DrawImpress, Context_OutlineText): break; default: break; } - mpTBxOutline->Show( maContext.GetApplication_DI() == vcl::EnumContext::Application_DrawImpress ); + mpTBxOutline->Show( maContext.GetApplication_DI() == vcl::EnumContext::Application::DrawImpress ); } void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent) @@ -199,9 +199,9 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, v { switch (maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Table): { SfxBoolItem aMargin( SID_INC_INDENT, true ); GetBindings()->GetDispatcher()->ExecuteList( @@ -228,9 +228,9 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, v { switch (maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Table): { SfxBoolItem aMargin( SID_DEC_INDENT, true ); GetBindings()->GetDispatcher()->ExecuteList( @@ -327,23 +327,23 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat switch (maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_Annotation): - case CombinedEnumContext(Application_Calc, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): - case CombinedEnumContext(Application_DrawImpress, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_Annotation): + case CombinedEnumContext(Application::Calc, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::DrawImpress, Context_Table): { mpLeftIndent->SetMin( DEFAULT_VALUE ); mpRightIndent->SetMin( DEFAULT_VALUE ); mpFLineIndent->SetMin( DEFAULT_VALUE ); } break; - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Table): { mpLeftIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); mpRightIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); @@ -371,9 +371,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM ); nVal = (long)mpLeftIndent->Normalize( (long)nVal ); - if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) - && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) - && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table)) + if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text) + && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default) + && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table)) { mpFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM ); } @@ -383,22 +383,22 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat switch (maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Table): - case CombinedEnumContext(Application_WriterVariants, Context_Annotation): + case CombinedEnumContext(Application::WriterVariants, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Annotation): { mpLeftIndent->SetMax( MAX_SW - nrVal, FUNIT_100TH_MM ); mpRightIndent->SetMax( MAX_SW - nVal, FUNIT_100TH_MM ); mpFLineIndent->SetMax( MAX_SW - nVal - nrVal, FUNIT_100TH_MM ); } break; - case CombinedEnumContext(Application_DrawImpress, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_Table): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::DrawImpress, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_Table): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): { mpLeftIndent->SetMax( MAX_SC_SD - nrVal, FUNIT_100TH_MM ); mpRightIndent->SetMax( MAX_SC_SD - nVal, FUNIT_100TH_MM ); @@ -419,9 +419,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat const sal_uInt16 nIdDecrIndent = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT); mpTbxIndent_IncDec->EnableItem(nIdHangingIndent); - if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) - && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) - && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) + if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text) + && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default) + && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table) ) { mpTbxIndent_IncDec->EnableItem(nIdIncrIndent); mpTbxIndent_IncDec->EnableItem(nIdDecrIndent); @@ -432,9 +432,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat mpLeftIndent-> Disable(); mpRightIndent->Disable(); mpFLineIndent->Disable(); - if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) && - maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) && - maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) + if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text) && + maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default) && + maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table) ) mpTbxIndent_IncDec->Disable(); else mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false); @@ -444,9 +444,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat mpLeftIndent->SetEmptyFieldValue(); mpRightIndent->SetEmptyFieldValue(); mpFLineIndent->SetEmptyFieldValue(); - if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) && - maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) && - maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) + if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text) && + maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default) && + maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table) ) mpTbxIndent_IncDec->Disable(); else mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false); @@ -492,9 +492,9 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if ( ( maContext.GetCombinedContext_DI() == CombinedEnumContext(Application_WriterVariants, Context_Text) - || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application_WriterVariants, Context_Default) - || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application_WriterVariants, Context_Table) ) + if ( ( maContext.GetCombinedContext_DI() == CombinedEnumContext(Application::WriterVariants, Context_Text) + || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application::WriterVariants, Context_Default) + || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application::WriterVariants, Context_Table) ) && ( nSID == SID_INC_INDENT || nSID == SID_DEC_INDENT ) ) { // Writer's text shell is the only one which provides reasonable states for Slots SID_INC_INDENT and SID_DEC_INDENT diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index 41a7e45bab1c..e822d2224709 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -147,23 +147,23 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat switch(m_aContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_Annotation): - case CombinedEnumContext(Application_Calc, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): - case CombinedEnumContext(Application_DrawImpress, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_Annotation): + case CombinedEnumContext(Application::Calc, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::DrawImpress, Context_Table): { m_pBeforeSpacing->SetMin(DEFAULT_VALUE); m_pAfterSpacing->SetMin(DEFAULT_VALUE); m_pFLSpacing->SetMin(DEFAULT_VALUE); } break; - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Table): { m_pBeforeSpacing->SetMin(NEGA_MAXVALUE, FUNIT_100TH_MM); m_pAfterSpacing->SetMin(NEGA_MAXVALUE, FUNIT_100TH_MM); @@ -185,9 +185,9 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat aTxtLeft = (long)m_pBeforeSpacing->Normalize(aTxtLeft); - if(m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) - && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) - && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table)) + if(m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text) + && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default) + && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table)) { m_pFLSpacing->SetMin(aTxtLeft*(-1), FUNIT_100TH_MM); } @@ -196,22 +196,22 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat switch(m_aContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Default): - case CombinedEnumContext(Application_WriterVariants, Context_Table): - case CombinedEnumContext(Application_WriterVariants, Context_Annotation): + case CombinedEnumContext(Application::WriterVariants, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Default): + case CombinedEnumContext(Application::WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Annotation): { m_pBeforeSpacing->SetMax(MAX_SW - aTxtRight, FUNIT_100TH_MM); m_pAfterSpacing->SetMax(MAX_SW - aTxtLeft, FUNIT_100TH_MM); m_pFLSpacing->SetMax(MAX_SW - aTxtLeft - aTxtRight, FUNIT_100TH_MM); } break; - case CombinedEnumContext(Application_DrawImpress, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_Table): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::DrawImpress, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_Table): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): { m_pBeforeSpacing->SetMax(MAX_SC_SD - aTxtRight, FUNIT_100TH_MM); m_pAfterSpacing->SetMax(MAX_SC_SD - aTxtLeft, FUNIT_100TH_MM); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 09703ceffadd..89b9a00efe04 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -264,37 +264,37 @@ void PosSizePropertyPanel::HandleContextChange( switch (maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_WriterVariants, Context_Draw): + case CombinedEnumContext(Application::WriterVariants, Context_Draw): bShowAngle = true; bShowFlip = true; break; - case CombinedEnumContext(Application_WriterVariants, Context_Graphic): + case CombinedEnumContext(Application::WriterVariants, Context_Graphic): bShowFlip = true; break; - case CombinedEnumContext(Application_Calc, Context_Draw): - case CombinedEnumContext(Application_Calc, Context_DrawLine): - case CombinedEnumContext(Application_Calc, Context_Graphic): - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_DrawLine): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::Calc, Context_Draw): + case CombinedEnumContext(Application::Calc, Context_DrawLine): + case CombinedEnumContext(Application::Calc, Context_Graphic): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_DrawLine): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): bShowPosition = true; bShowAngle = true; bShowFlip = true; break; - case CombinedEnumContext(Application_Calc, Context_Chart): - case CombinedEnumContext(Application_Calc, Context_Form): - case CombinedEnumContext(Application_Calc, Context_Media): - case CombinedEnumContext(Application_Calc, Context_OLE): - case CombinedEnumContext(Application_Calc, Context_MultiObject): - case CombinedEnumContext(Application_DrawImpress, Context_Media): - case CombinedEnumContext(Application_DrawImpress, Context_Form): - case CombinedEnumContext(Application_DrawImpress, Context_OLE): - case CombinedEnumContext(Application_DrawImpress, Context_3DObject): - case CombinedEnumContext(Application_DrawImpress, Context_MultiObject): + case CombinedEnumContext(Application::Calc, Context_Chart): + case CombinedEnumContext(Application::Calc, Context_Form): + case CombinedEnumContext(Application::Calc, Context_Media): + case CombinedEnumContext(Application::Calc, Context_OLE): + case CombinedEnumContext(Application::Calc, Context_MultiObject): + case CombinedEnumContext(Application::DrawImpress, Context_Media): + case CombinedEnumContext(Application::DrawImpress, Context_Form): + case CombinedEnumContext(Application::DrawImpress, Context_OLE): + case CombinedEnumContext(Application::DrawImpress, Context_3DObject): + case CombinedEnumContext(Application::DrawImpress, Context_MultiObject): bShowPosition = true; break; } @@ -763,8 +763,8 @@ void PosSizePropertyPanel::NotifyItemUpdate( const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier()); - if(((nCombinedContext == CombinedEnumContext(Application_DrawImpress, Context_Draw) - || nCombinedContext == CombinedEnumContext(Application_DrawImpress, Context_TextObject) + if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_Draw) + || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_TextObject) ) && OBJ_EDGE == eKind) || OBJ_CAPTION == eKind) { @@ -787,8 +787,8 @@ void PosSizePropertyPanel::NotifyItemUpdate( const SdrObject* pObj = rMarkList.GetMark(nMarkObj)->GetMarkedSdrObj(); const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier()); - if(((nCombinedContext == CombinedEnumContext(Application_DrawImpress, Context_Draw) - || nCombinedContext == CombinedEnumContext(Application_DrawImpress, Context_TextObject) + if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_Draw) + || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_TextObject) ) && OBJ_EDGE == eKind) || OBJ_CAPTION == eKind) { @@ -810,7 +810,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( } } - if(nCombinedContext == CombinedEnumContext(Application_DrawImpress, Context_TextObject)) + if(nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_TextObject)) { mpFlipTbx->Disable(); mpFtFlip->Disable(); @@ -855,8 +855,8 @@ void PosSizePropertyPanel::executeSize() SfxAllEnumItem aPointItem (SID_ATTR_TRANSFORM_SIZE_POINT, (sal_uInt16)RectPoint::LT); const sal_Int32 nCombinedContext(maContext.GetCombinedContext_DI()); - if( nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_Graphic) - || nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_OLE) + if( nCombinedContext == CombinedEnumContext(Application::WriterVariants, Context_Graphic) + || nCombinedContext == CombinedEnumContext(Application::WriterVariants, Context_OLE) ) { GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM, diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 6014b1fa067a..95bd906321ff 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -103,31 +103,31 @@ void TextPropertyPanel::HandleContextChange ( switch (maContext.GetCombinedContext_DI()) { - case CombinedEnumContext(Application_Calc, Context_Cell): - case CombinedEnumContext(Application_Calc, Context_Pivot): + case CombinedEnumContext(Application::Calc, Context_Cell): + case CombinedEnumContext(Application::Calc, Context_Pivot): // bNeedTextSpacing = false; break; - case CombinedEnumContext(Application_Calc, Context_EditCell): + case CombinedEnumContext(Application::Calc, Context_EditCell): bNeedTextSpacing = true; break; - case CombinedEnumContext(Application_Calc, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_DrawText): - case CombinedEnumContext(Application_WriterVariants, Context_Annotation): - case CombinedEnumContext(Application_DrawImpress, Context_DrawText): - case CombinedEnumContext(Application_DrawImpress, Context_Text): - case CombinedEnumContext(Application_DrawImpress, Context_Table): - case CombinedEnumContext(Application_DrawImpress, Context_OutlineText): - case CombinedEnumContext(Application_DrawImpress, Context_Draw): - case CombinedEnumContext(Application_DrawImpress, Context_TextObject): - case CombinedEnumContext(Application_DrawImpress, Context_Graphic): + case CombinedEnumContext(Application::Calc, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_DrawText): + case CombinedEnumContext(Application::WriterVariants, Context_Annotation): + case CombinedEnumContext(Application::DrawImpress, Context_DrawText): + case CombinedEnumContext(Application::DrawImpress, Context_Text): + case CombinedEnumContext(Application::DrawImpress, Context_Table): + case CombinedEnumContext(Application::DrawImpress, Context_OutlineText): + case CombinedEnumContext(Application::DrawImpress, Context_Draw): + case CombinedEnumContext(Application::DrawImpress, Context_TextObject): + case CombinedEnumContext(Application::DrawImpress, Context_Graphic): bNeedTextSpacing = true; bDrawText = true; break; - case CombinedEnumContext(Application_WriterVariants, Context_Text): - case CombinedEnumContext(Application_WriterVariants, Context_Table): + case CombinedEnumContext(Application::WriterVariants, Context_Text): + case CombinedEnumContext(Application::WriterVariants, Context_Table): bNeedTextSpacing = true; bWriterText = true; break; -- cgit