diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 10:27:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 10:27:56 +0000 |
| commit | c49a4b282a9ecfe4ee9e08b8710ca88e3fa09392 (patch) | |
| tree | 13f1766cb1e66e01780a50eec2fd5669755db22d /sw/source/ui/app/docsh.cxx | |
| parent | 7c769de6cae783f5df2e188cfcbd76fd62852e8e (diff) | |
INTEGRATION: CWS swqbf35 (1.52.22); FILE MERGED
2005/09/22 18:17:50 fme 1.52.22.3: RESYNC: (1.52-1.53); FILE MERGED
2005/08/18 12:58:34 fme 1.52.22.2: #i51737# Check if notes are in undo array in GetHiddenInformationState
2005/08/02 07:32:06 fme 1.52.22.1: #i50703# Update footnotes after binfilter import
Diffstat (limited to 'sw/source/ui/app/docsh.cxx')
| -rw-r--r-- | sw/source/ui/app/docsh.cxx | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 983f28a86b73..50d728789508 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docsh.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:29:54 $ + * last change: $Author: hr $ $Date: 2005-09-28 11:27:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -148,6 +148,9 @@ #ifndef _FMTFSIZE_HXX //autogen #include <fmtfsize.hxx> #endif +#ifndef _FMTFLD_HXX +#include <fmtfld.hxx> +#endif #ifndef _NODE_HXX //autogen #include <node.hxx> #endif @@ -220,6 +223,12 @@ #ifndef _NDOLE_HXX #include <ndole.hxx> #endif +#ifndef _TXTFTN_HXX +#include <txtftn.hxx> +#endif +#ifndef _FTNIDX_HXX +#include <ftnidx.hxx> +#endif // --> FME 2004-08-05 #i20883# Digital Signatures and Encryption #ifndef _FLDBAS_HXX @@ -1117,8 +1126,17 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates ) { SwFieldType* pType = GetWrtShell()->GetFldType( RES_POSTITFLD, aEmptyStr ); SwClientIter aIter( *pType ); - if ( aIter.GoStart() ) - nState |= HIDDENINFORMATION_NOTES; + SwClient* pFirst = aIter.GoStart(); + while( pFirst ) + { + if( static_cast<SwFmtFld*>(pFirst)->GetTxtFld() && + static_cast<SwFmtFld*>(pFirst)->IsFldInDoc() ) + { + nState |= HIDDENINFORMATION_NOTES; + break; + } + pFirst = ++aIter; + } } } @@ -1525,6 +1543,11 @@ void SwDocShell::CalcLayoutForOLEObjects() void SwDocShell::UpdateLinks() { GetDoc()->UpdateLinks(); + // --> FME 2005-07-27 #i50703# Update footnote numbers + SwTxtFtn::SetUniqueSeqRefNo( *GetDoc() ); + SwNodeIndex aTmp( GetDoc()->GetNodes() ); + GetDoc()->GetFtnIdxs().UpdateFtn( aTmp ); + // <-- } /* -----------------------------12.02.01 12:08-------------------------------- |