diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 14:32:59 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 14:32:59 +0000 |
| commit | 120735cf41f2e0487e07e9c2f61d78ff969dabc9 (patch) | |
| tree | 511a70ece617179c10a908ad50629b4f16ed1f7f | |
| parent | 0ed9b25f3e5385d2a6762f9647712e810de9c8c3 (diff) | |
INTEGRATION: CWS customfields (1.18.52); FILE MERGED
2007/10/25 09:56:02 mba 1.18.52.2: #i5092#: warning fixed
2007/10/15 18:38:48 mba 1.18.52.1: #i5092#: support custom properties in DocInfoFields
| -rw-r--r-- | sw/source/ui/fldui/fldtdlg.cxx | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 946c9beb67..2644bfe57d 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fldtdlg.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2007-09-27 11:48:54 $ + * last change: $Author: ihi $ $Date: 2007-11-26 15:32:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,6 +68,8 @@ #include <svx/htmlmode.hxx> #endif +#include <sfx2/docinf.hxx> + #ifndef _VIEWOPT_HXX #include <viewopt.hxx> #endif @@ -198,7 +200,7 @@ SwFldDlg::~SwFldDlg() BOOL SwFldDlg::Close() { - SfxViewFrame::Current()->GetDispatcher()-> + m_pBindings->GetDispatcher()-> Execute(m_bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); return TRUE; @@ -258,9 +260,19 @@ void SwFldDlg::Initialize(SfxChildWinInfo *pInfo) Beschreibung: --------------------------------------------------------------------*/ -SfxItemSet* SwFldDlg::CreateInputItemSet( USHORT ) +SfxItemSet* SwFldDlg::CreateInputItemSet( USHORT nID ) { - return 0; + if ( nID == TP_FLD_DOKINF ) + { + SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current(); + SfxItemSet* pISet = new SfxItemSet( pDocSh->GetPool(), SID_DOCINFO, SID_DOCINFO ); + com::sun::star::uno::Any aAny; + aAny <<= pDocSh->GetDocInfo().GetCustomPropertyNames(); + pISet->Put( SfxUnoAnyItem( SID_DOCINFO, aAny ) ); + return pISet; + } + else + return 0; } /*-------------------------------------------------------------------- |