lotuswordpro/inc/xfilter/xfannotation.hxx | 8 lotuswordpro/inc/xfilter/xfarrowstyle.hxx | 12 lotuswordpro/inc/xfilter/xfbookmark.hxx | 10 lotuswordpro/inc/xfilter/xfbreaks.hxx | 10 lotuswordpro/inc/xfilter/xfdrawgroup.hxx | 4 lotuswordpro/inc/xfilter/xfdropcap.hxx | 12 lotuswordpro/inc/xfilter/xfendnote.hxx | 16 lotuswordpro/inc/xfilter/xffooter.hxx | 4 lotuswordpro/inc/xfilter/xffootnote.hxx | 16 lotuswordpro/inc/xfilter/xffootnoteconfig.hxx | 42 - lotuswordpro/inc/xfilter/xfheader.hxx | 4 lotuswordpro/inc/xfilter/xfhyperlink.hxx | 20 lotuswordpro/inc/xfilter/xfinputlist.hxx | 18 lotuswordpro/inc/xfilter/xflinebreak.hxx | 4 lotuswordpro/inc/xfilter/xflineheight.hxx | 8 lotuswordpro/inc/xfilter/xflinenumberconfig.hxx | 36 lotuswordpro/inc/xfilter/xflistitem.hxx | 10 lotuswordpro/inc/xfilter/xfnumfmt.hxx | 8 lotuswordpro/inc/xfilter/xfpadding.hxx | 10 lotuswordpro/inc/xfilter/xfpagecount.hxx | 4 lotuswordpro/inc/xfilter/xfpagenumber.hxx | 6 lotuswordpro/inc/xfilter/xfplaceholder.hxx | 8 lotuswordpro/inc/xfilter/xfruby.hxx | 16 lotuswordpro/inc/xfilter/xfrubystyle.hxx | 16 lotuswordpro/inc/xfilter/xftabstop.hxx | 4 lotuswordpro/qa/cppunit/import_test.cxx | 111 +- lotuswordpro/qa/cppunit/test_lotuswordpro.cxx | 4 lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 12 lotuswordpro/source/filter/lwp9reader.cxx | 52 - lotuswordpro/source/filter/lwparrowstyles.hxx | 24 lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 2 lotuswordpro/source/filter/lwpchangemgr.cxx | 6 lotuswordpro/source/filter/lwpdoc.cxx | 4 lotuswordpro/source/filter/lwpfrib.cxx | 2 lotuswordpro/source/filter/lwpfribbreaks.cxx | 4 lotuswordpro/source/filter/lwpfribmark.cxx | 276 +++--- lotuswordpro/source/filter/lwpfribsection.cxx | 32 lotuswordpro/source/filter/lwpfribtext.cxx | 58 - lotuswordpro/source/filter/lwpgrfobj.cxx | 2 lotuswordpro/source/filter/lwpmarker.cxx | 18 lotuswordpro/source/filter/lwpnumericfmt.hxx | 80 - lotuswordpro/source/filter/lwppagelayout.cxx | 2 lotuswordpro/source/filter/lwppara.cxx | 8 lotuswordpro/source/filter/lwpsilverbullet.cxx | 4 lotuswordpro/source/filter/lwptablelayout.cxx | 2 lotuswordpro/source/filter/lwptoc.cxx | 2 lotuswordpro/source/filter/lwptools.cxx | 4 lotuswordpro/source/filter/xfilter/xfbgimage.cxx | 22 lotuswordpro/source/filter/xfilter/xfborders.cxx | 24 lotuswordpro/source/filter/xfilter/xfcell.cxx | 18 lotuswordpro/source/filter/xfilter/xfcellstyle.cxx | 24 lotuswordpro/source/filter/xfilter/xfchange.cxx | 54 - lotuswordpro/source/filter/xfilter/xfcolstyle.cxx | 14 lotuswordpro/source/filter/xfilter/xfcolumns.cxx | 34 lotuswordpro/source/filter/xfilter/xfcrossref.cxx | 12 lotuswordpro/source/filter/xfilter/xfdate.cxx | 12 lotuswordpro/source/filter/xfilter/xfdatestyle.cxx | 78 - lotuswordpro/source/filter/xfilter/xfdocfield.cxx | 80 - lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx | 18 lotuswordpro/source/filter/xfilter/xfdrawline.cxx | 30 lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx | 30 lotuswordpro/source/filter/xfilter/xfdrawobj.cxx | 26 lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 16 lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx | 8 lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx | 8 lotuswordpro/source/filter/xfilter/xfdrawrect.cxx | 4 lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx | 64 - lotuswordpro/source/filter/xfilter/xfentry.cxx | 24 lotuswordpro/source/filter/xfilter/xffont.cxx | 48 - lotuswordpro/source/filter/xfilter/xfframe.cxx | 36 lotuswordpro/source/filter/xfilter/xfframestyle.cxx | 48 - lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx | 22 lotuswordpro/source/filter/xfilter/xfimage.cxx | 42 - lotuswordpro/source/filter/xfilter/xfimagestyle.cxx | 52 - lotuswordpro/source/filter/xfilter/xfindex.cxx | 104 +- lotuswordpro/source/filter/xfilter/xflist.cxx | 12 lotuswordpro/source/filter/xfilter/xfliststyle.cxx | 54 - lotuswordpro/source/filter/xfilter/xfmargins.cxx | 8 lotuswordpro/source/filter/xfilter/xfmasterpage.cxx | 8 lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx | 106 +- lotuswordpro/source/filter/xfilter/xfofficemeta.cxx | 40 lotuswordpro/source/filter/xfilter/xfpagemaster.cxx | 44 - lotuswordpro/source/filter/xfilter/xfparagraph.cxx | 6 lotuswordpro/source/filter/xfilter/xfparastyle.cxx | 42 - lotuswordpro/source/filter/xfilter/xfrow.cxx | 8 lotuswordpro/source/filter/xfilter/xfrowstyle.cxx | 20 lotuswordpro/source/filter/xfilter/xfsection.cxx | 16 lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx | 20 lotuswordpro/source/filter/xfilter/xfshadow.cxx | 2 lotuswordpro/source/filter/xfilter/xfstylemanager.cxx | 36 lotuswordpro/source/filter/xfilter/xftable.cxx | 30 lotuswordpro/source/filter/xfilter/xftablestyle.cxx | 26 lotuswordpro/source/filter/xfilter/xftabstyle.cxx | 18 lotuswordpro/source/filter/xfilter/xftextboxstyle.cxx | 34 lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 6 lotuswordpro/source/filter/xfilter/xftextspan.cxx | 12 lotuswordpro/source/filter/xfilter/xftextstyle.cxx | 14 lotuswordpro/source/filter/xfilter/xftimestyle.cxx | 40 lotuswordpro/source/filter/xfilter/xfutil.cxx | 158 +-- oox/qa/unit/CryptoTest.cxx | 52 - oox/qa/unit/drawingml.cxx | 101 +- oox/qa/unit/export.cxx | 661 ++++++++-------- oox/qa/unit/mathml.cxx | 2 oox/qa/unit/mcgr.cxx | 68 - oox/qa/unit/shape.cxx | 34 oox/qa/unit/testscene3d.cxx | 22 oox/qa/unit/vba_compression.cxx | 2 oox/qa/unit/vba_encryption.cxx | 3 oox/qa/unit/vml.cxx | 26 oox/qa/unit/wpc_drawing_canvas.cxx | 14 oox/source/core/contexthandler2.cxx | 14 oox/source/core/fasttokenhandler.cxx | 4 oox/source/core/filterbase.cxx | 12 oox/source/core/filterdetect.cxx | 46 - oox/source/core/xmlfilterbase.cxx | 148 +-- oox/source/crypto/AgileEngine.cxx | 6 oox/source/crypto/CryptTools.cxx | 16 oox/source/crypto/DocumentDecryption.cxx | 4 oox/source/crypto/Standard2007Engine.cxx | 2 oox/source/crypto/StrongEncryptionDataSpace.cxx | 16 oox/source/docprop/docprophandler.cxx | 2 oox/source/docprop/ooxmldocpropimport.cxx | 8 oox/source/drawingml/chart/axiscontext.cxx | 2 oox/source/drawingml/chart/axisconverter.cxx | 2 oox/source/drawingml/chart/chartspaceconverter.cxx | 2 oox/source/drawingml/chart/datasourceconverter.cxx | 2 oox/source/drawingml/chart/datatableconverter.cxx | 2 oox/source/drawingml/chart/objectformatter.cxx | 2 oox/source/drawingml/chart/plotareaconverter.cxx | 2 oox/source/drawingml/chart/seriesconverter.cxx | 14 oox/source/drawingml/chart/titleconverter.cxx | 4 oox/source/drawingml/chart/typegroupconverter.cxx | 6 oox/source/drawingml/color.cxx | 56 - oox/source/drawingml/connectorhelper.cxx | 18 oox/source/drawingml/customshapepresetdata.cxx | 22 oox/source/drawingml/customshapeproperties.cxx | 2 oox/source/drawingml/diagram/datamodel.cxx | 6 oox/source/drawingml/diagram/diagram.cxx | 22 oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 6 oox/source/drawingml/effectproperties.cxx | 10 oox/source/drawingml/effectpropertiescontext.cxx | 32 oox/source/drawingml/fillproperties.cxx | 98 +- oox/source/drawingml/fontworkhelpers.cxx | 168 ++-- oox/source/drawingml/graphicshapecontext.cxx | 2 oox/source/drawingml/shape.cxx | 160 +-- oox/source/drawingml/shape3dproperties.cxx | 258 +++--- oox/source/drawingml/table/tablecell.cxx | 22 oox/source/drawingml/table/tableproperties.cxx | 6 oox/source/drawingml/textbody.cxx | 4 oox/source/drawingml/textbodypropertiescontext.cxx | 2 oox/source/drawingml/texteffectscontext.cxx | 108 +- oox/source/drawingml/textfield.cxx | 38 oox/source/drawingml/textparagraph.cxx | 4 oox/source/drawingml/textparagraphproperties.cxx | 14 oox/source/drawingml/textparagraphpropertiescontext.cxx | 4 oox/source/drawingml/textrun.cxx | 10 oox/source/export/DMLPresetShapeExport.cxx | 2 oox/source/export/ThemeExport.cxx | 2 oox/source/export/chartexport.cxx | 340 ++++---- oox/source/export/drawingml.cxx | 378 ++++----- oox/source/export/shapes.cxx | 148 +-- oox/source/export/vmlexport.cxx | 18 oox/source/helper/attributelist.cxx | 2 oox/source/helper/graphichelper.cxx | 10 oox/source/helper/modelobjecthelper.cxx | 12 oox/source/helper/textinputstream.cxx | 4 oox/source/ole/axcontrol.cxx | 78 - oox/source/ole/axcontrolfragment.cxx | 4 oox/source/ole/olehelper.cxx | 18 oox/source/ole/oleobjecthelper.cxx | 8 oox/source/ole/olestorage.cxx | 4 oox/source/ole/vbacontrol.cxx | 10 oox/source/ole/vbaexport.cxx | 16 oox/source/ole/vbaproject.cxx | 28 oox/source/ppt/comments.cxx | 2 oox/source/ppt/commontimenodecontext.cxx | 10 oox/source/ppt/pptimport.cxx | 4 oox/source/ppt/pptshape.cxx | 18 oox/source/ppt/presPropsfragmenthandler.cxx | 8 oox/source/ppt/presentationfragmenthandler.cxx | 42 - oox/source/ppt/slidefragmenthandler.cxx | 2 oox/source/ppt/slidepersist.cxx | 34 oox/source/ppt/timenode.cxx | 2 oox/source/shape/ShapeContextHandler.cxx | 8 oox/source/shape/WpsContext.cxx | 104 +- oox/source/vml/vmldrawing.cxx | 24 oox/source/vml/vmlformatting.cxx | 8 oox/source/vml/vmlshape.cxx | 92 +- oox/source/vml/vmlshapecontext.cxx | 16 oox/source/vml/vmltextbox.cxx | 12 oox/source/vml/vmltextboxcontext.cxx | 4 191 files changed, 3302 insertions(+), 3270 deletions(-)
New commits: commit e00f6e0b9df5ef8629738b551def2464d9a8e2ed Author: Noel Grandin <[email protected]> AuthorDate: Fri May 10 08:25:57 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri May 10 09:51:45 2024 +0200 loplugin:ostr in lotuswordpro Change-Id: Ifea660ab9e0663312f9013670c27d3feda314d81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167427 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/lotuswordpro/inc/xfilter/xfannotation.hxx b/lotuswordpro/inc/xfilter/xfannotation.hxx index 080dc92fd4ea..e8773974e013 100644 --- a/lotuswordpro/inc/xfilter/xfannotation.hxx +++ b/lotuswordpro/inc/xfilter/xfannotation.hxx @@ -88,14 +88,14 @@ inline void XFAnnotation::ToXml(IXFStream* pStrm) pAttrList->Clear(); if (!m_strDate.isEmpty()) - pAttrList->AddAttribute("office:create-date", m_strDate); + pAttrList->AddAttribute(u"office:create-date"_ustr, m_strDate); if (!m_strAuthor.isEmpty()) - pAttrList->AddAttribute("office:author", m_strAuthor); - pStrm->StartElement("office:annotation"); + pAttrList->AddAttribute(u"office:author"_ustr, m_strAuthor); + pStrm->StartElement(u"office:annotation"_ustr); XFContentContainer::ToXml(pStrm); - pStrm->EndElement("office:annotation"); + pStrm->EndElement(u"office:annotation"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xfarrowstyle.hxx b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx index 26a2372fa54a..1a7fbc324e64 100644 --- a/lotuswordpro/inc/xfilter/xfarrowstyle.hxx +++ b/lotuswordpro/inc/xfilter/xfarrowstyle.hxx @@ -101,14 +101,14 @@ inline void XFArrowStyle::ToXml(IXFStream* pStrm) pAttrList->Clear(); if (!m_strName.isEmpty()) - pAttrList->AddAttribute("draw:name", m_strName); + pAttrList->AddAttribute(u"draw:name"_ustr, m_strName); else - pAttrList->AddAttribute("draw:name", GetStyleName()); + pAttrList->AddAttribute(u"draw:name"_ustr, GetStyleName()); - pAttrList->AddAttribute("svg:viewBox", m_strViewBox); - pAttrList->AddAttribute("svg:d", m_strPath); - pStrm->StartElement("draw:marker"); - pStrm->EndElement("draw:marker"); + pAttrList->AddAttribute(u"svg:viewBox"_ustr, m_strViewBox); + pAttrList->AddAttribute(u"svg:d"_ustr, m_strPath); + pStrm->StartElement(u"draw:marker"_ustr); + pStrm->EndElement(u"draw:marker"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xfbookmark.hxx b/lotuswordpro/inc/xfilter/xfbookmark.hxx index 1dd473f94c44..c67e5b9645b2 100644 --- a/lotuswordpro/inc/xfilter/xfbookmark.hxx +++ b/lotuswordpro/inc/xfilter/xfbookmark.hxx @@ -96,16 +96,16 @@ public: IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "text:name", m_strName ); + pAttrList->AddAttribute( u"text:name"_ustr, m_strName ); if( m_bStart ) { - pStrm->StartElement( "text:bookmark-start" ); - pStrm->EndElement( "text:bookmark-start" ); + pStrm->StartElement( u"text:bookmark-start"_ustr ); + pStrm->EndElement( u"text:bookmark-start"_ustr ); } else { - pStrm->StartElement( "text:bookmark-end" ); - pStrm->EndElement( "text:bookmark-end" ); + pStrm->StartElement( u"text:bookmark-end"_ustr ); + pStrm->EndElement( u"text:bookmark-end"_ustr ); } } diff --git a/lotuswordpro/inc/xfilter/xfbreaks.hxx b/lotuswordpro/inc/xfilter/xfbreaks.hxx index fe2d7cee19d1..550487e7f86a 100644 --- a/lotuswordpro/inc/xfilter/xfbreaks.hxx +++ b/lotuswordpro/inc/xfilter/xfbreaks.hxx @@ -105,19 +105,19 @@ inline void XFBreaks::ToXml(IXFStream *pStrm) case enumXFBreakAuto: break; case enumXFBreakBefPage: - pAttrList->AddAttribute( "fo:break-before", "page" ); + pAttrList->AddAttribute( u"fo:break-before"_ustr, u"page"_ustr ); break; case enumXFBreakBefColumn: - pAttrList->AddAttribute( "fo:break-before", "column" ); + pAttrList->AddAttribute( u"fo:break-before"_ustr, u"column"_ustr ); break; case enumXFBreakAftPage: - pAttrList->AddAttribute( "fo:break-after", "page" ); + pAttrList->AddAttribute( u"fo:break-after"_ustr, u"page"_ustr ); break; case enumXFBreakAftColumn: - pAttrList->AddAttribute( "fo:break-after", "column" ); + pAttrList->AddAttribute( u"fo:break-after"_ustr, u"column"_ustr ); break; case enumXFBreakKeepWithNext: - pAttrList->AddAttribute( "fo:keep-with-next", "true" ); + pAttrList->AddAttribute( u"fo:keep-with-next"_ustr, u"true"_ustr ); break; } } diff --git a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx index b5e1f367c837..a7ee54ff5749 100644 --- a/lotuswordpro/inc/xfilter/xfdrawgroup.hxx +++ b/lotuswordpro/inc/xfilter/xfdrawgroup.hxx @@ -107,11 +107,11 @@ inline void XFDrawGroup::ToXml(IXFStream* pStrm) pAttrList->Clear(); XFDrawObject::ToXml(pStrm); - pStrm->StartElement("draw:g"); + pStrm->StartElement(u"draw:g"_ustr); m_aChildren->ToXml(pStrm); - pStrm->EndElement("draw:g"); + pStrm->EndElement(u"draw:g"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xfdropcap.hxx b/lotuswordpro/inc/xfilter/xfdropcap.hxx index eb5fb992ed22..a7a9203b8f86 100644 --- a/lotuswordpro/inc/xfilter/xfdropcap.hxx +++ b/lotuswordpro/inc/xfilter/xfdropcap.hxx @@ -121,13 +121,13 @@ inline void XFDropcap::ToXml(IXFStream *pStrm) if( m_nCharCount < 1 || m_nLines < 2 ) return; - pAttrList->AddAttribute("style:length", OUString::number(m_nCharCount) ); - pAttrList->AddAttribute("style:lines", OUString::number(m_nLines) ); - pAttrList->AddAttribute("style:distance", OUString::number(m_fDistance) + "cm" ); + pAttrList->AddAttribute(u"style:length"_ustr, OUString::number(m_nCharCount) ); + pAttrList->AddAttribute(u"style:lines"_ustr, OUString::number(m_nLines) ); + pAttrList->AddAttribute(u"style:distance"_ustr, OUString::number(m_fDistance) + "cm" ); if( !m_strStyleName.isEmpty() ) - pAttrList->AddAttribute("style:style-name", m_strStyleName ); - pStrm->StartElement( "style:drop-cap" ); - pStrm->EndElement( "style:drop-cap" ); + pAttrList->AddAttribute(u"style:style-name"_ustr, m_strStyleName ); + pStrm->StartElement( u"style:drop-cap"_ustr ); + pStrm->EndElement( u"style:drop-cap"_ustr ); } inline bool operator==(XFDropcap const & dc1, XFDropcap const & dc2) diff --git a/lotuswordpro/inc/xfilter/xfendnote.hxx b/lotuswordpro/inc/xfilter/xfendnote.hxx index 98bb280900f8..db6a47ed410d 100644 --- a/lotuswordpro/inc/xfilter/xfendnote.hxx +++ b/lotuswordpro/inc/xfilter/xfendnote.hxx @@ -92,23 +92,23 @@ inline void XFEndNote::ToXml(IXFStream *pStrm) IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "text:id", m_strID ); - pStrm->StartElement( "text:endnote" ); + pAttrList->AddAttribute( u"text:id"_ustr, m_strID ); + pStrm->StartElement( u"text:endnote"_ustr ); pAttrList->Clear(); if( !m_strLabel.isEmpty() ) - pAttrList->AddAttribute( "text:label", m_strLabel ); - pStrm->StartElement( "text:endnote-citation" ); + pAttrList->AddAttribute( u"text:label"_ustr, m_strLabel ); + pStrm->StartElement( u"text:endnote-citation"_ustr ); if( !m_strLabel.isEmpty()) pStrm->Characters(m_strLabel); - pStrm->EndElement( "text:endnote-citation" ); + pStrm->EndElement( u"text:endnote-citation"_ustr ); pAttrList->Clear(); - pStrm->StartElement( "text:endnote-body" ); + pStrm->StartElement( u"text:endnote-body"_ustr ); XFContentContainer::ToXml(pStrm); - pStrm->EndElement( "text:endnote-body" ); + pStrm->EndElement( u"text:endnote-body"_ustr ); - pStrm->EndElement( "text:endnote" ); + pStrm->EndElement( u"text:endnote"_ustr ); } #endif diff --git a/lotuswordpro/inc/xfilter/xffooter.hxx b/lotuswordpro/inc/xfilter/xffooter.hxx index cefca8263268..3060969f724b 100644 --- a/lotuswordpro/inc/xfilter/xffooter.hxx +++ b/lotuswordpro/inc/xfilter/xffooter.hxx @@ -75,9 +75,9 @@ public: { IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pStrm->StartElement("style:footer"); + pStrm->StartElement(u"style:footer"_ustr); XFContentContainer::ToXml(pStrm); - pStrm->EndElement("style:footer"); + pStrm->EndElement(u"style:footer"_ustr); } }; diff --git a/lotuswordpro/inc/xfilter/xffootnote.hxx b/lotuswordpro/inc/xfilter/xffootnote.hxx index 289217129287..f98d4389ed73 100644 --- a/lotuswordpro/inc/xfilter/xffootnote.hxx +++ b/lotuswordpro/inc/xfilter/xffootnote.hxx @@ -89,23 +89,23 @@ inline void XFFootNote::ToXml(IXFStream* pStrm) IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute("text:id", m_strID); - pStrm->StartElement("text:footnote"); + pAttrList->AddAttribute(u"text:id"_ustr, m_strID); + pStrm->StartElement(u"text:footnote"_ustr); pAttrList->Clear(); if (!m_strLabel.isEmpty()) - pAttrList->AddAttribute("text:label", m_strLabel); - pStrm->StartElement("text:footnote-citation"); + pAttrList->AddAttribute(u"text:label"_ustr, m_strLabel); + pStrm->StartElement(u"text:footnote-citation"_ustr); if (!m_strLabel.isEmpty()) pStrm->Characters(m_strLabel); - pStrm->EndElement("text:footnote-citation"); + pStrm->EndElement(u"text:footnote-citation"_ustr); pAttrList->Clear(); - pStrm->StartElement("text:footnote-body"); + pStrm->StartElement(u"text:footnote-body"_ustr); XFContentContainer::ToXml(pStrm); - pStrm->EndElement("text:footnote-body"); + pStrm->EndElement(u"text:footnote-body"_ustr); - pStrm->EndElement("text:footnote"); + pStrm->EndElement(u"text:footnote"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx index b24b3c2acddf..085af2352ce6 100644 --- a/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx +++ b/lotuswordpro/inc/xfilter/xffootnoteconfig.hxx @@ -157,66 +157,66 @@ inline void XFFootnoteConfig::ToXml(IXFStream *pStrm) pAttrList->Clear(); if( !m_strCitationStyle.isEmpty() ) - pAttrList->AddAttribute( "text:citation-style-name", m_strCitationStyle); + pAttrList->AddAttribute( u"text:citation-style-name"_ustr, m_strCitationStyle); if( !m_strBodyStyle.isEmpty() ) - pAttrList->AddAttribute( "text:citation-body-style-name", m_strBodyStyle); + pAttrList->AddAttribute( u"text:citation-body-style-name"_ustr, m_strBodyStyle); if( !m_strNumPrefix.isEmpty() ) - pAttrList->AddAttribute( "style:num-prefix", m_strNumPrefix); + pAttrList->AddAttribute( u"style:num-prefix"_ustr, m_strNumPrefix); if( !m_strNumSuffix.isEmpty() ) - pAttrList->AddAttribute( "style:num-suffix", m_strNumSuffix); + pAttrList->AddAttribute( u"style:num-suffix"_ustr, m_strNumSuffix); if( !m_strNumFmt.isEmpty() ) - pAttrList->AddAttribute( "style:num-format", m_strNumFmt); + pAttrList->AddAttribute( u"style:num-format"_ustr, m_strNumFmt); if( !m_strDefaultStyle.isEmpty() ) - pAttrList->AddAttribute( "text:default-style-name", m_strDefaultStyle); + pAttrList->AddAttribute( u"text:default-style-name"_ustr, m_strDefaultStyle); if( !m_strMasterPage.isEmpty() ) - pAttrList->AddAttribute( "text:master-page-name", m_strMasterPage); + pAttrList->AddAttribute( u"text:master-page-name"_ustr, m_strMasterPage); - pAttrList->AddAttribute( "text:start-value", OUString::number(m_nStartValue) ); + pAttrList->AddAttribute( u"text:start-value"_ustr, OUString::number(m_nStartValue) ); if( m_bIsFootnote ) { if( m_nRestartType == -1 ) - pAttrList->AddAttribute( "text:start-numbering-at", "document" ); + pAttrList->AddAttribute( u"text:start-numbering-at"_ustr, u"document"_ustr ); else if( m_nRestartType == 0 ) - pAttrList->AddAttribute( "text:start-numbering-at", "page" ); + pAttrList->AddAttribute( u"text:start-numbering-at"_ustr, u"page"_ustr ); else if( m_nRestartType == 1 ) - pAttrList->AddAttribute( "text:start-numbering-at", "chapter" ); + pAttrList->AddAttribute( u"text:start-numbering-at"_ustr, u"chapter"_ustr ); if( m_bInsertInPage ) - pAttrList->AddAttribute( "text:footnotes-position", "page" ); + pAttrList->AddAttribute( u"text:footnotes-position"_ustr, u"page"_ustr ); else - pAttrList->AddAttribute( "text:footnotes-position", "document" ); + pAttrList->AddAttribute( u"text:footnotes-position"_ustr, u"document"_ustr ); } if(m_bIsFootnote) { - pStrm->StartElement( "text:footnotes-configuration" ); + pStrm->StartElement( u"text:footnotes-configuration"_ustr ); if( !m_strMessageOn.isEmpty() ) { - pStrm->StartElement( "text:footnote-continuation-notice-forward" ); + pStrm->StartElement( u"text:footnote-continuation-notice-forward"_ustr ); pStrm->Characters(m_strMessageOn); - pStrm->EndElement( "text:footnote-continuation-notice-forward" ); + pStrm->EndElement( u"text:footnote-continuation-notice-forward"_ustr ); } if( !m_strMessageFrom.isEmpty() ) { - pStrm->StartElement( "text:footnote-continuation-notice-backward" ); + pStrm->StartElement( u"text:footnote-continuation-notice-backward"_ustr ); pStrm->Characters(m_strMessageFrom); - pStrm->EndElement( "text:footnote-continuation-notice-backward" ); + pStrm->EndElement( u"text:footnote-continuation-notice-backward"_ustr ); } - pStrm->EndElement( "text:footnotes-configuration" ); + pStrm->EndElement( u"text:footnotes-configuration"_ustr ); } else { - pStrm->StartElement( "text:endnotes-configuration" ); - pStrm->EndElement( "text:endnotes-configuration" ); + pStrm->StartElement( u"text:endnotes-configuration"_ustr ); + pStrm->EndElement( u"text:endnotes-configuration"_ustr ); } } diff --git a/lotuswordpro/inc/xfilter/xfheader.hxx b/lotuswordpro/inc/xfilter/xfheader.hxx index af569b25c6d1..31e43f210e99 100644 --- a/lotuswordpro/inc/xfilter/xfheader.hxx +++ b/lotuswordpro/inc/xfilter/xfheader.hxx @@ -75,9 +75,9 @@ public: IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pStrm->StartElement("style:header"); + pStrm->StartElement(u"style:header"_ustr); XFContentContainer::ToXml(pStrm); - pStrm->EndElement("style:header"); + pStrm->EndElement(u"style:header"_ustr); } }; diff --git a/lotuswordpro/inc/xfilter/xfhyperlink.hxx b/lotuswordpro/inc/xfilter/xfhyperlink.hxx index 3847de61b337..9585d4c2afb4 100644 --- a/lotuswordpro/inc/xfilter/xfhyperlink.hxx +++ b/lotuswordpro/inc/xfilter/xfhyperlink.hxx @@ -94,25 +94,25 @@ inline void XFHyperlink::ToXml(IXFStream* pStrm) IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute("xlink:type", "simple"); - pAttrList->AddAttribute("xlink:href", m_strHRef); + pAttrList->AddAttribute(u"xlink:type"_ustr, u"simple"_ustr); + pAttrList->AddAttribute(u"xlink:href"_ustr, m_strHRef); if (!m_strName.isEmpty()) - pAttrList->AddAttribute("office:name", m_strName); - pAttrList->AddAttribute("office:target-frame-name", m_strFrame); - pAttrList->AddAttribute("xlink:show", "replace"); - pStrm->StartElement("text:a"); + pAttrList->AddAttribute(u"office:name"_ustr, m_strName); + pAttrList->AddAttribute(u"office:target-frame-name"_ustr, m_strFrame); + pAttrList->AddAttribute(u"xlink:show"_ustr, u"replace"_ustr); + pStrm->StartElement(u"text:a"_ustr); pAttrList->Clear(); if (!GetStyleName().isEmpty()) - pAttrList->AddAttribute("text:style-name", GetStyleName()); - pStrm->StartElement("text:span"); + pAttrList->AddAttribute(u"text:style-name"_ustr, GetStyleName()); + pStrm->StartElement(u"text:span"_ustr); if (!m_strText.isEmpty()) pStrm->Characters(m_strText); else pStrm->Characters(m_strHRef); - pStrm->EndElement("text:span"); + pStrm->EndElement(u"text:span"_ustr); - pStrm->EndElement("text:a"); + pStrm->EndElement(u"text:a"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xfinputlist.hxx b/lotuswordpro/inc/xfilter/xfinputlist.hxx index 85dae8836e56..34e682b1c205 100644 --- a/lotuswordpro/inc/xfilter/xfinputlist.hxx +++ b/lotuswordpro/inc/xfilter/xfinputlist.hxx @@ -92,21 +92,21 @@ inline void XFInputList::ToXml(IXFStream *pStrm) IXFAttrList *pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "text:name", m_strName ); - pStrm->StartElement( "text:drop-down" ); + pAttrList->AddAttribute( u"text:name"_ustr, m_strName ); + pStrm->StartElement( u"text:drop-down"_ustr ); pAttrList->Clear(); - pAttrList->AddAttribute( "text:value", " " ); - pStrm->StartElement( "text:label" ); - pStrm->EndElement( "text:label" ); + pAttrList->AddAttribute( u"text:value"_ustr, u" "_ustr ); + pStrm->StartElement( u"text:label"_ustr ); + pStrm->EndElement( u"text:label"_ustr ); for(const OUString& rLabel : m_list) { pAttrList->Clear(); - pAttrList->AddAttribute( "text:value", rLabel); - pStrm->StartElement( "text:label" ); - pStrm->EndElement( "text:label" ); + pAttrList->AddAttribute( u"text:value"_ustr, rLabel); + pStrm->StartElement( u"text:label"_ustr ); + pStrm->EndElement( u"text:label"_ustr ); } - pStrm->EndElement( "text:drop-down" ); + pStrm->EndElement( u"text:drop-down"_ustr ); } #endif diff --git a/lotuswordpro/inc/xfilter/xflinebreak.hxx b/lotuswordpro/inc/xfilter/xflinebreak.hxx index b2c6412982cb..2eda7bf97b00 100644 --- a/lotuswordpro/inc/xfilter/xflinebreak.hxx +++ b/lotuswordpro/inc/xfilter/xflinebreak.hxx @@ -74,8 +74,8 @@ inline void XFLineBreak::ToXml(IXFStream* pStrm) IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pStrm->StartElement("text:line-break"); - pStrm->EndElement("text:line-break"); + pStrm->StartElement(u"text:line-break"_ustr); + pStrm->EndElement(u"text:line-break"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xflineheight.hxx b/lotuswordpro/inc/xfilter/xflineheight.hxx index cffff2457226..0f8a83d8cbff 100644 --- a/lotuswordpro/inc/xfilter/xflineheight.hxx +++ b/lotuswordpro/inc/xfilter/xflineheight.hxx @@ -131,16 +131,16 @@ inline void XFLineHeight::ToXml(IXFStream *pStrm) case enumLHNone: return; case enumLHHeight: - pAttrList->AddAttribute( "fo:line-height",OUString::number(m_Value.m_fValue) + "cm" ); + pAttrList->AddAttribute( u"fo:line-height"_ustr,OUString::number(m_Value.m_fValue) + "cm" ); break; case enumLHLeast: - pAttrList->AddAttribute( "style:line-height-at-least",OUString::number(m_Value.m_fValue) + "cm" ); + pAttrList->AddAttribute( u"style:line-height-at-least"_ustr,OUString::number(m_Value.m_fValue) + "cm" ); break; case enumLHPercent: - pAttrList->AddAttribute( "fo:line-height", OUString::number(m_Value.m_nValue) + "%" ); + pAttrList->AddAttribute( u"fo:line-height"_ustr, OUString::number(m_Value.m_nValue) + "%" ); break; case enumLHSpace: - pAttrList->AddAttribute( "style:line-spacing", OUString::number(m_Value.m_fValue) + "cm" ); + pAttrList->AddAttribute( u"style:line-spacing"_ustr, OUString::number(m_Value.m_fValue) + "cm" ); break; } } diff --git a/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx index 5c0516bce940..1984b0b37faf 100644 --- a/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx +++ b/lotuswordpro/inc/xfilter/xflinenumberconfig.hxx @@ -131,42 +131,42 @@ inline void XFLineNumberConfig::ToXml(IXFStream *pStrm) IXFAttrList *pAttrList = pStrm->GetAttrList(); if( !m_strTextStyle.isEmpty() ) - pAttrList->AddAttribute( "text:style-name", m_strTextStyle ); - pAttrList->AddAttribute( "text:offset", OUString::number(m_fOffset) + "cm" ); - pAttrList->AddAttribute( "style:num-format", m_strNumFmt ); + pAttrList->AddAttribute( u"text:style-name"_ustr, m_strTextStyle ); + pAttrList->AddAttribute( u"text:offset"_ustr, OUString::number(m_fOffset) + "cm" ); + pAttrList->AddAttribute( u"style:num-format"_ustr, m_strNumFmt ); //position: if( m_ePosition == enumXFLineNumberLeft ) - pAttrList->AddAttribute( "text:number-position", "left" ); + pAttrList->AddAttribute( u"text:number-position"_ustr, u"left"_ustr ); else if( m_ePosition == enumXFLineNumberRight ) - pAttrList->AddAttribute( "text:number-position", "right" ); + pAttrList->AddAttribute( u"text:number-position"_ustr, u"right"_ustr ); else if( m_ePosition == enumXFLineNumberInner ) - pAttrList->AddAttribute( "text:number-position", "inner" ); + pAttrList->AddAttribute( u"text:number-position"_ustr, u"inner"_ustr ); else if( m_ePosition == enumXFLineNumberOuter ) - pAttrList->AddAttribute( "text:number-position", "outer" ); + pAttrList->AddAttribute( u"text:number-position"_ustr, u"outer"_ustr ); - pAttrList->AddAttribute( "text:increment", OUString::number(m_nIncrement) ); + pAttrList->AddAttribute( u"text:increment"_ustr, OUString::number(m_nIncrement) ); if( m_bRestartOnPage ) - pAttrList->AddAttribute( "text:restart-on-page", "true" ); + pAttrList->AddAttribute( u"text:restart-on-page"_ustr, u"true"_ustr ); else - pAttrList->AddAttribute( "text:restart-on-page", "false" ); + pAttrList->AddAttribute( u"text:restart-on-page"_ustr, u"false"_ustr ); if( m_bCountEmptyLines ) - pAttrList->AddAttribute( "text:count-empty-lines", "true" ); + pAttrList->AddAttribute( u"text:count-empty-lines"_ustr, u"true"_ustr ); else - pAttrList->AddAttribute( "text:count-empty-lines", "false" ); + pAttrList->AddAttribute( u"text:count-empty-lines"_ustr, u"false"_ustr ); - pAttrList->AddAttribute( "text:count-in-floating-frames", "false" ); + pAttrList->AddAttribute( u"text:count-in-floating-frames"_ustr, u"false"_ustr ); - pStrm->StartElement( "text:linenumbering-configuration" ); + pStrm->StartElement( u"text:linenumbering-configuration"_ustr ); pAttrList->Clear(); - pAttrList->AddAttribute( "text:increment", OUString::number(m_nSepIncrement) ); - pStrm->StartElement( "text:linenumbering-separator" ); + pAttrList->AddAttribute( u"text:increment"_ustr, OUString::number(m_nSepIncrement) ); + pStrm->StartElement( u"text:linenumbering-separator"_ustr ); pStrm->Characters(m_strSeparator); - pStrm->EndElement( "text:linenumbering-separator" ); + pStrm->EndElement( u"text:linenumbering-separator"_ustr ); - pStrm->EndElement( "text:linenumbering-configuration" ); + pStrm->EndElement( u"text:linenumbering-configuration"_ustr ); } #endif diff --git a/lotuswordpro/inc/xfilter/xflistitem.hxx b/lotuswordpro/inc/xfilter/xflistitem.hxx index 329eb822016b..1debf6567645 100644 --- a/lotuswordpro/inc/xfilter/xflistitem.hxx +++ b/lotuswordpro/inc/xfilter/xflistitem.hxx @@ -87,19 +87,19 @@ inline void XFListItem::ToXml(IXFStream* pStrm) pAttrList->Clear(); if (!GetStyleName().isEmpty()) - pAttrList->AddAttribute("text:style-name", GetStyleName()); + pAttrList->AddAttribute(u"text:style-name"_ustr, GetStyleName()); if (!m_bIsHeader) { - pStrm->StartElement("text:list-item"); + pStrm->StartElement(u"text:list-item"_ustr); XFContentContainer::ToXml(pStrm); - pStrm->EndElement("text:list-item"); + pStrm->EndElement(u"text:list-item"_ustr); } else { - pStrm->StartElement("text:list-header"); + pStrm->StartElement(u"text:list-header"_ustr); XFContentContainer::ToXml(pStrm); - pStrm->EndElement("text:list-header"); + pStrm->EndElement(u"text:list-header"_ustr); } } diff --git a/lotuswordpro/inc/xfilter/xfnumfmt.hxx b/lotuswordpro/inc/xfilter/xfnumfmt.hxx index da4a866ecd15..37170a1d0b73 100644 --- a/lotuswordpro/inc/xfilter/xfnumfmt.hxx +++ b/lotuswordpro/inc/xfilter/xfnumfmt.hxx @@ -132,12 +132,12 @@ public: IXFAttrList *pAttrList = pStrm->GetAttrList(); if( !m_strPrefix.isEmpty() ) - pAttrList->AddAttribute( "style:num-prefix", m_strPrefix ); + pAttrList->AddAttribute( u"style:num-prefix"_ustr, m_strPrefix ); if( !m_strSuffix.isEmpty() ) - pAttrList->AddAttribute( "style:num-suffix", m_strSuffix ); - pAttrList->AddAttribute( "style:num-format", m_strFormat ); + pAttrList->AddAttribute( u"style:num-suffix"_ustr, m_strSuffix ); + pAttrList->AddAttribute( u"style:num-format"_ustr, m_strFormat ); if( m_nStartValue != 0 ) - pAttrList->AddAttribute( "text:start-value", OUString::number(static_cast<sal_Int32>(m_nStartValue)) ); + pAttrList->AddAttribute( u"text:start-value"_ustr, OUString::number(static_cast<sal_Int32>(m_nStartValue)) ); } private: OUString m_strPrefix; diff --git a/lotuswordpro/inc/xfilter/xfpadding.hxx b/lotuswordpro/inc/xfilter/xfpadding.hxx index 6276a8623de7..a2bec2a190a2 100644 --- a/lotuswordpro/inc/xfilter/xfpadding.hxx +++ b/lotuswordpro/inc/xfilter/xfpadding.hxx @@ -162,28 +162,28 @@ inline void XFPadding::ToXml(IXFStream *pStrm) if( (m_fLeft == m_fRight) && (m_fLeft == m_fTop) && (m_fLeft== m_fBottom ) && m_nFlag == 0x00000015 ) { - pAttrList->AddAttribute( "fo:padding", OUString::number(m_fLeft) + "cm" ); + pAttrList->AddAttribute( u"fo:padding"_ustr, OUString::number(m_fLeft) + "cm" ); return; } //margin left: if( m_nFlag&XFPADDING_FLAG_LEFT ) { - pAttrList->AddAttribute( "fo:padding-left", OUString::number(m_fLeft) + "cm" ); + pAttrList->AddAttribute( u"fo:padding-left"_ustr, OUString::number(m_fLeft) + "cm" ); } //margin right: if( m_nFlag&XFPADDING_FLAG_RIGHT ) { - pAttrList->AddAttribute("fo:padding-right", OUString::number(m_fRight) + "cm" ); + pAttrList->AddAttribute(u"fo:padding-right"_ustr, OUString::number(m_fRight) + "cm" ); } //margin top: if( m_nFlag&XFPADDING_FLAG_TOP ) { - pAttrList->AddAttribute("fo:padding-top", OUString::number(m_fTop) + "cm" ); + pAttrList->AddAttribute(u"fo:padding-top"_ustr, OUString::number(m_fTop) + "cm" ); } //margin bottom: if( m_nFlag&XFPADDING_FLAG_BOTTOM ) { - pAttrList->AddAttribute("fo:padding-bottom", OUString::number(m_fBottom) + "cm" ); + pAttrList->AddAttribute(u"fo:padding-bottom"_ustr, OUString::number(m_fBottom) + "cm" ); } } diff --git a/lotuswordpro/inc/xfilter/xfpagecount.hxx b/lotuswordpro/inc/xfilter/xfpagecount.hxx index 25b7d4be1472..baa9baab7688 100644 --- a/lotuswordpro/inc/xfilter/xfpagecount.hxx +++ b/lotuswordpro/inc/xfilter/xfpagecount.hxx @@ -78,8 +78,8 @@ inline void XFPageCount::ToXml(IXFStream* pStrm) IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pStrm->StartElement("text:page-count"); - pStrm->EndElement("text:page-count"); + pStrm->StartElement(u"text:page-count"_ustr); + pStrm->EndElement(u"text:page-count"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xfpagenumber.hxx b/lotuswordpro/inc/xfilter/xfpagenumber.hxx index 80516c452eec..57cf357751eb 100644 --- a/lotuswordpro/inc/xfilter/xfpagenumber.hxx +++ b/lotuswordpro/inc/xfilter/xfpagenumber.hxx @@ -86,9 +86,9 @@ inline void XFPageNumber::ToXml(IXFStream* pStrm) pAttrList->Clear(); m_aNumFmt.ToXml(pStrm); - pAttrList->AddAttribute("text:select-page", "current"); - pStrm->StartElement("text:page-number"); - pStrm->EndElement("text:page-number"); + pAttrList->AddAttribute(u"text:select-page"_ustr, u"current"_ustr); + pStrm->StartElement(u"text:page-number"_ustr); + pStrm->EndElement(u"text:page-number"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xfplaceholder.hxx b/lotuswordpro/inc/xfilter/xfplaceholder.hxx index 9bc598405b9b..c172172e8024 100644 --- a/lotuswordpro/inc/xfilter/xfplaceholder.hxx +++ b/lotuswordpro/inc/xfilter/xfplaceholder.hxx @@ -97,10 +97,10 @@ inline void XFHolderStart::ToXml(IXFStream* pStrm) { IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute("text:placeholder-type", m_strType); + pAttrList->AddAttribute(u"text:placeholder-type"_ustr, m_strType); if (!m_strDesc.isEmpty()) - pAttrList->AddAttribute("text:description", m_strDesc); - pStrm->StartElement("text:placeholder"); + pAttrList->AddAttribute(u"text:description"_ustr, m_strDesc); + pStrm->StartElement(u"text:placeholder"_ustr); if (!m_strText.isEmpty()) pStrm->Characters(m_strText); } @@ -117,7 +117,7 @@ XFHolderEnd::XFHolderEnd() {} XFHolderEnd::~XFHolderEnd() {} -inline void XFHolderEnd::ToXml(IXFStream* pStrm) { pStrm->EndElement("text:placeholder"); } +inline void XFHolderEnd::ToXml(IXFStream* pStrm) { pStrm->EndElement(u"text:placeholder"_ustr); } #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/inc/xfilter/xfruby.hxx b/lotuswordpro/inc/xfilter/xfruby.hxx index e92b55318540..3073c97c405b 100644 --- a/lotuswordpro/inc/xfilter/xfruby.hxx +++ b/lotuswordpro/inc/xfilter/xfruby.hxx @@ -84,26 +84,26 @@ void XFRubyStart::ToXml(IXFStream* pStrm) IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); if (!GetStyleName().isEmpty()) - pAttrList->AddAttribute("text:style-name", GetStyleName()); - pStrm->StartElement("text:ruby"); + pAttrList->AddAttribute(u"text:style-name"_ustr, GetStyleName()); + pStrm->StartElement(u"text:ruby"_ustr); pAttrList->Clear(); - pStrm->StartElement("text:ruby-base"); + pStrm->StartElement(u"text:ruby-base"_ustr); } void XFRubyEnd::SetText(const OUString& sText) { m_strText = sText; } void XFRubyEnd::ToXml(IXFStream* pStrm) { - pStrm->EndElement("text:ruby-base"); + pStrm->EndElement(u"text:ruby-base"_ustr); IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); if (!GetStyleName().isEmpty()) - pAttrList->AddAttribute("text:style-name", GetStyleName()); - pStrm->StartElement("text:ruby-text"); + pAttrList->AddAttribute(u"text:style-name"_ustr, GetStyleName()); + pStrm->StartElement(u"text:ruby-text"_ustr); if (!m_strText.isEmpty()) pStrm->Characters(m_strText); - pStrm->EndElement("text:ruby-text"); - pStrm->EndElement("text:ruby"); + pStrm->EndElement(u"text:ruby-text"_ustr); + pStrm->EndElement(u"text:ruby"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xfrubystyle.hxx b/lotuswordpro/inc/xfilter/xfrubystyle.hxx index eee1a75b179d..71dc0709595e 100644 --- a/lotuswordpro/inc/xfilter/xfrubystyle.hxx +++ b/lotuswordpro/inc/xfilter/xfrubystyle.hxx @@ -92,9 +92,9 @@ void XFRubyStyle::ToXml(IXFStream* pStrm) pAttrList->Clear(); if (!style.isEmpty()) - pAttrList->AddAttribute("style:name", GetStyleName()); - pAttrList->AddAttribute("style:family", "ruby"); - pStrm->StartElement("style:style"); + pAttrList->AddAttribute(u"style:name"_ustr, GetStyleName()); + pAttrList->AddAttribute(u"style:family"_ustr, u"ruby"_ustr); + pStrm->StartElement(u"style:style"_ustr); pAttrList->Clear(); @@ -112,7 +112,7 @@ void XFRubyStyle::ToXml(IXFStream* pStrm) sPos = "center"; } if (!sPos.isEmpty()) - pAttrList->AddAttribute("style:ruby-align", sPos); + pAttrList->AddAttribute(u"style:ruby-align"_ustr, sPos); OUString sAlign; if (m_ePos == enumXFRubyTop) @@ -124,11 +124,11 @@ void XFRubyStyle::ToXml(IXFStream* pStrm) sAlign = "below"; } if (!sAlign.isEmpty()) - pAttrList->AddAttribute("style:ruby-position", sAlign); + pAttrList->AddAttribute(u"style:ruby-position"_ustr, sAlign); - pStrm->StartElement("style:properties"); - pStrm->EndElement("style:properties"); - pStrm->EndElement("style:style"); + pStrm->StartElement(u"style:properties"_ustr); + pStrm->EndElement(u"style:properties"_ustr); + pStrm->EndElement(u"style:style"_ustr); } #endif diff --git a/lotuswordpro/inc/xfilter/xftabstop.hxx b/lotuswordpro/inc/xfilter/xftabstop.hxx index 466ea535bdd8..05248c760a6f 100644 --- a/lotuswordpro/inc/xfilter/xftabstop.hxx +++ b/lotuswordpro/inc/xfilter/xftabstop.hxx @@ -74,8 +74,8 @@ inline void XFTabStop::ToXml(IXFStream* pStrm) IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pStrm->StartElement("text:tab-stop"); - pStrm->EndElement("text:tab-stop"); + pStrm->StartElement(u"text:tab-stop"_ustr); + pStrm->EndElement(u"text:tab-stop"_ustr); } #endif diff --git a/lotuswordpro/qa/cppunit/import_test.cxx b/lotuswordpro/qa/cppunit/import_test.cxx index 9514395a02df..2e8ffe21ebd9 100644 --- a/lotuswordpro/qa/cppunit/import_test.cxx +++ b/lotuswordpro/qa/cppunit/import_test.cxx @@ -27,7 +27,7 @@ class LotusWordProTest : public UnoApiTest { public: LotusWordProTest() - : UnoApiTest("/lotuswordpro/qa/cppunit/data/") + : UnoApiTest(u"/lotuswordpro/qa/cppunit/data/"_ustr) { } }; @@ -52,85 +52,85 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, testtdf33787OrderedBullets) uno::Reference<beans::XPropertySet> xPara(xParaEnum->nextElement(), uno::UNO_QUERY); OUString aListLabelString; - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Make sure the list start from 1. - CPPUNIT_ASSERT_EQUAL(OUString("1."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"1."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "1.". - CPPUNIT_ASSERT_EQUAL(OUString("2."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"2."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "1.". - CPPUNIT_ASSERT_EQUAL(OUString("3."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"3."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Make sure the list start from i. - CPPUNIT_ASSERT_EQUAL(OUString("i."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"i."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "i.". - CPPUNIT_ASSERT_EQUAL(OUString("ii."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"ii."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "i.". - CPPUNIT_ASSERT_EQUAL(OUString("iii."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"iii."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Make sure the list start from I. - CPPUNIT_ASSERT_EQUAL(OUString("I."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"I."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "I.". - CPPUNIT_ASSERT_EQUAL(OUString("II."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"II."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "I.". - CPPUNIT_ASSERT_EQUAL(OUString("III."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"III."_ustr, aListLabelString); for (int i = 0; i < 7; ++i) xParaEnum->nextElement(); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "A.". - CPPUNIT_ASSERT_EQUAL(OUString("C."), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"C."_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Make sure the nested list (with indentation) starts from 1). - CPPUNIT_ASSERT_EQUAL(OUString("1)"), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"1)"_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Make sure skipped element has no prefix - CPPUNIT_ASSERT_EQUAL(OUString(""), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u""_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Make sure the value after Skip is incremented properly // Without the accompanying fix in place, this test would have failed, the list label was "1)". - CPPUNIT_ASSERT_EQUAL(OUString("2)"), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"2)"_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Next nested list - CPPUNIT_ASSERT_EQUAL(OUString("a)"), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"a)"_ustr, aListLabelString); xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY); - xPara->getPropertyValue("ListLabelString") >>= aListLabelString; + xPara->getPropertyValue(u"ListLabelString"_ustr) >>= aListLabelString; // Without the accompanying fix in place, this test would have failed, the list label was "a)". - CPPUNIT_ASSERT_EQUAL(OUString("b)"), aListLabelString); + CPPUNIT_ASSERT_EQUAL(u"b)"_ustr, aListLabelString); } CPPUNIT_TEST_FIXTURE(LotusWordProTest, testTdf129993) @@ -144,7 +144,8 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, testTdf129993) xParaEnum->nextElement(); uno::Reference<lang::XServiceInfo> xServiceInfo(xParaEnum->nextElement(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_True, xServiceInfo->supportsService("com.sun.star.text.TextTable")); + CPPUNIT_ASSERT_EQUAL(sal_True, + xServiceInfo->supportsService(u"com.sun.star.text.TextTable"_ustr)); } CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) @@ -164,7 +165,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet(xParagraph, uno::UNO_QUERY); float fFontWeight; - xPropertySet->getPropertyValue("CharWeight") >>= fFontWeight; + xPropertySet->getPropertyValue(u"CharWeight"_ustr) >>= fFontWeight; CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, fFontWeight); // italic @@ -172,7 +173,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet2(xParagraph2, uno::UNO_QUERY); awt::FontSlant fFontSlant; - xPropertySet2->getPropertyValue("CharPosture") >>= fFontSlant; + xPropertySet2->getPropertyValue(u"CharPosture"_ustr) >>= fFontSlant; CPPUNIT_ASSERT_EQUAL(awt::FontSlant_ITALIC, fFontSlant); // underline @@ -180,7 +181,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet3(xParagraph3, uno::UNO_QUERY); sal_Int16 nCharUnderline; - xPropertySet3->getPropertyValue("CharUnderline") >>= nCharUnderline; + xPropertySet3->getPropertyValue(u"CharUnderline"_ustr) >>= nCharUnderline; CPPUNIT_ASSERT_EQUAL(awt::FontUnderline::SINGLE, nCharUnderline); // striked through @@ -188,7 +189,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet4(xParagraph4, uno::UNO_QUERY); sal_Int16 nFontStrikeout; - xPropertySet4->getPropertyValue("CharStrikeout") >>= nFontStrikeout; + xPropertySet4->getPropertyValue(u"CharStrikeout"_ustr) >>= nFontStrikeout; CPPUNIT_ASSERT_EQUAL(awt::FontStrikeout::SINGLE, nFontStrikeout); //superscript @@ -196,11 +197,11 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet5(xParagraph5, uno::UNO_QUERY); sal_Int32 nCharEscapement; - xPropertySet5->getPropertyValue("CharEscapement") >>= nCharEscapement; + xPropertySet5->getPropertyValue(u"CharEscapement"_ustr) >>= nCharEscapement; CPPUNIT_ASSERT_EQUAL(sal_Int32(33), nCharEscapement); sal_Int32 nCharEscapementHeight; - xPropertySet5->getPropertyValue("CharEscapementHeight") >>= nCharEscapementHeight; + xPropertySet5->getPropertyValue(u"CharEscapementHeight"_ustr) >>= nCharEscapementHeight; CPPUNIT_ASSERT_EQUAL(sal_Int32(58), nCharEscapementHeight); //subscript @@ -208,11 +209,11 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet6(xParagraph6, uno::UNO_QUERY); sal_Int32 nCharEscapement2; - xPropertySet6->getPropertyValue("CharEscapement") >>= nCharEscapement2; + xPropertySet6->getPropertyValue(u"CharEscapement"_ustr) >>= nCharEscapement2; CPPUNIT_ASSERT_EQUAL(sal_Int32(-33), nCharEscapement2); sal_Int32 nCharEscapementHeight2; - xPropertySet6->getPropertyValue("CharEscapementHeight") >>= nCharEscapementHeight2; + xPropertySet6->getPropertyValue(u"CharEscapementHeight"_ustr) >>= nCharEscapementHeight2; CPPUNIT_ASSERT_EQUAL(sal_Int32(58), nCharEscapementHeight2); // red background and borders @@ -220,23 +221,23 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet7(xParagraph7, uno::UNO_QUERY); Color nParaBackColor; - xPropertySet7->getPropertyValue("ParaBackColor") >>= nParaBackColor; + xPropertySet7->getPropertyValue(u"ParaBackColor"_ustr) >>= nParaBackColor; CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, nParaBackColor); table::BorderLine2 aTopBorder; - xPropertySet7->getPropertyValue("TopBorder") >>= aTopBorder; + xPropertySet7->getPropertyValue(u"TopBorder"_ustr) >>= aTopBorder; CPPUNIT_ASSERT_EQUAL(sal_Int16(35), aTopBorder.OuterLineWidth); table::BorderLine2 aBottomBorder; - xPropertySet7->getPropertyValue("BottomBorder") >>= aBottomBorder; + xPropertySet7->getPropertyValue(u"BottomBorder"_ustr) >>= aBottomBorder; CPPUNIT_ASSERT_EQUAL(sal_Int16(35), aBottomBorder.OuterLineWidth); table::BorderLine2 aLeftBorder; - xPropertySet7->getPropertyValue("LeftBorder") >>= aLeftBorder; + xPropertySet7->getPropertyValue(u"LeftBorder"_ustr) >>= aLeftBorder; CPPUNIT_ASSERT_EQUAL(sal_Int16(35), aLeftBorder.OuterLineWidth); table::BorderLine2 aRightBorder; - xPropertySet7->getPropertyValue("RightBorder") >>= aRightBorder; + xPropertySet7->getPropertyValue(u"RightBorder"_ustr) >>= aRightBorder; CPPUNIT_ASSERT_EQUAL(sal_Int16(35), aRightBorder.OuterLineWidth); // centered @@ -244,7 +245,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet8(xParagraph8, uno::UNO_QUERY); sal_Int16 nParaAdjust = {}; // spurious -Werror=maybe-uninitialized - xPropertySet8->getPropertyValue("ParaAdjust") >>= nParaAdjust; + xPropertySet8->getPropertyValue(u"ParaAdjust"_ustr) >>= nParaAdjust; CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_cast<style::ParagraphAdjust>(nParaAdjust)); @@ -253,7 +254,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet9(xParagraph9, uno::UNO_QUERY); sal_Int32 nParaLeftMargin; - xPropertySet9->getPropertyValue("ParaLeftMargin") >>= nParaLeftMargin; + xPropertySet9->getPropertyValue(u"ParaLeftMargin"_ustr) >>= nParaLeftMargin; CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), nParaLeftMargin); // double line spacing @@ -261,7 +262,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet10(xParagraph10, uno::UNO_QUERY); style::LineSpacing nParaLineSpacing; - xPropertySet10->getPropertyValue("ParaLineSpacing") >>= nParaLineSpacing; + xPropertySet10->getPropertyValue(u"ParaLineSpacing"_ustr) >>= nParaLineSpacing; CPPUNIT_ASSERT_EQUAL(sal_Int16(200), nParaLineSpacing.Height); // time new roman 12 @@ -269,10 +270,10 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet11(xParagraph11, uno::UNO_QUERY); OUString sCharFontName; - xPropertySet11->getPropertyValue("CharFontName") >>= sCharFontName; - CPPUNIT_ASSERT_EQUAL(OUString("Times New Roman"), sCharFontName); + xPropertySet11->getPropertyValue(u"CharFontName"_ustr) >>= sCharFontName; + CPPUNIT_ASSERT_EQUAL(u"Times New Roman"_ustr, sCharFontName); float fCharFontHeight; - xPropertySet11->getPropertyValue("CharHeight") >>= fCharFontHeight; + xPropertySet11->getPropertyValue(u"CharHeight"_ustr) >>= fCharFontHeight; CPPUNIT_ASSERT_EQUAL(float(12.), fCharFontHeight); // time new roman 16 @@ -280,10 +281,10 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet12(xParagraph12, uno::UNO_QUERY); OUString sCharFontName2; - xPropertySet12->getPropertyValue("CharFontName") >>= sCharFontName2; - CPPUNIT_ASSERT_EQUAL(OUString("Times New Roman"), sCharFontName2); + xPropertySet12->getPropertyValue(u"CharFontName"_ustr) >>= sCharFontName2; + CPPUNIT_ASSERT_EQUAL(u"Times New Roman"_ustr, sCharFontName2); float fCharFontHeight2; - xPropertySet12->getPropertyValue("CharHeight") >>= fCharFontHeight2; + xPropertySet12->getPropertyValue(u"CharHeight"_ustr) >>= fCharFontHeight2; CPPUNIT_ASSERT_EQUAL(float(16.), fCharFontHeight2); //ignore this paragraph @@ -294,7 +295,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropertySet13(xParagraph13, uno::UNO_QUERY); Color nCharColor; - xPropertySet13->getPropertyValue("CharColor") >>= nCharColor; + xPropertySet13->getPropertyValue(u"CharColor"_ustr) >>= nCharColor; CPPUNIT_ASSERT_EQUAL(COL_LIGHTGREEN, nCharColor); } diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx index f4c16903059f..784bb6af66f4 100644 --- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx +++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx @@ -46,7 +46,7 @@ namespace test::BootstrapFixture::setUp(); m_xFilter.set(m_xSFactory->createInstance( - "com.sun.star.comp.Writer.LotusWordProImportFilter"), + u"com.sun.star.comp.Writer.LotusWordProImportFilter"_ustr), uno::UNO_QUERY_THROW); } @@ -54,7 +54,7 @@ namespace const OUString &rURL, const OUString &, SfxFilterFlags, SotClipboardFormatId, unsigned int) { - uno::Sequence aDescriptor{ comphelper::makePropertyValue("URL", rURL) }; + uno::Sequence aDescriptor{ comphelper::makePropertyValue(u"URL"_ustr, rURL) }; return m_xFilter->filter(aDescriptor); } diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index a4f9671760d6..ad1687bde41e 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -90,7 +90,7 @@ public: const uno::Reference< xml::sax::XAttributeList > & xAttribs) override { m_handler->startElement(aName, xAttribs); - m_debug->ignorableWhitespace(" "); // NOTE: needed for pretty-printing + m_debug->ignorableWhitespace(u" "_ustr); // NOTE: needed for pretty-printing m_debug->startElement(aName, xAttribs); } @@ -98,7 +98,7 @@ public: endElement(const OUString& aName) override { m_handler->endElement(aName); - m_debug->ignorableWhitespace(" "); // NOTE: needed for pretty-printing + m_debug->ignorableWhitespace(u" "_ustr); // NOTE: needed for pretty-printing m_debug->endElement(aName); } @@ -168,7 +168,7 @@ bool LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyV // An XML import service: what we push sax messages to... uno::Reference< XDocumentHandler > xInternalHandler( - mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.comp.Writer.XMLImporter", mxContext ), UNO_QUERY ); + mxContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.comp.Writer.XMLImporter"_ustr, mxContext ), UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 std::unique_ptr<osl::File> pDebugFile; @@ -224,7 +224,7 @@ void SAL_CALL LotusWordProImportFilter::setTargetDocument( const uno::Reference< // XExtendedFilterDetection OUString SAL_CALL LotusWordProImportFilter::detect( css::uno::Sequence< PropertyValue >& Descriptor ) { - OUString sTypeName( "writer_LotusWordPro_Document" ); + OUString sTypeName( u"writer_LotusWordPro_Document"_ustr ); OUString sURL; uno::Reference < XInputStream > xInputStream; for (const PropertyValue& rValue : Descriptor) @@ -271,7 +271,7 @@ void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& /*aAr // XServiceInfo OUString SAL_CALL LotusWordProImportFilter::getImplementationName() { - return "com.sun.star.comp.Writer.LotusWordProImportFilter"; + return u"com.sun.star.comp.Writer.LotusWordProImportFilter"_ustr; } sal_Bool SAL_CALL LotusWordProImportFilter::supportsService(const OUString& rServiceName) @@ -281,7 +281,7 @@ sal_Bool SAL_CALL LotusWordProImportFilter::supportsService(const OUString& rSer Sequence<OUString> SAL_CALL LotusWordProImportFilter::getSupportedServiceNames() { - return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" }; + return { u"com.sun.star.document.ImportFilter"_ustr, u"com.sun.star.document.ExtendedTypeDetection"_ustr }; } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx index dfcadf541fad..b11a5332401e 100644 --- a/lotuswordpro/source/filter/lwp9reader.cxx +++ b/lotuswordpro/source/filter/lwp9reader.cxx @@ -162,7 +162,7 @@ bool Lwp9Reader::ParseDocument() //Parse document content m_pStream->GetAttrList()->Clear(); - m_pStream->StartElement("office:body"); + m_pStream->StartElement(u"office:body"_ustr); //Parse change list LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); @@ -170,7 +170,7 @@ bool Lwp9Reader::ParseDocument() pChangeMgr->ConvertAllChange(m_pStream); doc->Parse(m_pStream); - m_pStream->EndElement("office:body"); + m_pStream->EndElement(u"office:body"_ustr); WriteDocEnd(); return true; @@ -185,29 +185,29 @@ void Lwp9Reader::WriteDocHeader() IXFAttrList* pAttrList = m_pStream->GetAttrList(); - pAttrList->AddAttribute("xmlns:office", "http://openoffice.org/2000/office";); - pAttrList->AddAttribute("xmlns:style", "http://openoffice.org/2000/style";); - pAttrList->AddAttribute("xmlns:text", "http://openoffice.org/2000/text";); - pAttrList->AddAttribute("xmlns:table", "http://openoffice.org/2000/table";); - pAttrList->AddAttribute("xmlns:draw", "http://openoffice.org/2000/drawing";); - - pAttrList->AddAttribute("xmlns:fo", "http://www.w3.org/1999/XSL/Format";); - pAttrList->AddAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink";); - pAttrList->AddAttribute("xmlns:number", "http://openoffice.org/2000/datastyle";); - pAttrList->AddAttribute("xmlns:svg", "http://www.w3.org/2000/svg";); - pAttrList->AddAttribute("xmlns:chart", "http://openoffice.org/2000/chart";); - - pAttrList->AddAttribute("xmlns:dr3d", "http://openoffice.org/2000/dr3d";); - pAttrList->AddAttribute("xmlns:math", "http://www.w3.org/1998/Math/MathML";); - pAttrList->AddAttribute("xmlns:form", "http://openoffice.org/2000/form";); - pAttrList->AddAttribute("xmlns:script", "http://openoffice.org/2000/script";); - pAttrList->AddAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/";); - - pAttrList->AddAttribute("xmlns:meta", "http://openoffice.org/2000/meta";); - pAttrList->AddAttribute("office:class", "text"); - pAttrList->AddAttribute("office:version", "1.0"); - - m_pStream->StartElement("office:document"); + pAttrList->AddAttribute(u"xmlns:office"_ustr, u"http://openoffice.org/2000/office"_ustr); + pAttrList->AddAttribute(u"xmlns:style"_ustr, u"http://openoffice.org/2000/style"_ustr); + pAttrList->AddAttribute(u"xmlns:text"_ustr, u"http://openoffice.org/2000/text"_ustr); + pAttrList->AddAttribute(u"xmlns:table"_ustr, u"http://openoffice.org/2000/table"_ustr); + pAttrList->AddAttribute(u"xmlns:draw"_ustr, u"http://openoffice.org/2000/drawing"_ustr); + + pAttrList->AddAttribute(u"xmlns:fo"_ustr, u"http://www.w3.org/1999/XSL/Format"_ustr); + pAttrList->AddAttribute(u"xmlns:xlink"_ustr, u"http://www.w3.org/1999/xlink"_ustr); + pAttrList->AddAttribute(u"xmlns:number"_ustr, u"http://openoffice.org/2000/datastyle"_ustr); + pAttrList->AddAttribute(u"xmlns:svg"_ustr, u"http://www.w3.org/2000/svg"_ustr); + pAttrList->AddAttribute(u"xmlns:chart"_ustr, u"http://openoffice.org/2000/chart"_ustr); + + pAttrList->AddAttribute(u"xmlns:dr3d"_ustr, u"http://openoffice.org/2000/dr3d"_ustr); + pAttrList->AddAttribute(u"xmlns:math"_ustr, u"http://www.w3.org/1998/Math/MathML"_ustr); + pAttrList->AddAttribute(u"xmlns:form"_ustr, u"http://openoffice.org/2000/form"_ustr); + pAttrList->AddAttribute(u"xmlns:script"_ustr, u"http://openoffice.org/2000/script"_ustr); + pAttrList->AddAttribute(u"xmlns:dc"_ustr, u"http://purl.org/dc/elements/1.1/"_ustr); + + pAttrList->AddAttribute(u"xmlns:meta"_ustr, u"http://openoffice.org/2000/meta"_ustr); + pAttrList->AddAttribute(u"office:class"_ustr, u"text"_ustr); + pAttrList->AddAttribute(u"office:version"_ustr, u"1.0"_ustr); + + m_pStream->StartElement(u"office:document"_ustr); pAttrList->Clear(); } /** @@ -215,7 +215,7 @@ void Lwp9Reader::WriteDocHeader() */ void Lwp9Reader::WriteDocEnd() { - m_pStream->EndElement("office:document"); + m_pStream->EndElement(u"office:document"_ustr); m_pStream->EndDocument(); } diff --git a/lotuswordpro/source/filter/lwparrowstyles.hxx b/lotuswordpro/source/filter/lwparrowstyles.hxx index 55b0a3b148f9..b5c87e697129 100644 --- a/lotuswordpro/source/filter/lwparrowstyles.hxx +++ b/lotuswordpro/source/filter/lwparrowstyles.hxx @@ -72,30 +72,30 @@ void RegisteArrowStyles() return; //reversed arrow: std::unique_ptr<XFArrowStyle> pArrowStyle100(new XFArrowStyle()); - pArrowStyle100->SetArrowName("arrow100"); - pArrowStyle100->SetViewbox("0 0 140 200"); - pArrowStyle100->SetSVGPath("M0 180 L70 0 L140 180 L120 180 L70 30 L20 180 L0 180"); + pArrowStyle100->SetArrowName(u"arrow100"_ustr); + pArrowStyle100->SetViewbox(u"0 0 140 200"_ustr); + pArrowStyle100->SetSVGPath(u"M0 180 L70 0 L140 180 L120 180 L70 30 L20 180 L0 180"_ustr); pXFStyleManager->AddStyle(std::move(pArrowStyle100)); //reversed arrow: std::unique_ptr<XFArrowStyle> pArrowStyle1(new XFArrowStyle()); - pArrowStyle1->SetArrowName("reverse arrow"); - pArrowStyle1->SetViewbox("0 0 140 200"); - pArrowStyle1->SetSVGPath("M0 0 L70 200 L140 0"); + pArrowStyle1->SetArrowName(u"reverse arrow"_ustr); + pArrowStyle1->SetViewbox(u"0 0 140 200"_ustr); + pArrowStyle1->SetSVGPath(u"M0 0 L70 200 L140 0"_ustr); pXFStyleManager->AddStyle(std::move(pArrowStyle1)); //reversed concave arrow std::unique_ptr<XFArrowStyle> pArrowStyle2(new XFArrowStyle()); - pArrowStyle2->SetArrowName("reverse concave arrow"); - pArrowStyle2->SetViewbox("0 0 140 200"); - pArrowStyle2->SetSVGPath("M0 0 L80 200 L160 0 L80 100"); + pArrowStyle2->SetArrowName(u"reverse concave arrow"_ustr); + pArrowStyle2->SetViewbox(u"0 0 140 200"_ustr); + pArrowStyle2->SetSVGPath(u"M0 0 L80 200 L160 0 L80 100"_ustr); pXFStyleManager->AddStyle(std::move(pArrowStyle2)); //reversed line arrow std::unique_ptr<XFArrowStyle> pArrowStyle3(new XFArrowStyle()); - pArrowStyle3->SetArrowName("reverse line arrow"); - pArrowStyle3->SetViewbox("0 0 140 200"); - pArrowStyle3->SetSVGPath("M0 0 L70 200 L140 0L110 0 L70 160 L20 0 L0 0"); + pArrowStyle3->SetArrowName(u"reverse line arrow"_ustr); + pArrowStyle3->SetViewbox(u"0 0 140 200"_ustr); + pArrowStyle3->SetSVGPath(u"M0 0 L70 200 L140 0L110 0 L70 160 L20 0 L0 0"_ustr); pXFStyleManager->AddStyle(std::move(pArrowStyle3)); } diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index 9a9bca7fec36..b633f9d18626 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -223,7 +223,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, const LwpBulletO } pListStyle->SetListBullet(nPos, LwpSilverBullet::GetNumCharByStyleID(pParaNumber), - "Times New Roman", aPrefix, aSuffix); + u"Times New Roman"_ustr, aPrefix, aSuffix); } pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0); diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx index ee8c8f8dd8df..833beee4cd78 100644 --- a/lotuswordpro/source/filter/lwpchangemgr.cxx +++ b/lotuswordpro/source/filter/lwpchangemgr.cxx @@ -121,12 +121,12 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream) if (m_ChangeList.empty()) return; // Add for disable change tracking - pStream->GetAttrList()->AddAttribute("text:track-changes", "false"); - pStream->StartElement("text:tracked-changes"); + pStream->GetAttrList()->AddAttribute(u"text:track-changes"_ustr, u"false"_ustr); + pStream->StartElement(u"text:tracked-changes"_ustr); for (auto const& elem : m_ChangeList) elem->ToXml(pStream); - pStream->EndElement("text:tracked-changes"); + pStream->EndElement(u"text:tracked-changes"_ustr); m_ChangeList.clear(); } diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx index a00f29e0c9ce..8a2b0de32944 100644 --- a/lotuswordpro/source/filter/lwpdoc.cxx +++ b/lotuswordpro/source/filter/lwpdoc.cxx @@ -367,7 +367,7 @@ void LwpDocument::RegisterFootnoteStyles() = dynamic_cast<LwpFootnoteOptions*>(m_FootnoteOpts.obj().get()); if (pFootnoteOpts) { - pFootnoteOpts->SetMasterPage("Endnote"); + pFootnoteOpts->SetMasterPage(u"Endnote"_ustr); pFootnoteOpts->RegisterStyle(); } } @@ -788,7 +788,7 @@ void LwpDocument::ChangeStyleName() XFTextStyle* pStyle = dynamic_cast<XFTextStyle*>(pXFStyleManager->FindStyle(u"ClickHere")); if (pStyle) { - pStyle->SetStyleName("Placeholder"); + pStyle->SetStyleName(u"Placeholder"_ustr); } } LwpDocSock::LwpDocSock(LwpObjectHeader const& objHdr, LwpSvStream* pStrm) diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index fb4c47ebd84e..50196175cca6 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -252,7 +252,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) std::unique_ptr<XFTextStyle> pNewStyle(new XFTextStyle()); *pNewStyle = *pNamedStyle; - pNewStyle->SetStyleName(""); + pNewStyle->SetStyleName(u""_ustr); pFont = pFoundry->GetFontManager().CreateOverrideFont(pCharStyle->GetFinalFontID(), m_pModifiers->FontID); pNewStyle->SetFont(pFont); diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx index 52dd3e8ae1d1..6ccf14b2d9dc 100644 --- a/lotuswordpro/source/filter/lwpfribbreaks.cxx +++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx @@ -75,7 +75,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara* pPara) std::unique_ptr<XFParaStyle> pOverStyle(new XFParaStyle); *pOverStyle = *pBaseStyle; - pOverStyle->SetStyleName(""); + pOverStyle->SetStyleName(u""_ustr); //New code LwpStory* pStory = dynamic_cast<LwpStory*>(pPara->GetStoryID().obj().get()); @@ -128,7 +128,7 @@ void LwpFribPageBreak::RegisterBreakStyle(LwpPara* pPara) std::unique_ptr<XFParaStyle> pOverStyle(new XFParaStyle); *pOverStyle = *pBaseStyle; - pOverStyle->SetStyleName(""); + pOverStyle->SetStyleName(u""_ustr); pOverStyle->SetMasterPage(pBaseStyle->GetMasterPage()); if (!GetNext() || GetNext()->GetType() == FRIB_TAG_EOP) diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx index f4e35c0d8477..2dda5912fbca 100644 --- a/lotuswordpro/source/filter/lwpfribmark.cxx +++ b/lotuswordpro/source/filter/lwpfribmark.cxx @@ -199,9 +199,9 @@ void LwpFribBookMark::XFConvert(XFContentContainer* pXFPara) LwpFribField::LwpFribField(LwpPara* pPara) : LwpFrib(pPara) , m_nType(0) - , m_TimeStyle("") + , m_TimeStyle(u""_ustr) , m_nSubType(0) - , m_sFormula("") + , m_sFormula(u""_ustr) , m_nCrossRefType(0) , m_nDateTimeType(0) , m_nDocPowerType(0) @@ -245,7 +245,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara) if (pFieldMark->IsFormulaInsert()) { XFTextContent* pSpan = new XFTextContent(); - pSpan->SetText(">"); + pSpan->SetText(u">"_ustr); pXFPara->Add(pSpan); } if (fieldType == LwpFieldMark::FLD_FIELD) @@ -329,7 +329,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara) if (pFieldMark->IsFormulaInsert()) { XFTextContent* pSpan = new XFTextContent(); - pSpan->SetText("<"); + pSpan->SetText(u"<"_ustr); pXFPara->Add(pSpan); } @@ -409,119 +409,119 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonth(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonthDay(); } else if (sFormula == u"%FLISODate2" || sFormula == u"%FLYYYY/MM/DD HH:mm:SS") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonth(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonthDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddHour(); - pDateStyle->AddText(":"); + pDateStyle->AddText(u":"_ustr); pDateStyle->AddMinute(); - pDateStyle->AddText(":"); + pDateStyle->AddText(u":"_ustr); pDateStyle->AddSecond(); } else if (sFormula == u"%FLM/D/YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLMonth D, YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLWeekday, Month D, YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLMn D, YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLWday, Mn D, YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLMn D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLWeekday, Mn D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLMn D, YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLM/D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLM/YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLMn YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLWeekday") @@ -569,49 +569,49 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(false); - pDateStyle->AddText("-"); + pDateStyle->AddText(u"-"_ustr); pDateStyle->AddMonth(false); - pDateStyle->AddText("-"); + pDateStyle->AddText(u"-"_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLYYYY Month D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLWeekday, YYYY Month D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(","); + pDateStyle->AddText(u","_ustr); pDateStyle->AddYear(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLYYYY Mn D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLWday, YYYY Mn D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(false); - pDateStyle->AddText(","); + pDateStyle->AddText(u","_ustr); pDateStyle->AddYear(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } //next 2 are the same with english version @@ -619,23 +619,23 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLYY/M") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false); - pDateStyle->AddText("-"); + pDateStyle->AddText(u"-"_ustr); pDateStyle->AddMonth(false); } else if (sFormula == u"%FLYY Mn") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); } else if (sFormula == u"%FLeeeeoa" || sFormula == u"%FLffffooaa" || sFormula == u"%FLEEEEOA") @@ -667,18 +667,18 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(); - pDateStyle->AddText("-"); + pDateStyle->AddText(u"-"_ustr); pDateStyle->AddMonth(false); - pDateStyle->AddText("-"); + pDateStyle->AddText(u"-"_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%FLYY.M.D") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(false); - pDateStyle->AddText("."); + pDateStyle->AddText(u"."_ustr); pDateStyle->AddMonth(false); - pDateStyle->AddText("."); + pDateStyle->AddText(u"."_ustr); pDateStyle->AddMonthDay(false); } //chinese version end @@ -687,182 +687,182 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLYYYY/MM/DD") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLD/M/YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonth(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLD Month YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLDD Month YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLWeekday, D Month YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLWeekday, DD Month YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonthDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLD Mn YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLWday, D Mn YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLWday, DD Mn YYYY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonthDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%FLD Mn") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); } else if (sFormula == u"%FLDD Mn") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); } else if (sFormula == u"%FLWeekday, D Mn") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); } else if (sFormula == u"%FLWeekday, DD Mn") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonthDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); } else if (sFormula == u"%FLD Mn YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLDD Mn YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(false, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLD/M") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonth(false); } else if (sFormula == u"%FLDD/MM") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonth(); } else if (sFormula == u"%FLDD/MM/YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonth(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(false); } else if (sFormula == u"%FLMM/YY") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(false); } //other version end @@ -875,52 +875,52 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddSecond(); } else if (sFormula == u"%FLH:mm ampm") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(false); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(" "); + pTimeStyle->AddText(u" "_ustr); pTimeStyle->SetAmPm(true); } else if (sFormula == u"%FLH:mm") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(false); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); } else if (sFormula == u"%FLH:mm:SS ampm") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(false); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddSecond(); - pTimeStyle->AddText(" "); + pTimeStyle->AddText(u" "_ustr); pTimeStyle->SetAmPm(true); } else if (sFormula == u"%FLH:mm:SS") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(false); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddSecond(); } else if (sFormula == u"%FLH ampm") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(false); - pTimeStyle->AddText(" "); + pTimeStyle->AddText(u" "_ustr); pTimeStyle->SetAmPm(true); } else if (sFormula == u"%FLH") @@ -974,43 +974,43 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(" "); + pTimeStyle->AddText(u" "_ustr); pTimeStyle->SetAmPm(true); } else if (sFormula == u"%FLHH ampm") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(" "); + pTimeStyle->AddText(u" "_ustr); pTimeStyle->SetAmPm(true); } else if (sFormula == u"%FLHH:mm:SS ampm") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddSecond(); - pTimeStyle->AddText(" "); + pTimeStyle->AddText(u" "_ustr); pTimeStyle->SetAmPm(true); } else if (sFormula == u"%FLHH:mm") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); } else if (sFormula == u"%FLHH:mm:SS") { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddSecond(); } //other version end @@ -1025,102 +1025,102 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%Dc" || sFormula == u"%DC") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%Dd" || sFormula == u"%DD") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText(", "); + pDateStyle->AddText(u", "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%DE" || sFormula == u"%De") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%Df" || sFormula == u"%DF") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddWeekDay(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%Dg") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%Dh") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonthDay(false); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%Di" || sFormula == u"%DI") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText("."); + pDateStyle->AddText(u"."_ustr); pDateStyle->AddMonth(true, true); } else if (sFormula == u"%Dj" || sFormula == u"%DJ") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(false); - pDateStyle->AddText("."); + pDateStyle->AddText(u"."_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%Dk" || sFormula == u"%DK") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddYear(); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(" "); + pDateStyle->AddText(u" "_ustr); pDateStyle->AddMonthDay(false); } else if (sFormula == u"%DL" || sFormula == u"%Dl") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonth(true, true); - pDateStyle->AddText(","); + pDateStyle->AddText(u","_ustr); pDateStyle->AddYear(); } else if (sFormula == u"%Dm") { pDateStyle.reset(new XFDateStyle); pDateStyle->AddMonthDay(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonth(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(); } } @@ -1130,7 +1130,7 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); } else if (sFormula == u"%T2" || sFormula == u"%T6" || sFormula == u"%T4" @@ -1138,9 +1138,9 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(false); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->SetAmPm(true); } else if (sFormula == u"%T3" || sFormula == u"%T7" || sFormula == u"%T5" @@ -1148,9 +1148,9 @@ void LwpFribField::RegisterDateTimeStyle(std::u16string_view sFormula) { pTimeStyle.reset(new XFTimeStyle); pTimeStyle->AddHour(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->AddMinute(); - pTimeStyle->AddText(":"); + pTimeStyle->AddText(u":"_ustr); pTimeStyle->SetAmPm(true); } } diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx index a65763f38bd0..c7975129e5f7 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -177,35 +177,35 @@ void LwpFribSection::ParseSection() void LwpFribSection::SetDefaultAlphaIndex(XFIndex* pXFIndex) { LwpFoundry* pFoundry = m_pPara->GetFoundry(); - OUString styleName = pFoundry->FindActualStyleName("Separator"); + OUString styleName = pFoundry->FindActualStyleName(u"Separator"_ustr); LwpIndexSection* pIndexSection = dynamic_cast<LwpIndexSection*>(m_Section.obj().get()); XFIndexTemplate* pTemplateSep = new XFIndexTemplate(); if (pIndexSection && pIndexSection->IsFormatSeparator()) { pXFIndex->SetSeparator(true); - pTemplateSep->AddEntry(enumXFIndexTemplateText, ""); + pTemplateSep->AddEntry(enumXFIndexTemplateText, u""_ustr); } //pXFIndex->AddTemplate("separator","Separator",pTemplateSep); - pXFIndex->AddTemplate("separator", styleName, pTemplateSep); + pXFIndex->AddTemplate(u"separator"_ustr, styleName, pTemplateSep); - styleName = pFoundry->FindActualStyleName("Primary"); + styleName = pFoundry->FindActualStyleName(u"Primary"_ustr); XFIndexTemplate* pTemplate1 = new XFIndexTemplate(); - pTemplate1->AddEntry(enumXFIndexTemplateText, ""); - pTemplate1->AddEntry(enumXFIndexTemplateTab, ""); - pTemplate1->AddEntry(enumXFIndexTemplatePage, ""); + pTemplate1->AddEntry(enumXFIndexTemplateText, u""_ustr); + pTemplate1->AddEntry(enumXFIndexTemplateTab, u""_ustr); + pTemplate1->AddEntry(enumXFIndexTemplatePage, u""_ustr); //pXFIndex->AddTemplate(OUString::number(1),"Primary",pTemplate1); pXFIndex->AddTemplate(OUString::number(1), styleName, pTemplate1); XFIndexTemplate* pTemplate2 = new XFIndexTemplate(); - pTemplate2->AddEntry(enumXFIndexTemplateText, ""); - pTemplate2->AddEntry(enumXFIndexTemplateTab, ""); - pTemplate2->AddEntry(enumXFIndexTemplatePage, ""); + pTemplate2->AddEntry(enumXFIndexTemplateText, u""_ustr); + pTemplate2->AddEntry(enumXFIndexTemplateTab, u""_ustr); + pTemplate2->AddEntry(enumXFIndexTemplatePage, u""_ustr); XFIndexTemplate* pTemplate3 = new XFIndexTemplate(); - pTemplate3->AddEntry(enumXFIndexTemplateText, ""); - pTemplate3->AddEntry(enumXFIndexTemplateTab, ""); - pTemplate3->AddEntry(enumXFIndexTemplatePage, ""); + pTemplate3->AddEntry(enumXFIndexTemplateText, u""_ustr); + pTemplate3->AddEntry(enumXFIndexTemplateTab, u""_ustr); + pTemplate3->AddEntry(enumXFIndexTemplatePage, u""_ustr); if (pIndexSection && pIndexSection->IsFormatRunin()) { @@ -218,7 +218,7 @@ void LwpFribSection::SetDefaultAlphaIndex(XFIndex* pXFIndex) { //pXFIndex->AddTemplate(OUString::number(2),"Secondary",pTemplate2); //pXFIndex->AddTemplate(OUString::number(3),"Secondary",pTemplate3); - styleName = pFoundry->FindActualStyleName("Secondary"); + styleName = pFoundry->FindActualStyleName(u"Secondary"_ustr); pXFIndex->AddTemplate(OUString::number(2), styleName, pTemplate2); pXFIndex->AddTemplate(OUString::number(3), styleName, pTemplate3); } @@ -254,7 +254,7 @@ void LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) std::unique_ptr<XFParaStyle> xOverStyle(new XFParaStyle); *xOverStyle = *(m_pPara->GetXFParaStyle()); - xOverStyle->SetStyleName(""); + xOverStyle->SetStyleName(u""_ustr); LwpLayout::UseWhenType eUserType = m_pLayout->GetUseWhenType(); switch (eUserType) @@ -430,7 +430,7 @@ void LwpMasterPage::RegisterFillerPageStyle() { std::unique_ptr<XFParaStyle> pPagebreakStyle(new XFParaStyle); *pPagebreakStyle = *(m_pPara->GetXFParaStyle()); - pPagebreakStyle->SetStyleName(""); + pPagebreakStyle->SetStyleName(u""_ustr); pPagebreakStyle->SetBreaks(enumXFBreakAftPage); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); m_FillerPageStyleName diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx index b48050be6b42..11a23bbda4ae 100644 --- a/lotuswordpro/source/filter/lwpfribtext.cxx +++ b/lotuswordpro/source/filter/lwpfribtext.cxx @@ -175,15 +175,15 @@ void LwpFribDocVar::RegisterDefaultTimeStyle() std::unique_ptr<XFDateStyle> pDateStyle(new XFDateStyle);//use the default format pDateStyle->AddMonth(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddMonthDay(); - pDateStyle->AddText("/"); + pDateStyle->AddText(u"/"_ustr); pDateStyle->AddYear(); - pDateStyle->AddText(","); + pDateStyle->AddText(u","_ustr); -e ... etc. - the rest is truncated
