diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 16:30:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 16:30:35 +0000 |
| commit | 6d1900b83a9303f6a0fcb9f29fffcd2469673ddf (patch) | |
| tree | 8e4573080b54da06429f1cc5ad6f180a7ff9c084 /sw/source/ui/dbui | |
| parent | 360d78fc92774b2aa99543804d5a2f65e65442a6 (diff) | |
INTEGRATION: CWS writercorehandoff (1.5.140); FILE MERGED
2006/03/17 08:29:43 tra 1.5.140.7: RESYNC: (1.8-1.9); FILE MERGED
2005/11/04 12:58:11 tra 1.5.140.6: #i50348#
2005/10/26 07:37:56 tra 1.5.140.5: #i50348#
2005/10/25 08:48:20 tra 1.5.140.4: RESYNC: (1.6-1.7); FILE MERGED
2005/09/13 16:25:19 tra 1.5.140.3: RESYNC: (1.5-1.6); FILE MERGED
2005/06/07 14:15:26 fme 1.5.140.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:29:22 tra 1.5.140.1: Unnecessary includes removed #i50348#
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/mailmergehelper.cxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index e7fb605ae29b..9d960e38c9ad 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mailmergehelper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2006-01-31 18:33:50 $ + * last change: $Author: hr $ $Date: 2006-08-14 17:30:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,6 @@ * ************************************************************************/ #pragma hdrstop - #ifndef _SWTYPES_HXX #include <swtypes.hxx> #endif @@ -61,24 +60,15 @@ #ifndef _SFX_FCONTNR_HXX #include <sfx2/fcontnr.hxx> #endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ -#include <com/sun/star/container/XNameAccess.hpp> -#endif #ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #endif #ifndef _COM_SUN_STAR_SDB_XCOLUMN_HPP_ #include <com/sun/star/sdb/XColumn.hpp> #endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#endif #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ -#include <com/sun/star/uno/XComponentContext.hpp> -#endif #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #endif @@ -106,7 +96,10 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -using ::rtl::OUString; + +using rtl::OUString; + +//using namespace ::rtl; namespace SwMailMergeHelper { |