diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:51:04 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 14:51:04 +0000 |
| commit | 2f9b2d056d7742e869bd159553e433c050b6fa98 (patch) | |
| tree | aeb32e0c1523220edf2151b1ee50a846fcb078df /sfx2/source/control/macro.cxx | |
| parent | 62b112ccf291cfcc798dac7076b6e96a9a77c960 (diff) | |
INTEGRATION: CWS sb59 (1.8.16); FILE MERGED
2006/08/16 09:31:17 sb 1.8.16.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'sfx2/source/control/macro.cxx')
| -rw-r--r-- | sfx2/source/control/macro.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx index a9092d5f6019..3eb67e2d0d84 100644 --- a/sfx2/source/control/macro.cxx +++ b/sfx2/source/control/macro.cxx @@ -4,9 +4,9 @@ * * $RCSfile: macro.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:26:50 $ + * last change: $Author: obo $ $Date: 2006-10-12 15:51:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -407,7 +407,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl if ( bPrevReplaced ) { aRecordable.Insert( aReplacement, n - 2 ); - n += aReplacement.Len(); + n = n + aReplacement.Len(); aRecordable.SetChar((unsigned short) (n-2), 0x0029);// ')' = 29h aRecordable.Replace( n-1, 2, DEFINE_CONST_UNICODE("+\"") ); // ++n; @@ -417,7 +417,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl aReplacement += DEFINE_CONST_UNICODE(")+\""); aRecordable.SetChar(n, 0x0022 );// '"' = 22h aRecordable.Insert( aReplacement, n + 1 ); - n += aReplacement.Len(); + n = n + aReplacement.Len(); } bPrevReplaced = TRUE; } @@ -438,8 +438,11 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl } */ } - else if ( pType != ::getVoidCppuType() ) - DBG_ERROR("Unknown Type in recorder!"); + else + { + OSL_ENSURE( + pType == ::getVoidCppuType(), "Unknown Type in recorder!" ); + } // den Parameter anh"angen aStatement += aArg; |