diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:39:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:39:59 +0000 |
| commit | 42bad41eda902a327583de04202098af062ccc52 (patch) | |
| tree | 30c9aae1886f7739d7c616d1a4d9890f4d52d7f4 /svx/source/editeng/impedit5.cxx | |
| parent | INTEGRATION: CWS sb59 (1.65.62); FILE MERGED (diff) | |
| download | core-42bad41eda902a327583de04202098af062ccc52.tar.gz core-42bad41eda902a327583de04202098af062ccc52.zip | |
INTEGRATION: CWS sb59 (1.28.62); FILE MERGED
2006/08/03 13:51:43 cl 1.28.62.1: removed compiler warnings
Diffstat (limited to 'svx/source/editeng/impedit5.cxx')
| -rw-r--r-- | svx/source/editeng/impedit5.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx index 72ec048478e4..7072ecbd2583 100644 --- a/svx/source/editeng/impedit5.cxx +++ b/svx/source/editeng/impedit5.cxx @@ -4,9 +4,9 @@ * * $RCSfile: impedit5.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:53:00 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:39:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,13 +76,13 @@ void ImpEditEngine::SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle ) USHORT nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() ); USHORT nEndPara = aEditDoc.GetPos( aSel.Max().GetNode() ); - BOOL bUpdate = GetUpdateMode(); + BOOL _bUpdate = GetUpdateMode(); SetUpdateMode( FALSE ); for ( USHORT n = nStartPara; n <= nEndPara; n++ ) SetStyleSheet( n, pStyle ); - SetUpdateMode( bUpdate, 0 ); + SetUpdateMode( _bUpdate, 0 ); } void ImpEditEngine::SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle ) @@ -275,7 +275,7 @@ void ImpEditEngine::UndoActionStart( USHORT nId ) } } -void ImpEditEngine::UndoActionEnd( USHORT nId ) +void ImpEditEngine::UndoActionEnd( USHORT ) { if ( IsUndoEnabled() && !IsInUndo() ) { @@ -674,7 +674,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() ); USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() ); - const SfxItemSet* pEmptyItemSet = bRemoveParaAttribs ? &GetEmptyItemSet() : 0; + const SfxItemSet* _pEmptyItemSet = bRemoveParaAttribs ? &GetEmptyItemSet() : 0; if ( IsUndoEnabled() && !IsInUndo() && aStatus.DoUndoAttribs() ) { @@ -706,7 +706,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri BOOL bChanged = aEditDoc.RemoveAttribs( pNode, nStartPos, nEndPos, nWhich ); if ( bRemoveParaAttribs ) { - SetParaAttribs( nNode, *pEmptyItemSet ); // Invalidiert + SetParaAttribs( nNode, *_pEmptyItemSet ); // Invalidiert } else { |