diff options
| author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
| commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
| tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /oox/source/xls/richstring.cxx | |
| parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) | |
Resync to trunk, windows non-pro buildaoo/aw080
Diffstat (limited to 'oox/source/xls/richstring.cxx')
| -rw-r--r-- | oox/source/xls/richstring.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/oox/source/xls/richstring.cxx b/oox/source/xls/richstring.cxx index b2349ab6df72..1fb24f4c4c7b 100644 --- a/oox/source/xls/richstring.cxx +++ b/oox/source/xls/richstring.cxx @@ -19,8 +19,6 @@ * *************************************************************/ - - #include "oox/xls/richstring.hxx" #include <com/sun/star/text/XText.hpp> @@ -59,7 +57,8 @@ inline bool lclNeedsRichTextFormat( const Font* pFont ) RichStringPortion::RichStringPortion( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), - mnFontId( -1 ) + mnFontId( -1 ), + mbConverted( false ) { } @@ -89,6 +88,9 @@ void RichStringPortion::finalizeImport() void RichStringPortion::convert( const Reference< XText >& rxText, const Font* pFont, bool bReplace ) { + if ( mbConverted ) + return; + Reference< XTextRange > xRange; if( bReplace ) xRange.set( rxText, UNO_QUERY ); @@ -113,6 +115,8 @@ void RichStringPortion::convert( const Reference< XText >& rxText, const Font* p pFont->writeToPropertySet( aPropSet, FONT_PROPTYPE_TEXT ); } } + + mbConverted = true; } // ---------------------------------------------------------------------------- |