diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-29 11:47:06 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-29 11:47:06 +0000 |
commit | ae67984ac11b13d02d2d735610856eff6ee1a0ce (patch) | |
tree | 45cc9dbb5f12463c6526ada5917f2061569e5d1c /basic | |
parent | d3f3acd7426e4b8c0e96744f36edcad76844ade7 (diff) |
INTEGRATION: CWS ab17fixes (1.2.282); FILE MERGED
2005/08/17 11:18:44 ab 1.2.282.1: #125043# Also accept ; after channel
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/comp/io.cxx | 71 |
1 files changed, 49 insertions, 22 deletions
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 90f2c70605f9..736e71e98615 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -1,35 +1,61 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite - * * $RCSfile: io.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ + * + * last change: $Author: hr $ $Date: 2005-09-29 12:47:06 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA * - * last change: $Author: rt $ $Date: 2005-09-07 21:29:10 $ + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA * ************************************************************************/ @@ -50,7 +76,8 @@ BOOL SbiParser::Channel( BOOL bAlways ) if( IsHash() ) { SbiExpression aExpr( this ); - if( Peek() == COMMA ) Next(); + while( Peek() == COMMA || Peek() == SEMICOLON ) + Next(); aExpr.Gen(); aGen.Gen( _CHANNEL ); bRes = TRUE; |