svx/source/svdraw/svdotext.cxx | 135 ++++++++++++++++++-----------------------
1 file changed, 61 insertions(+), 74 deletions(-)
New commits:
commit b218e34b9b92e5359b1c272d52f12259133876c1
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed Aug 31 23:01:39 2022 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Sep 6 21:35:25 2022 +0200
svx: set vars to initial values in constructor init for SdrTextObj
Change-Id: Id3fb342a4273b617ac2975bff3dd79159ab8df75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139531
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2b5fa5023345..24223aaee738 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -69,46 +69,43 @@ std::unique_ptr<sdr::contact::ViewContact>
SdrTextObj::CreateObjectSpecificViewC
}
SdrTextObj::SdrTextObj(SdrModel& rSdrModel)
-: SdrAttrObj(rSdrModel),
- mpEditingOutliner(nullptr),
- meTextKind(SdrObjKind::Text)
+ : SdrAttrObj(rSdrModel)
+ , mpEditingOutliner(nullptr)
+ , meTextKind(SdrObjKind::Text)
+ , maTextEditOffset(Point(0, 0))
+ , mbTextFrame(false)
+ , mbNoShear(false)
+ , mbTextSizeDirty(false)
+ , mbInEditMode(false)
+ , mbDisableAutoWidthOnDragging(false)
+ , mbTextAnimationAllowed(true)
+ , mbInDownScale(false)
{
- mbTextSizeDirty = false;
- mbTextFrame = false;
- mbNoShear = false;
- mbDisableAutoWidthOnDragging = false;
-
- mbInEditMode = false;
- mbTextAnimationAllowed = true;
- maTextEditOffset = Point(0, 0);
-
// #i25616#
mbSupportTextIndentingOnLineWidthChange = true;
- mbInDownScale = false;
}
SdrTextObj::SdrTextObj(SdrModel& rSdrModel, SdrTextObj const & rSource)
-: SdrAttrObj(rSdrModel, rSource),
- mpEditingOutliner(nullptr)
+ : SdrAttrObj(rSdrModel, rSource)
+ , mpEditingOutliner(nullptr)
+ , meTextKind(rSource.meTextKind)
+ , maTextEditOffset(Point(0, 0))
+ , mbTextFrame(rSource.mbTextFrame)
+ , mbNoShear(rSource.mbNoShear)
+ , mbTextSizeDirty(rSource.mbTextSizeDirty)
+ , mbInEditMode(false)
+ , mbDisableAutoWidthOnDragging(rSource.mbDisableAutoWidthOnDragging)
+ , mbTextAnimationAllowed(true)
+ , mbInDownScale(false)
{
- mbInEditMode = false;
- mbTextAnimationAllowed = true;
- maTextEditOffset = Point(0, 0);
-
// #i25616#
mbSupportTextIndentingOnLineWidthChange = true;
- mbInDownScale = false;
maRect = rSource.maRect;
maGeo = rSource.maGeo;
- meTextKind = rSource.meTextKind;
- mbTextFrame = rSource.mbTextFrame;
maTextSize = rSource.maTextSize;
- mbTextSizeDirty = rSource.mbTextSizeDirty;
// Not all of the necessary parameters were copied yet.
- mbNoShear = rSource.mbNoShear;
- mbDisableAutoWidthOnDragging = rSource.mbDisableAutoWidthOnDragging;
SdrText* pText = getActiveText();
if( pText && rSource.HasText() )
@@ -136,70 +133,60 @@ SdrTextObj::SdrTextObj(SdrModel& rSdrModel, SdrTextObj
const & rSource)
ImpSetTextStyleSheetListeners();
}
-SdrTextObj::SdrTextObj(
- SdrModel& rSdrModel,
- const tools::Rectangle& rNewRect)
-: SdrAttrObj(rSdrModel),
- maRect(rNewRect),
- mpEditingOutliner(nullptr),
- meTextKind(SdrObjKind::Text)
+SdrTextObj::SdrTextObj(SdrModel& rSdrModel, const tools::Rectangle& rNewRect)
+ : SdrAttrObj(rSdrModel)
+ , maRect(rNewRect)
+ , mpEditingOutliner(nullptr)
+ , meTextKind(SdrObjKind::Text)
+ , maTextEditOffset(Point(0, 0))
+ , mbTextFrame(false)
+ , mbNoShear(false)
+ , mbTextSizeDirty(false)
+ , mbInEditMode(false)
+ , mbDisableAutoWidthOnDragging(false)
+ , mbTextAnimationAllowed(true)
+ , mbInDownScale(false)
{
- mbTextSizeDirty = false;
- mbTextFrame = false;
- mbNoShear = false;
- mbDisableAutoWidthOnDragging = false;
ImpJustifyRect(maRect);
- mbInEditMode = false;
- mbTextAnimationAllowed = true;
- mbInDownScale = false;
- maTextEditOffset = Point(0, 0);
-
// #i25616#
mbSupportTextIndentingOnLineWidthChange = true;
}
-SdrTextObj::SdrTextObj(
- SdrModel& rSdrModel,
- SdrObjKind eNewTextKind)
-: SdrAttrObj(rSdrModel),
- mpEditingOutliner(nullptr),
- meTextKind(eNewTextKind)
+SdrTextObj::SdrTextObj(SdrModel& rSdrModel, SdrObjKind eNewTextKind)
+ : SdrAttrObj(rSdrModel)
+ , mpEditingOutliner(nullptr)
+ , meTextKind(eNewTextKind)
+ , maTextEditOffset(Point(0, 0))
+ , mbTextFrame(true)
+ , mbNoShear(true)
+ , mbTextSizeDirty(false)
+ , mbInEditMode(false)
+ , mbDisableAutoWidthOnDragging(false)
+ , mbTextAnimationAllowed(true)
+ , mbInDownScale(false)
{
- mbTextSizeDirty = false;
- mbTextFrame = true;
- mbNoShear = true;
- mbDisableAutoWidthOnDragging = false;
-
- mbInEditMode = false;
- mbTextAnimationAllowed = true;
- mbInDownScale = false;
- maTextEditOffset = Point(0, 0);
-
// #i25616#
mbSupportTextIndentingOnLineWidthChange = true;
}
-SdrTextObj::SdrTextObj(
- SdrModel& rSdrModel,
- SdrObjKind eNewTextKind,
- const tools::Rectangle& rNewRect)
-: SdrAttrObj(rSdrModel),
- maRect(rNewRect),
- mpEditingOutliner(nullptr),
- meTextKind(eNewTextKind)
+SdrTextObj::SdrTextObj(SdrModel& rSdrModel, SdrObjKind eNewTextKind,
+ const tools::Rectangle& rNewRect)
+ : SdrAttrObj(rSdrModel)
+ , maRect(rNewRect)
+ , mpEditingOutliner(nullptr)
+ , meTextKind(eNewTextKind)
+ , maTextEditOffset(Point(0, 0))
+ , mbTextFrame(true)
+ , mbNoShear(true)
+ , mbTextSizeDirty(false)
+ , mbInEditMode(false)
+ , mbDisableAutoWidthOnDragging(false)
+ , mbTextAnimationAllowed(true)
+ , mbInDownScale(false)
{
- mbTextSizeDirty = false;
- mbTextFrame = true;
- mbNoShear = true;
- mbDisableAutoWidthOnDragging = false;
ImpJustifyRect(maRect);
- mbInEditMode = false;
- mbTextAnimationAllowed = true;
- mbInDownScale = false;
- maTextEditOffset = Point(0, 0);
-
// #i25616#
mbSupportTextIndentingOnLineWidthChange = true;
}
