[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Michael Weghorn (via logerrit)]

 sw/source/filter/xml/xmlimp.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8b59b877241dca50e5f7f84500fc08d8ee212837
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Nov 15 11:22:38 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Nov 20 10:57:15 2019 +0100

    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 at posteo.de>
    (cherry picked from commit cef397d0e00fcc3ba7603b1b8e141a10479bb59e)
    Reviewed-on: https://gerrit.libreoffice.org/83262

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index c198632b2261..6b71e5ae372b 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1330,6 +1330,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");
@@ -1338,6 +1339,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");