cui/source/tabpages/grfpage.cxx | 3 ++-
sw/source/ui/envelp/label1.cxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 435023376b7f07c974fa348782cff058f60ceba3
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Sep 24 12:10:21 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 24 17:11:09 2019 +0200
use GetDefDialogParent as an arbitrary parent for temp widget
Change-Id: I7226481c7d501c88ac937760ba464b1b11260f7e
Reviewed-on: https://gerrit.libreoffice.org/79452
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1e19b0d0667f..7defa0a2b08e 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,6 +33,7 @@
#include <strings.hrc>
#include <vcl/field.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <svtools/unitconv.hxx>
#define CM_1_TO_TWIP 567
@@ -631,7 +632,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
// display original size
const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() );
- ScopedVclPtrInstance< MetricField > aFld(this, WB_HIDE);
+ ScopedVclPtrInstance< MetricField >
aFld(Application::GetDefDialogParent(), WB_HIDE);
SetFieldUnit( *aFld, eMetric );
aFld->SetDecimalDigits(m_xWidthMF->get_digits());
aFld->SetMax( LONG_MAX - 1 );
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 9908ab6a8477..e1e42ba1ef64 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -18,6 +18,7 @@
*/
#include <memory>
+#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
#include <rtl/ustring.hxx>
#include <sfx2/sfxsids.hrc>
@@ -393,7 +394,7 @@ IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBox&, void)
void SwLabPage::DisplayFormat()
{
- ScopedVclPtrInstance< MetricField > aField(this, WinBits(0));
+ ScopedVclPtrInstance< MetricField >
aField(Application::GetDefDialogParent(), WinBits(0));
FieldUnit aMetric = ::GetDfltMetric(false);
SetMetric(*aField, aMetric);
aField->SetDecimalDigits(2);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
