diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:44:03 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 15:44:03 +0000 |
| commit | 2f9f9fa30aea26a2eace8d6cc9faa1f343a38093 (patch) | |
| tree | 0b9c5d5190f5752140fb3aa601ba2d22caa25146 /svx/source/outliner | |
| parent | 006d9bcad77b778dde5da4c47b7dfc9ee039a3ce (diff) | |
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
Diffstat (limited to 'svx/source/outliner')
| -rw-r--r-- | svx/source/outliner/outlvw.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx index e263960fb1..4ba28864bc 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 |