sw/qa/extras/layout/data/tdf163042.fodt | 188 ++++++++++++++++++++++++++++++++
sw/qa/extras/layout/layout3.cxx | 42 +++++++
sw/source/core/text/itrcrsr.cxx | 15 ++
sw/source/core/text/itrpaint.cxx | 8 +
4 files changed, 249 insertions(+), 4 deletions(-)
New commits:
commit 6c799ef5d9a345d6ddfe62784172445bd9b44f18
Author: László Németh <nem...@numbertext.org>
AuthorDate: Thu Sep 19 11:22:50 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Oct 25 16:07:29 2024 +0200
tdf#163042 sw smart justify: fix cursor of single portion lines
Fixed problems with cursor/pilcrow positions in a shrunk last
line of a paragraph with a single portion:
– clicking before the last or the last but one characters of the line,
the cursor could be positioned at the end of the line, not before
the last or the last but one characters (especially a line with
more spaces and bigger space shrinking).
– when the text cursor was there at the end, the visible cursor position
was inside the line instead of the end of the line;
– pilcrow symbol was inside the line instead of the end of the line.
Follow-up to commit 6b857398a59d16308d6185d01e003e401439f060
"tdf#162109 sw smart justify: fix overhanging last line"
and commit 22eac3145ca62d15b47d95f4df60ce38d4f5aa46
"tdf#162220 sw smart justify: fix shrinking for single portion lines".
Change-Id: I0057f17fe187381c4c5d78574dcd99e0dafc11b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173662
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
(cherry picked from commit 2baaf66b71fd429479dddb41f6b06aa7bba61039)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173638
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/layout/data/tdf163042.fodt
b/sw/qa/extras/layout/data/tdf163042.fodt
new file mode 100644
index 000000000000..b4426050fec5
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf163042.fodt
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="ViewAreaTop"
config:type="long">0</config:config-item>
+ <config:config-item config:name="ViewAreaLeft"
config:type="long">9384</config:config-item>
+ <config:config-item config:name="ViewAreaWidth"
config:type="long">6414</config:config-item>
+ <config:config-item config:name="ViewAreaHeight"
config:type="long">3750</config:config-item>
+ <config:config-item config:name="ShowRedlineChanges"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="InBrowseMode"
config:type="boolean">false</config:config-item>
+ <config:config-item-map-indexed config:name="Views">
+ <config:config-item-map-entry>
+ <config:config-item config:name="ViewId"
config:type="string">view2</config:config-item>
+ <config:config-item config:name="ViewLeft"
config:type="long">14035</config:config-item>
+ <config:config-item config:name="ViewTop"
config:type="long">1263</config:config-item>
+ <config:config-item config:name="VisibleLeft"
config:type="long">9384</config:config-item>
+ <config:config-item config:name="VisibleTop"
config:type="long">0</config:config-item>
+ <config:config-item config:name="VisibleRight"
config:type="long">15796</config:config-item>
+ <config:config-item config:name="VisibleBottom"
config:type="long">3748</config:config-item>
+ <config:config-item config:name="ZoomType"
config:type="short">0</config:config-item>
+ <config:config-item config:name="ViewLayoutColumns"
config:type="short">1</config:config-item>
+ <config:config-item config:name="ViewLayoutBookMode"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ZoomFactor"
config:type="short">600</config:config-item>
+ <config:config-item config:name="IsSelectedFrame"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="KeepRatio"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AnchoredTextOverflowLegacy"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LegacySingleLineFontwork"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ConnectorUseSnapRect"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IgnoreBreakAfterMultilineField"
config:type="boolean">false</config:config-item>
+ </config:config-item-map-entry>
+ </config:config-item-map-indexed>
+ </config:config-item-set>
+ <config:config-item-set config:name="ooo:configuration-settings">
+ <config:config-item config:name="PrintProspectRTL"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintPageBackground"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintDrawings"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintFaxName" config:type="string"/>
+ <config:config-item config:name="PrintReversed"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintAnnotationMode"
config:type="short">0</config:config-item>
+ <config:config-item config:name="PrintHiddenText"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintEmptyPages"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PaintHellOverHeaderFooter"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintGraphics"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="NoNumberingShowFollowBy"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="MinRowHeightInclBorder"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="HyphenateURLs"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ImagePreferredDPI"
config:type="int">0</config:config-item>
+ <config:config-item config:name="FootnoteInColumnToPageEnd"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="GutterAtTop"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ContinuousEndnotes"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="FrameAutowidthWithMorePara"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SubtractFlysAnchoredAtFlys"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SurroundTextWrapSmall"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintControls"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="TreatSingleColumnBreakAsPageBreak"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="TabOverSpacing"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="TabOverMargin"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedComplexScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedAsianScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintTextPlaceholder"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ApplyTextAttrToEmptyLineAtEndOfParagraph"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedSystemFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DisableOffPagePositioning"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="BackgroundParaOverDrawings"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="TabOverflow"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AllowPrintJobCancel"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddVerticalFrameOffsets"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ProtectBookmarks"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AddFrameOffsets"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintBlackFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="TableRowKeep"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ApplyParagraphMarkFormatToNumbering"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrinterIndependentLayout"
config:type="string">high-resolution</config:config-item>
+ <config:config-item config:name="JustifyLinesWithShrinking"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="RsidRoot"
config:type="int">1673509</config:config-item>
+ <config:config-item config:name="PrintProspect"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CollapseEmptyCellPara"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintPaperFromSetup"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CurrentDatabaseCommand"
config:type="string"/>
+ <config:config-item config:name="CurrentDatabaseDataSource"
config:type="string"/>
+ <config:config-item config:name="SaveThumbnail"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbeddedDatabaseName"
config:type="string"/>
+ <config:config-item config:name="UnbreakableNumberings"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SaveGlobalDocumentLinks"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="MsWordCompTrailingBlanks"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintTables"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintLeftPages"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddParaTableSpacing"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterPaperFromSetup"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CurrentDatabaseCommandType"
config:type="int">0</config:config-item>
+ <config:config-item config:name="ChartAutoUpdate"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="OutlineLevelYieldsNumbering"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UseOldNumbering"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AddParaSpacingToTableCells"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="FieldAutoUpdate"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PropLineSpacingShrinksFirstLine"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="TabAtLeftIndentForParagraphsInList"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintRightPages"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="DoNotCaptureDrawObjsOnPage"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="LoadReadonly"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="HeaderSpacingBelowLastPara"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SaveVersionOnClose"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ClippedPictures"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="MathBaselineAlignment"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AlignTabStopPosition"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="UseFormerLineSpacing"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DoNotMirrorRtlDrawObjs"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrinterName"
config:type="string">hp-LaserJet-1320-series</config:config-item>
+ <config:config-item config:name="AddParaLineSpacingToTableCells"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsKernAsianPunctuation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DoNotJustifyLinesWithManualBreak"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CharacterCompressionType"
config:type="short">0</config:config-item>
+ <config:config-item config:name="IsLabelDocument"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedLatinScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="UseVariableWidthNBSP"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedOnlyUsedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ApplyUserData"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddParaTableSpacingAtStart"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="InvertBorderSpacing"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ProtectFields"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AddExternalLeading"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="LinkUpdateMode"
config:type="short">1</config:config-item>
+ <config:config-item config:name="UseFormerObjectPositioning"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UnxForceZeroExtLeading"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UseFormerTextWrapping"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ConsiderTextWrapOnObjPos"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="StylesNoDefault"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IgnoreFirstLineIndentInNumbering"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="NoGapAfterNoteNumber"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmptyDbFieldHidesPara"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DoNotResetParaAttrsForNumFont"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DropCapPunctuation"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="UseOldPrinterMetrics"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RedlineProtectionKey"
config:type="base64Binary"/>
+ <config:config-item config:name="TabsRelativeToIndent"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="Rsid"
config:type="int">2068774</config:config-item>
+ <config:config-item config:name="UpdateFromTemplate"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ProtectForm"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="MsWordCompMinLineHeightByFly"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SmallCapsPercentage66"
config:type="boolean">false</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"
style:font-family-generic="swiss" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:hyphenation-ladder-count="no-limit"
fo:hyphenation-keep="auto" loext:hyphenation-keep-type="column"
style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging"
style:line-break="strict" style:tab-stop-distance="1.27cm"
style:writing-mode="lr-tb"/>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Calibri" fo:font-size="10pt"
fo:language="en" fo:country="US" style:letter-kerning="false"
fo:hyphenate="false" fo:hyphenation-remain-char-count="2"
fo:hyphenation-push-char-count="2" loext:hyphenation-no-caps="false"
loext:hyphenation-no-last-word="false" loext:hyphenation-word-char-count="5"
loext:hyphenation-zone="no-limit"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text">
+ <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm"
style:contextual-spacing="false" fo:text-align="start"
style:justify-single-word="false" fo:orphans="2" fo:widows="2"
style:writing-mode="lr-tb"/>
+ <style:text-properties style:font-name="Arial" fo:font-family="Arial"
style:font-family-generic="swiss" style:font-pitch="variable"
fo:font-size="12pt" fo:language="en" fo:country="GB"/>
+ </style:style>
+ <style:default-page-layout>
+ <style:page-layout-properties style:writing-mode="lr-tb"
style:layout-grid-standard-mode="true"/>
+ </style:default-page-layout>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:text-align="justify"
style:justify-single-word="false"/>
+ <style:text-properties fo:font-size="5pt"
officeooo:paragraph-rsid="001b7e24"/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="14.801cm"
fo:page-height="21.001cm" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="0.762cm"
fo:margin-bottom="0.508cm" fo:margin-left="1.27cm" fo:margin-right="1.27cm"
style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0"
style:layout-grid-lines="31" style:layout-grid-base-height="0.635cm"
style:layout-grid-ruby-height="0cm" style:layout-grid-mode="none"
style:layout-grid-ruby-below="false" style:layout-grid-print="false"
style:layout-grid-display="false" style:layout-grid-base-width="0.369cm"
style:layout-grid-snap-to="true" style:footnote-max-height="0cm"
loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:style style:name="dp1" style:family="drawing-page">
+ <style:drawing-page-properties draw:background-size="full"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"
draw:style-name="dp1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text>
+ <text:p text:style-name="P1">Donec auctor molestie sem, sit amet tristique
lectus hendrerit sed. Cras sodalesDonec auctor molestie sem, sit amet tristique
lectus hendrerit sed. Cras sodales</text:p>
+ </office:text>
+ </office:body>
+</office:document>
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index 977959a670af..c497276c9adc 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -339,6 +339,48 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158419)
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(156),
aPosition.GetContentIndex());
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf163042)
+{
+ createSwDoc("tdf163042.fodt");
+ SwDoc* pDoc = getSwDoc();
+ SwDocShell* pShell = pDoc->GetDocShell();
+
+ // Ensure that all text portions are calculated before testing.
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwViewShell* pViewShell
+ =
pTextDoc->GetDocShell()->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
+ CPPUNIT_ASSERT(pViewShell);
+ pViewShell->Reformat();
+
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+ // 1-line paragraph
+ SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+ SwWrtShell* pWrtShell = pShell->GetWrtShell();
+ SwPosition aPosition(*pWrtShell->GetCursor()->Start());
+ SwTwips nParaLeft
+ = getXPath(pXmlDoc, "/root/page/body/txt[1]/infos/bounds"_ostr,
"left"_ostr).toInt32();
+ SwTwips nParaWidth
+ = getXPath(pXmlDoc, "/root/page/body/txt[1]/infos/bounds"_ostr,
"width"_ostr).toInt32();
+ SwTwips nParaTop
+ = getXPath(pXmlDoc, "/root/page/body/txt[1]/infos/bounds"_ostr,
"top"_ostr).toInt32();
+ SwTwips nParaHeight
+ = getXPath(pXmlDoc, "/root/page/body/txt[1]/infos/bounds"_ostr,
"height"_ostr).toInt32();
+ Point aPoint;
+
+ // click before the last but one character of the paragraph
+ // (in a line shrunk by the new space shrinking justification)
+
+ aPoint.setX(nParaLeft + nParaWidth - 2 * nParaWidth / 160);
+ aPoint.setY(nParaTop + nParaHeight * 0.5);
+ SwCursorMoveState aState(CursorMoveState::NONE);
+ pLayout->GetModelPositionForViewPoint(&aPosition, aPoint, &aState);
+ // Without the accompanying fix in place, this test would have failed:
character position was 160,
+ // i.e. cursor was at the end of the paragraph instead of the last but one
character
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(158),
aPosition.GetContentIndex());
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf162109)
{
createSwDoc("tdf162109.fodt");
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 76bc368856fa..4f082cf0ce47 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -644,7 +644,12 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig,
TextFrameIndex const nOfst,
if ( aInf.GetIdx() + pPor->GetLen() < nOfst + nExtra )
{
if ( pPor->InSpaceGrp() && nSpaceAdd )
- nX += pPor->PrtWidth() +
+ // tdf#163042 In the case of shrunk lines with a
single portion,
+ // adjust the line width to show the cursor in the
correct position
+ nX += ( ( std::abs( m_pCurr->Width() -
pPor->PrtWidth() ) <= 1 &&
+ m_pCurr->ExtraShrunkWidth() > 0 )
+ ? m_pCurr->ExtraShrunkWidth()
+ : pPor->PrtWidth() ) +
pPor->CalcSpacing( nSpaceAdd, aInf );
else
{
@@ -1415,8 +1420,12 @@ TextFrameIndex
SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, con
// nWidth is the width of the line, or the width of
// the paragraph with the font change, in which nX is situated.
-
- SwTwips nWidth = pPor->Width();
+ // tdf#16342 In the case of shrunk lines with a single portion,
+ // adjust the line width to move the cursor to the click position
+ SwTwips nWidth =
+ ( std::abs( m_pCurr->Width() - pPor->Width() ) <= 1 &&
m_pCurr->ExtraShrunkWidth() > 0 )
+ ? m_pCurr->ExtraShrunkWidth()
+ : pPor->Width();
if ( m_pCurr->IsSpaceAdd() || pKanaComp )
{
if ( pPor->InSpaceGrp() && nSpaceAdd )
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 5b6bb1288d57..a8a74952bc37 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -516,7 +516,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint,
SwSaveClip &rClip,
delete GetInfo().GetUnderFnt();
GetInfo().SetUnderFnt( nullptr );
- // paint remaining stuff
+ // paint remaining stuff, e.g. the line ending symbols, pilcrow (¶) and
the line break
if( bDrawInWindow )
{
// If special vertical alignment is enabled, GetInfo().Y() is the
@@ -549,6 +549,12 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint,
SwSaveClip &rClip,
GetInfo().Y( GetInfo().GetPos().Y()
+ AdjustBaseLine( *m_pCurr, &aEnd ) );
GetInfo().X( GetInfo().X() +
+ // tdf#163042 In the case of shrunk lines with a single
portion, adjust
+ // the line width (if needed, i.e. if the shrunk line doesn't
end in a space)
+ // to show the terminating pilcrow at the correct position,
and not before that
+ ( ( !( pEndTempl->GetNextPortion() &&
pEndTempl->GetNextPortion()->IsHolePortion() ) &&
+ std::abs( m_pCurr->Width() -
m_pCurr->GetFirstPortion()->Width() ) <= 1 && m_pCurr->ExtraShrunkWidth() > 0 )
+ ? m_pCurr->ExtraShrunkWidth() - m_pCurr->Width() : 0 )
+
( GetCurr()->IsHanging() ? GetCurr()->GetHangingMargin() :
0 ) );
aEnd.Paint( GetInfo() );
GetInfo().Y( nOldY );
