diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 13:09:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 13:09:38 +0000 |
| commit | 9ad1f94ab14c4e3cd4aa7b9baee9965cc2cdec45 (patch) | |
| tree | 7b4be8608e2088b1651faf542a13388cf2b10191 /xmloff | |
| parent | 6cb6964d3463039251e126d99518fd53cd21e7d7 (diff) | |
INTEGRATION: CWS ooo11rc (1.99.30); FILE MERGED
2003/06/27 00:49:34 nick 1.99.30.1: IZ 15350: GCC 2 bug when member function is part of initialiser (on IRIX)
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 03d097104873..76afbf7a3e82 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtimp.cxx,v $ * - * $Revision: 1.100 $ + * $Revision: 1.101 $ * - * last change: $Author: hr $ $Date: 2003-06-30 15:59:45 $ + * last change: $Author: vg $ $Date: 2003-07-02 14:09:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1245,7 +1245,17 @@ void XMLTextImportHelper::SetOutlineStyle( nLevel > 0 && nLevel <= xChapterNumbering->getCount() ) { if( !pOutlineStyles ) + { +#ifdef IRIX + /* GCC 2 bug when member function is called as part of an array + * initialiser + */ + sal_Int8 count = xChapterNumbering->getCount(); + pOutlineStyles = new OUString[count]; +#else pOutlineStyles = new OUString[xChapterNumbering->getCount()]; +#endif + } pOutlineStyles[nLevel-1] = rStyleName; } } |