sw/CppunitTest_sw_subsequent_ww8export.mk | 101 ++++++++++++++++++++++++++++++
sw/Module_sw.mk | 1
sw/qa/extras/ww8export/data/n325936.doc |binary
sw/qa/extras/ww8export/ww8export.cxx | 88 ++++++++++++++++++++++++++
4 files changed, 190 insertions(+)
New commits:
commit c62708c39288719510dac1a914ee282636335375
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri Jun 15 11:50:56 2012 +0200
n#325936 testcase
Change-Id: I35d2ef784cbdcefe4c9bb18e1017d773202c1a9a
diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk
b/sw/CppunitTest_sw_subsequent_ww8export.mk
new file mode 100644
index 0000000..57a1faf
--- /dev/null
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -0,0 +1,101 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmik...@suse.cz> (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8export, \
+ sw/qa/extras/ww8export/ww8export \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
+ cppu \
+ cppuhelper \
+ sal \
+ test \
+ unotest \
+ utl \
+ sw \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8export,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8export,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ dbaccess/util/dba \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ forms/util/frm \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sw/util/msword \
+ sw/util/sw \
+ sw/util/swd \
+ sfx2/util/sfx \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unotools/util/utl \
+ unoxml/source/service/unoxml \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)), \
+ xmlhelp/util/ucpchelp1) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8export))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8export,\
+ $(OUTDIR)/unittest/registry \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 43b8403..59e2612 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_macros_test \
CppunitTest_sw_subsequent_ooxmlexport \
CppunitTest_sw_subsequent_ooxmltok \
+ CppunitTest_sw_subsequent_ww8export \
CppunitTest_sw_subsequent_ww8tok \
CppunitTest_sw_subsequent_rtfexport \
CppunitTest_sw_subsequent_rtftok \
diff --git a/sw/qa/extras/ww8export/data/n325936.doc
b/sw/qa/extras/ww8export/data/n325936.doc
new file mode 100644
index 0000000..23d0f60
Binary files /dev/null and b/sw/qa/extras/ww8export/data/n325936.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
new file mode 100644
index 0000000..f0587a7
--- /dev/null
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -0,0 +1,88 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Miklos Vajna <vmik...@suse.cz> (SUSE, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2012 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "../swmodeltestbase.hxx"
+
+#include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+
+#include <unotools/tempfile.hxx>
+
+using rtl::OUString;
+
+class Test : public SwModelTestBase
+{
+public:
+ void testN325936();
+
+ CPPUNIT_TEST_SUITE(Test);
+#if !defined(MACOSX) && !defined(WNT)
+ CPPUNIT_TEST(testN325936);
+#endif
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ void roundtrip(const OUString& rURL);
+};
+
+void Test::roundtrip(const OUString& rFilename)
+{
+ uno::Reference<lang::XComponent> xImported =
loadFromDesktop(getURLFromSrc("/sw/qa/extras/ww8export/data/") + rFilename);
+ uno::Reference<frame::XStorable> xStorable(xImported, uno::UNO_QUERY);
+ uno::Sequence<beans::PropertyValue> aArgs(1);
+ aArgs[0].Name = "FilterName";
+ aArgs[0].Value <<= OUString("MS Word 97");
+ utl::TempFile aTempFile;
+ aTempFile.EnableKillingFile();
+ xStorable->storeToURL(aTempFile.GetURL(), aArgs);
+ mxComponent = loadFromDesktop(aTempFile.GetURL());
+}
+
+void Test::testN325936()
+{
+ /*
+ * The problem was that the transparent background of the drawing in the
+ * header was exported as non-transparent.
+ *
+ * xray ThisComponent.DrawPage(0).BackColorTransparency
+ */
+
+ roundtrip("n325936.doc");
+ uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet> xPropertySet(xDraws->getByIndex(0),
uno::UNO_QUERY);
+ sal_Int32 nValue = 0;
+ xPropertySet->getPropertyValue("BackColorTransparency") >>= nValue;
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(100), nValue);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
