sw/source/core/text/guess.cxx | 2 +-
sw/source/core/text/inftxt.cxx | 10 +++++-----
sw/source/core/text/inftxt.hxx | 12 ++++++------
sw/source/core/text/pordrop.hxx | 2 +-
sw/source/core/text/porexp.cxx | 4 ++--
sw/source/core/text/porexp.hxx | 2 +-
sw/source/core/text/porfld.cxx | 4 ++--
sw/source/core/text/porfld.hxx | 2 +-
sw/source/core/text/porftn.hxx | 2 +-
sw/source/core/text/porglue.cxx | 8 ++++----
sw/source/core/text/porglue.hxx | 2 +-
sw/source/core/text/porlay.cxx | 2 +-
sw/source/core/text/porlay.hxx | 4 ++--
sw/source/core/text/porlin.cxx | 8 ++++----
sw/source/core/text/porlin.hxx | 8 ++++----
sw/source/core/text/pormulti.cxx | 4 ++--
sw/source/core/text/porrst.hxx | 2 +-
sw/source/core/text/portxt.cxx | 12 ++++++------
sw/source/core/text/portxt.hxx | 6 +++---
sw/source/core/text/possiz.hxx | 20 ++++++++++----------
sw/source/core/text/txtdrop.cxx | 4 ++--
sw/source/core/text/txtftn.cxx | 2 +-
sw/source/core/text/txthyph.cxx | 6 +++---
23 files changed, 64 insertions(+), 64 deletions(-)
New commits:
commit 8351c54ee1c0f915f6378d58216432cec4a610d0
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Feb 25 13:40:39 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Feb 25 12:25:22 2025 +0100
SwPosSize -> SwPositiveSize
Maybe it was obvious, but I confused it for "position + size".
Change-Id: Id6b550cb4fac34d39647cc61cde0c1ffa06c03e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182146
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 6e4996b6f980..df98dab34b5f 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -726,7 +726,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor,
SwTextFormatInfo &rInf,
if (m_nBreakPos > m_nCutPos && m_nBreakPos !=
TextFrameIndex(COMPLETE_STRING))
{
const TextFrameIndex nHangingLen = m_nBreakPos - m_nCutPos;
- SwPosSize aTmpSize = rInf.GetTextSize( &rSI, m_nCutPos,
nHangingLen );
+ SwPositiveSize aTmpSize = rInf.GetTextSize( &rSI, m_nCutPos,
nHangingLen );
aTmpSize.Width(aTmpSize.Width() + nLeftRightBorderSpace);
OSL_ENSURE( !m_pHanging, "A hanging portion is hanging around" );
m_pHanging.reset( new SwHangingPortion( std::move(aTmpSize) ) );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index bde01b5bf5b1..1ad5fe78934b 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -403,7 +403,7 @@ void SwTextSizeInfo::NoteAnimation() const
"SwTextSizeInfo::NoteAnimation() changed m_pOut" );
}
-SwPosSize SwTextSizeInfo::GetTextSize( OutputDevice* pOutDev,
+SwPositiveSize SwTextSizeInfo::GetTextSize( OutputDevice* pOutDev,
const SwScriptInfo* pSI,
const OUString& rText,
const TextFrameIndex nIndex,
@@ -415,10 +415,10 @@ SwPosSize SwTextSizeInfo::GetTextSize( OutputDevice*
pOutDev,
aDrawInf.SetFont( m_pFnt );
aDrawInf.SetSnapToGrid( SnapToGrid() );
aDrawInf.SetKanaComp( 0 );
- return SwPosSize(m_pFnt->GetTextSize_( aDrawInf ));
+ return SwPositiveSize(m_pFnt->GetTextSize_( aDrawInf ));
}
-SwPosSize
+SwPositiveSize
SwTextSizeInfo::GetTextSize(std::optional<SwLinePortionLayoutContext>
nLayoutContext) const
{
const SwScriptInfo& rSI =
@@ -438,7 +438,7 @@
SwTextSizeInfo::GetTextSize(std::optional<SwLinePortionLayoutContext> nLayoutCon
aDrawInf.SetFont( m_pFnt );
aDrawInf.SetSnapToGrid( SnapToGrid() );
aDrawInf.SetKanaComp( nComp );
- return SwPosSize(m_pFnt->GetTextSize_( aDrawInf ));
+ return SwPositiveSize(m_pFnt->GetTextSize_( aDrawInf ));
}
void SwTextSizeInfo::GetTextSize(const SwScriptInfo* pSI, const TextFrameIndex
nIndex,
@@ -455,7 +455,7 @@ void SwTextSizeInfo::GetTextSize(const SwScriptInfo* pSI,
const TextFrameIndex n
aDrawInf.SetFont( m_pFnt );
aDrawInf.SetSnapToGrid( SnapToGrid() );
aDrawInf.SetKanaComp( nComp );
- SwPosSize aSize( m_pFnt->GetTextSize_( aDrawInf ) );
+ SwPositiveSize aSize( m_pFnt->GetTextSize_( aDrawInf ) );
nMaxSizeDiff = aDrawInf.GetKanaDiff();
nExtraAscent = aDrawInf.GetExtraAscent();
nExtraDescent = aDrawInf.GetExtraDescent();
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index e0f8dc10297c..8f8e0945b6a2 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -247,19 +247,19 @@ public:
sal_uInt16 GetTextHeight() const;
- SwPosSize GetTextSize( OutputDevice* pOut, const SwScriptInfo* pSI,
+ SwPositiveSize GetTextSize( OutputDevice* pOut, const SwScriptInfo* pSI,
const OUString& rText, TextFrameIndex nIdx,
TextFrameIndex nLen ) const;
- SwPosSize GetTextSize(std::optional<SwLinePortionLayoutContext>
nLayoutContext
+ SwPositiveSize GetTextSize(std::optional<SwLinePortionLayoutContext>
nLayoutContext
= std::nullopt) const;
void GetTextSize(const SwScriptInfo* pSI, TextFrameIndex nIdx,
TextFrameIndex nLen,
std::optional<SwLinePortionLayoutContext> nLayoutContext,
const sal_uInt16 nComp, SwTwips& nMinSize, tools::Long&
nMaxSizeDiff,
SwTwips& nExtraAscent, SwTwips& nExtraDescent,
vcl::text::TextLayoutCache const* = nullptr) const;
- inline SwPosSize GetTextSize(const SwScriptInfo* pSI, TextFrameIndex nIdx,
+ inline SwPositiveSize GetTextSize(const SwScriptInfo* pSI, TextFrameIndex
nIdx,
TextFrameIndex nLen) const;
- inline SwPosSize GetTextSize( const OUString &rText ) const;
+ inline SwPositiveSize GetTextSize( const OUString &rText ) const;
TextFrameIndex GetTextBreak( const tools::Long nLineWidth,
const TextFrameIndex nMaxLen,
@@ -774,12 +774,12 @@ inline sal_uInt16 SwTextSizeInfo::GetHangingBaseline()
const
return const_cast<SwFont*>(GetFont())->GetHangingBaseline( m_pVsh,
*GetOut() );
}
-inline SwPosSize SwTextSizeInfo::GetTextSize( const OUString &rText ) const
+inline SwPositiveSize SwTextSizeInfo::GetTextSize( const OUString &rText )
const
{
return GetTextSize(m_pOut, nullptr, rText, TextFrameIndex(0),
TextFrameIndex(rText.getLength()));
}
-inline SwPosSize SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI,
+inline SwPositiveSize SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI,
TextFrameIndex const nNewIdx,
TextFrameIndex const nNewLen) const
{
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 6d36d8a3d462..eb5a2aa01892 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -85,7 +85,7 @@ public:
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
void PaintDrop( const SwTextPaintInfo &rInf ) const;
virtual bool Format( SwTextFormatInfo &rInf ) override;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
virtual TextFrameIndex GetModelPositionForViewPoint(SwTwips nOfst) const
override;
sal_uInt16 GetLines() const { return m_nLines; }
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 78f7de5a8b3b..afdf71da21c0 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -49,7 +49,7 @@ void SwExpandPortion::dumpAsXml(xmlTextWriterPtr pWriter,
const OUString& rText,
(void)xmlTextWriterEndElement(pWriter);
}
-SwPosSize SwExpandPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
+SwPositiveSize SwExpandPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
{
SwTextSlot aDiffText( &rInf, this, false, false );
return rInf.GetTextSize();
@@ -223,7 +223,7 @@ void SwBlankPortion::Paint( const SwTextPaintInfo &rInf )
const
: u"°"_ustr
: u"-"_ustr); //CHAR_HARDHYPHEN
- SwPosSize aMarkerSize(rInf.GetTextSize(aMarker));
+ SwPositiveSize aMarkerSize(rInf.GetTextSize(aMarker));
Point aPos(rInf.GetPos());
std::shared_ptr<SwRect> pPortionRect = std::make_shared<SwRect>();
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 0e0eadf3dd2d..baf45c7cf2dd 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -28,7 +28,7 @@ public:
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual TextFrameIndex GetModelPositionForViewPoint(SwTwips nOfst) const
override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
// Accessibility: pass information about this portion to the PortionHandler
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index a32f9acbae5d..b3355286c205 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -513,10 +513,10 @@ void SwFieldPortion::dumpAsXml(xmlTextWriterPtr pWriter,
const OUString& rText,
(void)xmlTextWriterEndElement(pWriter);
}
-SwPosSize SwFieldPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
+SwPositiveSize SwFieldPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
{
SwFontSave aSave( rInf, m_pFont.get() );
- SwPosSize aSize( SwExpandPortion::GetTextSize( rInf ) );
+ SwPositiveSize aSize( SwExpandPortion::GetTextSize( rInf ) );
return aSize;
}
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 697f54dce330..1c4198cf2b3a 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -103,7 +103,7 @@ public:
virtual SwFieldPortion *Clone( const OUString &rExpand ) const;
// Extra GetTextSize because of pFnt
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 58ece78aab34..b22deb6ca4a2 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -41,7 +41,7 @@ public:
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
// #i98418#
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 8d72a5b8745c..cd5eaf2643b5 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -41,12 +41,12 @@ TextFrameIndex
SwGluePortion::GetModelPositionForViewPoint(const SwTwips nOfst)
return TextFrameIndex(nOfst / (Width() / sal_Int32(GetLen())));
}
-SwPosSize SwGluePortion::GetTextSize( const SwTextSizeInfo &rInf ) const
+SwPositiveSize SwGluePortion::GetTextSize( const SwTextSizeInfo &rInf ) const
{
if (TextFrameIndex(1) >= GetLen() || rInf.GetLen() > GetLen() || !Width()
|| !GetLen())
- return SwPosSize(*this);
+ return SwPositiveSize(*this);
else
- return SwPosSize((Width() / sal_Int32(GetLen())) *
sal_Int32(rInf.GetLen()), Height());
+ return SwPositiveSize((Width() / sal_Int32(GetLen())) *
sal_Int32(rInf.GetLen()), Height());
}
bool SwGluePortion::GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const
@@ -88,7 +88,7 @@ void SwGluePortion::Paint( const SwTextPaintInfo &rInf ) const
if (TextFrameIndex(1) == GetLen())
{
OUString aBullet( CH_BULLET );
- SwPosSize aBulletSize( rInf.GetTextSize( aBullet ) );
+ SwPositiveSize aBulletSize( rInf.GetTextSize( aBullet ) );
Point aPos( rInf.GetPos() );
aPos.AdjustX((Width()/2) - (aBulletSize.Width()/2) );
SwTextPaintInfo aInf( rInf, &aBullet );
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index c48d063144ff..bf72ac571151 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -45,7 +45,7 @@ public:
inline void AdjFixWidth();
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual TextFrameIndex GetModelPositionForViewPoint(SwTwips nOfst) const
override;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
void dumpAsXml(xmlTextWriterPtr pWriter, const OUString& rText,
TextFrameIndex& nOffset) const override;
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 5862b396bc52..352a0b17e5f2 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -108,7 +108,7 @@ void SwLineLayout::DeleteNext()
void SwLineLayout::Height(const SwTwips nNew, const bool bText)
{
- SwPosSize::Height(nNew);
+ SwPositiveSize::Height(nNew);
if (bText)
m_nTextHeight = nNew;
}
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 3d0ce27e3884..6634dff7cb13 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -108,8 +108,8 @@ private:
void DeleteNext();
public:
- // From SwPosSize
- using SwPosSize::Height;
+ // From SwPositiveSize
+ using SwPositiveSize::Height;
virtual void Height(const SwTwips nNew, const bool bText = true) override;
// From SwLinePortion
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index ec88383e73d1..f02fc0bae0f0 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -138,12 +138,12 @@ void SwLinePortion::PrePaint( const SwTextPaintInfo& rInf,
void SwLinePortion::CalcTextSize( const SwTextSizeInfo &rInf )
{
if( GetLen() == rInf.GetLen() )
- *static_cast<SwPosSize*>(this) = GetTextSize( rInf );
+ *static_cast<SwPositiveSize*>(this) = GetTextSize( rInf );
else
{
SwTextSizeInfo aInf( rInf );
aInf.SetLen( GetLen() );
- *static_cast<SwPosSize*>(this) = GetTextSize( aInf );
+ *static_cast<SwPositiveSize*>(this) = GetTextSize( aInf );
}
}
@@ -230,11 +230,11 @@ TextFrameIndex
SwLinePortion::GetModelPositionForViewPoint(const SwTwips nOfst)
return TextFrameIndex(0);
}
-SwPosSize SwLinePortion::GetTextSize( const SwTextSizeInfo & ) const
+SwPositiveSize SwLinePortion::GetTextSize( const SwTextSizeInfo & ) const
{
OSL_ENSURE( false, "SwLinePortion::GetTextSize: don't ask me about sizes, "
"I'm only a stupid SwLinePortion" );
- return SwPosSize();
+ return SwPositiveSize();
}
bool SwLinePortion::Format( SwTextFormatInfo &rInf )
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 28f3c80d06a6..ff3f571b72e6 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -33,7 +33,7 @@ class SwPortionHandler;
/// Base class for anything that can be part of a line in the Writer layout.
/// Typically owned by SwLineLayout.
-class SAL_DLLPUBLIC_RTTI SwLinePortion: public SwPosSize
+class SAL_DLLPUBLIC_RTTI SwLinePortion: public SwPositiveSize
{
protected:
// Here we have areas with different attributes
@@ -145,7 +145,7 @@ public:
SwLinePortion *FindLastPortion();
virtual TextFrameIndex GetModelPositionForViewPoint(SwTwips nOfst) const;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const;
void CalcTextSize( const SwTextSizeInfo &rInfo );
// Output
@@ -184,7 +184,7 @@ public:
inline SwLinePortion &SwLinePortion::operator=(const SwLinePortion &rPortion)
{
- *static_cast<SwPosSize*>(this) = rPortion;
+ *static_cast<SwPositiveSize*>(this) = rPortion;
mnLineLength = rPortion.mnLineLength;
mnAscent = rPortion.mnAscent;
mnHangingBaseline = rPortion.mnHangingBaseline;
@@ -198,7 +198,7 @@ inline SwLinePortion &SwLinePortion::operator=(const
SwLinePortion &rPortion)
}
inline SwLinePortion::SwLinePortion(const SwLinePortion &rPortion) :
- SwPosSize( rPortion ),
+ SwPositiveSize( rPortion ),
mpNextPortion( nullptr ),
mnLineLength( rPortion.mnLineLength ),
mnAscent( rPortion.mnAscent ),
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 50e9a13ebd4a..8724ff4b9c8c 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -425,7 +425,7 @@ void SwDoubleLinePortion::FormatBrackets( SwTextFormatInfo
&rInf, SwTwips& nMaxW
if( SW_SCRIPTS > m_pBracket->nPreScript )
aTmpFnt.SetActual( m_pBracket->nPreScript );
SwFontSave aSave( rInf, &aTmpFnt );
- SwPosSize aSize = rInf.GetTextSize( aStr );
+ SwPositiveSize aSize = rInf.GetTextSize( aStr );
m_pBracket->nAscent = rInf.GetAscent();
m_pBracket->nHeight = aSize.Height();
aTmpFnt.SetActual( nActualScr );
@@ -449,7 +449,7 @@ void SwDoubleLinePortion::FormatBrackets( SwTextFormatInfo
&rInf, SwTwips& nMaxW
if( SW_SCRIPTS > m_pBracket->nPostScript )
aTmpFnt.SetActual( m_pBracket->nPostScript );
SwFontSave aSave( rInf, &aTmpFnt );
- SwPosSize aSize = rInf.GetTextSize( aStr );
+ SwPositiveSize aSize = rInf.GetTextSize( aStr );
const sal_uInt16 nTmpAsc = rInf.GetAscent();
if( nTmpAsc > m_pBracket->nAscent )
{
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index 85c58d6e2619..07187c7d42f3 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -133,7 +133,7 @@ class SwHangingPortion : public SwTextPortion
{
SwTwips m_nInnerWidth;
public:
- explicit SwHangingPortion( SwPosSize aSize ) : m_nInnerWidth(
aSize.Width() )
+ explicit SwHangingPortion( SwPositiveSize aSize ) : m_nInnerWidth(
aSize.Width() )
{
SetWhichPor( PortionType::Hanging );
SetLen(TextFrameIndex(1));
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 8f453531d4f3..914e2b156ef3 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -583,9 +583,9 @@ TextFrameIndex
SwTextPortion::GetModelPositionForViewPoint(const SwTwips nOfst)
}
// The GetTextSize() assumes that the own length is correct
-SwPosSize SwTextPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
+SwPositiveSize SwTextPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
{
- SwPosSize aSize = rInf.GetTextSize(GetLayoutContext());
+ SwPositiveSize aSize = rInf.GetTextSize(GetLayoutContext());
if( !GetJoinBorderWithPrev() )
aSize.Width(aSize.Width() + rInf.GetFont()->GetLeftBorderSpace() );
if( !GetJoinBorderWithNext() )
@@ -817,12 +817,12 @@ bool SwTextInputFieldPortion::GetExpText( const
SwTextSizeInfo &rInf, OUString &
return true;
}
-SwPosSize SwTextInputFieldPortion::GetTextSize( const SwTextSizeInfo &rInf )
const
+SwPositiveSize SwTextInputFieldPortion::GetTextSize( const SwTextSizeInfo
&rInf ) const
{
SwTextSlot aFormatText( &rInf, this, true, false );
if (rInf.GetLen() == TextFrameIndex(0))
{
- return SwPosSize( 0, 0 );
+ return SwPositiveSize( 0, 0 );
}
return rInf.GetTextSize();
@@ -841,9 +841,9 @@ SwHolePortion::SwHolePortion( const SwTextPortion &rPor )
SwLinePortion *SwHolePortion::Compress() { return this; }
// The GetTextSize() assumes that the own length is correct
-SwPosSize SwHolePortion::GetTextSize(const SwTextSizeInfo& rInf) const
+SwPositiveSize SwHolePortion::GetTextSize(const SwTextSizeInfo& rInf) const
{
- SwPosSize aSize = rInf.GetTextSize();
+ SwPositiveSize aSize = rInf.GetTextSize();
if (!GetJoinBorderWithPrev())
aSize.Width(aSize.Width() + rInf.GetFont()->GetLeftBorderSpace());
if (!GetJoinBorderWithNext())
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 438764e31318..028b52af5b0e 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -36,7 +36,7 @@ public:
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
virtual TextFrameIndex GetModelPositionForViewPoint(SwTwips nOfst) const
override;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
virtual SwTwips CalcSpacing( tools::Long nSpaceAdd, const SwTextSizeInfo
&rInf ) const override;
@@ -57,7 +57,7 @@ public:
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
+ virtual SwPositiveSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
};
class SwHolePortion : public SwLinePortion
@@ -69,7 +69,7 @@ public:
void SetBlankWidth(const SwTwips nNew) { m_nBlankWidth = nNew; }
virtual SwLinePortion *Compress() override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
- virtual SwPosSize GetTextSize(const SwTextSizeInfo& rInfo) const override;
+ virtual SwPositiveSize GetTextSize(const SwTextSizeInfo& rInfo) const
override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
// Accessibility: pass information about this portion to the PortionHandler
diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index fa803fcc467e..858ef70da594 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.hxx
@@ -21,27 +21,27 @@
#include <tools/gen.hxx>
#include <swtypes.hxx>
-// Compared to the SV sizes SwPosSize is always positive
-class SwPosSize
+// Compared to the SV sizes SwPositiveSize is always positive
+class SwPositiveSize
{
SwTwips m_nWidth;
SwTwips m_nHeight;
public:
- SwPosSize( const SwTwips nW = 0, const SwTwips nH = 0 )
+ SwPositiveSize( const SwTwips nW = 0, const SwTwips nH = 0 )
: m_nWidth(nW)
, m_nHeight(nH)
{
}
- explicit SwPosSize( const Size &rSize )
+ explicit SwPositiveSize( const Size &rSize )
: m_nWidth(SwTwips(rSize.Width()))
, m_nHeight(SwTwips(rSize.Height()))
{
}
- virtual ~SwPosSize() {}
- SwPosSize(SwPosSize const &) = default;
- SwPosSize(SwPosSize &&) = default;
- SwPosSize & operator =(SwPosSize const &) = default;
- SwPosSize & operator =(SwPosSize &&) = default;
+ virtual ~SwPositiveSize() {}
+ SwPositiveSize(SwPositiveSize const &) = default;
+ SwPositiveSize(SwPositiveSize &&) = default;
+ SwPositiveSize & operator =(SwPositiveSize const &) = default;
+ SwPositiveSize & operator =(SwPositiveSize &&) = default;
SwTwips Height() const { return m_nHeight; }
virtual void Height(const SwTwips nNew, const bool = true) { m_nHeight =
nNew; }
SwTwips Width() const { return m_nWidth; }
@@ -57,7 +57,7 @@ public:
m_nHeight = SwTwips(rSize.Width());
m_nWidth = SwTwips(rSize.Height());
}
- SwPosSize& operator=( const Size &rSize )
+ SwPositiveSize& operator=( const Size &rSize )
{
m_nWidth = SwTwips(rSize.Width());
m_nHeight = SwTwips(rSize.Height());
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 7e57d80c7cd5..681785bbbb0a 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -432,7 +432,7 @@ bool SwDropPortion::FormatText( SwTextFormatInfo &rInf )
return true;
}
-SwPosSize SwDropPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
+SwPositiveSize SwDropPortion::GetTextSize( const SwTextSizeInfo &rInf ) const
{
SwTwips nMyX = 0;
TextFrameIndex nIdx(0);
@@ -461,7 +461,7 @@ SwPosSize SwDropPortion::GetTextSize( const SwTextSizeInfo
&rInf ) const
// robust
SwFontSave aFontSave( rInf, pCurrPart ? &pCurrPart->GetFont() : nullptr );
- SwPosSize aPosSize( SwTextPortion::GetTextSize( rInf ) );
+ SwPositiveSize aPosSize( SwTextPortion::GetTextSize( rInf ) );
aPosSize.Width( aPosSize.Width() + nMyX );
const_cast<SwTextSizeInfo&>(rInf).SetIdx( nOldIdx );
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 09289408fc4c..31ad728ccdbc 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1423,7 +1423,7 @@ void SwFootnotePortion::Paint( const SwTextPaintInfo
&rInf ) const
SwExpandPortion::Paint( rInf );
}
-SwPosSize SwFootnotePortion::GetTextSize( const SwTextSizeInfo &rInfo ) const
+SwPositiveSize SwFootnotePortion::GetTextSize( const SwTextSizeInfo &rInfo )
const
{
// #i98418#
// SwFootnoteSave aFootnoteSave( rInfo, pFootnote );
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index ab1ebf984b74..510654a74f82 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -288,7 +288,7 @@ bool SwTextPortion::CreateHyphen( SwTextFormatInfo &rInf,
SwTextGuess const &rGu
// length of pHyphPor is adjusted
pHyphPor->SetLen( TextFrameIndex(aAltText.getLength() + 1) );
- static_cast<SwPosSize&>(*pHyphPor) = pHyphPor->GetTextSize( rInf );
+ static_cast<SwPositiveSize&>(*pHyphPor) = pHyphPor->GetTextSize( rInf
);
pHyphPor->SetLen( TextFrameIndex(aAltSpell.nChangedLength + nTmpLen) );
}
else
@@ -304,7 +304,7 @@ bool SwTextPortion::CreateHyphen( SwTextFormatInfo &rInf,
SwTextGuess const &rGu
rInf.GetFont()->GetFontCacheId( nTmpFontCacheId, nFntIdx,
rInf.GetFont()->GetActual() );
if( !nLastFontCacheId || nLastFontCacheId != nTmpFontCacheId ) {
nLastFontCacheId = nTmpFontCacheId;
- static_cast<SwPosSize&>(*pHyphPor) = pHyphPor->GetTextSize( rInf );
+ static_cast<SwPositiveSize&>(*pHyphPor) = pHyphPor->GetTextSize(
rInf );
aMiniCacheH = pHyphPor->Height();
aMiniCacheW = pHyphPor->Width();
} else {
@@ -449,7 +449,7 @@ void SwSoftHyphPortion::Paint( const SwTextPaintInfo &rInf
) const
OUString aMarker = u"-"_ustr;
SwTextPaintInfo aInf(rInf, &aMarker);
SwTextPortion aMarkerPor;
- SwPosSize aMarkerSize(rInf.GetTextSize(aMarker));
+ SwPositiveSize aMarkerSize(rInf.GetTextSize(aMarker));
aMarkerPor.Width(aMarkerSize.Width());
aMarkerPor.Height(aMarkerSize.Height());
aMarkerPor.SetAscent(GetAscent());
