[Libreoffice-commits] .: 5 commits - sc/qa sd/qa sw/CppunitTest_sw_macros_test.mk sw/Module_sw.mk sw/qa
Markus Mohrhard
mmohrhard at kemper.freedesktop.org
Mon Nov 14 14:50:53 PST 2011
sc/qa/unit/filters-test.cxx | 2
sc/qa/unit/macros-test.cxx | 66 ++---------
sd/qa/unit/filters-test.cxx | 2
sw/CppunitTest_sw_macros_test.mk | 144 ++++++++++++++++++++++++
sw/Module_sw.mk | 1
sw/qa/core/data/xls/testVba.doc |binary
sw/qa/core/macros-test.cxx | 232 +++++++++++++++++++++++++++++++++++++++
7 files changed, 395 insertions(+), 52 deletions(-)
New commits:
commit cb7c50c1a0739d11d28135160c573f59f010a73e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Nov 14 22:38:34 2011 +0100
move macros_test to sw
the macros_test does not execute a useful macro at the moment
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
new file mode 100644
index 0000000..21603f0
--- /dev/null
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -0,0 +1,144 @@
+# -*- 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
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 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_macros_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \
+ sw/qa/core/macros-test \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sw_macros_test, \
+ avmedia \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ fileacc \
+ for \
+ forui \
+ i18nisolang1 \
+ msfilter \
+ oox \
+ sal \
+ salhelper \
+ sax \
+ sb \
+ sw \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ test \
+ tl \
+ tk \
+ ucbhelper \
+ unotest \
+ utl \
+ vbahelper \
+ vcl \
+ xo \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_macros_test,\
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sw_macros_test,\
+ offapi \
+ oovbaapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sw_macros_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sw_macros_test,\
+ oovbaapi \
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_components,sw_macros_test,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ dbaccess/util/dba \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ forms/util/frm \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ oox/util/oox \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sax/source/fastparser/fastsax \
+ sw/util/sw \
+ sw/util/swd \
+ sw/util/msword \
+ sw/util/vbaswobj \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
+ sfx2/util/sfx \
+ sot/util/sot \
+ svl/source/fsstor/fsstorage \
+ toolkit/util/tk \
+ unotools/util/utl \
+ unoxml/source/rdf/unordf \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,sw_macros_test,\
+ configmgr \
+ ucb1 \
+ ucpfile1 \
+ ucptdoc1 \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
+ --headless \
+ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
+ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(SRCDIR)/sc/qa/unit/data/registry)" \
+))
+ # .../spool is required for the (somewhat strange) filter configuration
+
+# we need to
+# a) explicitly depend on library msword because it is not implied by a link
+# relation
+# b) explicitly depend on the sw resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sw_macros_test) : $(call gb_Library_get_target,msword)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c66b92e..e750e86 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_targets,sw,\
$(eval $(call gb_Module_add_check_targets,sw,\
CppunitTest_sw_filters_test \
+ CppunitTest_sw_macros_test \
CppunitTest_sw_swdoc_test \
))
diff --git a/sw/qa/core/data/xls/testVba.doc b/sw/qa/core/data/xls/testVba.doc
new file mode 100644
index 0000000..e8c87c6
Binary files /dev/null and b/sw/qa/core/data/xls/testVba.doc differ
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
new file mode 100644
index 0000000..10e83bc
--- /dev/null
+++ b/sw/qa/core/macros-test.cxx
@@ -0,0 +1,232 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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
+ * Caolán McNamara <caolanm at redhat.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Caolán McNamara <caolanm at redhat.com>
+ * Markus Mohrhard <markus.mohrhard at googlemail.com>
+ *
+ * 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 <sal/config.h>
+#include <unotest/filters-test.hxx>
+#include <test/bootstrapfixture.hxx>
+#include <rtl/strbuf.hxx>
+#include <osl/file.hxx>
+
+#include <com/sun/star/frame/XDesktop.hpp>
+
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/document/MacroExecMode.hpp>
+
+#include <sfx2/app.hxx>
+#include <sfx2/docfilt.hxx>
+#include <sfx2/docfile.hxx>
+#include <sfx2/sfxmodelfactory.hxx>
+#include <svl/intitem.hxx>
+
+#include <basic/sbxdef.hxx>
+
+#include "docsh.hxx"
+
+SO2_DECL_REF(SwDocShell)
+SO2_IMPL_REF(SwDocShell)
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+
+/* Implementation of Macros test */
+
+class SwMacrosTest
+ : public test::FiltersTest
+ , public test::BootstrapFixture
+{
+public:
+ SwMacrosTest();
+
+ virtual bool load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData);
+ SwDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
+ const rtl::OUString &rUserData, const rtl::OUString& rTypeName, sal_uLong nFormatType=0);
+ uno::Reference< com::sun::star::lang::XComponent > loadFromDesktop(const rtl::OUString& rURL);
+
+ void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath);
+
+ virtual void setUp();
+ virtual void tearDown();
+
+ //void testStarBasic();
+ void testVba();
+ CPPUNIT_TEST_SUITE(SwMacrosTest);
+#if !defined(MACOSX) && !defined(WNT)
+ //enable this test if you want to play with star basic macros in unit tests
+ //works but does nothing useful yet
+ //CPPUNIT_TEST(testStarBasic);
+ CPPUNIT_TEST(testVba);
+#endif
+
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<uno::XInterface> m_xCalcComponent;
+ uno::Reference<frame::XDesktop> mxDesktop;
+ ::rtl::OUString m_aBaseString;
+};
+
+uno::Reference< com::sun::star::lang::XComponent > SwMacrosTest::loadFromDesktop(const rtl::OUString& rURL)
+{
+ uno::Reference< com::sun::star::frame::XComponentLoader> xLoader = uno::Reference< com::sun::star::frame::XComponentLoader >( mxDesktop, UNO_QUERY );
+ com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > args(1);
+ args[0].Name = rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode"));
+ args[0].Handle = -1;
+ args[0].Value <<=
+ com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
+ args[0].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
+ uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), 0, args);
+ CPPUNIT_ASSERT_MESSAGE("loading failed", xComponent.is());
+ return xComponent;
+}
+
+
+bool SwMacrosTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
+ const rtl::OUString &rUserData)
+{
+ SwDocShellRef xDocShRef;
+ bool bLoaded = xDocShRef.Is();
+ //reference counting of SwDocShellRef is very confused.
+ if (bLoaded)
+ xDocShRef->DoClose();
+ return bLoaded;
+}
+
+void SwMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
+{
+ rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/"));
+ rtl::OUStringBuffer aBuffer( getSrcRootURL() );
+ aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
+ aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
+ rFilePath = aBuffer.makeStringAndClear();
+}
+
+#if 0
+
+void SwMacrosTest::testStarBasic()
+{
+ const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("StarBasic."));
+ rtl::OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
+ rtl::OUString aFileName;
+ createFileURL(aFileNameBase, aFileExtension, aFileName);
+ uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName);
+
+ CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
+
+ rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"));
+ String sUrl = aURL;
+ Any aRet;
+ Sequence< sal_Int16 > aOutParamIndex;
+ Sequence< Any > aOutParam;
+ Sequence< uno::Any > aParams;
+
+ SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
+
+ CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+
+ pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
+ pFoundShell->DoClose();
+}
+
+#endif
+
+struct TestMacroInfo
+{
+ rtl::OUString sFileBaseName;
+ rtl::OUString sMacroUrl;
+};
+void SwMacrosTest::testVba()
+{
+ TestMacroInfo testInfo[] = {
+ {
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testVba.")),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:Project.NewMacros.Macro1?language=Basic&location=document"))
+ }
+ };
+ rtl::OUString aFileExtension( RTL_CONSTASCII_USTRINGPARAM("doc") );
+ for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i )
+ {
+ rtl::OUString aFileName;
+ createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
+ uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName);
+ rtl::OUStringBuffer sMsg( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to load ")) );
+ sMsg.append ( aFileName );
+ CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
+
+ String sUrl = testInfo[i].sMacroUrl;
+ Any aRet;
+ Sequence< sal_Int16 > aOutParamIndex;
+ Sequence< Any > aOutParam;
+ Sequence< uno::Any > aParams;
+
+ SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
+
+ CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+ pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
+ rtl::OUString aStringRes;
+ aRet >>= aStringRes;
+ std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
+ //CPPUNIT_ASSERT_MESSAGE("script reported failure",aStringRes.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OK") )) );
+ pFoundShell->DoClose();
+ }
+}
+
+SwMacrosTest::SwMacrosTest()
+ : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data"))
+{
+}
+
+void SwMacrosTest::setUp()
+{
+ test::BootstrapFixture::setUp();
+
+ // This is a bit of a fudge, we do this to ensure that SwGlobals::ensure,
+ // which is a private symbol to us, gets called
+ m_xCalcComponent =
+ getMultiServiceFactory()->createInstance(rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.TextDocument")));
+ CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
+ mxDesktop = Reference<com::sun::star::frame::XDesktop>( getMultiServiceFactory()->createInstance(
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
+ CPPUNIT_ASSERT_MESSAGE("", mxDesktop.is());
+}
+
+void SwMacrosTest::tearDown()
+{
+ uno::Reference< lang::XComponent >( m_xCalcComponent, UNO_QUERY_THROW )->dispose();
+ test::BootstrapFixture::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SwMacrosTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ba49ae1bdbbd75b4b3bc3db596fcf315ed4c8979
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Nov 14 19:46:34 2011 +0100
clean up macros_test
diff --git a/sc/qa/unit/macros-test.cxx b/sc/qa/unit/macros-test.cxx
index bcf2014..5250ae6 100644
--- a/sc/qa/unit/macros-test.cxx
+++ b/sc/qa/unit/macros-test.cxx
@@ -35,34 +35,9 @@
#include <osl/file.hxx>
#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/XUntitledNumbers.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/WindowArrange.hpp>
-#include <com/sun/star/frame/TerminationVetoException.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/frame/XWindowArranger.hpp>
-#include <com/sun/star/frame/XTask.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/frame/XFrames.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <com/sun/star/frame/XTasksSupplier.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/frame/XDispatchResultListener.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <sfx2/app.hxx>
@@ -103,7 +78,7 @@ FileFormat aFileFormats[] = {
}
-/* Implementation of Filters test */
+/* Implementation of Macros test */
class ScMacrosTest
: public test::FiltersTest
@@ -129,8 +104,6 @@ public:
//enable this test if you want to play with star basic macros in unit tests
//works but does nothing useful yet
CPPUNIT_TEST(testStarBasic);
- //enable if you want to hack vba support for unit tests
- //does not work, still problems during loading
CPPUNIT_TEST(testVba);
#endif
@@ -165,7 +138,7 @@ ScDocShellRef ScMacrosTest::load(const rtl::OUString &rFilter, const rtl::OUStri
}
else if (nFormatType)
{
- pSrcMed->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, 4));
+ pSrcMed->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN ));
SfxObjectShell::SetCurrentComponent( xDocShRef->GetModel() );
}
@@ -183,7 +156,7 @@ uno::Reference< com::sun::star::lang::XComponent > ScMacrosTest::loadFromDesktop
com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
args[0].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), 0, args);
- CPPUNIT_ASSERT_MESSAGE("", xComponent.is());
+ CPPUNIT_ASSERT_MESSAGE("loading failed", xComponent.is());
return xComponent;
}
commit 275110a0956505fa5e7efaef86c053ed65c4e8a6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Nov 14 19:31:39 2011 +0100
don't use XUnoTunnel directly, use SfxObjectShell::GetShellFromComponent
diff --git a/sc/qa/unit/macros-test.cxx b/sc/qa/unit/macros-test.cxx
index 658a603..bcf2014 100644
--- a/sc/qa/unit/macros-test.cxx
+++ b/sc/qa/unit/macros-test.cxx
@@ -64,7 +64,6 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <sfx2/app.hxx>
#include <sfx2/docfilt.hxx>
@@ -116,7 +115,7 @@ public:
virtual bool load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData);
ScDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
const rtl::OUString &rUserData, const rtl::OUString& rTypeName, sal_uLong nFormatType=0);
- uno::Reference< com::sun::star::frame::XModel > loadFromDesktop(const rtl::OUString& rURL);
+ uno::Reference< com::sun::star::lang::XComponent > loadFromDesktop(const rtl::OUString& rURL);
void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath);
@@ -173,7 +172,7 @@ ScDocShellRef ScMacrosTest::load(const rtl::OUString &rFilter, const rtl::OUStri
return xDocShRef;
}
-uno::Reference< com::sun::star::frame::XModel > ScMacrosTest::loadFromDesktop(const rtl::OUString& rURL)
+uno::Reference< com::sun::star::lang::XComponent > ScMacrosTest::loadFromDesktop(const rtl::OUString& rURL)
{
uno::Reference< com::sun::star::frame::XComponentLoader> xLoader = uno::Reference< com::sun::star::frame::XComponentLoader >( mxDesktop, UNO_QUERY );
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > args(1);
@@ -184,9 +183,8 @@ uno::Reference< com::sun::star::frame::XModel > ScMacrosTest::loadFromDesktop(co
com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
args[0].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), 0, args);
- uno::Reference< com::sun::star::frame::XModel > xModel( xComponent, UNO_QUERY );
CPPUNIT_ASSERT_MESSAGE("", xComponent.is());
- return xModel;
+ return xComponent;
}
@@ -219,9 +217,9 @@ void ScMacrosTest::testStarBasic()
createFileURL(aFileNameBase, aFileExtension, aFileName);
rtl::OUString aFilterType(aFileFormats[0].pTypeName, strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8);
std::cout << aFileFormats[0].pName << " Test" << std::endl;
- uno::Reference< com::sun::star::frame::XModel > xModel = loadFromDesktop(aFileName);
+ uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName);
- CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xModel.is());
+ CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is());
rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"));
String sUrl = aURL;
@@ -230,13 +228,13 @@ void ScMacrosTest::testStarBasic()
Sequence< Any > aOutParam;
Sequence< uno::Any > aParams;
- com::sun::star::uno::Reference< com::sun::star::lang::XUnoTunnel > xObjShellTunnel( xModel,com::sun::star::uno:: UNO_QUERY_THROW );
- SfxObjectShell* pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
+ SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
+
CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
- ScDocShell* xDocSh = ( ScDocShell*)pFoundShell;
+ ScDocShell* xDocSh = static_cast<ScDocShell*>(pFoundShell);
ScDocument* pDoc = xDocSh->GetDocument();
- pFoundShell->CallXScript(xModel, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
+ pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
double aValue;
pDoc->GetValue(0,0,0,aValue);
std::cout << "returned value = " << aValue << std::endl;
@@ -270,26 +268,21 @@ void ScMacrosTest::testVba()
{
rtl::OUString aFileName;
createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
- uno::Reference< com::sun::star::frame::XModel > xModel = loadFromDesktop(aFileName);
+ uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName);
rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM("Failed to load ") );
sMsg.concat( aFileName );
- CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xModel.is() );
+ CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg, RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
- //is it really the right way to call a vba macro through CallXScript?
- //it seems that the basic ide does it differently, but then we would need to init all parts ourself
- //the problem is that CallXScript inits the basic part
- ////BasicIDE::RunMethod takes an SbMethod as parametre
String sUrl = testInfo[i].sMacroUrl;
Any aRet;
Sequence< sal_Int16 > aOutParamIndex;
Sequence< Any > aOutParam;
Sequence< uno::Any > aParams;
- com::sun::star::uno::Reference< com::sun::star::lang::XUnoTunnel > xObjShellTunnel( xModel,com::sun::star::uno:: UNO_QUERY_THROW );
- SfxObjectShell* pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
+ SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
- pFoundShell->CallXScript(xModel, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
+ pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam);
rtl::OUString aStringRes;
aRet >>= aStringRes;
std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
commit 51e89c41823e9d64f1f99f239c6900bb1a8bfe0e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Nov 14 19:06:32 2011 +0100
we don't need to open unit test files in sd with READWRITE either
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index c014143..441be8e 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -117,7 +117,7 @@ FileFormat aFileFormats[] = {
aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
- SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READWRITE, true);
+ SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
pSrcMed->SetFilter(aFilter);
if ( !xDocShRef->DoLoad(pSrcMed) )
{
commit 98f138c7ca207f6625be4fb910deac8cb4cb68d9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Nov 14 19:00:29 2011 +0100
we no longer need to open unit test files READWRITE in sc
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 0c9482a..20cf95e 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -209,7 +209,7 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUStr
aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
ScDocShellRef xDocShRef = new ScDocShell;
- SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READWRITE, true);
+ SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
pSrcMed->SetFilter(aFilter);
if (!xDocShRef->DoLoad(pSrcMed))
{
More information about the Libreoffice-commits
mailing list