mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#106701 tabOverMargin: only affect specified tabstops, not autotab

Browse Source 
Change-Id: I15bf3a8555a152cab90380524b4a968f9f95fc37
Reviewed-on: https://gerrit.libreoffice.org/35924
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
This commit is contained in:
Justin Luth
2017-03-30 12:48:18 +03:00
parent 4a58754714
commit 5251e7988a
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/uiwriter/data/tdf106701_tabOverMarginAutotab.doc Normal file
View File

Binary file not shown.

15
sw/qa/extras/uiwriter/uiwriter.cxx
View File

@@ -227,6 +227,7 @@ public:
void testTdf104814();
void testTdf66405();
void testTdf35021_tabOverMarginDemo();
void testTdf106701_tabOverMarginAutotab();
void testTdf104492();
void testTdf105417();
void testTdf105625();
@@ -349,6 +350,7 @@ public:
CPPUNIT_TEST(testTdf104814);
CPPUNIT_TEST(testTdf66405);
CPPUNIT_TEST(testTdf35021_tabOverMarginDemo);
CPPUNIT_TEST(testTdf106701_tabOverMarginAutotab);
CPPUNIT_TEST(testTdf104492);
CPPUNIT_TEST(testTdf105417);
CPPUNIT_TEST(testTdf105625);
@@ -4415,6 +4417,19 @@ void SwUiWriterTest::testTdf35021_tabOverMarginDemo()
CPPUNIT_ASSERT_MESSAGE("Decimal Tab width is ~4096", nMargin < nWidth);
}
void SwUiWriterTest::testTdf106701_tabOverMarginAutotab()
{
createDoc("tdf106701_tabOverMarginAutotab.doc");
calcLayout();
xmlDocPtr pXmlDoc = parseLayoutDump();
// The right margin is ~3378
sal_Int32 nRightMargin = getXPath(pXmlDoc, "//body/txt[1]/infos/prtBounds", "width").toInt32();
// Automatic tabstops should never be affected by tabOverMargin compatibility
// The 1st line's width previously was ~9506
sal_Int32 nWidth = getXPath(pXmlDoc, "//LineBreak[1]", "nWidth").toInt32();
CPPUNIT_ASSERT_MESSAGE("1st line's width is less than the right margin", nWidth < nRightMargin);
}
void SwUiWriterTest::testTdf104492()
{
createDoc("tdf104492.docx");

2
sw/source/core/text/txttab.cxx
View File

@@ -378,7 +378,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
case POR_TABLEFT:
{
// handle this case in PostFormat
if( bTabOverMargin && GetTabPos() > rInf.Width() )
if( bTabOverMargin && !bAutoTabStop && GetTabPos() > rInf.Width() )
{
rInf.SetLastTab( this );
break;