officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4 ++--
vcl/source/window/printdlg.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 94283af977246c70dbed4452d197b003d8bb14b9
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Mon Mar 1 11:47:22 2021 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Tue Mar 2 08:54:24 2021 +0100
Value for display size in 32bit
Follow-up to 28e022c258682dc030668fed7879d9d3f078b720
Change-Id: I05a7edd2e24071e4ddbbbf8eb6a9232912f4a376
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111738
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 0739d3289518..f6f87e53c1f3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3502,12 +3502,12 @@
</info>
<value>false</value>
</prop>
- <prop oor:name="Width" oor:type="xs:long">
+ <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:long">
+ <prop oor:name="Height" oor:type="xs:int">
<info>
<desc>Stores the height of the print dialog.</desc>
</info>
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index e104f79fc81b..a7b1bd96e9ba 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -684,8 +684,8 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const
std::shared_ptr<PrinterC
450);
// restore dialog size
- std::optional<long> aWidth =
officecfg::Office::Common::Print::Dialog::Width::get();
- std::optional<long> aHeight =
officecfg::Office::Common::Print::Dialog::Height::get();
+ 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
