[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sc/qa sc/source
Katarina Behrens
Katarina.Behrens at cib.de
Tue Jun 28 07:42:03 UTC 2016
sc/qa/unit/screenshots/screenshots.cxx | 28 ++++++++++++++++++++++++++++
sc/source/ui/inc/protectiondlg.hxx | 4 +++-
sc/source/ui/inc/sharedocdlg.hxx | 2 +-
3 files changed, 32 insertions(+), 2 deletions(-)
New commits:
commit 6f2ac328f72479eba5c715071d6efc33fdb6889f
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Mon Jun 27 23:11:34 2016 +0200
Open more sc modal dialogs, part 2
Change-Id: Ia5a1bbc00acff10405aa5205b9fd5a930deb5fc9
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 9af18fe..4937474 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -27,13 +27,17 @@
#include <tabvwsh.hxx>
#include <docsh.hxx>
#include <document.hxx>
+#include <sharedocdlg.hxx>
+#include <protectiondlg.hxx>
#include <docuno.hxx>
#include <scabstdlg.hxx>
#include <reffact.hxx>
#include <scui_def.hxx>
+#include <impex.hxx>
#include <sc.hrc>
#include <scresid.hxx>
+#include <scitems.hxx>
using namespace css;
@@ -201,6 +205,30 @@ void ScScreenshotTest::testOpeningSomeDialog()
CPPUNIT_ASSERT( pDlg12 != nullptr );
pDlg12->Execute();
+
+ const OUString aCsv("some, strings, here, separated, by, commas");
+ ScImportStringStream aStream( aCsv );
+ std::unique_ptr<AbstractScImportAsciiDlg> pDlg13( pFact->CreateScImportAsciiDlg(
+ OUString(), &aStream, SC_PASTETEXT ));
+ CPPUNIT_ASSERT( pDlg13 != nullptr );
+
+ pDlg13->Execute();
+
+ ScopedVclPtrInstance<ScShareDocumentDlg> pDlg14( pViewShell->GetDialogParent(), &rViewData );
+ CPPUNIT_ASSERT( pDlg14 != nullptr );
+
+ pDlg14->Execute();
+
+ std::unique_ptr<AbstractScMoveTableDlg> pDlg15( pFact->CreateScMoveTableDlg(
+ pViewShell->GetDialogParent(), aDefaultSheetName));
+ CPPUNIT_ASSERT( pDlg15 != nullptr );
+
+ pDlg15->Execute();
+
+ ScopedVclPtrInstance<ScTableProtectionDlg> pDlg16(pViewShell->GetDialogParent());
+ CPPUNIT_ASSERT( pDlg16 != nullptr );
+
+ pDlg16->Execute();
}
#endif
diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx
index 6833117b..b2c1a47 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -27,6 +27,8 @@
#include <vcl/layout.hxx>
#include <svx/checklbx.hxx>
+#include "scdllapi.h"
+
namespace vcl { class Window; }
class ScTableProtection;
@@ -34,7 +36,7 @@ class ScTableProtectionDlg : public ModalDialog
{
public:
ScTableProtectionDlg() = delete;
- explicit ScTableProtectionDlg(vcl::Window* pParent);
+ explicit SC_DLLPUBLIC ScTableProtectionDlg(vcl::Window* pParent);
virtual ~ScTableProtectionDlg();
virtual void dispose() override;
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 01a195a..838f3ac 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -47,7 +47,7 @@ private:
DECL_LINK_TYPED( ToggleHandle, CheckBox&, void );
public:
- ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData );
+ SC_DLLPUBLIC ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData );
virtual ~ScShareDocumentDlg();
virtual void dispose() override;
More information about the Libreoffice-commits
mailing list