sw: config item "OutlineLevelYieldsNumbering" has no effect
... since CWS swqbf90 in 2005, so remove it, except for the entry in the property set. Change-Id: I5f82d1957a15bf5141108ac9821b813dd36f1995
This commit is contained in:
@@ -54,7 +54,6 @@ enum class DocumentSettingId
|
||||
DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK,
|
||||
TREAT_SINGLE_COLUMN_BREAK_AS_PAGE_BREAK,
|
||||
DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT,
|
||||
OUTLINE_LEVEL_YIELDS_OUTLINE_RULE,
|
||||
|
||||
DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE,
|
||||
TABLE_ROW_KEEP,
|
||||
|
@@ -67,7 +67,6 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
|
||||
mbTableRowKeep(false),
|
||||
mbIgnoreTabsAndBlanksForLineCalculation(false),
|
||||
mbDoNotCaptureDrawObjsOnPage(false),
|
||||
mbOutlineLevelYieldsOutlineRule(false),
|
||||
mbClipAsCharacterAnchoredWriterFlyFrames(false),
|
||||
mbUnixForceZeroExtLeading(false),
|
||||
mbTabRelativeToIndent(true),
|
||||
@@ -159,7 +158,6 @@ bool sw::DocumentSettingManager::get(/*[in]*/ DocumentSettingId id) const
|
||||
case DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION: return mbConsiderWrapOnObjPos;
|
||||
case DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK: return mbDoNotJustifyLinesWithManualBreak;
|
||||
case DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING: return mbIgnoreFirstLineIndentInNumbering;
|
||||
case DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE: return mbOutlineLevelYieldsOutlineRule;
|
||||
case DocumentSettingId::TABLE_ROW_KEEP: return mbTableRowKeep;
|
||||
case DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: return mbIgnoreTabsAndBlanksForLineCalculation;
|
||||
case DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: return mbDoNotCaptureDrawObjsOnPage;
|
||||
@@ -276,10 +274,6 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
|
||||
mbIgnoreFirstLineIndentInNumbering = value;
|
||||
break;
|
||||
|
||||
case DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE:
|
||||
mbOutlineLevelYieldsOutlineRule = value;
|
||||
break;
|
||||
|
||||
case DocumentSettingId::TABLE_ROW_KEEP:
|
||||
mbTableRowKeep = value;
|
||||
break;
|
||||
@@ -554,7 +548,6 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
|
||||
mbIgnoreFirstLineIndentInNumbering = rSource.mbIgnoreFirstLineIndentInNumbering;
|
||||
mbDoNotJustifyLinesWithManualBreak = rSource.mbDoNotJustifyLinesWithManualBreak;
|
||||
mbDoNotResetParaAttrsForNumFont = rSource.mbDoNotResetParaAttrsForNumFont;
|
||||
mbOutlineLevelYieldsOutlineRule = rSource.mbOutlineLevelYieldsOutlineRule;
|
||||
mbTableRowKeep = rSource.mbTableRowKeep;
|
||||
mbIgnoreTabsAndBlanksForLineCalculation = rSource.mbIgnoreTabsAndBlanksForLineCalculation;
|
||||
mbDoNotCaptureDrawObjsOnPage = rSource.mbDoNotCaptureDrawObjsOnPage;
|
||||
|
@@ -133,7 +133,6 @@ class DocumentSettingManager :
|
||||
bool mbTableRowKeep : 1;
|
||||
bool mbIgnoreTabsAndBlanksForLineCalculation : 1; // #i3952#
|
||||
bool mbDoNotCaptureDrawObjsOnPage : 1; // #i62875#
|
||||
bool mbOutlineLevelYieldsOutlineRule : 1;
|
||||
bool mbClipAsCharacterAnchoredWriterFlyFrames : 1;
|
||||
bool mbUnixForceZeroExtLeading : 1; // #i60945#
|
||||
bool mbTabRelativeToIndent : 1; // #i24363# tab stops relative to indent
|
||||
|
@@ -1100,7 +1100,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
|
||||
// below, and set them if not found
|
||||
bool bPrinterIndependentLayout = false;
|
||||
bool bUseOldNumbering = false;
|
||||
bool bOutlineLevelYieldsOutlineRule = false;
|
||||
bool bAddExternalLeading = false;
|
||||
bool bAddParaSpacingToTableCells = false;
|
||||
bool bUseFormerLineSpacing = false;
|
||||
@@ -1182,8 +1181,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
|
||||
bUseFormerTextWrapping = true;
|
||||
else if ( pValues->Name == "UseOldNumbering" )
|
||||
bUseOldNumbering = true;
|
||||
else if ( pValues->Name == "OutlineLevelYieldsNumbering" )
|
||||
bOutlineLevelYieldsOutlineRule = true;
|
||||
else if ( pValues->Name == "ConsiderTextWrapOnObjPos" )
|
||||
bConsiderWrapOnObjPos = true;
|
||||
else if ( pValues->Name == "IgnoreFirstLineIndentInNumbering" )
|
||||
@@ -1270,11 +1267,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
|
||||
xProps->setPropertyValue( "UseOldNumbering", makeAny(true) );
|
||||
}
|
||||
|
||||
if( !bOutlineLevelYieldsOutlineRule )
|
||||
{
|
||||
xProps->setPropertyValue( "OutlineLevelYieldsNumbering", makeAny(true) );
|
||||
}
|
||||
|
||||
if( !bAddParaSpacingToTableCells )
|
||||
{
|
||||
xProps->setPropertyValue( "AddParaSpacingToTableCells",
|
||||
|
@@ -581,8 +581,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
|
||||
break;
|
||||
case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING:
|
||||
{
|
||||
bool bTmp = *o3tl::doAccess<bool>(rValue);
|
||||
mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE, bTmp);
|
||||
// ignore - this is a dead property
|
||||
}
|
||||
break;
|
||||
case HANDLE_ALLOW_PRINTJOB_CANCEL:
|
||||
@@ -1064,7 +1063,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
|
||||
break;
|
||||
case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING:
|
||||
{
|
||||
rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE);
|
||||
rValue <<= false;
|
||||
}
|
||||
break;
|
||||
case HANDLE_ALLOW_PRINTJOB_CANCEL:
|
||||
|
Reference in New Issue
Block a user