diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 08:52:49 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 08:52:49 +0000 |
| commit | ec8309046aa997e5dab017883dac411a9cbd2d2a (patch) | |
| tree | aa82fb6b641e0a9a2437cde86baf254710022ba6 | |
| parent | 57ff5e3ca2ecc81dda8a44c37710496257c17a04 (diff) | |
INTEGRATION: CWS calc36 (1.15.108); FILE MERGED
2006/04/06 13:13:36 dr 1.15.108.1: #i63766# patch moved from CWS dr47
| -rw-r--r-- | svx/source/msfilter/svxmsbas.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/svx/source/msfilter/svxmsbas.cxx b/svx/source/msfilter/svxmsbas.cxx index a597854ba164..28803f092dd6 100644 --- a/svx/source/msfilter/svxmsbas.cxx +++ b/svx/source/msfilter/svxmsbas.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svxmsbas.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2006-02-03 18:30:38 $ + * last change: $Author: rt $ $Date: 2006-05-05 09:52:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -375,10 +375,16 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, const char cLineEnd = bMac ? '\x0D' : '\x0A'; const String sAttribute(String::CreateFromAscii( bAsComment ? "Rem Attribute" : "Attribute")); - while (STRING_NOTFOUND != (nBegin = pStr->Search(sAttribute))) + nBegin = 0; + while (STRING_NOTFOUND != (nBegin = pStr->Search(sAttribute, nBegin))) { if ((nBegin) && pStr->GetChar(nBegin-1) != cLineEnd) + { + // npower #i63766# Need to skip instances of Attribute + // that are NOT Attribute statements + nBegin += sAttribute.Len(); continue; + } xub_StrLen nEnd = pStr->Search(cLineEnd ,nBegin); // DR #i26521# catch STRING_NOTFOUND, will loop endless otherwise if( nEnd == STRING_NOTFOUND ) |