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

[Caolán McNamara (via logerrit)]

 sc/qa/unit/screenshots/screenshots.cxx |    3 +--
 sc/source/ui/inc/tabvwsh.hxx           |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b49e1e709b3fc4b9831fd0961e9310ebf1050429
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun May 12 19:24:35 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 12 22:20:12 2019 +0200

    drop unneeded forward declare
    
    Change-Id: Ib9a7d484cb93c0dbf6a13b540895e0e5d5c00d49
    Reviewed-on: https://gerrit.libreoffice.org/72202
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index a738669dd7d1..7d51dbc5c7fa 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -38,7 +38,6 @@
 class SdrOle2Obj;
 class SfxBindings;
 class SfxChildWindow;
-class SfxModelessDialog;
 class SvxNumberInfoItem;
 struct SfxChildWinInfo;
 
commit e4228ba740f86f701b9d6f0472b65383f4cf44f0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun May 12 19:21:17 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 12 22:19:28 2019 +0200

    drop intermediate vcl::Window
    
    Change-Id: Ie8455f6082a762e730354e56bac6d76c26de6979
    Reviewed-on: https://gerrit.libreoffice.org/72201
    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/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 402db2452590..96b2779860d2 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -192,8 +192,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
         case 8: // "modules/scalc/ui/inputstringdialog.ui"
         {
             const OString aEmpty("");
-            vcl::Window* pWindow = mpViewShell->GetDialogParent();
-            pReturnDialog = mpFact->CreateScStringInputDlg(pWindow ? pWindow->GetFrameWeld() : nullptr,
+            pReturnDialog = mpFact->CreateScStringInputDlg(mpViewShell->GetFrameWeld(),
                                 ScResId(SCSTR_APDTABLE), ScResId(SCSTR_NAME),
                                 aDefaultSheetName, aEmpty, aEmpty );
             break;