diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/column2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconrec.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconstr.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fudraw.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fusel.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/futext.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 21ae683ae443..d434239e0502 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -470,7 +470,7 @@ tools::Long ScColumn::GetNeededSize( pEngine->SetDefaults(std::move(pSet)); } - bool bEngineVertical = pEngine->IsVertical(); + bool bEngineVertical = pEngine->IsEffectivelyVertical(); pEngine->SetVertical( bAsianVertical ); pEngine->SetUpdateMode( true ); diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 2a927f999164..6e9056027009 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -140,7 +140,7 @@ bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) if ( auto pSdrTextObj = dynamic_cast<SdrTextObj*>( pObj) ) pSdrTextObj->ForceOutlinerParaObject(); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - if( pOPO && !pOPO->IsVertical() ) + if( pOPO && !pOPO->IsEffectivelyVertical() ) pOPO->SetVertical( true ); } } diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 28ce53300be9..1064a30e1093 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -149,7 +149,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) if ( dynamic_cast<const SdrTextObj*>( pObj) != nullptr && dynamic_cast<const SdrUnoObj*>( pObj) == nullptr ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - bool bVertical = ( pOPO && pOPO->IsVertical() ); + bool bVertical = ( pOPO && pOPO->IsEffectivelyVertical() ); sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; rViewShell.GetViewData().GetDispatcher(). diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index ab70e9094615..b55ccdfecd17 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -163,7 +163,7 @@ static bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell& rViewShell, const // but with bCursorToEnd instead of mouse position OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - bool bVertical = ( pOPO && pOPO->IsVertical() ); + bool bVertical = ( pOPO && pOPO->IsEffectivelyVertical() ); sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; // don't switch shells if text shell is already active diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 02af11bfe7ca..0e103948835f 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -481,7 +481,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) else if ( dynamic_cast<const SdrTextObj*>( pObj) != nullptr && dynamic_cast<const SdrUnoObj*>( pObj) == nullptr && dynamic_cast<const SdrMediaObj*>( pObj) == nullptr ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - bool bVertical = ( pOPO && pOPO->IsVertical() ); + bool bVertical = ( pOPO && pOPO->IsEffectivelyVertical() ); sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; rViewShell.GetViewData().GetDispatcher(). diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index e80ecb39bbf3..dc2f1d8ec8fb 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -191,7 +191,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if ( pOPO ) - bVertical = pOPO->IsVertical(); // content wins + bVertical = pOPO->IsEffectivelyVertical(); // content wins pO->SetVertical( bVertical ); //!?? the default values are not correct when result is without outliner ???!? @@ -576,7 +576,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if ( pOPO ) - bVertical = pOPO->IsVertical(); // content wins + bVertical = pOPO->IsEffectivelyVertical(); // content wins pO->SetVertical( bVertical ); //!?? without returned Outliner the defaults are not correct ???!? diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index effb52c917c1..87ac3d9b9ebe 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2574,7 +2574,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !nButtonDown && ScGlobal::ShouldOpenURL() && pFld ) SetPointer( PointerStyle::RefHand ); - else if ( pEditView->GetEditEngine()->IsVertical() ) + else if ( pEditView->GetEditEngine()->IsEffectivelyVertical() ) SetPointer( PointerStyle::TextVertical ); else SetPointer( PointerStyle::Text ); @@ -3172,7 +3172,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCCOL nCellX, S tools::Rectangle aVisArea = pEditView->GetVisArea(); Point aTextPos = PixelToLogic( rPosPixel ); - if ( pEditEngine->IsVertical() ) // have to manually transform position + if ( pEditEngine->IsEffectivelyVertical() ) // have to manually transform position { aTextPos -= aOutputArea.TopRight(); tools::Long nTemp = -aTextPos.X(); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 1e045bf35ca4..6809df0b38e5 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1586,7 +1586,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, bool bBreak = ( eJust == SvxCellHorJustify::Block ) || pPattern->GetItem(ATTR_LINEBREAK).GetValue(); - bool bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler + bool bAsianVertical = pNewEngine->IsEffectivelyVertical(); // set by InputHandler tools::Rectangle aPixRect = ScEditUtil(&mrDoc, nNewX, nNewY, nTabNo, GetScrPos(nNewX, nNewY, eWhich), pWin->GetOutDev(), nPPTX,nPPTY,GetZoomX(),GetZoomY() ). @@ -1879,7 +1879,7 @@ void ScViewData::EditGrowX() tools::Long nTextWidth = pEngine->CalcTextWidth(); bool bChanged = false; - bool bAsianVertical = pEngine->IsVertical(); + bool bAsianVertical = pEngine->IsEffectivelyVertical(); // get bGrow... variables the same way as in SetEditEngine const ScPatternAttr* pPattern = rLocalDoc.GetPattern( nEditCol, nEditRow, nTabNo ); |