Don't explicitly convert OUString to OString

See commit 57afeb8d9e35933630568a02fc48a00f5582b261

Change-Id: Idb41fb2e3b90bd0eb1d7ebd588c13fd50b9536fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98173
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

4 files changed, 51 insertions, 53 deletions

diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 17a12acde6e7..b3aec333967e 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -633,11 +633,11 @@ writeCoreProperties( XmlFilterBase& rSelf, const Reference< XDocumentProperties
             "docProps/core.xml",
             "application/vnd.openxmlformats-package.core-properties+xml" );
     pCoreProps->startElementNS( XML_cp, XML_coreProperties,
-        FSNS(XML_xmlns, XML_cp),       rSelf.getNamespaceURL(OOX_NS(packageMetaCorePr)).toUtf8(),
-        FSNS(XML_xmlns, XML_dc),       rSelf.getNamespaceURL(OOX_NS(dc)).toUtf8(),
-        FSNS(XML_xmlns, XML_dcterms),  rSelf.getNamespaceURL(OOX_NS(dcTerms)).toUtf8(),
-        FSNS(XML_xmlns, XML_dcmitype), rSelf.getNamespaceURL(OOX_NS(dcmiType)).toUtf8(),
-        FSNS(XML_xmlns, XML_xsi),      rSelf.getNamespaceURL(OOX_NS(xsi)).toUtf8());
+        FSNS(XML_xmlns, XML_cp),       rSelf.getNamespaceURL(OOX_NS(packageMetaCorePr)),
+        FSNS(XML_xmlns, XML_dc),       rSelf.getNamespaceURL(OOX_NS(dc)),
+        FSNS(XML_xmlns, XML_dcterms),  rSelf.getNamespaceURL(OOX_NS(dcTerms)),
+        FSNS(XML_xmlns, XML_dcmitype), rSelf.getNamespaceURL(OOX_NS(dcmiType)),
+        FSNS(XML_xmlns, XML_xsi),      rSelf.getNamespaceURL(OOX_NS(xsi)));
 
 #ifdef OOXTODO
     writeElement( pCoreProps, FSNS( XML_cp, XML_category ),         "category" );
@@ -675,8 +675,8 @@ writeAppProperties( XmlFilterBase& rSelf, const Reference< XDocumentProperties >
             "docProps/app.xml",
             "application/vnd.openxmlformats-officedocument.extended-properties+xml" );
     pAppProps->startElement( XML_Properties,
-            XML_xmlns,               rSelf.getNamespaceURL(OOX_NS(officeExtPr)).toUtf8(),
-            FSNS(XML_xmlns, XML_vt), rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)).toUtf8());
+            XML_xmlns,               rSelf.getNamespaceURL(OOX_NS(officeExtPr)),
+            FSNS(XML_xmlns, XML_vt), rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)));
 
     writeElement( pAppProps, XML_Template,              xProperties->getTemplateName() );
 #ifdef OOXTODO
@@ -787,8 +787,8 @@ writeCustomProperties( XmlFilterBase& rSelf, const Reference< XDocumentPropertie
             "docProps/custom.xml",
             "application/vnd.openxmlformats-officedocument.custom-properties+xml" );
     pAppProps->startElement( XML_Properties,
-            XML_xmlns,               rSelf.getNamespaceURL(OOX_NS(officeCustomPr)).toUtf8(),
-            FSNS(XML_xmlns, XML_vt), rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)).toUtf8());
+            XML_xmlns,               rSelf.getNamespaceURL(OOX_NS(officeCustomPr)),
+            FSNS(XML_xmlns, XML_vt), rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)));
 
     size_t nIndex = 0;
     for (const auto& rProp : aprop)
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e1ff4e7f763c..5f8ea80f8c9b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -689,7 +689,7 @@ void ChartExport::WriteChartObj( const Reference< XShape >& xShape, sal_Int32 nI
 
     pFS->startElementNS( mnXmlNamespace, XML_cNvPr,
                           XML_id,     OString::number(nID),
-                          XML_name,   sName.toUtf8());
+                          XML_name,   sName);
 
     OUString sURL;
     if ( GetProperty( xShapeProps, "URL" ) )
@@ -701,8 +701,7 @@ void ChartExport::WriteChartObj( const Reference< XShape >& xShape, sal_Int32 nI
                 mpURLTransformer->getTransformedString(sURL),
                 mpURLTransformer->isExternalURL(sURL));
 
-        mpFS->singleElementNS( XML_a, XML_hlinkClick,
-                FSNS( XML_r,XML_id ), sRelId.toUtf8() );
+        mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId);
     }
     pFS->endElementNS(mnXmlNamespace, XML_cNvPr);
 
