impress202: #i113673# added support of smybol fonts

2 files changed, 50 insertions, 2 deletions

diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 3ac5018c1dad..9750375f97dd 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -96,7 +96,7 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
         rPropMap[ PROP_CharFontFamilyComplex ] <<= nFontFamily;
     }
 
-    // symbol font not supported
+    // symbolfont, will now be ... textrun.cxx ... ausgewertet !!!i#113673
 
     if( maCharColor.isUsed() )
         rPropMap[ PROP_CharColor ] <<= maCharColor.getColor( rFilter.getGraphicHelper() );
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index aa74d767a7ad..1f2b3da4560e 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -78,7 +78,55 @@ void TextRun::insertAt(
             }
             else
             {
-                xText->insertString( xStart, getText(), sal_False );
+                OUString aLatinFontName, aSymbolFontName;
+                sal_Int16 nLatinFontPitch = 0, nSymbolFontPitch = 0;
+                sal_Int16 nLatinFontFamily = 0, nSymbolFontFamily = 0;
+
+                if ( !aTextCharacterProps.maSymbolFont.getFontData( aSymbolFontName, nSymbolFontPitch, nSymbolFontFamily, rFilterBase ) )
+                    xText->insertString( xStart, getText(), sal_False );
+                else if ( getText().getLength() )
+                {   // !!#i113673<<<
+                    aTextCharacterProps.maLatinFont.getFontData( aLatinFontName, nLatinFontPitch, nLatinFontFamily, rFilterBase );
+
+                    sal_Int32 nIndex = 0;
+                    while ( sal_True )
+                    {
+                        sal_Int32 nCount = 0;
+                        sal_Bool bSymbol = ( getText()[ nIndex ] & 0xff00 ) == 0xf000;
+                        if ( bSymbol )
+                        {
+                            do
+                            {
+                                nCount++;
+                            }
+                            while( ( ( nCount + nIndex ) < getText().getLength() ) && ( ( getText()[ nCount + nIndex ] & 0xff00 ) == 0xf000 ) );
+                            aPropSet.setAnyProperty( PROP_CharFontName, Any( aSymbolFontName ) );
+                            aPropSet.setAnyProperty( PROP_CharFontPitch, Any( nSymbolFontPitch ) );
+                            aPropSet.setAnyProperty( PROP_CharFontFamily, Any( nSymbolFontFamily ) );
+                        }
+                        else
+                        {
+                            do
+                            {
+                                nCount++;
+                            }
+                            while( ( ( nCount + nIndex ) < getText().getLength() ) && ( ( getText()[ nCount + nIndex ] & 0xff00 ) != 0xf000 ) );
+                            aPropSet.setAnyProperty( PROP_CharFontName, Any( aLatinFontName ) );
+                            aPropSet.setAnyProperty( PROP_CharFontPitch, Any( nLatinFontPitch ) );
+                            aPropSet.setAnyProperty( PROP_CharFontFamily, Any( nLatinFontFamily ) );
+                        }
+                        rtl::OUString aSubString( getText().copy( nIndex, nCount ) );
+                        xText->insertString( xStart, aSubString, sal_False );
+                        nIndex += nCount;
+
+                        if ( nIndex >= getText().getLength() )
+                            break;
+
+                        Reference< XTextRange > xStart( xAt, UNO_QUERY );
+                        aPropSet = PropertySet( xStart );
+                        aTextCharacterProps.pushToPropSet( aPropSet, rFilterBase );
+                    }
+                }
             }
         }
         else