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:24:50 +0100 |
| commit | b194c387c774a01a5e322670a754cf325a368451 (patch) | |
| tree | 02094de9865ed30d846cdef339b6127d841e9d08 /sw | |
| parent | 2c736afc7fb3fa745511e6e7232f6d86b553ce77 (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
(cherry picked from commit 15b9ea2b42d1c2e012c064d39b9afffdb08a9bbd)
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 c65c2c1190d8..ea211cf616f5 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1261,14 +1261,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++) { @@ -1336,11 +1334,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++; @@ -1472,10 +1465,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 ); - } } } @@ -1515,8 +1504,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 |