@@ -769,9 +768,9 @@ void ChartExport::WriteChartObj( const Reference< XShape >& xShape, sal_Int32 nI
 
     XmlFilterBase* pFB = GetFB();
     pFS->singleElement(  FSNS( XML_c, XML_chart ),
-            FSNS(XML_xmlns, XML_c), pFB->getNamespaceURL(OOX_NS(dmlChart)).toUtf8(),
-            FSNS(XML_xmlns, XML_r), pFB->getNamespaceURL(OOX_NS(officeRel)).toUtf8(),
-            FSNS(XML_r, XML_id), sId.toUtf8() );
+            FSNS(XML_xmlns, XML_c), pFB->getNamespaceURL(OOX_NS(dmlChart)),
+            FSNS(XML_xmlns, XML_r), pFB->getNamespaceURL(OOX_NS(officeRel)),
+            FSNS(XML_r, XML_id), sId );
 
     pFS->endElement( FSNS( XML_a, XML_graphicData ) );
     pFS->endElement( FSNS( XML_a, XML_graphic ) );
@@ -846,9 +845,9 @@ void ChartExport::exportChartSpace( const Reference< css::chart::XChartDocument
     FSHelperPtr pFS = GetFS();
     XmlFilterBase* pFB = GetFB();
     pFS->startElement( FSNS( XML_c, XML_chartSpace ),
-            FSNS( XML_xmlns, XML_c ), pFB->getNamespaceURL(OOX_NS(dmlChart)).toUtf8(),
-            FSNS( XML_xmlns, XML_a ), pFB->getNamespaceURL(OOX_NS(dml)).toUtf8(),
-            FSNS( XML_xmlns, XML_r ), pFB->getNamespaceURL(OOX_NS(officeRel)).toUtf8());
+            FSNS( XML_xmlns, XML_c ), pFB->getNamespaceURL(OOX_NS(dmlChart)),
+            FSNS( XML_xmlns, XML_a ), pFB->getNamespaceURL(OOX_NS(dml)),
+            FSNS( XML_xmlns, XML_r ), pFB->getNamespaceURL(OOX_NS(officeRel)));
     // TODO: get the correct editing language
     pFS->singleElement(FSNS(XML_c, XML_lang), XML_val, "en-US");
 
@@ -919,7 +918,7 @@ void ChartExport::exportExternalData( const Reference< css::chart::XChartDocumen
     OUString sRelId = GetFB()->addRelation(pFS->getOutputStream(),
                     type,
                     relationPath);
-    pFS->singleElementNS(XML_c, XML_externalData, FSNS(XML_r, XML_id), sRelId.toUtf8());
+    pFS->singleElementNS(XML_c, XML_externalData, FSNS(XML_r, XML_id), sRelId);
 }
 
 void ChartExport::exportChart( const Reference< css::chart::XChartDocument >& xChartDoc )
