diff options
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 4f95d2e29671..373d08f14c32 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -916,7 +916,7 @@ void DocxExport::WriteDocVars(const sax_fastparser::FSHelperPtr& pFS) // Only write docVars if there will be at least a single docVar. bool bStarted = false; - const OUStringLiteral aPrefix("com.sun.star.text.fieldmaster.User."); + const OUStringLiteral aPrefix(u"com.sun.star.text.fieldmaster.User."); for (const auto& rMasterName : std::as_const(aMasterNames)) { if (!rMasterName.startsWith(aPrefix)) @@ -1447,7 +1447,7 @@ void DocxExport::WriteCustomXml() uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - static const OUStringLiteral aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + static const OUStringLiteral aName = u"" UNO_NAME_MISC_OBJ_INTEROPGRABBAG; if ( !xPropSetInfo->hasPropertyByName( aName ) ) return; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 3f0c50b84ef1..560a6065a373 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -883,7 +883,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/, aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o"; if (aWW8Ruby.GetDirective()) { - aStr += OUStringLiteral("\\a") + OUStringChar(aWW8Ruby.GetDirective()); + aStr += OUStringLiteral(u"\\a") + OUStringChar(aWW8Ruby.GetDirective()); } aStr += "(\\s\\up " + OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1) + "("; aStr += rRuby.GetText() + ")"; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index a1f8611b9a4f..6a905d5279dd 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2142,7 +2142,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, { if ( iRes != 25 ) mnChecked = iRes; - msDefault = ( wDef == 0 ) ? OUStringLiteral( "0" ) : OUStringLiteral( "1" ); + msDefault = ( wDef == 0 ) ? OUStringLiteral( u"0" ) : OUStringLiteral( u"1" ); } } // xstzTextFormat diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 7b379c6d1f3e..4bb690199826 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -7397,7 +7397,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib ) #ifdef OSL_BIGENDIAN swapEndian(pSecondary); #endif - p->sFontname += OUStringLiteral(";") + pSecondary; + p->sFontname += OUStringLiteral(u";") + pSecondary; } // #i43762# check font name for illegal characters |