diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-01-18 15:54:47 +0100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2018-03-14 21:19:23 +0100 |
| commit | 15b9ea2b42d1c2e012c064d39b9afffdb08a9bbd (patch) | |
| tree | 516be4807cfe692d46b16fed511ce9b241e071b1 /sw | |
| parent | 6c86ae2fec7d2a1375a3e9683ea2155448990ce7 (diff) | |
sw: remove duplicate "MsWordCompTrailingBlanks" view setting
This is already a document setting, no point in writing it twice into
settings.xml.
(cherry picked from commit 7667675397c98bb38cdd14dd689a32e9f8a986d3)
Change-Id: Idcc99a194df321e11e091a2388b919e11fe94316
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 4ca6fc94bfe6..6037ff24a417 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1262,14 +1262,12 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns(); bool bSelectedFrame = ( m_pWrtShell->GetSelFrameType() != FrameTypeFlags::NONE ), - bMsWordCompTrailingBlanks = false, bGotVisibleLeft = false, bGotVisibleTop = false, bGotVisibleRight = false, bGotVisibleBottom = false, bGotZoomType = false, bGotZoomFactor = false, bGotIsSelectedFrame = false, bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false, - bBrowseMode = false, bGotBrowseMode = false, - bGotMsWordCompTrailingBlanks = false; + bBrowseMode = false, bGotBrowseMode = false; for (sal_Int32 i = 0 ; i < nLength; i++) { @@ -1337,11 +1335,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > pValue->Value >>= bBrowseMode; bGotBrowseMode = true; } - else if ( pValue->Name == "MsWordCompTrailingBlanks" ) - { - pValue->Value >>= bMsWordCompTrailingBlanks; - bGotMsWordCompTrailingBlanks = true; - } // Fallback to common SdrModel processing else GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->ReadUserDataSequenceValue(pValue); pValue++; @@ -1473,10 +1466,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > m_pWrtShell->EnableSmooth( true ); } } - if ( bGotMsWordCompTrailingBlanks ) - { - GetDocShell()->GetDoc()->getIDocumentSettingAccess().set( DocumentSettingId::MS_WORD_COMP_TRAILING_BLANKS, bMsWordCompTrailingBlanks ); - } } } @@ -1516,8 +1505,6 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe aVector.push_back(comphelper::makePropertyValue("IsSelectedFrame", FrameTypeFlags::NONE != m_pWrtShell->GetSelFrameType())); - aVector.push_back(comphelper::makePropertyValue("MsWordCompTrailingBlanks", GetDocShell()->GetDoc()->getIDocumentSettingAccess().get( DocumentSettingId::MS_WORD_COMP_TRAILING_BLANKS ))); - rSequence = comphelper::containerToSequence(aVector); // Common SdrModel processing |