diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 07fcc54d10d4..1177b5472dcd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1610,14 +1610,6 @@
false
-
-
-
- Specifies whether to hide whitespace.
-
-
- false
-
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index 45590d5e0b8a..e2599f4092b3 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -271,9 +271,8 @@ Sequence SwLayoutViewConfig::GetPropertyNames() const
"Other/IsSquaredPageMode", //17
"Other/ApplyCharUnit", //18
"Window/ShowScrollBarTips", //19
- "ViewLayout/HideWhitespace", //20
};
- const int nCount = m_bWeb ? 13 : 21;
+ const int nCount = m_bWeb ? 13 : 20;
Sequence aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -335,7 +334,6 @@ void SwLayoutViewConfig::ImplCommit()
case 17: rVal <<= m_rParent.IsSquaredPageMode(); break; // "Other/IsSquaredPageMode",
case 18: rVal <<= m_rParent.IsApplyCharUnit(); break; // "Other/ApplyCharUnit",
case 19: rVal <<= m_rParent.IsShowScrollBarTips(); break; // "Window/ShowScrollBarTips",
- case 20: rVal <<= m_rParent.IsHideWhitespaceMode(); break; // "ViewLayout/HideWhitespace"
}
}
PutProperties(aNames, aValues);
@@ -391,7 +389,6 @@ void SwLayoutViewConfig::Load()
case 17: m_rParent.SetDefaultPageMode(bSet,true); break;// "Other/IsSquaredPageMode",
case 18: m_rParent.SetApplyCharUnit(bSet, true); break;// "Other/ApplyUserChar"
case 29: m_rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips",
- case 20: m_rParent.SetHideWhitespaceMode(bSet); break;// "ViewLayout/HideWhitespace"
}
}
}
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index a878e5591a9d..219958ec8517 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1347,7 +1347,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
sal_Int16 nZoomFactor = static_cast < sal_Int16 > (pVOpt->GetZoom());
bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();
sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns();
- bool bHideWhitespace = pVOpt->IsHideWhitespaceMode();
bool bSelectedFrame = ( m_pWrtShell->GetSelFrameType() != FrameTypeFlags::NONE ),
bGotVisibleLeft = false,
@@ -1355,7 +1354,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
bGotZoomType = false,
bGotZoomFactor = false, bGotIsSelectedFrame = false,
bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false,
- bGotHideWhitespace = false,
bBrowseMode = false, bGotBrowseMode = false;
bool bKeepRatio = pVOpt->IsKeepRatio();
bool bGotKeepRatio = false;
@@ -1419,11 +1417,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
rValue.Value >>= bKeepRatio;
bGotKeepRatio = true;
}
- else if (rValue.Name == "HideWhitespace")
- {
- rValue.Value >>= bHideWhitespace;
- bGotHideWhitespace = true;
- }
// Fallback to common SdrModel processing
else
GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->ReadUserDataSequenceValue(&rValue);
@@ -1493,21 +1486,11 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
m_pWrtShell->SetMacroExecAllowed( bSavedFlagValue );
}
- SwViewOption aUsrPref(*pVOpt);
- bool bUsrPrefModified = false;
if (bGotKeepRatio && bKeepRatio != pVOpt->IsKeepRatio())
{
// Got a custom value, then it makes sense to trigger notifications.
+ SwViewOption aUsrPref(*pVOpt);
aUsrPref.SetKeepRatio(bKeepRatio);
- bUsrPrefModified = true;
- }
- if (bGotHideWhitespace && bHideWhitespace != pVOpt->IsHideWhitespaceMode())
- {
- aUsrPref.SetHideWhitespaceMode(bHideWhitespace);
- bUsrPrefModified = true;
- }
- if (bUsrPrefModified)
- {
SW_MOD()->ApplyUsrPref(aUsrPref, this);
}
@@ -1613,9 +1596,6 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe
aVector.push_back(
comphelper::makePropertyValue("KeepRatio", m_pWrtShell->GetViewOptions()->IsKeepRatio()));
- aVector.push_back(comphelper::makePropertyValue(
- "HideWhitespace", m_pWrtShell->GetViewOptions()->IsHideWhitespaceMode()));
-
rSequence = comphelper::containerToSequence(aVector);
// Common SdrModel processing