diff options
author | Aron Budea <aron.budea@collabora.com> | 2018-12-21 22:32:54 +0100 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2018-12-27 17:17:40 +0100 |
commit | fb4dd9667551a0ee162584e1cf1c10fd3451ea0b (patch) | |
tree | 570feb2a9061e50ce9fc53ceabfbdd9900f85e0c /editeng | |
parent | c503ba502a9b7ddc6ac41044fb04dc2e1f276891 (diff) |
Revert tdf#115639 fixes
This reverts commit 62cf24fbd48064e3ba309109a92a2c408ae654b6.
This reverts commit ea4a9ca0a6ccf747a34997dc1d50efb82f9106ee.
This reverts commit 2a664263d043f0327a92d5d5f7507bd10143fd31.
Change-Id: If57c9f2aed054335d214ce87f17ab3f62dbebe65
Reviewed-on: https://gerrit.libreoffice.org/65645
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 144 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 10 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 7 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 10 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 12 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 10 |
6 files changed, 6 insertions, 187 deletions
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 6e27de1fd649..b16781ff9441 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -33,7 +33,6 @@ #include <svl/srchitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> -#include <editeng/adjustitem.hxx> #include <com/sun/star/text/textfield/Type.hpp> @@ -96,9 +95,6 @@ public: void testLargeParaCopyPaste(); - /// Test HoriAlignIgnoreTrailingWhitespace compatibility flag - void testHoriAlignIgnoreTrailingWhitespace(); - DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void ); CPPUNIT_TEST_SUITE(Test); @@ -118,7 +114,6 @@ public: CPPUNIT_TEST(testParaStartCopyPaste); CPPUNIT_TEST(testSectionAttributes); CPPUNIT_TEST(testLargeParaCopyPaste); - CPPUNIT_TEST(testHoriAlignIgnoreTrailingWhitespace); CPPUNIT_TEST_SUITE_END(); private: @@ -1838,145 +1833,6 @@ void Test::testLargeParaCopyPaste() CPPUNIT_ASSERT_EQUAL( aTenthPara, rDoc.GetParaAsString(sal_Int32(11)) ); } -void Test::testHoriAlignIgnoreTrailingWhitespace() -{ - // Create EditEngine's instance - EditEngine aEditEngine(mpItemPool); - - // Get EditDoc for current EditEngine's instance - EditDoc &rDoc = aEditEngine.GetEditDoc(); - - // Initially no text should be there - CPPUNIT_ASSERT_EQUAL(sal_uLong(0), rDoc.GetTextLen()); - CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(sal_Int32(0))); - - // Set initial text - OUString aText = "Some text "; - sal_Int32 aTextLen = aText.getLength(); - aEditEngine.SetText(aText); - - // Assert changes - text insertion - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(aTextLen), rDoc.GetTextLen()); - CPPUNIT_ASSERT_EQUAL(aText, rDoc.GetParaAsString(static_cast<sal_Int32>(0))); - - // First test case: center alignment with compatibility option enabled - { - aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(true); - std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet())); - pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST )); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(1), pSet->Count()); - - // Select all paragraphs and apply changes - ESelection aSelection(0, 0, 0, aTextLen); - aEditEngine.QuickSetAttribs(*pSet, aSelection); - - // Use a one line paragraph - aEditEngine.SetPaperSize(Size(10000, 6000)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEditEngine.GetLineCount(0)); - - // Check horizontal position - ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0]; - EditLine* pLine = &pParaPortion->GetLines()[0]; - CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast<long>(4527), pLine->GetStartPosX(), 100); - } - - // Second test case: center alignment with compatibility option disabled - { - aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(false); - std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet())); - pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST )); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(1), pSet->Count()); - - // Select all paragraphs and apply changes - ESelection aSelection(0, 0, 0, aTextLen); - aEditEngine.QuickSetAttribs(*pSet, aSelection); - - // Use a one line paragraph - aEditEngine.SetPaperSize(Size(10000, 6000)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEditEngine.GetLineCount(0)); - - // Check horizontal position - ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0]; - EditLine* pLine = &pParaPortion->GetLines()[0]; - CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast<long>(4407), pLine->GetStartPosX(), 100); - } - - // Third test case: right alignment with compatibility option enabled - { - aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(true); - std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet())); - pSet->Put(SvxAdjustItem( SvxAdjust::Right, EE_PARA_JUST )); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(1), pSet->Count()); - - // Select all paragraphs and apply changes - ESelection aSelection(0, 0, 0, aTextLen); - aEditEngine.QuickSetAttribs(*pSet, aSelection); - - // Use a one line paragraph - aEditEngine.SetPaperSize(Size(10000, 6000)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEditEngine.GetLineCount(0)); - - // Check horizontal position - ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0]; - EditLine* pLine = &pParaPortion->GetLines()[0]; - CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast<long>(9054), pLine->GetStartPosX(), 100); - } - - // Fourth test case: right alignment with compatibility option disabled - { - aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(false); - std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet())); - pSet->Put(SvxAdjustItem( SvxAdjust::Right, EE_PARA_JUST )); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(1), pSet->Count()); - - // Select all paragraphs and apply changes - ESelection aSelection(0, 0, 0, aTextLen); - aEditEngine.QuickSetAttribs(*pSet, aSelection); - - // Use a one line paragraph - aEditEngine.SetPaperSize(Size(10000, 6000)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEditEngine.GetLineCount(0)); - - // Check horizontal position - ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0]; - EditLine* pLine = &pParaPortion->GetLines()[0]; - CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast<long>(8815), pLine->GetStartPosX(), 100); - } - - // Test multiple paragraph case - { - // Set initial text - aText = "Some text \nMore Text "; - aTextLen = aText.getLength(); - aEditEngine.SetText(aText); - - // Assert changes - text insertion - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(aTextLen - 1), rDoc.GetTextLen()); - CPPUNIT_ASSERT_EQUAL(OUString("Some text "), rDoc.GetParaAsString(static_cast<sal_Int32>(0))); - CPPUNIT_ASSERT_EQUAL(OUString("More Text "), rDoc.GetParaAsString(static_cast<sal_Int32>(1))); - - aEditEngine.SetHoriAlignIgnoreTrailingWhitespace(true); - std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet())); - pSet->Put(SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST )); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(1), pSet->Count()); - - // Select all paragraphs and apply changes - ESelection aSelection(0, 0, 0, aTextLen); - aEditEngine.QuickSetAttribs(*pSet, aSelection); - - // Get one line paragraphs - aEditEngine.SetPaperSize(Size(10000, 6000)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEditEngine.GetLineCount(0)); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEditEngine.GetLineCount(1)); - - // Check horizontal position - ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0]; - CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast<long>(4527), pParaPortion->GetLines()[0].GetStartPosX(), 100); - pParaPortion = aEditEngine.GetParaPortions()[1]; - CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast<long>(8815), pParaPortion->GetLines()[0].GetStartPosX(), 100); - } -} - CPPUNIT_TEST_SUITE_REGISTRATION(Test); } diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index d840584f2739..a3679f5809b1 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2804,16 +2804,6 @@ bool EditEngine::IsPageOverflow() { return pImpEditEngine->IsPageOverflow(); } -void EditEngine::SetHoriAlignIgnoreTrailingWhitespace(bool bEnabled) -{ - pImpEditEngine->SetHoriAlignIgnoreTrailingWhitespace(bEnabled); -} - -bool EditEngine::IsHoriAlignIgnoreTrailingWhitespace() const -{ - return pImpEditEngine->IsHoriAlignIgnoreTrailingWhitespace(); -} - EFieldInfo::EFieldInfo() { } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index e80ab97cf918..d9ec9a17136a 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -535,7 +535,6 @@ private: bool bFirstWordCapitalization:1; // specifies if auto-correction should capitalize the first word or not bool mbLastTryMerge:1; bool mbReplaceLeadingSingleQuotationMark:1; - bool mbHoriAlignIgnoreTrailingWhitespace:1; bool mbNbspRunNext; // can't be a bitfield as it is passed as bool& @@ -833,7 +832,7 @@ public: sal_uInt32 GetTextHeight() const; sal_uInt32 GetTextHeightNTP() const; sal_uInt32 CalcTextWidth( bool bIgnoreExtraSpace ); - sal_uInt32 CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, bool bIgnoreExtraSpace, bool bIgnoreTrailingWhiteSpaces = false ); + sal_uInt32 CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, bool bIgnoreExtraSpace ); sal_Int32 GetLineCount( sal_Int32 nParagraph ) const; sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const; void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const; @@ -1064,10 +1063,6 @@ public: bool IsNbspRunNext() const { return mbNbspRunNext; } void Dispose(); - - // tdf#115639 compatibility flag - void SetHoriAlignIgnoreTrailingWhitespace(bool bEnabled) { mbHoriAlignIgnoreTrailingWhitespace = bEnabled; } - bool IsHoriAlignIgnoreTrailingWhitespace() const { return mbHoriAlignIgnoreTrailingWhitespace; } }; inline EPaM ImpEditEngine::CreateEPaM( const EditPaM& rPaM ) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index c39295b11a2d..653d552823ac 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -108,7 +108,6 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : bFirstWordCapitalization(true), mbLastTryMerge(false), mbReplaceLeadingSingleQuotationMark(true), - mbHoriAlignIgnoreTrailingWhitespace(false), mbNbspRunNext(false) { pEditEngine = pEE; @@ -3165,7 +3164,7 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace ) return (sal_uInt32)nMaxWidth; } -sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, bool bIgnoreExtraSpace, bool bIgnoreTrailingWhiteSpaces ) +sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, bool bIgnoreExtraSpace ) { sal_Int32 nPara = GetEditDoc().GetPos( pPortion->GetNode() ); @@ -3194,7 +3193,7 @@ sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, break; case PortionKind::TEXT: { - if ( (( eJustification != SvxAdjust::Block ) || ( !bIgnoreExtraSpace )) && !bIgnoreTrailingWhiteSpaces ) + if ( ( eJustification != SvxAdjust::Block ) || ( !bIgnoreExtraSpace ) ) { nWidth += rTextPortion.GetSize().Width(); } @@ -3204,10 +3203,7 @@ sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, SeekCursor( pPortion->GetNode(), nPos+1, aTmpFont ); aTmpFont.SetPhysFont( GetRefDevice() ); ImplInitDigitMode(GetRefDevice(), aTmpFont.GetLanguage()); - if (bIgnoreTrailingWhiteSpaces) - nWidth += aTmpFont.QuickGetTextSize( GetRefDevice(), pPortion->GetNode()->GetString().trim(), nPos, rTextPortion.GetLen() ).Width(); - else - nWidth += aTmpFont.QuickGetTextSize( GetRefDevice(), pPortion->GetNode()->GetString(), nPos, rTextPortion.GetLen() ).Width(); + nWidth += aTmpFont.QuickGetTextSize( GetRefDevice(), pPortion->GetNode()->GetString(), nPos, rTextPortion.GetLen() ).Width(); } } break; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index c7557a47375e..352386410d5f 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1509,11 +1509,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) { case SvxAdjust::Center: { - long n; - if(IsHoriAlignIgnoreTrailingWhitespace()) - n = ( nMaxLineWidth - CalcLineWidth( pParaPortion, pLine, false, true ) ) / 2; - else - n = ( nMaxLineWidth - aTextSize.Width() ) / 2; + long n = ( nMaxLineWidth - aTextSize.Width() ) / 2; n += nStartX; // Indentation is kept. pLine->SetStartPosX( n ); } @@ -1522,11 +1518,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) { // For automatically wrapped lines, which has a blank at the end // the blank must not be displayed! - long n; - if(IsHoriAlignIgnoreTrailingWhitespace()) - n = nMaxLineWidth - CalcLineWidth( pParaPortion, pLine, false, true ); - else - n = nMaxLineWidth - aTextSize.Width(); + long n = nMaxLineWidth - aTextSize.Width(); n += nStartX; // Indentation is kept. pLine->SetStartPosX( n ); } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 7e65100b03f7..27ffe02353db 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -366,16 +366,6 @@ sal_Int32 Outliner::GetBulletsNumberingStatus() const : 2; } -void Outliner::SetHoriAlignIgnoreTrailingWhitespace(bool bEnabled) -{ - pEditEngine->SetHoriAlignIgnoreTrailingWhitespace( bEnabled ); -} - -bool Outliner::IsHoriAlignIgnoreTrailingWhitespace() const -{ - return pEditEngine->IsHoriAlignIgnoreTrailingWhitespace(); -} - OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 nCount ) const { if ( static_cast<sal_uLong>(nStartPara) + nCount > |