summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-04-01 22:22:51 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-04-02 09:05:39 +0200
commit38b6cef2d3fe707cbc7bc79399db4524176eda07 (patch)
treeecf4256482e86caa775abd29c1a7877203e099cb /sw/source
parent3ea506eb7a0b11323569956255475dfbb113a6a5 (diff)
sw: handle ContinuousEndnotes when replacing compat options
1) Use grep 'bool mb' sw/source/core/inc/DocumentSettingManager.hxx|sed 's/.*bool \(mb[A-Za-z0-9]\+\).*/\1/' to get a complete list of document settings. 2) Replace the old ad-hoc list in ReplaceCompatibilityOptions() with a list of all settings. 3) Enable the settings which were enabled already. 4) The remaining list needs manual review to determine what is and what is not a compat option, but ContinuousEndnotes is definitely a compat one. The idea is that we have a large set of strange compat options and ideally ReplaceCompatibilityOptions() could be used to reset them to a sane default (if the user explicitly asks for it), but first ReplaceCompatibilityOptions() has to really replace all compat options. Change-Id: I0a86c812226b71bcf23bacbcc047bf76aa609a40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91535 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/DocumentSettingManager.cxx35
1 files changed, 32 insertions, 3 deletions
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index c9270116cb51..24616650c450 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -580,19 +580,29 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
Setn32DummyCompatibilityOptions1( rSource.Getn32DummyCompatibilityOptions1() );
Setn32DummyCompatibilityOptions2( rSource.Getn32DummyCompatibilityOptions2() );
+ // No mbHTMLMode
+ // No mbIsGlobalDoc
+ // No mbGlblDocSaveLinks
+ // No mbIsLabelDoc
+ // No mbPurgeOLE
+ // No mbKernAsianPunctuation
mbParaSpaceMax = rSource.mbParaSpaceMax;
mbParaSpaceMaxAtPages = rSource.mbParaSpaceMaxAtPages;
mbTabCompat = rSource.mbTabCompat;
mbUseVirtualDevice = rSource.mbUseVirtualDevice;
+ mbAddFlyOffsets = rSource.mbAddFlyOffsets;
+ // No mbAddVerticalFlyOffsets
mbAddExternalLeading = rSource.mbAddExternalLeading;
+ mbUseHiResolutionVirtualDevice = rSource.mbUseHiResolutionVirtualDevice;
mbOldLineSpacing = rSource.mbOldLineSpacing;
mbAddParaSpacingToTableCells = rSource.mbAddParaSpacingToTableCells;
mbUseFormerObjectPos = rSource.mbUseFormerObjectPos;
mbUseFormerTextWrapping = rSource.mbUseFormerTextWrapping;
mbConsiderWrapOnObjPos = rSource.mbConsiderWrapOnObjPos;
- mbAddFlyOffsets = rSource.mbAddFlyOffsets;
+ // No mbMathBaselineAlignment
+ // No mbStylesNoDefault
+ // No mbFloattableNomargins
mbOldNumbering = rSource.mbOldNumbering;
- mbUseHiResolutionVirtualDevice = rSource.mbUseHiResolutionVirtualDevice;
mbIgnoreFirstLineIndentInNumbering = rSource.mbIgnoreFirstLineIndentInNumbering;
mbDoNotJustifyLinesWithManualBreak = rSource.mbDoNotJustifyLinesWithManualBreak;
mbDoNotResetParaAttrsForNumFont = rSource.mbDoNotResetParaAttrsForNumFont;
@@ -602,9 +612,28 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
mbClipAsCharacterAnchoredWriterFlyFrames = rSource.mbClipAsCharacterAnchoredWriterFlyFrames;
mbUnixForceZeroExtLeading = rSource.mbUnixForceZeroExtLeading;
mbTabRelativeToIndent = rSource.mbTabRelativeToIndent;
- mbTabAtLeftIndentForParagraphsInList = rSource.mbTabAtLeftIndentForParagraphsInList;
+ // No mbProtectForm
mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks;
+ // No mbInvertBorderSpacing
+ // No mbCollapseEmptyCellPara
+ mbTabAtLeftIndentForParagraphsInList = rSource.mbTabAtLeftIndentForParagraphsInList;
+ // No mbSmallCapsPercentage66
+ // No mbTabOverflow
+ // No mbUnbreakableNumberings
+ // No mbClippedPictures
+ // No mbBackgroundParaOverDrawings
+ // No mbTabOverMargin
+ // No mbTreatSingleColumnBreakAsPageBreak
+ // No mbSurroundTextWrapSmall
+ // No mbPropLineSpacingShrinksFirstLine
+ // No mbSubtractFlys
+ // No mbLastBrowseMode
+ // No mbDisableOffPagePositioning
+ // No mbEmptyDbFieldHidesPara
mbEmptyDbFieldHidesPara = rSource.mbEmptyDbFieldHidesPara;
+ mbContinuousEndnotes = rSource.mbContinuousEndnotes;
+ // No mbProtectBookmarks
+ // No mbProtectFields
}
sal_uInt32 sw::DocumentSettingManager::Getn32DummyCompatibilityOptions1() const