compilerplugins/clang/unusedmethods.results | 2
editeng/inc/editdoc.hxx | 4 -
editeng/source/editeng/editdoc.cxx | 8 +-
editeng/source/editeng/editeng.cxx | 32 ++++----
editeng/source/editeng/editobj.cxx | 4 -
editeng/source/editeng/editobj2.hxx | 4 -
editeng/source/editeng/impedit.cxx | 10 +-
editeng/source/editeng/impedit.hxx | 4 -
editeng/source/editeng/impedit2.cxx | 6 -
editeng/source/editeng/impedit3.cxx | 74 +++++++++----------
editeng/source/editeng/impedit4.cxx | 4 -
editeng/source/outliner/outlin2.cxx | 2
editeng/source/outliner/outlobj.cxx | 10 +-
editeng/source/uno/unofored.cxx | 6 -
filter/source/msfilter/escherex.cxx | 2
forms/source/richtext/specialdispatchers.cxx | 6 -
include/editeng/editeng.hxx | 4 -
include/editeng/editobj.hxx | 4 -
include/editeng/outlobj.hxx | 4 -
sc/source/core/data/column2.cxx | 2
sc/source/ui/drawfunc/fuconrec.cxx | 2
sc/source/ui/drawfunc/fuconstr.cxx | 2
sc/source/ui/drawfunc/fudraw.cxx | 2
sc/source/ui/drawfunc/fusel.cxx | 2
sc/source/ui/drawfunc/futext.cxx | 4 -
sc/source/ui/view/gridwin.cxx | 4 -
sc/source/ui/view/viewdata.cxx | 4 -
sd/source/core/sdpage.cxx | 4 -
sd/source/ui/func/futext.cxx | 10 +-
sd/source/ui/unoidl/unoobj.cxx | 2
sd/source/ui/view/outlview.cxx | 4 -
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 2
svx/source/svdraw/svdoashp.cxx | 2
svx/source/svdraw/svdotext.cxx | 6 -
svx/source/svdraw/svdotextdecomposition.cxx | 8 +-
svx/source/svdraw/svdview.cxx | 2
svx/source/unodraw/unoshtxt.cxx | 4 -
sw/source/uibase/ribbar/conrect.cxx | 2
38 files changed, 129 insertions(+), 129 deletions(-)
New commits:
commit 1cfa72a83101d7ea1f89b2c20a6c29d12e8da933
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Jul 21 13:36:13 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Jul 21 14:03:49 2021 +0200
IsVertical->IsEffectivelyVertical, GetDirectVertical->GetVertical
Before commit 653b53287ca09a9ffe3f5ce0242919e719c1086c, editengine
objects had a pair IsVertical/SetVertical, which queried and set
a boolean flag (and SetVertical also had a second argument to set
another flag).
The mentioned commit had introduced an inconsistency, changing
SetVertical to only set a single flag, but at the same time making
IsVertical to return a synthesized result from two values: vertical
and rotation. Additionally, GetDirectVertical was introduced to
complement SetVertical.
In many places, the use of synthetic IsVertical looks suspicious,
especially where it is used in combinations with SetVertical. But
here I don't change existing logic, and only rename the methods,
so that in case someone sees an actual problem, it would be easier
to spot the method mismatch.
The end result is that now we have a proper getter/setter pair
GetVertical/SetVertical, and also IsEffectivelyVertical, named to
reflect that it calculates its return value.
Change-Id: I38e2b7c5bd7af0787dd7a1c48e1385138dac80b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119315
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index b89889feb939..73fd7a66791c 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -515,7 +515,7 @@ include/drawinglayer/primitive3d/baseprimitive3d.hxx:112
include/drawinglayer/tools/primitive2dxmldump.hxx:45
void drawinglayer::Primitive2dXmlDump::dump(const class
drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &)
include/editeng/editeng.hxx:241
- _Bool EditEngine::GetDirectVertical() const
+ _Bool EditEngine::GetVertical() const
include/editeng/editeng.hxx:243
enum TextRotation EditEngine::GetRotation() const
include/editeng/editeng.hxx:472
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 133ea1ca9daa..b18b22195973 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -756,9 +756,9 @@ public:
sal_uInt16 GetDefTab() const { return nDefTab; }
void SetVertical( bool bVertical ) { bIsVertical = bVertical;
}
- bool IsVertical() const;
+ bool IsEffectivelyVertical() const;
bool IsTopToBottom() const;
- bool GetDirectVertical() const;
+ bool GetVertical() const;
void SetRotation( TextRotation nRotation ) { mnRotation =
nRotation; }
TextRotation GetRotation() const { return
mnRotation; }
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index a30111e33e66..774d3ad52cf9 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2015,8 +2015,8 @@ void EditDoc::CreateDefFont( bool bUseStyles )
{
SfxItemSet aTmpSet( GetItemPool(), svl::Items<EE_PARA_START, EE_CHAR_END>
);
CreateFont( aDefFont, aTmpSet );
- aDefFont.SetVertical( IsVertical() );
- aDefFont.SetOrientation( Degree10(IsVertical() ? (IsTopToBottom() ? 2700 :
900) : 0) );
+ aDefFont.SetVertical( IsEffectivelyVertical() );
+ aDefFont.SetOrientation( Degree10(IsEffectivelyVertical() ?
(IsTopToBottom() ? 2700 : 900) : 0) );
for ( sal_Int32 nNode = 0; nNode < Count(); nNode++ )
{
@@ -2027,7 +2027,7 @@ void EditDoc::CreateDefFont( bool bUseStyles )
}
}
-bool EditDoc::IsVertical() const
+bool EditDoc::IsEffectivelyVertical() const
{
return (bIsVertical && mnRotation == TextRotation::NONE) ||
(!bIsVertical && mnRotation != TextRotation::NONE);
@@ -2039,7 +2039,7 @@ bool EditDoc::IsTopToBottom() const
(!bIsVertical && mnRotation == TextRotation::TOPTOBOTTOM);
}
-bool EditDoc::GetDirectVertical() const
+bool EditDoc::GetVertical() const
{
return bIsVertical;
}
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index b90ad3127fee..9159f9b7169c 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -213,7 +213,7 @@ void EditEngine::Draw( OutputDevice& rOutDev, const Point&
rStartPos, Degree10 n
if( rOutDev.GetConnectMetaFile() )
rOutDev.Push();
Point aStartPos( rStartPos );
- if ( IsVertical() )
+ if ( IsEffectivelyVertical() )
{
aStartPos.AdjustX(GetPaperSize().Width() );
aStartPos = Rotate( aStartPos, nOrientation, rStartPos );
@@ -241,7 +241,7 @@ void EditEngine::Draw( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect,
aOutRect = rOutDev.PixelToLogic( aOutRect );
Point aStartPos;
- if ( !IsVertical() )
+ if ( !IsEffectivelyVertical() )
{
aStartPos.setX( aOutRect.Left() - rStartDocPos.X() );
aStartPos.setY( aOutRect.Top() - rStartDocPos.Y() );
@@ -437,9 +437,9 @@ TextRotation EditEngine::GetRotation() const
return pImpEditEngine->GetRotation();
}
-bool EditEngine::IsVertical() const
+bool EditEngine::IsEffectivelyVertical() const
{
- return pImpEditEngine->IsVertical();
+ return pImpEditEngine->IsEffectivelyVertical();
}
bool EditEngine::IsTopToBottom() const
@@ -447,9 +447,9 @@ bool EditEngine::IsTopToBottom() const
return pImpEditEngine->IsTopToBottom();
}
-bool EditEngine::GetDirectVertical() const
+bool EditEngine::GetVertical() const
{
- return pImpEditEngine->GetDirectVertical();
+ return pImpEditEngine->GetVertical();
}
void EditEngine::SetTextColumns(sal_Int16 nColumns, sal_Int32 nSpacing)
@@ -633,7 +633,7 @@ tools::Rectangle EditEngine::GetParaBounds( sal_Int32 nPara
)
Point aPnt = GetDocPosTopLeft( nPara );
- if( IsVertical() )
+ if( IsEffectivelyVertical() )
{
sal_Int32 nTextHeight = pImpEditEngine->GetTextHeight();
sal_Int32 nParaWidth = pImpEditEngine->CalcParaWidth( nPara, true );
@@ -1399,15 +1399,15 @@ bool EditEngine::PostKeyEvent( const KeyEvent&
rKeyEvent, EditView* pEditView, v
}
pImpEditEngine->UpdateSelections();
- if ( ( !IsVertical() && ( nCode != KEY_UP ) && ( nCode != KEY_DOWN ) ) ||
- ( IsVertical() && ( nCode != KEY_LEFT ) && ( nCode != KEY_RIGHT ) ))
+ if ( ( !IsEffectivelyVertical() && ( nCode != KEY_UP ) && ( nCode !=
KEY_DOWN ) ) ||
+ ( IsEffectivelyVertical() && ( nCode != KEY_LEFT ) && ( nCode !=
KEY_RIGHT ) ))
{
pEditView->pImpEditView->nTravelXPos = TRAVEL_X_DONTKNOW;
}
if ( /* ( nCode != KEY_HOME ) && ( nCode != KEY_END ) && */
- ( !IsVertical() && ( nCode != KEY_LEFT ) && ( nCode != KEY_RIGHT ) ) ||
- ( IsVertical() && ( nCode != KEY_UP ) && ( nCode != KEY_DOWN ) ))
+ ( !IsEffectivelyVertical() && ( nCode != KEY_LEFT ) && ( nCode !=
KEY_RIGHT ) ) ||
+ ( IsEffectivelyVertical() && ( nCode != KEY_UP ) && ( nCode !=
KEY_DOWN ) ))
{
pEditView->pImpEditView->SetCursorBidiLevel( CURSOR_BIDILEVEL_DONTKNOW
);
}
@@ -1441,7 +1441,7 @@ sal_uInt32 EditEngine::GetTextHeight() const
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
- sal_uInt32 nHeight = !IsVertical() ? pImpEditEngine->GetTextHeight() :
pImpEditEngine->CalcTextWidth( true );
+ sal_uInt32 nHeight = !IsEffectivelyVertical() ?
pImpEditEngine->GetTextHeight() : pImpEditEngine->CalcTextWidth( true );
return nHeight;
}
@@ -1451,7 +1451,7 @@ sal_uInt32 EditEngine::GetTextHeightNTP() const
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
- if ( IsVertical() )
+ if ( IsEffectivelyVertical() )
return pImpEditEngine->CalcTextWidth( true );
return pImpEditEngine->GetTextHeightNTP();
@@ -1463,7 +1463,7 @@ sal_uInt32 EditEngine::CalcTextWidth()
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatDoc();
- sal_uInt32 nWidth = !IsVertical() ? pImpEditEngine->CalcTextWidth( true )
: pImpEditEngine->GetTextHeight();
+ sal_uInt32 nWidth = !IsEffectivelyVertical() ?
pImpEditEngine->CalcTextWidth( true ) : pImpEditEngine->GetTextHeight();
return nWidth;
}
@@ -1817,7 +1817,7 @@ void EditEngine::StripPortions()
{
ScopedVclPtrInstance< VirtualDevice > aTmpDev;
tools::Rectangle aBigRect( Point( 0, 0 ), Size( 0x7FFFFFFF, 0x7FFFFFFF ) );
- if ( IsVertical() )
+ if ( IsEffectivelyVertical() )
{
if( IsTopToBottom() )
{
@@ -1958,7 +1958,7 @@ tools::Long EditEngine::GetFirstLineStartX( sal_Int32
nParagraph )
Point EditEngine::GetDocPos( const Point& rPaperPos ) const
{
Point aDocPos( rPaperPos );
- if ( IsVertical() )
+ if ( IsEffectivelyVertical() )
{
if ( IsTopToBottom() )
{
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index e9654f4d3a38..579f8d73c30a 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -365,7 +365,7 @@ std::vector<svl::SharedString>
EditTextObjectImpl::GetSharedStrings() const
return aSSs;
}
-bool EditTextObjectImpl::IsVertical() const
+bool EditTextObjectImpl::IsEffectivelyVertical() const
{
return (mbVertical && meRotation == TextRotation::NONE) ||
(!mbVertical && meRotation != TextRotation::NONE);
@@ -386,7 +386,7 @@ void EditTextObjectImpl::SetVertical( bool bVert)
}
}
-bool EditTextObjectImpl::GetDirectVertical() const
+bool EditTextObjectImpl::GetVertical() const
{
return mbVertical;
}
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index 66a3517883be..a6f2b1be0d6d 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -199,8 +199,8 @@ public:
virtual void NormalizeString( svl::SharedStringPool& rPool ) override;
virtual std::vector<svl::SharedString> GetSharedStrings() const override;
- virtual bool IsVertical() const override;
- virtual bool GetDirectVertical() const override;
+ virtual bool IsEffectivelyVertical() const override;
+ virtual bool GetVertical() const override;
virtual bool IsTopToBottom() const override;
virtual void SetVertical( bool bVert) override;
virtual void SetRotation(TextRotation nRotation)
override;
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 63dd7b78cd44..25942b9e09c9 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -736,7 +736,7 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice&
rTarget, const Point& rDo
bool ImpEditView::IsVertical() const
{
- return pEditEngine->pImpEditEngine->IsVertical();
+ return pEditEngine->pImpEditEngine->IsEffectivelyVertical();
}
bool ImpEditView::IsTopToBottom() const
@@ -754,7 +754,7 @@ Point ImpEditView::GetDocPos( const Point& rWindowPos )
const
// Window Position => Position Document
Point aPoint;
- if ( !pEditEngine->pImpEditEngine->IsVertical() )
+ if ( !pEditEngine->pImpEditEngine->IsEffectivelyVertical() )
{
aPoint.setX( rWindowPos.X() - aOutArea.Left() + GetVisDocLeft() );
aPoint.setY( rWindowPos.Y() - aOutArea.Top() + GetVisDocTop() );
@@ -781,7 +781,7 @@ Point ImpEditView::GetWindowPos( const Point& rDocPos )
const
// Document position => window position
Point aPoint;
- if ( !pEditEngine->pImpEditEngine->IsVertical() )
+ if ( !pEditEngine->pImpEditEngine->IsEffectivelyVertical() )
{
aPoint.setX( rDocPos.X() + aOutArea.Left() - GetVisDocLeft() );
aPoint.setY( rDocPos.Y() + aOutArea.Top() - GetVisDocTop() );
@@ -809,7 +809,7 @@ tools::Rectangle ImpEditView::GetWindowPos( const
tools::Rectangle& rDocRect ) c
Point aPos( GetWindowPos( rDocRect.TopLeft() ) );
Size aSz = rDocRect.GetSize();
tools::Rectangle aRect;
- if ( !pEditEngine->pImpEditEngine->IsVertical() )
+ if ( !pEditEngine->pImpEditEngine->IsEffectivelyVertical() )
{
aRect = tools::Rectangle( aPos, aSz );
}
@@ -2571,7 +2571,7 @@ void ImpEditView::dragOver(const
css::datatransfer::dnd::DropTargetDragEvent& rD
Point aEndPos( GetOutputArea().GetWidth(), nDDYPos );
aEndPos = GetWindowPos( aEndPos );
aEditCursor = rOutDev.LogicToPixel( tools::Rectangle(
aStartPos, aEndPos ) );
- if ( !pEditEngine->IsVertical() )
+ if ( !pEditEngine->IsEffectivelyVertical() )
{
aEditCursor.AdjustTop( -1 );
aEditCursor.AdjustBottom( 1 );
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index b074117dfd58..5be7f1bbd1c2 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -808,9 +808,9 @@ public:
void SetPaperSize( const Size& rSz ) {
aPaperSize = rSz; }
void SetVertical( bool bVertical);
- bool IsVertical() const { return
GetEditDoc().IsVertical(); }
+ bool IsEffectivelyVertical() const
{ return GetEditDoc().IsEffectivelyVertical(); }
bool IsTopToBottom() const { return
GetEditDoc().IsTopToBottom(); }
- bool GetDirectVertical() const { return
GetEditDoc().GetDirectVertical(); }
+ bool GetVertical() const { return
GetEditDoc().GetVertical(); }
void SetRotation( TextRotation nRotation);
TextRotation GetRotation() const { return
GetEditDoc().GetRotation(); }
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 091bad24e080..e89c1258bc33 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -795,9 +795,9 @@ EditSelection const & ImpEditEngine::MoveCursor( const
KeyEvent& rKeyEvent, Edit
EditPaM aOldPaM( aPaM );
TextDirectionality eTextDirection =
TextDirectionality::LeftToRight_TopToBottom;
- if (IsVertical() && IsTopToBottom())
+ if (IsEffectivelyVertical() && IsTopToBottom())
eTextDirection = TextDirectionality::TopToBottom_RightToLeft;
- else if (IsVertical() && !IsTopToBottom())
+ else if (IsEffectivelyVertical() && !IsTopToBottom())
eTextDirection = TextDirectionality::BottomToTop_LeftToRight;
else if ( IsRightToLeft( GetEditDoc().GetPos( aPaM.GetNode() ) ) )
eTextDirection = TextDirectionality::RightToLeft_TopToBottom;
@@ -1980,7 +1980,7 @@ bool ImpEditEngine::IsRightToLeft( sal_Int32 nPara ) const
bool bR2L = false;
const SvxFrameDirectionItem* pFrameDirItem = nullptr;
- if ( !IsVertical() )
+ if ( !IsEffectivelyVertical() )
{
bR2L = GetDefaultHorizontalTextDirection() ==
EEHorizontalTextDirection::R2L;
pFrameDirItem = &GetParaAttrib( nPara, EE_PARA_WRITINGDIR );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 273f44a65a59..b98470ec2c28 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -425,7 +425,7 @@ void ImpEditEngine::FormatDoc()
tools::Long nNewHeight = CalcTextHeight(&nNewHeightNTP);
tools::Long nDiff = nNewHeight - nCurTextHeight;
if ( nDiff )
- aStatus.GetStatusWord() |= !IsVertical() ?
EditStatusFlags::TextHeightChanged : EditStatusFlags::TEXTWIDTHCHANGED;
+ aStatus.GetStatusWord() |= !IsEffectivelyVertical() ?
EditStatusFlags::TextHeightChanged : EditStatusFlags::TEXTWIDTHCHANGED;
nCurTextHeight = nNewHeight;
nCurTextHeightNTP = nNewHeightNTP;
@@ -503,20 +503,20 @@ void ImpEditEngine::CheckAutoPageSize()
{
Size aPrevPaperSize( GetPaperSize() );
if ( GetStatus().AutoPageWidth() )
- aPaperSize.setWidth( !IsVertical() ? CalcTextWidth( true ) :
GetTextHeight() );
+ aPaperSize.setWidth( !IsEffectivelyVertical() ? CalcTextWidth( true )
: GetTextHeight() );
if ( GetStatus().AutoPageHeight() )
- aPaperSize.setHeight( !IsVertical() ? GetTextHeight() : CalcTextWidth(
true ) );
+ aPaperSize.setHeight( !IsEffectivelyVertical() ? GetTextHeight() :
CalcTextWidth( true ) );
SetValidPaperSize( aPaperSize ); // consider Min, Max
if ( aPaperSize == aPrevPaperSize )
return;
- if ( ( !IsVertical() && ( aPaperSize.Width() != aPrevPaperSize.Width() ) )
- || ( IsVertical() && ( aPaperSize.Height() != aPrevPaperSize.Height()
) ) )
+ if ( ( !IsEffectivelyVertical() && ( aPaperSize.Width() !=
aPrevPaperSize.Width() ) )
+ || ( IsEffectivelyVertical() && ( aPaperSize.Height() !=
aPrevPaperSize.Height() ) ) )
{
// If ahead is centered / right or tabs...
- aStatus.GetStatusWord() |= !IsVertical() ?
EditStatusFlags::TEXTWIDTHCHANGED : EditStatusFlags::TextHeightChanged;
+ aStatus.GetStatusWord() |= !IsEffectivelyVertical() ?
EditStatusFlags::TEXTWIDTHCHANGED : EditStatusFlags::TextHeightChanged;
for ( sal_Int32 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
{
// Only paragraphs which are not aligned to the left need to be
@@ -538,7 +538,7 @@ void ImpEditEngine::CheckAutoPageSize()
aInvSize.setHeight( aPrevPaperSize.Height() );
Size aSz( aInvSize );
- if ( IsVertical() )
+ if ( IsEffectivelyVertical() )
{
aSz.setWidth( aInvSize.Height() );
aSz.setHeight( aInvSize.Width() );
@@ -591,7 +591,7 @@ static sal_Int32 ImplCalculateFontIndependentLineSpacing(
const sal_Int32 nFontH
tools::Long ImpEditEngine::GetColumnWidth(const Size& rPaperSize) const
{
assert(mnColumns >= 1);
- tools::Long nWidth = IsVertical() ? rPaperSize.Height() :
rPaperSize.Width();
+ tools::Long nWidth = IsEffectivelyVertical() ? rPaperSize.Height() :
rPaperSize.Width();
return (nWidth - mnColumnSpacing * (mnColumns - 1)) / mnColumns;
}
@@ -782,7 +782,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara,
sal_uInt32 nStartPosY )
}
}
- const bool bAutoSize = IsVertical() ? aStatus.AutoPageHeight() :
aStatus.AutoPageWidth();
+ const bool bAutoSize = IsEffectivelyVertical() ?
aStatus.AutoPageHeight() : aStatus.AutoPageWidth();
tools::Long nMaxLineWidth = GetColumnWidth(bAutoSize ?
aMaxAutoPaperSize : aPaperSize);
nMaxLineWidth -= GetXValue( rLRItem.GetRight() );
@@ -816,7 +816,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara,
sal_uInt32 nStartPosY )
tools::Long nTextLineHeight = 0;
if ( GetTextRanger() )
{
- GetTextRanger()->SetVertical( IsVertical() );
+ GetTextRanger()->SetVertical( IsEffectivelyVertical() );
tools::Long nTextY = nStartPosY + GetEditCursor( &rParaPortion,
pLine, pLine->GetStart(), GetCursorFlags::NONE ).Top();
if ( !bSameLineAgain )
@@ -844,7 +844,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara,
sal_uInt32 nStartPosY )
{
tools::Long nYOff = nTextY + nTextExtraYOffset;
tools::Long nYDiff = nTextLineHeight;
- if ( IsVertical() )
+ if ( IsEffectivelyVertical() )
{
tools::Long nMaxPolygonX =
GetTextRanger()->GetBoundRect().Right();
nYOff = nMaxPolygonX-nYOff;
@@ -1455,8 +1455,8 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara,
sal_uInt32 nStartPosY )
}
}
- if ( ( !IsVertical() && aStatus.AutoPageWidth() ) ||
- ( IsVertical() && aStatus.AutoPageHeight() ) )
+ if ( ( !IsEffectivelyVertical() && aStatus.AutoPageWidth() ) ||
+ ( IsEffectivelyVertical() && aStatus.AutoPageHeight() ) )
{
// If the row fits within the current paper width, then this width
// has to be used for the Alignment. If it does not fit or if it
@@ -2604,7 +2604,7 @@ void ImpEditEngine::SetTextRanger(
std::unique_ptr<TextRanger> pRanger )
void ImpEditEngine::SetVertical( bool bVertical)
{
- if ( IsVertical() != bVertical)
+ if ( IsEffectivelyVertical() != bVertical)
{
GetEditDoc().SetVertical(bVertical);
bool bUseCharAttribs = bool(aStatus.GetControlWord() &
EEControlBits::USECHARATTRIBS);
@@ -2958,17 +2958,17 @@ void ImpEditEngine::RecalcFormatterFontMetrics(
FormatterFontMetric& rCurMetrics
tools::Long ImpEditEngine::getWidthDirectionAware(const Size& sz) const
{
- return !IsVertical() ? sz.Width() : sz.Height();
+ return !IsEffectivelyVertical() ? sz.Width() : sz.Height();
}
tools::Long ImpEditEngine::getHeightDirectionAware(const Size& sz) const
{
- return !IsVertical() ? sz.Height() : sz.Width();
+ return !IsEffectivelyVertical() ? sz.Height() : sz.Width();
}
void ImpEditEngine::adjustXDirectionAware(Point& pt, tools::Long x) const
{
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
pt.AdjustX(x);
else
pt.AdjustY(IsTopToBottom() ? x : -x);
@@ -2976,7 +2976,7 @@ void ImpEditEngine::adjustXDirectionAware(Point& pt,
tools::Long x) const
void ImpEditEngine::adjustYDirectionAware(Point& pt, tools::Long y) const
{
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
pt.AdjustY(y);
else
pt.AdjustX(IsTopToBottom() ? -y : y);
@@ -2984,7 +2984,7 @@ void ImpEditEngine::adjustYDirectionAware(Point& pt,
tools::Long y) const
void ImpEditEngine::setXDirectionAwareFrom(Point& ptDest, const Point& ptSrc)
const
{
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
ptDest.setX(ptSrc.X());
else
ptDest.setY(ptSrc.Y());
@@ -2992,7 +2992,7 @@ void ImpEditEngine::setXDirectionAwareFrom(Point& ptDest,
const Point& ptSrc) co
void ImpEditEngine::setYDirectionAwareFrom(Point& ptDest, const Point& ptSrc)
const
{
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
ptDest.setY(ptSrc.Y());
else
ptDest.setX(ptSrc.Y());
@@ -3002,7 +3002,7 @@ tools::Long
ImpEditEngine::getYOverflowDirectionAware(const Point& pt,
const tools::Rectangle&
rectMax) const
{
tools::Long nRes;
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
nRes = pt.Y() - rectMax.Bottom();
else if (IsTopToBottom())
nRes = rectMax.Left() - pt.X();
@@ -3013,7 +3013,7 @@ tools::Long
ImpEditEngine::getYOverflowDirectionAware(const Point& pt,
bool ImpEditEngine::isXOverflowDirectionAware(const Point& pt, const
tools::Rectangle& rectMax) const
{
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
return pt.X() > rectMax.Right();
if (IsTopToBottom())
@@ -3024,7 +3024,7 @@ bool ImpEditEngine::isXOverflowDirectionAware(const
Point& pt, const tools::Rect
tools::Long ImpEditEngine::getBottomDocOffset(const tools::Rectangle& rect)
const
{
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
return rect.Bottom();
if (IsTopToBottom())
@@ -3035,7 +3035,7 @@ tools::Long ImpEditEngine::getBottomDocOffset(const
tools::Rectangle& rect) cons
Size ImpEditEngine::getTopLeftDocOffset(const tools::Rectangle& rect) const
{
- if (!IsVertical())
+ if (!IsEffectivelyVertical())
return { rect.Left(), rect.Top() };
if (IsTopToBottom())
@@ -3140,9 +3140,9 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev,
tools::Rectangle aClipRect, Po
const tools::Long nParaHeight = rPortion.GetHeight();
if ( rPortion.IsVisible() && (
- ( !IsVertical() && ( ( aStartPos.Y() + nParaHeight ) >
aClipRect.Top() ) ) ||
- ( IsVertical() && IsTopToBottom() && ( ( aStartPos.X() -
nParaHeight ) < aClipRect.Right() ) ) ||
- ( IsVertical() && !IsTopToBottom() && ( ( aStartPos.X() +
nParaHeight ) > aClipRect.Left() ) ) ) )
+ ( !IsEffectivelyVertical() && ( ( aStartPos.Y() + nParaHeight
) > aClipRect.Top() ) ) ||
+ ( IsEffectivelyVertical() && IsTopToBottom() && ( (
aStartPos.X() - nParaHeight ) < aClipRect.Right() ) ) ||
+ ( IsEffectivelyVertical() && !IsTopToBottom() && ( (
aStartPos.X() + nParaHeight ) > aClipRect.Left() ) ) ) )
{
Point aTmpPos;
@@ -3174,9 +3174,9 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev,
tools::Rectangle aClipRect, Po
adjustXDirectionAware(aTmpPos, pLine->GetStartPosX());
adjustYDirectionAware(aTmpPos, pLine->GetMaxAscent() -
nLineHeight);
- if ( ( !IsVertical() && ( aStartPos.Y() > aClipRect.Top() ) )
- || ( IsVertical() && IsTopToBottom() && aStartPos.X() <
aClipRect.Right() )
- || ( IsVertical() && !IsTopToBottom() && aStartPos.X() >
aClipRect.Left() ) )
+ if ( ( !IsEffectivelyVertical() && ( aStartPos.Y() >
aClipRect.Top() ) )
+ || ( IsEffectivelyVertical() && IsTopToBottom() &&
aStartPos.X() < aClipRect.Right() )
+ || ( IsEffectivelyVertical() && !IsTopToBottom() &&
aStartPos.X() > aClipRect.Left() ) )
{
bPaintBullet = false;
@@ -3556,8 +3556,8 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev,
tools::Rectangle aClipRect, Po
// Take only what begins in the visible
range:
// Important, because of a bug in some
graphic cards
// when transparent font, output when
negative
- if ( nOrientation || ( !IsVertical() && (
( aTmpPos.X() + nTxtWidth ) >= nFirstVisXPos ) )
- || ( IsVertical() && ( (
aTmpPos.Y() + nTxtWidth ) >= nFirstVisYPos ) ) )
+ if ( nOrientation || (
!IsEffectivelyVertical() && ( ( aTmpPos.X() + nTxtWidth ) >= nFirstVisXPos ) )
+ || ( IsEffectivelyVertical() && (
( aTmpPos.Y() + nTxtWidth ) >= nFirstVisYPos ) ) )
{
if ( nEsc && ( aTmpFont.GetUnderline()
!= LINESTYLE_NONE ) )
{
@@ -3674,7 +3674,7 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev,
tools::Rectangle aClipRect, Po
}
Color aOldColor(
rOutDev.GetLineColor() );
rOutDev.SetLineColor(
GetColorConfig().GetColorValue( svtools::SPELL ).nColor );
- lcl_DrawRedLines( rOutDev,
aTmpFont.GetFontSize().Height(), aRedLineTmpPos, static_cast<size_t>(nIndex),
static_cast<size_t>(nIndex) + rTextPortion.GetLen(), pDXArray,
rPortion.GetNode()->GetWrongList(), nOrientation, aOrigin, IsVertical(),
rTextPortion.IsRightToLeft() );
+ lcl_DrawRedLines( rOutDev,
aTmpFont.GetFontSize().Height(), aRedLineTmpPos, static_cast<size_t>(nIndex),
static_cast<size_t>(nIndex) + rTextPortion.GetLen(), pDXArray,
rPortion.GetNode()->GetWrongList(), nOrientation, aOrigin,
IsEffectivelyVertical(), rTextPortion.IsRightToLeft() );
rOutDev.SetLineColor( aOldColor );
}
}
@@ -3847,7 +3847,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const
tools::Rectangle& rRect, Ou
OutputDevice& rTarget = pTargetDevice ? *pTargetDevice :
*pView->GetWindow()->GetOutDev();
Point aStartPos;
- if ( !IsVertical() )
+ if ( !IsEffectivelyVertical() )
aStartPos = pView->GetOutputArea().TopLeft();
else
{
@@ -3863,7 +3863,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const
tools::Rectangle& rRect, Ou
// the fields usually protrude if > line.
// (Not at the top, since there the Doc-width from formatting is already
// there)
- if ( !IsVertical() && ( pView->GetOutputArea().GetWidth() >
GetPaperSize().Width() ) )
+ if ( !IsEffectivelyVertical() && ( pView->GetOutputArea().GetWidth() >
GetPaperSize().Width() ) )
{
tools::Long nMaxX = pView->GetOutputArea().Left() +
GetPaperSize().Width();
if ( aClipRect.Left() > nMaxX )
@@ -4139,7 +4139,7 @@ tools::Long ImpEditEngine::CalcVertLineSpacing(Point&
rStartPos) const
return 0;
// Shift the text to the right for the asian layout mode.
- if (IsVertical())
+ if (IsEffectivelyVertical())
adjustYDirectionAware(rStartPos, -nTotalSpace);
return nTotalSpace / (nTotalLineCount-1);
@@ -4218,7 +4218,7 @@ void ImpEditEngine::SetFlatMode( bool bFlat )
void ImpEditEngine::SetCharStretching( sal_uInt16 nX, sal_uInt16 nY )
{
bool bChanged;
- if ( !IsVertical() )
+ if ( !IsEffectivelyVertical() )
{
bChanged = nStretchX!=nX || nStretchY!=nY;
nStretchX = nX;
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 90b89fc3bcc7..bda54e123304 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -990,7 +990,7 @@ std::unique_ptr<EditTextObject>
ImpEditEngine::CreateTextObject(const EditSelect
std::unique_ptr<EditTextObject> ImpEditEngine::CreateTextObject( EditSelection
aSel, SfxItemPool* pPool, bool bAllowBigObjects, sal_Int32 nBigObjectStart )
{
std::unique_ptr<EditTextObjectImpl>
pTxtObj(std::make_unique<EditTextObjectImpl>(pPool));
- pTxtObj->SetVertical( GetDirectVertical() );
+ pTxtObj->SetVertical( GetVertical() );
pTxtObj->SetRotation( GetRotation() );
MapUnit eMapUnit = aEditDoc.GetItemPool().GetMetric( DEF_METRIC );
pTxtObj->SetMetric( eMapUnit );
@@ -1150,7 +1150,7 @@ void ImpEditEngine::SetText( const EditTextObject&
rTextObject )
EnableUndo( false );
InsertText( rTextObject, EditSelection( aPaM, aPaM ) );
- SetVertical(rTextObject.GetDirectVertical());
+ SetVertical(rTextObject.GetVertical());
SetRotation(rTextObject.GetRotation());
DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(),
"From where comes the Undo in SetText ?!" );
diff --git a/editeng/source/outliner/outlin2.cxx
b/editeng/source/outliner/outlin2.cxx
index 789d5d54e061..d486b2e8b7e3 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -529,7 +529,7 @@ void Outliner::SetRotation(TextRotation nRotation)
bool Outliner::IsVertical() const
{
- return pEditEngine->IsVertical();
+ return pEditEngine->IsEffectivelyVertical();
}
bool Outliner::IsTopToBottom() const
diff --git a/editeng/source/outliner/outlobj.cxx
b/editeng/source/outliner/outlobj.cxx
index 373fca12c5f1..e8cbd6dbd565 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -119,14 +119,14 @@ void OutlinerParaObject::SetOutlinerMode(OutlinerMode
nNew)
}
}
-bool OutlinerParaObject::IsVertical() const
+bool OutlinerParaObject::IsEffectivelyVertical() const
{
- return mpImpl->mpEditTextObject->IsVertical();
+ return mpImpl->mpEditTextObject->IsEffectivelyVertical();
}
-bool OutlinerParaObject::GetDirectVertical() const
+bool OutlinerParaObject::GetVertical() const
{
- return mpImpl->mpEditTextObject->GetDirectVertical();
+ return mpImpl->mpEditTextObject->GetVertical();
}
bool OutlinerParaObject::IsTopToBottom() const
@@ -137,7 +137,7 @@ bool OutlinerParaObject::IsTopToBottom() const
void OutlinerParaObject::SetVertical(bool bNew)
{
const ::o3tl::cow_wrapper< OutlinerParaObjData >* pImpl = &mpImpl;
- if ( ( *pImpl )->mpEditTextObject->IsVertical() != bNew)
+ if ( ( *pImpl )->mpEditTextObject->IsEffectivelyVertical() != bNew)
{
mpImpl->mpEditTextObject->SetVertical(bNew);
}
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index de8cab5ef060..114792e98073 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -294,7 +294,7 @@ tools::Rectangle SvxEditEngineForwarder::GetCharBounds(
sal_Int32 nPara, sal_Int
tools::Long tmp = aSize.Width();
aSize.setWidth(aSize.Height());
aSize.setHeight(tmp);
- bool bIsVertical( rEditEngine.IsVertical() );
+ bool bIsVertical( rEditEngine.IsEffectivelyVertical() );
// #108900# Handle virtual position one-past-the end of the string
if( nIndex >= rEditEngine.GetTextLen(nPara) )
@@ -341,7 +341,7 @@ tools::Rectangle SvxEditEngineForwarder::GetParaBounds(
sal_Int32 nPara ) const
sal_uLong nWidth;
sal_uLong nHeight;
- if( rEditEngine.IsVertical() )
+ if( rEditEngine.IsEffectivelyVertical() )
{
// Hargl. EditEngine's 'external' methods return the rotated
// dimensions, 'internal' methods like GetTextHeight( n )
@@ -380,7 +380,7 @@ bool SvxEditEngineForwarder::GetIndexAtPoint( const Point&
rPos, sal_Int32& nPar
aSize.setHeight(tmp);
Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos,
aSize,
- rEditEngine.IsVertical()
));
+
rEditEngine.IsEffectivelyVertical() ));
EPosition aDocPos = rEditEngine.FindDocPosition( aEEPos );
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 81a792a00baf..8b16be57bab2 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3447,7 +3447,7 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if((nTextPathFlags & 0x4000) != 0) // Is Font work
{
OutlinerParaObject*
pOutlinerParaObject(rSdrObjCustomShape.GetOutlinerParaObject());
- if ( pOutlinerParaObject &&
pOutlinerParaObject->IsVertical() )
+ if ( pOutlinerParaObject &&
pOutlinerParaObject->IsEffectivelyVertical() )
nTextPathFlags |= 0x2000;
}
diff --git a/forms/source/richtext/specialdispatchers.cxx
b/forms/source/richtext/specialdispatchers.cxx
index 9617cde6f048..db7ef6807df8 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -93,7 +93,7 @@ namespace frm
EditEngine* pEngine = getEditView() ? getEditView()->GetEditEngine() :
nullptr;
OSL_ENSURE( pEngine, "OParagraphDirectionDispatcher::dispatch: no edit
engine - but not yet disposed?" );
- if ( pEngine && pEngine->IsVertical() )
+ if ( pEngine && pEngine->IsEffectivelyVertical() )
aEvent.IsEnabled = false;
return aEvent;
@@ -117,7 +117,7 @@ namespace frm
if ( !pEngine )
return;
- pEngine->SetVertical( !pEngine->IsVertical() );
+ pEngine->SetVertical( !pEngine->IsEffectivelyVertical() );
}
@@ -129,7 +129,7 @@ namespace frm
OSL_ENSURE( pEngine, "OTextDirectionDispatcher::dispatch: no edit
engine - but not yet disposed?" );
aEvent.IsEnabled = true;
- aEvent.State <<= pEngine && pEngine->IsVertical();
+ aEvent.State <<= pEngine && pEngine->IsEffectivelyVertical();
return aEvent;
}
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 630cbc50dbeb..c1fb0c2c8ffb 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -237,9 +237,9 @@ public:
const Size& GetPaperSize() const;
void SetVertical( bool bVertical );
- bool IsVertical() const;
+ bool IsEffectivelyVertical() const;
bool IsTopToBottom() const;
- bool GetDirectVertical() const;
+ bool GetVertical() const;
void SetRotation(TextRotation nRotation);
TextRotation GetRotation() const;
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index fdc0db57d09f..5badaf8e8a2a 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -72,8 +72,8 @@ public:
virtual OutlinerMode GetUserType() const = 0; // For OutlinerMode, it
can however not save in compatible format
virtual void SetUserType( OutlinerMode n ) = 0;
- virtual bool IsVertical() const = 0;
- virtual bool GetDirectVertical() const = 0;
+ virtual bool IsEffectivelyVertical() const = 0;
+ virtual bool GetVertical() const = 0;
virtual bool IsTopToBottom() const = 0;
virtual void SetVertical( bool bVertical ) = 0;
virtual void SetRotation( TextRotation nRotation ) = 0;
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 0b961e9f30f3..b2c00a1683ff 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -87,8 +87,8 @@ public:
void SetOutlinerMode(OutlinerMode nNew);
// vertical access
- bool IsVertical() const;
- bool GetDirectVertical() const;
+ bool IsEffectivelyVertical() const;
+ bool GetVertical() const;
bool IsTopToBottom() const;
void SetVertical(bool bNew);
void SetRotation(TextRotation nRotation);
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 );
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index ddd5fdbb037c..38b0308bf667 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2893,7 +2893,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
bool bVertical = false;
OutlinerParaObject* pOldPara =
pTextObj->GetOutlinerParaObject();
if( pOldPara )
- bVertical = pOldPara->IsVertical(); // is old para object
vertical?
+ bVertical = pOldPara->IsEffectivelyVertical(); // is old
para object vertical?
SetObjText( pTextObj, nullptr, ePresObjKind, aString );
@@ -2904,7 +2904,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
// AutoGrowWidth/Height items still exist in the
// not changed object.
if(pTextObj->GetOutlinerParaObject()
- && pTextObj->GetOutlinerParaObject()->IsVertical() !=
bVertical)
+ &&
pTextObj->GetOutlinerParaObject()->IsEffectivelyVertical() != bVertical)
{
::tools::Rectangle aObjectRect =
pTextObj->GetSnapRect();
pTextObj->GetOutlinerParaObject()->SetVertical(bVertical);
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index c3f4895a9098..a3ff351337e4 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -709,7 +709,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
// vertical when there was a vertical one used last time.
OutlinerParaObject* pOPO = GetTextObj()->GetOutlinerParaObject();
SdrOutliner&
rOutl(mxTextObj->getSdrModelFromSdrObject().GetDrawOutliner(GetTextObj()));
- bool bVertical((pOPO && pOPO->IsVertical())
+ bool bVertical((pOPO && pOPO->IsEffectivelyVertical())
|| nSlotId == SID_ATTR_CHAR_VERTICAL
|| nSlotId == SID_TEXT_FITTOSIZE_VERTICAL);
rOutl.SetVertical(bVertical);
@@ -726,7 +726,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
pPara = GetTextObj()->GetOutlinerParaObject();
}
- if(pPara && bVertical != pPara->IsVertical())
+ if(pPara && bVertical != pPara->IsEffectivelyVertical())
{
// set ParaObject orientation accordingly
pPara->SetVertical(bVertical);
@@ -848,7 +848,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
pPara = GetTextObj()->GetOutlinerParaObject();
}
- if(pPara && !pPara->IsVertical())
+ if(pPara && !pPara->IsEffectivelyVertical())
{
// set ParaObject orientation accordingly
pPara->SetVertical(true);
@@ -1081,9 +1081,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool
bQuickDrag)
if( pTextObj )
{
OutlinerParaObject* pOPO =
pTextObj->GetOutlinerParaObject();
- if( pOPO && pOPO->IsVertical() )
+ if( pOPO && pOPO->IsEffectivelyVertical() )
{
- pOutl->SetVertical(pOPO->GetDirectVertical());
+ pOutl->SetVertical(pOPO->GetVertical());
pOutl->SetRotation(pOPO->GetRotation());
}
else if (nSlotId == SID_ATTR_CHAR_VERTICAL || nSlotId ==
SID_TEXT_FITTOSIZE_VERTICAL)
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index dff577534ed5..49bdbc6e94b6 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -894,7 +894,7 @@ void SdXShape::SetEmptyPresObj(bool bEmpty)
if(!bEmpty)
{
OutlinerParaObject* pOutlinerParaObject =
pObj->GetOutlinerParaObject();
- const bool bVertical = pOutlinerParaObject &&
pOutlinerParaObject->IsVertical();
+ const bool bVertical = pOutlinerParaObject &&
pOutlinerParaObject->IsEffectivelyVertical();
// really delete SdrOutlinerObj at pObj
pObj->NbcSetOutlinerParaObject(nullptr);
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 210df149cd8a..6234d7bfe298 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1021,7 +1021,7 @@ void OutlineView::FillOutliner()
OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject();
if (pOPO)
{
- bool bVertical = pOPO->IsVertical();
+ bool bVertical = pOPO->IsEffectivelyVertical();
pOPO->SetVertical( false );
mrOutliner.AddText(*pOPO);
pOPO->SetVertical( bVertical );
@@ -1064,7 +1064,7 @@ void OutlineView::FillOutliner()
if (pOPO)
{
sal_Int32 nParaCount1 = mrOutliner.GetParagraphCount();
- bool bVertical = pOPO->IsVertical();
+ bool bVertical = pOPO->IsEffectivelyVertical();
pOPO->SetVertical( false );
mrOutliner.AddText(*pOPO);
pOPO->SetVertical( bVertical );
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index dcff748ea60f..9d19dd35def3 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -65,7 +65,7 @@ basegfx::B2DRange getTextAnchorRange(const
attribute::SdrTextAttribute& rText,
// Take vertical text orientation into account when deciding
// which dimension is its width, and which is its height
const OutlinerParaObject& rOutlinerParaObj = rText.getOutlinerParaObject();
- const bool bVerticalWriting(rOutlinerParaObj.IsVertical());
+ const bool bVerticalWriting(rOutlinerParaObj.IsEffectivelyVertical());
const double fWidthForText = bVerticalWriting ? rSnapRange.getHeight() :
rSnapRange.getWidth();
// create a range describing the wanted text position and size
(aTextAnchorRange). This
// means to use the text distance values here
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index e90a257308f3..b48d6b937b41 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2200,7 +2200,7 @@ void SdrObjCustomShape::SetVerticalWriting( bool
bVertical )
DBG_ASSERT( pOutlinerParaObject, "SdrTextObj::SetVerticalWriting() without
OutlinerParaObject!" );
if( !pOutlinerParaObject ||
- (pOutlinerParaObject->IsVertical() == bVertical) )
+ (pOutlinerParaObject->IsEffectivelyVertical() == bVertical) )
return;
// get item settings
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 34987b6bf34d..850cb48b0263 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1354,7 +1354,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText(
std::unique_ptr<OutlinerParaOb
if (pText && pText->GetOutlinerParaObject())
{
- SvxWritingModeItem
aWritingMode(pText->GetOutlinerParaObject()->IsVertical() &&
pText->GetOutlinerParaObject()->IsTopToBottom()
+ SvxWritingModeItem
aWritingMode(pText->GetOutlinerParaObject()->IsEffectivelyVertical() &&
pText->GetOutlinerParaObject()->IsTopToBottom()
? css::text::WritingMode_TB_RL
: css::text::WritingMode_LR_TB,
SDRATTR_TEXTDIRECTION);
@@ -1474,7 +1474,7 @@ bool SdrTextObj::IsVerticalWriting() const
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
if(pOutlinerParaObject)
{
- return pOutlinerParaObject->IsVertical();
+ return pOutlinerParaObject->IsEffectivelyVertical();
}
return false;
@@ -1493,7 +1493,7 @@ void SdrTextObj::SetVerticalWriting(bool bVertical)
}
if (!pOutlinerParaObject ||
- (pOutlinerParaObject->IsVertical() == bVertical))
+ (pOutlinerParaObject->IsEffectivelyVertical() == bVertical))
return;
// get item settings
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index c6f3bbdb8193..a1e885c0e009 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -758,7 +758,7 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() +
1));
const OutlinerParaObject* pOutlinerParaObject =
rSdrAutofitTextPrimitive.getSdrText()->GetOutlinerParaObject();
OSL_ENSURE(pOutlinerParaObject, "impDecomposeBlockTextPrimitive used with
no OutlinerParaObject (!)");
- const bool bVerticalWriting(pOutlinerParaObject->IsVertical());
+ const bool bVerticalWriting(pOutlinerParaObject->IsEffectivelyVertical());
const bool bTopToBottom(pOutlinerParaObject->IsTopToBottom());
const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight));
@@ -945,7 +945,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
// add one to rage sizes to get back to the old Rectangle and outliner
measurements
const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() +
1));
- const bool
bVerticalWriting(rSdrBlockTextPrimitive.getOutlinerParaObject().IsVertical());
+ const bool
bVerticalWriting(rSdrBlockTextPrimitive.getOutlinerParaObject().IsEffectivelyVertical());
const bool
bTopToBottom(rSdrBlockTextPrimitive.getOutlinerParaObject().IsTopToBottom());
const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight));
@@ -1197,7 +1197,7 @@ void SdrTextObj::impDecomposeStretchTextPrimitive(
// #i101957# Check for vertical text. If used, aNewTransformA
// needs to translate the text initially around object width to orient
// it relative to the topper right instead of the topper left
- const bool
bVertical(rSdrStretchTextPrimitive.getOutlinerParaObject().IsVertical());
+ const bool
bVertical(rSdrStretchTextPrimitive.getOutlinerParaObject().IsEffectivelyVertical());
const bool
bTopToBottom(rSdrStretchTextPrimitive.getOutlinerParaObject().IsTopToBottom());
if(bVertical)
@@ -1559,7 +1559,7 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
const OutlinerParaObject* pOutlinerParaObject =
rSdrChainedTextPrimitive.getSdrText()->GetOutlinerParaObject();
OSL_ENSURE(pOutlinerParaObject, "impDecomposeBlockTextPrimitive used with
no OutlinerParaObject (!)");
- const bool bVerticalWriting(pOutlinerParaObject->IsVertical());
+ const bool bVerticalWriting(pOutlinerParaObject->IsEffectivelyVertical());
const bool bTopToBottom(pOutlinerParaObject->IsTopToBottom());
const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight));
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index b6d54499fe9b..73185618c8ae 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1038,7 +1038,7 @@ PointerStyle SdrView::GetPreferredPointer(const Point&
rMousePos, const OutputDe
if(pText && pText->HasText())
{
OutlinerParaObject* pParaObj = pText->GetOutlinerParaObject();
- if(pParaObj && pParaObj->IsVertical())
+ if(pParaObj && pParaObj->IsEffectivelyVertical())
return PointerStyle::TextVertical;
}
return PointerStyle::Text;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 0cc8baffa233..7afed3609a5d 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -565,7 +565,7 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
}
else
{
- bool bVertical = pOutlinerParaObject &&
pOutlinerParaObject->IsVertical();
+ bool bVertical = pOutlinerParaObject &&
pOutlinerParaObject->IsEffectivelyVertical();
// set objects style sheet on empty outliner
SfxStyleSheetPool* pPool =
static_cast<SfxStyleSheetPool*>(mpObject->getSdrModelFromSdrObject().GetStyleSheetPool());
@@ -578,7 +578,7 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if( bVertical )
{
- mpOutliner->SetVertical(
pOutlinerParaObject->GetDirectVertical());
+ mpOutliner->SetVertical( pOutlinerParaObject->GetVertical());
mpOutliner->SetRotation( pOutlinerParaObject->GetRotation());
}
}
diff --git a/sw/source/uibase/ribbar/conrect.cxx
b/sw/source/uibase/ribbar/conrect.cxx
index 6797849bec5d..d520039b34d8 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -140,7 +140,7 @@ bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
pCaptObj->ForceOutlinerParaObject();
OutlinerParaObject* pOPO = pCaptObj->GetOutlinerParaObject();
- if( pOPO && !pOPO->IsVertical() )
+ if( pOPO && !pOPO->IsEffectivelyVertical() )
pOPO->SetVertical( true );
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
