summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2019-11-15 11:22:38 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2019-11-20 09:15:35 +0100
commitcef397d0e00fcc3ba7603b1b8e141a10479bb59e (patch)
treec6918693d5065507dace663d0f5c8b31828a34e3
parent8a82100c8274d3c0e6d8386116fe8c48543fc4c3 (diff)
Load "PrintTextPlaceholder" and "PrintHiddenText" based on config
While looking at tdf#118263, I realized that the "PrintTextPlaceholder" and "PrintHiddenText" attributes are unconditionally taken from the settings.xml when opening a document. All of the other options related to what content to print in "File" -> "Printer Settings" -> "Options" are (not) taken from the document based on whether the "Load user-specific settings with the document" option is enabled or not (in "Tools" -> "Options" -> "Load/Save" -> "General"). I didn't find a reason why those two should be handled differently, so also add them to the list of options not to load from the document if the above option is disabled. Change-Id: Id7e4810c10f4809650eab1f20a2caaf6881bf23d Reviewed-on: https://gerrit.libreoffice.org/82784 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--sw/source/filter/xml/xmlimp.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index ad6427077b88..0ba597d22b6f 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1334,6 +1334,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
aExcludeWhenNotLoadingUserSettings.insert("PrintControls");
aExcludeWhenNotLoadingUserSettings.insert("PrintDrawings");
aExcludeWhenNotLoadingUserSettings.insert("PrintGraphics");
+ aExcludeWhenNotLoadingUserSettings.insert("PrintHiddenText");
aExcludeWhenNotLoadingUserSettings.insert("PrintLeftPages");
aExcludeWhenNotLoadingUserSettings.insert("PrintPageBackground");
aExcludeWhenNotLoadingUserSettings.insert("PrintProspect");
@@ -1342,6 +1343,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
aExcludeWhenNotLoadingUserSettings.insert("PrintFaxName");
aExcludeWhenNotLoadingUserSettings.insert("PrintPaperFromSetup");
aExcludeWhenNotLoadingUserSettings.insert("PrintTables");
+ aExcludeWhenNotLoadingUserSettings.insert("PrintTextPlaceholder");
aExcludeWhenNotLoadingUserSettings.insert("PrintSingleJobs");
aExcludeWhenNotLoadingUserSettings.insert("UpdateFromTemplate");
aExcludeWhenNotLoadingUserSettings.insert("PrinterIndependentLayout");