From c56fad11f3e1c2160df682ba6be243186e081198 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Fri, 23 Nov 2007 15:44:03 +0000 Subject: [PATCH] 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 --- svx/source/outliner/outlvw.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx index e379aacd1024..fca11888bdf9 100644 --- a/svx/source/outliner/outlvw.cxx +++ b/svx/source/outliner/outlvw.cxx @@ -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,13 +1217,21 @@ 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 ); - pEditView->RemoveAttribs( bRemoveParaAttribs, nWhich ); + if (bKeepLanguages) + pEditView->RemoveAttribsKeepLanguages( bRemoveParaAttribs ); + else + pEditView->RemoveAttribs( bRemoveParaAttribs, nWhich ); if ( bRemoveParaAttribs ) { // Ueber alle Absaetze, und Einrueckung und Level einstellen