From 130719bdba770f1c9ac634f436bab3285fef7a1a Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Wed, 13 Feb 2019 08:59:01 +0100 Subject: tdf#123378 Prevent modifying doc when printing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just remove this update fields call, they are updated anyway. Change-Id: Iaed1b6e7e1be8138ecb48e7557cc09ec0eeebda3 Reviewed-on: https://gerrit.libreoffice.org/67754 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit ac1b2c9e1ab2f84de3a8856772e00302d237e82f) Reviewed-on: https://gerrit.libreoffice.org/67785 Reviewed-by: Thorsten Behrens Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Xisco Faulí Tested-by: Xisco Faulí --- sw/qa/uitest/writer_tests5/tdf123378.py | 25 +++++++++++++++++++++++++ sw/source/uibase/uno/unotxdoc.cxx | 3 --- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 sw/qa/uitest/writer_tests5/tdf123378.py diff --git a/sw/qa/uitest/writer_tests5/tdf123378.py b/sw/qa/uitest/writer_tests5/tdf123378.py new file mode 100644 index 000000000000..6c78e0ecf699 --- /dev/null +++ b/sw/qa/uitest/writer_tests5/tdf123378.py @@ -0,0 +1,25 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +from uitest.framework import UITestCase + +#Bug 123378 - Printing always sets "document modified" status + +class tdf123378(UITestCase): + def test_tdf123378_print_sets_modified(self): + self.ui_test.create_doc_in_start_center("writer") + document = self.ui_test.get_component() + xWriterDoc = self.xUITest.getTopFocusWindow() + + self.xUITest.executeCommand(".uno:Print") + xDialog = self.xUITest.getTopFocusWindow() + xOK = xDialog.getChild("cancel") + self.ui_test.close_dialog_through_button(xOK) + + self.assertEqual(document.isModified(), False) + + self.ui_test.close_doc() +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index e1c6924b1c8d..8ee3a4aa689c 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2639,9 +2639,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( pViewShell->CalcLayout(); pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() ); - // #122919# Force field update before PDF export, but after layout init (tdf#121962) - pViewShell->SwViewShell::UpdateFields(true); - pViewShell->SetPDFExportOption( false ); // enable view again -- cgit