@@ -3147,7 +3146,7 @@ void ChartExport::_exportAxis(
                 {
                     pFS->startElement(FSNS(XML_c, XML_dispUnits));
 
-                    pFS->singleElement(FSNS(XML_c, XML_builtInUnit), XML_val, aVal.toUtf8());
+                    pFS->singleElement(FSNS(XML_c, XML_builtInUnit), XML_val, aVal);
 
                     pFS->singleElement(FSNS( XML_c, XML_dispUnitsLbl ));
                     pFS->endElement( FSNS( XML_c, XML_dispUnits ) );
@@ -3282,8 +3281,8 @@ void writeCustomLabel( const FSHelperPtr& pFS, ChartExport* pChartExport,
         else
         {
             // Field
-            pFS->startElement(FSNS(XML_a, XML_fld), XML_id, rField->getGuid().toUtf8(), XML_type,
-                              sFieldType.toUtf8());
+            pFS->startElement(FSNS(XML_a, XML_fld), XML_id, rField->getGuid(), XML_type,
+                              sFieldType);
             writeRunProperties(pChartExport, xPropertySet);
 
             pFS->startElement(FSNS(XML_a, XML_t));
@@ -3514,7 +3513,7 @@ void ChartExport::exportDataLabels(
     if( eChartType != chart::TYPEID_PIE )
     {
         pFS->startElement(FSNS(XML_c, XML_extLst));
-        pFS->startElement(FSNS(XML_c, XML_ext), XML_uri, "{CE6537A1-D6FC-4f65-9D91-7224C49458BB}", FSNS(XML_xmlns, XML_c15), GetFB()->getNamespaceURL(OOX_NS(c15)).toUtf8());
+        pFS->startElement(FSNS(XML_c, XML_ext), XML_uri, "{CE6537A1-D6FC-4f65-9D91-7224C49458BB}", FSNS(XML_xmlns, XML_c15), GetFB()->getNamespaceURL(OOX_NS(c15)));
         pFS->singleElement(FSNS(XML_c15, XML_showLeaderLines), XML_val, "1");
         pFS->endElement(FSNS(XML_c, XML_ext));
         pFS->endElement(FSNS(XML_c, XML_extLst));
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4adf7a9406b5..1d52bef4b25c 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -310,19 +310,19 @@ void DrawingML::WriteColor( const OUString& sColorSchemeName, const Sequence< Pr
 
     if( aTransformations.hasElements() )
     {
-        mpFS->startElementNS(XML_a, XML_schemeClr, XML_val, sColorSchemeName.toUtf8());
+        mpFS->startElementNS(XML_a, XML_schemeClr, XML_val, sColorSchemeName);
         WriteColorTransformations( aTransformations, nAlpha );
         mpFS->endElementNS( XML_a, XML_schemeClr );
     }
     else if(nAlpha < MAX_PERCENT)
     {
-        mpFS->startElementNS(XML_a, XML_schemeClr, XML_val, sColorSchemeName.toUtf8());
+        mpFS->startElementNS(XML_a, XML_schemeClr, XML_val, sColorSchemeName);
         mpFS->singleElementNS(XML_a, XML_alpha, XML_val, OString::number(nAlpha));
         mpFS->endElementNS( XML_a, XML_schemeClr );
     }
     else
     {
-        mpFS->singleElementNS(XML_a, XML_schemeClr, XML_val, sColorSchemeName.toUtf8());
+        mpFS->singleElementNS(XML_a, XML_schemeClr, XML_val, sColorSchemeName);
     }
 }
 
@@ -1291,14 +1291,14 @@ void DrawingML::WriteMediaNonVisualProperties(const css::uno::Reference<css::dra
     GetFS()->startElementNS(XML_p, XML_nvPr);
 
     GetFS()->singleElementNS(XML_a, eMediaType == Relationship::VIDEO ? XML_videoFile : XML_audioFile,
-                    FSNS(XML_r, XML_link), aVideoFileRelId.toUtf8());
+                    FSNS(XML_r, XML_link), aVideoFileRelId);
 
     GetFS()->startElementNS(XML_p, XML_extLst);
     // media extensions; google this ID for details
     GetFS()->startElementNS(XML_p, XML_ext, XML_uri, "{DAA4B4D4-6D71-4841-9C94-3DE7FCFB9230}");
 
     GetFS()->singleElementNS(XML_p14, XML_media,
-            bEmbed? FSNS(XML_r, XML_embed): FSNS(XML_r, XML_link), aMediaRelId.toUtf8());
+            bEmbed? FSNS(XML_r, XML_embed): FSNS(XML_r, XML_link), aMediaRelId);
 
     GetFS()->endElementNS(XML_p, XML_ext);
     GetFS()->endElementNS(XML_p, XML_extLst);
@@ -1380,7 +1380,7 @@ OUString DrawingML::WriteXGraphicBlip(uno::Reference<beans::XPropertySet> const
         }
     }
 
-    mpFS->startElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelId.toUtf8());
+    mpFS->startElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelId);
 
     WriteImageBrightnessContrastTransparence(rXPropSet);
 
@@ -1975,7 +1975,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool
             usTypeface = aSubstName;
 
         mpFS->singleElementNS( XML_a, XML_latin,
-                               XML_typeface, usTypeface.toUtf8(),
+                               XML_typeface, usTypeface,
                                XML_pitchFamily, pitch,
                                XML_charset, charset );
     }
@@ -1997,7 +1997,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool
             usTypeface = aSubstName;
 
         mpFS->singleElementNS( XML_a, bComplex ? XML_cs : XML_ea,
-                               XML_typeface, usTypeface.toUtf8(),
+                               XML_typeface, usTypeface,
                                XML_pitchFamily, pitch,
                                XML_charset, charset );
     }
@@ -2022,7 +2022,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool
                                   oox::getRelationship(Relationship::HYPERLINK),
                                   sURL, true );
 
-            mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId.toUtf8());
+            mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId);
         }
     }
 
