diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:24:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:24:43 +0000 |
| commit | 6f0cdbfcdc4382f3fb33fd0c709b5ebd6b0bf464 (patch) | |
| tree | f0cc3446a327fc30ef9872cd6a1a68394f04f008 /sw | |
| parent | 5eff89dafd8833e2d2a3a3184afe88d18af48c1d (diff) | |
INTEGRATION: CWS custommeta (1.49.28); FILE MERGED
2008/02/26 10:37:07 mst 1.49.28.2: RESYNC: (1.49-1.50); FILE MERGED
2008/01/18 10:24:11 mst 1.49.28.1: remove support for field types DI_INFO[1-4]
- sw/inc/docufld.hxx, sw/source/core/fields/docufld.cxx:
+ nsSwDocInfoSubType: removed constants DI_INFO[1-4]
+ use XDocumentProperties instead of SfxDocumentInfo
+ adapt to SwDoc interface change
- sw/source/ui/fldui/{flddinf.cxx,fldedt.cxx,fldmgr.cxx,fldtdlg.cxx}:
+ remove support for field types DI_INFO[1-4]
+ use XDocumentProperties instead of SfxDocumentInfo
+ fix bug in SwFldDokInfPage::FillItemSet: name of custom property was lost
- sw/source/ui/fldui/makefile.mk:
+ enable exceptions for fldedt.cxx, fldtdlg.cxx
- sw/source/ui/inc/utlui.hrc, sw/source/ui/utlui/initui.src:
+ remove FLD_DOCINFO_INFO[1-4]
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index c89f41a7cda1..7299ca8d6201 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fldmgr.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: rt $ $Date: 2008-02-19 13:55:48 $ + * last change: $Author: obo $ $Date: 2008-02-26 14:24:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,9 +90,6 @@ #ifndef _SFXDISPATCH_HXX //autogen #include <sfx2/dispatch.hxx> #endif -#ifndef _SFXDOCINF_HXX //autogen -#include <sfx2/docinf.hxx> -#endif #ifndef _SFX_OBJSH_HXX //autogen #include <sfx2/objsh.hxx> #endif @@ -713,9 +710,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) String* pNew; if (nTypeId == TYP_DOCINFOFLD) { - if (i >= DI_INFO1 && i <= DI_INFO4) - pNew = new String( pSh->GetInfo()->GetUserKeyTitle(i-DI_INFO1)); - else if ( i == DI_CUSTOM ) + if ( i == DI_CUSTOM ) pNew = new String( String(SW_RES( STR_CUSTOM )) ); else pNew = new String(*ViewShell::GetShellRes()->aDocInfoLst[i]); |