officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 ----------
vcl/source/window/printdlg.cxx | 11 -----------
2 files changed, 21 deletions(-)
New commits:
commit e53ac4207d2f9e53f7bfe4f927961ebe2bd17182
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Apr 29 12:02:06 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Apr 29 17:20:12 2021 +0200
vcl: print dialog: remove broken code
This was introduced in 149807eb6100090e178505ba4a264bb38eba1e0c
< Resolves tdf#127782 - Print dialog height >
trying to fix the problem of the window size not being remembered
after reopening the dialog, however, the problem is still
reproducible in master with GEN, thus, remove this code
Change-Id: I65f327fa692cd3e2b5597d04e9e15abc952fe6d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114874
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ca7a467c2cca..908decfc99e0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3524,16 +3524,6 @@
</info>
<value>false</value>
</prop>
- <prop oor:name="Width" oor:type="xs:int">
- <info>
- <desc>Stores the width of the print dialog.</desc>
- </info>
- </prop>
- <prop oor:name="Height" oor:type="xs:int">
- <info>
- <desc>Stores the height of the print dialog.</desc>
- </info>
- </prop>
</group>
</group>
<group oor:name="AddXMLToStorage">
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index be53d3511365..9f5906310799 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -732,15 +732,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const
std::shared_ptr<PrinterC
mxScrolledWindow->get_preferred_size().Width() +
mxScrolledWindow->get_scroll_thickness(),
450);
- // restore dialog size
- std::optional<sal_Int32> aWidth =
officecfg::Office::Common::Print::Dialog::Width::get();
- std::optional<sal_Int32> aHeight =
officecfg::Office::Common::Print::Dialog::Height::get();
- WindowStateData aState;
- if (aWidth) aState.SetWidth(*aWidth); else aWidth = -1;
- if (aHeight) aState.SetHeight(*aHeight); else aHeight = -1;
- aState.SetMask(WindowStateMask::Width | WindowStateMask::Height);
- m_xDialog->set_window_state(aState.ToStr());
-
m_xDialog->set_centered_on_parent(true);
}
@@ -749,8 +740,6 @@ PrintDialog::~PrintDialog()
std::shared_ptr<comphelper::ConfigurationChanges>
batch(comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Print::Dialog::RangeSectionExpanded::set(mxRangeExpander->get_expanded(),
batch);
officecfg::Office::Common::Print::Dialog::LayoutSectionExpanded::set(mxLayoutExpander->get_expanded(),
batch);
-
officecfg::Office::Common::Print::Dialog::Width::set(m_xDialog->get_size().getWidth(),
batch);
-
officecfg::Office::Common::Print::Dialog::Height::set(m_xDialog->get_size().getHeight(),
batch);
batch->commit();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