@@ -2188,7 +2188,7 @@ void DrawingML::WriteRun( const Reference< XTextRange >& rRun,
             OString sUUID(comphelper::xml::generateGUIDString());
             mpFS->startElementNS( XML_a, XML_fld,
                                   XML_id, sUUID.getStr(),
-                                  XML_type, sFieldValue.toUtf8() );
+                                  XML_type, sFieldValue );
         }
         else
         {
@@ -2384,7 +2384,7 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS
         mpFS->singleElementNS( XML_a, XML_buSzPct,
                                XML_val, OString::number(std::min<sal_Int32>(std::lround(100000.f * fBulletSizeRel), 400000)));
         mpFS->startElementNS(XML_a, XML_buBlip);
-        mpFS->singleElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelationId.toUtf8());
+        mpFS->singleElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelationId);
         mpFS->endElementNS( XML_a, XML_buBlip );
     }
     else
@@ -2408,7 +2408,7 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS
             if ( SVX_NUM_CHAR_SPECIAL == nNumberingType )
                 aBulletChar = SubstituteBullet( aBulletChar, aFontDesc );
             mpFS->singleElementNS( XML_a, XML_buFont,
-                                   XML_typeface, aFontDesc.Name.toUtf8(),
+                                   XML_typeface, aFontDesc.Name,
                                    XML_charset, (aFontDesc.CharSet == awt::CharSet::SYMBOL) ? "2" : nullptr );
         }
 
@@ -2417,12 +2417,12 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS
         if (!aAutoNumType.isEmpty())
         {
             mpFS->singleElementNS(XML_a, XML_buAutoNum,
-                                  XML_type, aAutoNumType.toUtf8(),
+                                  XML_type, aAutoNumType,
                                   XML_startAt, nStartWith > 1 ? OString::number(nStartWith).getStr() : nullptr);
         }
         else
         {
-            mpFS->singleElementNS(XML_a, XML_buChar, XML_char, OUString(aBulletChar).toUtf8());
+            mpFS->singleElementNS(XML_a, XML_buChar, XML_char, OUString(aBulletChar));
         }
     }
 }
@@ -2849,7 +2849,7 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin
         {
             if (aAdjustmentSeq.hasElements())
             {
-                mpFS->startElementNS(XML_a, XML_prstTxWarp, XML_prst, presetWarp.toUtf8());
+                mpFS->startElementNS(XML_a, XML_prstTxWarp, XML_prst, presetWarp);
                 mpFS->startElementNS(XML_a, XML_avLst);
                 for (sal_Int32 i = 0, nElems = aAdjustmentSeq.getLength(); i < nElems; ++i )
                 {
@@ -2895,7 +2895,7 @@ void DrawingML::WriteText( const Reference< XInterface >& rXIface, const OUStrin
             }
             else
             {
-                mpFS->singleElementNS(XML_a, XML_prstTxWarp, XML_prst, presetWarp.toUtf8());
+                mpFS->singleElementNS(XML_a, XML_prstTxWarp, XML_prst, presetWarp);
             }
         }
 
@@ -4282,7 +4282,7 @@ void DrawingML::WriteArtisticEffect( const Reference< XPropertySet >& rXPropSet
     mpFS->startElementNS(XML_a, XML_extLst);
     mpFS->startElementNS(XML_a, XML_ext, XML_uri, "{BEBA8EAE-BF5A-486C-A8C5-ECC9F3942E4B}");
     mpFS->startElementNS( XML_a14, XML_imgProps,
-                          FSNS(XML_xmlns, XML_a14), mpFB->getNamespaceURL(OOX_NS(a14)).toUtf8() );
+                          FSNS(XML_xmlns, XML_a14), mpFB->getNamespaceURL(OOX_NS(a14)) );
     mpFS->startElementNS(XML_a14, XML_imgLayer, FSNS(XML_r, XML_embed), sRelId);
     mpFS->startElementNS(XML_a14, XML_imgEffect);
 
@@ -4378,9 +4378,8 @@ void DrawingML::WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rX
         mpFS->singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef);
         mpFS->singleElementNS(XML_wp, XML_cNvGraphicFramePr);
 
-        mpFS->startElementNS(
-            XML_a, XML_graphic, FSNS(XML_xmlns, XML_a),
-            mpFB->getNamespaceURL(OOX_NS(dml)).toUtf8());
+        mpFS->startElementNS(XML_a, XML_graphic, FSNS(XML_xmlns, XML_a),
+                             mpFB->getNamespaceURL(OOX_NS(dml)));
     }
     else
     {
@@ -4394,7 +4393,7 @@ void DrawingML::WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rX
         // change tracking extension - required in PPTX
         mpFS->startElementNS(XML_p, XML_ext, XML_uri, "{D42A27DB-BD31-4B8C-83A1-F6EECF244321}");
         mpFS->singleElementNS(XML_p14, XML_modId,
-            FSNS(XML_xmlns, XML_p14), mpFB->getNamespaceURL(OOX_NS(p14)).toUtf8(),
+            FSNS(XML_xmlns, XML_p14), mpFB->getNamespaceURL(OOX_NS(p14)),
             XML_val,
             OString::number(comphelper::rng::uniform_uint_distribution(1, SAL_MAX_UINT32)));
         mpFS->endElementNS(XML_p, XML_ext);
@@ -4484,8 +4483,8 @@ void DrawingML::WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rX
     }
 
     mpFS->singleElementNS(XML_dgm, XML_relIds,
-        FSNS(XML_xmlns, XML_dgm), mpFB->getNamespaceURL(OOX_NS(dmlDiagram)).toUtf8(),
-        FSNS(XML_xmlns, XML_r), mpFB->getNamespaceURL(OOX_NS(officeRel)).toUtf8(),
+        FSNS(XML_xmlns, XML_dgm), mpFB->getNamespaceURL(OOX_NS(dmlDiagram)),
+        FSNS(XML_xmlns, XML_r), mpFB->getNamespaceURL(OOX_NS(officeRel)),
         FSNS(XML_r, XML_dm), dataRelId, FSNS(XML_r, XML_lo), layoutRelId,
         FSNS(XML_r, XML_qs), styleRelId, FSNS(XML_r, XML_cs), colorRelId);
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index eb5eedff1d89..8cab446a3488 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -815,7 +815,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
                         mpURLTransformer->getTransformedString(sURL),
                         mpURLTransformer->isExternalURL(sURL));
 
