[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sc/qa vcl/source

[Armin Le Grand]

 dev/null                               |binary
 sc/qa/unit/screenshots/screenshots.cxx |    5 ++---
 vcl/source/window/tabdlg.cxx           |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f8a692b69334d57b8d2a0262209eecb0d88dc380
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Wed Aug 17 12:30:11 2016 +0200

    Adapted sc screenshot test to create new document
    
    Change-Id: I644d2fcb9fe4ec66e964192d3dda61ca331acece

diff --git a/sc/qa/unit/screenshots/data/empty.ods b/sc/qa/unit/screenshots/data/empty.ods
deleted file mode 100644
index 14b4232..0000000
Binary files a/sc/qa/unit/screenshots/data/empty.ods and /dev/null differ
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index c52bbc5..8edeca8 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -72,11 +72,9 @@ public:
     virtual ~ScScreenshotTest();
 
     void testOpeningModalDialogs();
-    //void testOpeningModelessDialogs();
 
     CPPUNIT_TEST_SUITE(ScScreenshotTest);
     CPPUNIT_TEST(testOpeningModalDialogs);
-    //CPPUNIT_TEST(testOpeningModelessDialogs);
     CPPUNIT_TEST_SUITE_END();
 };
 
@@ -99,7 +97,8 @@ void ScScreenshotTest::initializeWithDoc(const char* pName)
 {
     if (mxComponent.is())
         mxComponent->dispose();
-    mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) + OUString::createFromAscii(pName), "com.sun.star.sheet.SpreadsheetDocument");
+    // use new, epty doc to avoid file locking
+    mxComponent = loadFromDesktop("private:factory/scalc", "com.sun.star.sheet.SpreadsheetDocument");
 
     mpFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent);
     CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", mpFoundShell);
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 335c00c..99da7cc 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -21,6 +21,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabdlg.hxx>
+#include <vcl/tabpage.hxx>
 #include <tools/rc.h>
 
 void TabDialog::ImplInitTabDialogData()