diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-15 17:15:31 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-18 07:15:21 +0100 |
commit | 39c618caf5aa19da95285bec6cab7108bee3984c (patch) | |
tree | ea579195273f6796b0b386c98867232f1771d0d0 | |
parent | 12bb4bc980863d4338725cf5a5dcaf3acbfddc09 (diff) |
convert EEHorizontalTextDirection to scoped enum
Change-Id: Icb7298742ae80fa17d5e6f6a3a09a6bb30892b6d
Reviewed-on: https://gerrit.libreoffice.org/46590
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 6 | ||||
-rw-r--r-- | include/editeng/editdata.hxx | 2 | ||||
-rw-r--r-- | sc/inc/document.hxx | 3 | ||||
-rw-r--r-- | sc/source/core/data/documen8.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/formatsh.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/view/output2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/output3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/view/vdraw.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 2 |
13 files changed, 26 insertions, 25 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 1597764a4927..5d2b0d27e8a3 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -137,7 +137,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : nAsianCompressionMode = CharCompressType::NONE; - eDefaultHorizontalTextDirection = EE_HTEXTDIR_DEFAULT; + eDefaultHorizontalTextDirection = EEHorizontalTextDirection::Default; aStatus.GetControlWord() = EEControlBits::USECHARATTRIBS | EEControlBits::DOIDLEFORMAT | @@ -1971,12 +1971,12 @@ bool ImpEditEngine::IsRightToLeft( sal_Int32 nPara ) const if ( !IsVertical() ) { - bR2L = GetDefaultHorizontalTextDirection() == EE_HTEXTDIR_R2L; + bR2L = GetDefaultHorizontalTextDirection() == EEHorizontalTextDirection::R2L; pFrameDirItem = &GetParaAttrib( nPara, EE_PARA_WRITINGDIR ); if ( pFrameDirItem->GetValue() == SvxFrameDirection::Environment ) { // #103045# if DefaultHorizontalTextDirection is set, use that value, otherwise pool default. - if ( GetDefaultHorizontalTextDirection() != EE_HTEXTDIR_DEFAULT ) + if ( GetDefaultHorizontalTextDirection() != EEHorizontalTextDirection::Default ) { pFrameDirItem = nullptr; // bR2L already set to default horizontal text direction } diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index eef5770900a1..9e71c81a2dd8 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -34,7 +34,7 @@ class SvxRTFItemStackType; enum class HtmlTokenId : sal_Int16; enum class EETextFormat { Text = 0x20, Rtf, Html = 0x32, Xml }; -enum EEHorizontalTextDirection { EE_HTEXTDIR_DEFAULT, EE_HTEXTDIR_L2R, EE_HTEXTDIR_R2L }; +enum class EEHorizontalTextDirection { Default, L2R, R2L }; enum class EESelectionMode { Std, TxtOnly, Hidden }; // EE_SELMODE_HIDDEN can be used to completely hide the selection. This is useful e.g. when you want show the selection // only as long as your window (which the edit view works on) has the focus diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 5c1b93763d1c..ac3025ffb1d8 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -55,6 +55,7 @@ enum class SvtScriptType; enum class ScMF; enum class FormulaError : sal_uInt16; enum class CharCompressType; +enum class EEHorizontalTextDirection; namespace editeng { class SvxBorderLine; } namespace formula { struct VectorRefArray; } namespace svl { @@ -2032,7 +2033,7 @@ public: void SetAsianKerning(bool bNew); void ApplyAsianEditSettings(ScEditEngineDefaulter& rEngine); - sal_uInt8 GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values + EEHorizontalTextDirection GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;} void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index c474f068c49e..24dda526ec6d 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -360,9 +360,9 @@ bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNe return bWasInUse; } -sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const +EEHorizontalTextDirection ScDocument::GetEditTextDirection(SCTAB nTab) const { - EEHorizontalTextDirection eRet = EE_HTEXTDIR_DEFAULT; + EEHorizontalTextDirection eRet = EEHorizontalTextDirection::Default; OUString aStyleName = GetPageStyle( nTab ); SfxStyleSheetBase* pStyle = mxPoolHelper->GetStylePool()->Find( aStyleName, SfxStyleFamily::Page ); @@ -373,13 +373,13 @@ sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const rStyleSet.Get( ATTR_WRITINGDIR ).GetValue(); if ( eDirection == SvxFrameDirection::Horizontal_LR_TB ) - eRet = EE_HTEXTDIR_L2R; + eRet = EEHorizontalTextDirection::L2R; else if ( eDirection == SvxFrameDirection::Horizontal_RL_TB ) - eRet = EE_HTEXTDIR_R2L; + eRet = EEHorizontalTextDirection::R2L; // else (invalid for EditEngine): keep "default" } - return sal::static_int_cast<sal_uInt8>(eRet); + return eRet; } ScMacroManager* ScDocument::GetMacroManager() diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 7cf8faa1d231..4afd6f76e4a1 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -783,7 +783,7 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab ) ScDocument* pDoc = rViewData.GetDocument(); pDoc->ApplyAsianEditSettings( *mpEditEngine ); mpEditEngine->SetDefaultHorizontalTextDirection( - (EEHorizontalTextDirection)pDoc->GetEditTextDirection( rViewData.GetTabNo() ) ); + pDoc->GetEditTextDirection( rViewData.GetTabNo() ) ); mpEditEngine->SetFirstWordCapitalization( false ); } diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 3069a5a855e2..3e428992b63e 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -1170,7 +1170,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) if ( eAttrDir == SvxFrameDirection::Environment ) { // get "environment" direction from page style - if ( pViewData->GetDocument()->GetEditTextDirection( pViewData->GetTabNo() ) == EE_HTEXTDIR_R2L ) + if ( pViewData->GetDocument()->GetEditTextDirection( pViewData->GetTabNo() ) == EEHorizontalTextDirection::R2L ) eAttrDir = SvxFrameDirection::Horizontal_RL_TB; else eAttrDir = SvxFrameDirection::Horizontal_LR_TB; diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 63021b4810f2..786dad811bbe 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -93,7 +93,7 @@ ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits nBits, ScEditWindowLoc pEdEngine->SetControlWord( pEdEngine->GetControlWord() | EEControlBits::MARKFIELDS ); mbRTL = ScGlobal::IsSystemRTL(); if (mbRTL) - pEdEngine->SetDefaultHorizontalTextDirection(EE_HTEXTDIR_R2L); + pEdEngine->SetDefaultHorizontalTextDirection(EEHorizontalTextDirection::R2L); pEdView = new EditView( pEdEngine, this ); pEdView->SetOutputArea( tools::Rectangle( Point(0,0), GetOutputSize() ) ); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 0716ff89a815..c1938e213908 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2737,17 +2737,17 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) rAttrSet.Get( ATTR_VERTICAL_ASIAN ).GetValue(); bool bBidiDontCare = (rAttrSet.GetItemState( ATTR_WRITINGDIR ) == SfxItemState::DONTCARE); - EEHorizontalTextDirection eBidiDir = EE_HTEXTDIR_DEFAULT; + EEHorizontalTextDirection eBidiDir = EEHorizontalTextDirection::Default; if ( !bBidiDontCare ) { SvxFrameDirection eCellDir = rAttrSet.Get( ATTR_WRITINGDIR ).GetValue(); if ( eCellDir == SvxFrameDirection::Environment ) - eBidiDir = (EEHorizontalTextDirection)GetViewData()->GetDocument()-> + eBidiDir = GetViewData()->GetDocument()-> GetEditTextDirection( GetViewData()->GetTabNo() ); else if ( eCellDir == SvxFrameDirection::Horizontal_RL_TB ) - eBidiDir = EE_HTEXTDIR_R2L; + eBidiDir = EEHorizontalTextDirection::R2L; else - eBidiDir = EE_HTEXTDIR_L2R; + eBidiDir = EEHorizontalTextDirection::L2R; } SvtLanguageOptions aLangOpt; @@ -2786,9 +2786,9 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) else if ( bBidiDontCare ) rSet.InvalidateItem( nWhich ); else if ( nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT ) - rSet.Put( SfxBoolItem( nWhich, eBidiDir == EE_HTEXTDIR_L2R ) ); + rSet.Put( SfxBoolItem( nWhich, eBidiDir == EEHorizontalTextDirection::L2R ) ); else - rSet.Put( SfxBoolItem( nWhich, eBidiDir == EE_HTEXTDIR_R2L ) ); + rSet.Put( SfxBoolItem( nWhich, eBidiDir == EEHorizontalTextDirection::R2L ) ); } } nWhich = aIter.NextWhich(); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index effa25a89b13..25bc75f745ce 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2123,7 +2123,7 @@ ScFieldEditEngine* ScOutputData::CreateOutputEditEngine() pEngine->SetControlWord( nCtrl ); mpDoc->ApplyAsianEditSettings( *pEngine ); pEngine->EnableAutoColor( mbUseStyleColor ); - pEngine->SetDefaultHorizontalTextDirection( (EEHorizontalTextDirection)mpDoc->GetEditTextDirection( nTab ) ); + pEngine->SetDefaultHorizontalTextDirection( mpDoc->GetEditTextDirection( nTab ) ); return pEngine; } diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 4fdf0a2b67aa..9cb20ad3c1ad 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -178,7 +178,7 @@ void ScOutputData::DrawSelectiveObjects(SdrLayerID nLayer) SdrOutliner& rOutl = pModel->GetDrawOutliner(); rOutl.EnableAutoColor( mbUseStyleColor ); rOutl.SetDefaultHorizontalTextDirection( - (EEHorizontalTextDirection)mpDoc->GetEditTextDirection( nTab ) ); + mpDoc->GetEditTextDirection( nTab ) ); // #i69767# The hyphenator must be set (used to be before drawing a text shape with hyphenation). // LinguMgr::GetHyphenator (EditEngine) uses a wrapper now that creates the real hyphenator on demand, diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 1728e4990927..a7fe6dc18ce8 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -3472,7 +3472,7 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const } rOutl.SetDefaultHorizontalTextDirection( - (EEHorizontalTextDirection)pLocalDoc->GetEditTextDirection( nTabNo ) ); + pLocalDoc->GetEditTextDirection( nTabNo ) ); } ScAddress ScViewData::GetCurPos() const diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 6f1c02898f76..5cd851f2c66e 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -114,7 +114,7 @@ void SwViewShellImp::PaintLayer( const SdrLayerID _nLayerID, Color aOldOutlinerBackgrdColor; // set default horizontal text direction on painting <hell> or // <heaven>. - EEHorizontalTextDirection aOldEEHoriTextDir = EE_HTEXTDIR_L2R; + EEHorizontalTextDirection aOldEEHoriTextDir = EEHorizontalTextDirection::L2R; const IDocumentDrawModelAccess& rIDDMA = GetShell()->getIDocumentDrawModelAccess(); if ( (_nLayerID == rIDDMA.GetHellId()) || (_nLayerID == rIDDMA.GetHeavenId()) ) @@ -131,7 +131,7 @@ void SwViewShellImp::PaintLayer( const SdrLayerID _nLayerID, aOldEEHoriTextDir = GetDrawView()->GetModel()->GetDrawOutliner().GetDefaultHorizontalTextDirection(); EEHorizontalTextDirection aEEHoriTextDirOfPage = - _bIsPageRightToLeft ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; + _bIsPageRightToLeft ? EEHorizontalTextDirection::R2L : EEHorizontalTextDirection::L2R; GetDrawView()->GetModel()->GetDrawOutliner().SetDefaultHorizontalTextDirection( aEEHoriTextDirOfPage ); } diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 013e40085d02..4366440bf8d4 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -538,7 +538,7 @@ bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, // set default horizontal text direction at outliner EEHorizontalTextDirection aDefHoriTextDir = - pSh->IsShapeDefaultHoriTextDirR2L() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; + pSh->IsShapeDefaultHoriTextDirR2L() ? EEHorizontalTextDirection::R2L : EEHorizontalTextDirection::L2R; pOutliner->SetDefaultHorizontalTextDirection( aDefHoriTextDir ); } |