-                mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId.toUtf8());
+                mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId);
             }
         }
         pFS->endElementNS(mnXmlNamespace, XML_cNvPr);
@@ -1179,7 +1179,7 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape
         pFS->startElementNS(mnXmlNamespace, XML_pic);
     else
         pFS->startElementNS(mnXmlNamespace, XML_pic,
-            FSNS(XML_xmlns, XML_pic), pFB->getNamespaceURL(OOX_NS(dmlPicture)).toUtf8());
+            FSNS(XML_xmlns, XML_pic), pFB->getNamespaceURL(OOX_NS(dmlPicture)));
 
     pFS->startElementNS(mnXmlNamespace, XML_nvPicPr);
 
@@ -1208,7 +1208,7 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape
                 mpURLTransformer->getTransformedString(sURL),
                 mpURLTransformer->isExternalURL(sURL));
 
-        mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId.toUtf8());
+        mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId);
     }
     pFS->endElementNS(mnXmlNamespace, XML_cNvPr);
 
@@ -1882,7 +1882,7 @@ ShapeExport& ShapeExport::WriteTextShape( const Reference< XShape >& xShape )
                     mpURLTransformer->getTransformedString(sURL),
                     mpURLTransformer->isExternalURL(sURL));
 
-            mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId.toUtf8());
+            mpFS->singleElementNS(XML_a, XML_hlinkClick, FSNS(XML_r, XML_id), sRelId);
         }
         pFS->endElementNS(mnXmlNamespace, XML_cNvPr);
     }
@@ -1927,7 +1927,7 @@ void ShapeExport::WriteMathShape(Reference<XShape> const& xShape)
     // WordProcessingML so write a MCE like PPT 2010 does
     mpFS->startElementNS(XML_mc, XML_AlternateContent);
     mpFS->startElementNS(XML_mc, XML_Choice,
-        FSNS(XML_xmlns, XML_a14), mpFB->getNamespaceURL(OOX_NS(a14)).toUtf8(),
+        FSNS(XML_xmlns, XML_a14), mpFB->getNamespaceURL(OOX_NS(a14)),
         XML_Requires, "a14");
     mpFS->startElementNS(mnXmlNamespace, XML_sp);
     mpFS->startElementNS(mnXmlNamespace, XML_nvSpPr);
@@ -2123,14 +2123,14 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
     {
         mpFS->startElementNS( mnXmlNamespace, XML_oleObj,
                           XML_progId, pProgID,
-                          FSNS(XML_r, XML_id), sRelId.toUtf8(),
+                          FSNS(XML_r, XML_id), sRelId,
                           XML_spid, "" );
     }
     else
     {
         mpFS->startElementNS( mnXmlNamespace, XML_oleObj,
 //?                                              XML_name, "Document",
-                          FSNS(XML_r, XML_id), sRelId.toUtf8(),
+                          FSNS(XML_r, XML_id), sRelId,
                           // The spec says that this is a required attribute, but PowerPoint can only handle an empty value.
                           XML_spid, "" );
     }