[Libreoffice-commits] .: 2 commits - sc/source sw/CppunitTest_sw_layout_test.mk sw/qa
Markus Mohrhard
mmohrhard at kemper.freedesktop.org
Tue Feb 14 07:40:30 PST 2012
sc/source/ui/namedlg/namedlg.cxx | 6 -
sw/CppunitTest_sw_layout_test.mk | 139 +++++++++++++++++++++++++++++++++++++++
sw/qa/core/data/odt/test.odt |binary
sw/qa/core/layout-test.cxx | 127 +++++++++++++++++++++++++++++++++++
4 files changed, 266 insertions(+), 6 deletions(-)
New commits:
commit 156bd43bd96379d86535afa38ce4d4f8044f45a6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Feb 14 16:34:47 2012 +0100
add a test case that allows testing of sw's Layout code
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
new file mode 100644
index 0000000..a14af32
--- /dev/null
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -0,0 +1,139 @@
+# -*- 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_layout_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \
+ sw/qa/core/layout-test \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sw_layout_test, \
+ avmedia \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ fileacc \
+ for \
+ forui \
+ i18nisolang1 \
+ msfilter \
+ oox \
+ sal \
+ salhelper \
+ sax \
+ 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_layout_test,\
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sw_layout_test,\
+ offapi \
+ oovbaapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sw_layout_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sw_layout_test,\
+ oovbaapi \
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_components,sw_layout_test,\
+ 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 \
+ 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 \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
+ unotools/util/utl \
+ unoxml/source/rdf/unordf \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sw_layout_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,$(OUTDIR)/unittest/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_layout_test) : \
+ $(call gb_Library_get_target,localedata_en) \
+ $(call gb_Library_get_target,msword) \
+ $(call gb_Library_get_target,vbaswobj) \
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/core/data/odt/test.odt b/sw/qa/core/data/odt/test.odt
new file mode 100644
index 0000000..5688df4
Binary files /dev/null and b/sw/qa/core/data/odt/test.odt differ
diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx
new file mode 100644
index 0000000..8d6e36b
--- /dev/null
+++ b/sw/qa/core/layout-test.cxx
@@ -0,0 +1,127 @@
+/* -*- 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 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.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+ * (initial developer)
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com>
+ *
+ * All Rights Reserved.
+ *
+ * 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.
+ */
+
+#include <sal/config.h>
+#include <unotest/macros_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>
+
+using namespace ::com::sun::star::uno;
+using namespace com::sun::star;
+
+/* Implementation of Macros test */
+
+class SwLayoutTest : public test::BootstrapFixture, public unotest::MacrosTest
+{
+public:
+ SwLayoutTest();
+
+ void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath);
+
+ virtual void setUp();
+ virtual void tearDown();
+
+ void test();
+
+ CPPUNIT_TEST_SUITE(SwLayoutTest);
+#if !defined(MACOSX) && !defined(WNT)
+ CPPUNIT_TEST(test);
+#endif
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+ uno::Reference<uno::XInterface> m_xWriterComponent;
+ ::rtl::OUString m_aBaseString;
+};
+
+void SwLayoutTest::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();
+}
+
+void SwLayoutTest::test()
+{
+ rtl::OUString aFilePath;
+ rtl::OUString aFileBase(RTL_CONSTASCII_USTRINGPARAM("test."));
+ rtl::OUString aExtension(RTL_CONSTASCII_USTRINGPARAM("odt"));
+ createFileURL(aFileBase, aExtension, aFilePath);
+ uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFilePath);
+ CPPUNIT_ASSERT(xComponent.is());
+}
+
+
+SwLayoutTest::SwLayoutTest()
+ : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data"))
+{
+}
+
+void SwLayoutTest::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_xWriterComponent =
+ getMultiServiceFactory()->createInstance(rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.TextDocument")));
+ CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.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 SwLayoutTest::tearDown()
+{
+ uno::Reference< lang::XComponent >( m_xWriterComponent, UNO_QUERY_THROW )->dispose();
+ test::BootstrapFixture::tearDown();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 289144b2fee5b3932a01f24d045c5358f45e12c8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Feb 13 23:15:41 2012 +0100
cleanup namedlg.cxx
remove unneeded comments, includes and macros
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 72469f7..b2a7de6 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -52,7 +52,6 @@
#include <map>
#include <memory>
-#include <iostream>
// defines -------------------------------------------------------------------
@@ -60,13 +59,10 @@
| SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
#define ABS_DREF ABS_SREF \
| SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
//logic
-#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
-
ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScViewData* ptrViewData,
const ScAddress& aCursorPos, boost::ptr_map<rtl::OUString, ScRangeName>* pRangeMap )
@@ -187,8 +183,6 @@ void ScNameDlg::Init()
CheckForEmptyTable();
- //TODO: fix the Add Button
- //maBtnAdd.Disable();
}
sal_Bool ScNameDlg::IsRefInputMode() const
More information about the Libreoffice-commits
mailing list