summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-10-13 11:00:43 +0200
committerJan Holesovsky <kendy@collabora.com>2015-10-13 11:07:50 +0200
commitb630f9a36a844f46757abb6ce16fa7cd527a4341 (patch)
tree281a7fe26b4b4aa907eb84953c78fc17abad7b71
parent71586837f926c5dc7e8146a4e625b57c37343806 (diff)
tdf#94386: Unit test stub - emulates the steps to trigger the bug.
[But does not assert the result yet.] Change-Id: I7a9c64057339538f80d57c21fce83f4b23cdf396
-rw-r--r--sw/CppunitTest_sw_ww8export.mk5
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx32
2 files changed, 36 insertions, 1 deletions
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index d7ea01189ef8..8ec16bcbf53f 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -24,6 +24,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export, \
test \
unotest \
utl \
+ sfx \
+ svl \
sw \
tl \
$(gb_UWINAPI) \
@@ -37,7 +39,8 @@ $(eval $(call gb_CppunitTest_use_externals,sw_ww8export,\
$(eval $(call gb_CppunitTest_set_include,sw_ww8export,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/qa/extras/inc \
+ -I$(SRCDIR)/sw/source/uibase/inc \
+ -I$(SRCDIR)/sw/qa/extras/inc \
$$(INCLUDE) \
))
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index d2374ecc8509..4268e4f653d5 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -20,6 +20,15 @@
#include <com/sun/star/text/XFormField.hpp>
#include <com/sun/star/view/DocumentZoomType.hpp>
+#include <sfx2/bindings.hxx>
+#include <sfx2/request.hxx>
+
+#include <cmdid.h>
+#include <envimg.hxx>
+#include <swmodule.hxx>
+#include <view.hxx>
+#include <wrtsh.hxx>
+
class Test : public SwModelTestBase
{
public:
@@ -53,6 +62,23 @@ protected:
}
return false;
}
+
+ virtual void postLoad(const char* pFilename) SAL_OVERRIDE
+ {
+ if (OString(pFilename) == "tdf94386.odt")
+ {
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+
+ // emulate the behavior from tdf#94386 - insert an envelope to the
+ // document
+ SfxItemSet aSet(pWrtShell->GetView().GetCurShell()->GetPool(), FN_ENVELOP, FN_ENVELOP);
+ aSet.Put(SwEnvItem());
+ SfxRequest aRequest(FN_ENVELOP, SfxCallMode::SYNCHRON, aSet);
+ SW_MOD()->ExecOther(aRequest);
+ }
+ }
};
DECLARE_WW8EXPORT_TEST(testN325936, "n325936.doc")
@@ -542,6 +568,12 @@ DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt")
//the save must survive without asserting
}
+DECLARE_WW8EXPORT_TEST(testTdf94386, "tdf94386.odt")
+{
+ // TODO: assert here that the 2nd page has the right size even after
+ // the save as .doc
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */