diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:58:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 06:58:25 +0000 |
| commit | f726e88355b53fd945dade809bc2a9e9493e9ed5 (patch) | |
| tree | 8da8a8d7183be85b61a06f05df1a61f5e35b626e | |
| parent | ee5063b5beba967f1e34c7d56952cc226a538489 (diff) | |
INTEGRATION: CWS swwarnings (1.33.42); FILE MERGED
2007/08/20 15:15:00 tl 1.33.42.6: RESYNC: (1.34-1.35); FILE MERGED
2007/05/29 10:39:04 os 1.33.42.5: RESYNC: (1.33-1.34); FILE MERGED
2007/04/03 12:57:04 tl 1.33.42.4: #i69287# warning-free code
2007/03/12 08:48:16 fme 1.33.42.3: #i69287# Warning free code
2007/02/27 08:00:47 os 1.33.42.2: #i69287# warnings removed
2007/02/26 11:50:32 os 1.33.42.1: #i69287# warnings removed
| -rw-r--r-- | sw/inc/dbmgr.hxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 8031d1adea..45687edcba 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dbmgr.hxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: rt $ $Date: 2007-07-05 07:37:06 $ + * last change: $Author: hr $ $Date: 2007-09-27 07:58:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -53,7 +53,6 @@ #ifndef INCLUDED_SWDLLAPI_H #include "swdllapi.h" #endif -// @@@ #include "swtypes.hxx" // fuer aEmptyStr #ifndef _SWDBDATA_HXX #include <swdbdata.hxx> @@ -61,8 +60,8 @@ #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> #endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ -#include <com/sun/star/uno/Sequence.h> +#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ +#include <com/sun/star/uno/Sequence.hxx> #endif #ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ #include <com/sun/star/lang/Locale.hpp> @@ -110,7 +109,6 @@ class SfxProgress; class ListBox; class Button; class SvNumberFormatter; -//CHINA001 class SwMailMergeDlg; class SwDbtoolsClient; class SwXMailMerge; class SwMailMergeConfigItem; @@ -211,12 +209,13 @@ struct SwMergeDescriptor SwMergeDescriptor( USHORT nType, SwWrtShell& rShell, ::svx::ODataAccessDescriptor& rDesc ) : nMergeType(nType), rSh(rShell), - pMailMergeConfigItem(0), rDescriptor(rDesc), + bSendAsHTML( sal_True ), + bSendAsAttachment( sal_False ), bPrintAsync( sal_True ), bCreateSingleFile( sal_False ), - bSendAsHTML( sal_True ), - bSendAsAttachment( sal_False ){} + pMailMergeConfigItem(0) + {} }; |