INTEGRATION: CWS langstatusbar (1.29.300); FILE MERGED

2007/10/05 14:52:02 tl 1.29.300.2: RESYNC: (1.29-1.30); FILE MERGED
2007/08/13 12:40:23 tl 1.29.300.1: #i78856# Default Formatting Behavior
This commit is contained in:
Ivo Hinkelmann 2007-11-23 15:44:03 +00:00
parent 4ffa816179
commit c56fad11f3

View file

@ -4,9 +4,9 @@
*
* $RCSfile: outlvw.cxx,v $
*
* $Revision: 1.30 $
* $Revision: 1.31 $
*
* last change: $Author: hr $ $Date: 2007-06-27 18:42:38 $
* last change: $Author: ihi $ $Date: 2007-11-23 16:44:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -1217,12 +1217,20 @@ void OutlinerView::ShowBullets( BOOL bShow, BOOL bAffectLevel0 )
pOwner->UndoActionEnd( OLUNDO_ATTR );
}
void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich )
void OutlinerView::RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs )
{
RemoveAttribs( bRemoveParaAttribs, 0, TRUE /*keep language attribs*/ );
}
void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL bKeepLanguages )
{
DBG_CHKTHIS(OutlinerView,0);
BOOL bUpdate = pOwner->GetUpdateMode();
pOwner->SetUpdateMode( FALSE );
pOwner->UndoActionStart( OLUNDO_ATTR );
if (bKeepLanguages)
pEditView->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
else
pEditView->RemoveAttribs( bRemoveParaAttribs, nWhich );
if ( bRemoveParaAttribs )
{