[Libreoffice-commits] core.git: 2 commits - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/reffact.cxx |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

New commits:
commit def3802af84a8f1b0d6d885d0481e02d7fa1da64
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 1 12:34:23 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 1 22:13:22 2019 +0200

    parent SfxChildWindow::GetInfo does the same already
    
    Change-Id: I1c3185530f7b892f78f71d2db8534aec07e73e57
    Reviewed-on: https://gerrit.libreoffice.org/71623
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 47927d38071c..9887ba56364b 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -55,16 +55,8 @@ SFX_IMPL_CHILDWINDOW_WITHID(ScValidityRefChildWin, SID_VALIDITY_REFERENCE)
 
 SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
 {
-    SfxChildWinInfo anInfo = SfxChildWindow::GetInfo();
-
-    auto xDlgController = GetController();
-    if (xDlgController)
-    {
-        weld::Dialog* pDialog = xController->getDialog();
-        aInfo.aSize = pDialog->get_size();
-    }
-
-    return anInfo;
+    SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
+    return aInfo;
 }
 
 namespace
commit 95a9ec752032c82cdd72624b4c0eb030989d0803
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 1 12:31:19 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 1 22:13:13 2019 +0200

    ScValidityRefChildWin has a Controller, not a Window now
    
    Change-Id: Ia570417f6f7926dbce19944d91d4a9cb9814eb19
    Reviewed-on: https://gerrit.libreoffice.org/71622
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 8a389b529ade..47927d38071c 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -57,13 +57,11 @@ SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
 {
     SfxChildWinInfo anInfo = SfxChildWindow::GetInfo();
 
-    if( vcl::Window *pWnd = GetWindow() )
+    auto xDlgController = GetController();
+    if (xDlgController)
     {
-        anInfo.aSize  = pWnd->GetSizePixel();
-
-        if( pWnd->IsDialog() )
-            if ( static_cast<Dialog*>(pWnd)->IsRollUp() )
-                anInfo.nFlags |= SfxChildWindowFlags::ZOOMIN;
+        weld::Dialog* pDialog = xController->getDialog();
+        aInfo.aSize = pDialog->get_size();
     }
 
     return anInfo;