From a27462189d1d6a3d22be23a5eee603edca5d8ea3 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 21:01:20 +0100 Subject: Remove visual noise from sw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicts: sw/inc/unodraw.hxx sw/inc/unoframe.hxx sw/sdi/swriter.sdi sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unoparagraph.cxx sw/source/filter/ww8/rtfexportfilter.cxx sw/source/ui/inc/unotxvw.hxx sw/source/ui/lingu/hyp.cxx sw/source/ui/lingu/sdrhhcwrap.cxx sw/source/ui/uno/swdetect.hxx Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908 Reviewed-on: https://gerrit.libreoffice.org/8322 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/ui/uno/unomailmerge.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sw/source/ui/uno/unomailmerge.cxx') diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 6d23b1b24a80..8e80738003e2 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -622,9 +622,8 @@ uno::Any SAL_CALL SwXMailMerge::execute( throw IllegalArgumentException("Either the ResultSet or DataSourceName and DataCommand must be set.", static_cast < cppu::OWeakObject * > ( this ), 0 ); } - // // build ResultSet from DataSourceName, DataCommand and DataCommandType - // + Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); if (xMgr.is()) { @@ -859,7 +858,6 @@ void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const } } - uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo( ) throw (RuntimeException, std::exception) { @@ -1126,7 +1124,6 @@ void SAL_CALL SwXMailMerge::removeVetoableChangeListener( OSL_FAIL("not implemented"); } - void SAL_CALL SwXMailMerge::dispose() throw(RuntimeException, std::exception) { -- cgit