diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-02-19 12:52:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-02-19 12:52:46 +0000 |
| commit | 7262932905e7a5be5ee366649086943a82b26d2a (patch) | |
| tree | f4905755581c9949b834d0181318b925f0c5d151 /sw | |
| parent | b173ac608bcb0454200012d6e0047740ef7c54ff (diff) | |
INTEGRATION: CWS notes2 (1.90.22); FILE MERGED
2007/12/17 09:52:14 mod 1.90.22.7: fix for wrong fix for merge conflict
2007/12/15 16:16:03 mod 1.90.22.6: RESYNC: (1.97-1.98); FILE MERGED
2007/09/28 16:32:52 mod 1.90.22.5: RESYNC: (1.96-1.97); FILE MERGED
2007/09/01 14:10:58 mod 1.90.22.4: RESYNC: (1.95-1.96); FILE MERGED
2007/07/05 12:19:22 mba 1.90.22.3: HINT_DOCCHANGED was never sent
2007/07/04 12:07:58 mod 1.90.22.2: RESYNC: (1.90-1.95); FILE MERGED
2007/05/24 04:34:45 mod 1.90.22.1: Initial checking, do not use
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index c742e917def0..8b9eb1144f50 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docsh2.cxx,v $ * - * $Revision: 1.98 $ + * $Revision: 1.99 $ * - * last change: $Author: hr $ $Date: 2007-11-01 14:25:09 $ + * last change: $Author: rt $ $Date: 2008-02-19 13:52:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,9 +71,11 @@ #ifndef _SFXENUMITEM_HXX //autogen #include <svtools/eitem.hxx> #endif +/* #ifndef _SFXMACITEM_HXX //autogen #include <svtools/macitem.hxx> #endif +*/ #ifndef _ZFORLIST_HXX //autogen #include <svtools/zforlist.hxx> #endif @@ -1623,12 +1625,11 @@ void SwDocShell::FillClass( SvGlobalName * pClassName, void SwDocShell::SetModified( BOOL bSet ) { SfxObjectShell::SetModified( bSet ); - if( IsEnableSetModified() ) + if( IsEnableSetModified()) { - if ( !pDoc->IsInCallModified() ) - { + if (!pDoc->IsInCallModified() ) + { EnableSetModified( FALSE ); - if( bSet ) { BOOL bOld = pDoc->IsModified(); @@ -1640,7 +1641,7 @@ void SwDocShell::SetModified( BOOL bSet ) pDoc->ResetModified(); EnableSetModified( TRUE ); - } + } UpdateChildWindows(); Broadcast(SfxSimpleHint(SFX_HINT_DOCCHANGED)); |