sw/source/ui/vba/vbaaddin.cxx | 6
sw/source/ui/vba/vbaaddins.cxx | 4
sw/source/ui/vba/vbaapplication.cxx | 14 +-
sw/source/ui/vba/vbaautotextentry.cxx | 20 +--
sw/source/ui/vba/vbabookmark.cxx | 6
sw/source/ui/vba/vbabookmarks.cxx | 6
sw/source/ui/vba/vbaborders.cxx | 18 +-
sw/source/ui/vba/vbacell.cxx | 4
sw/source/ui/vba/vbacells.cxx | 4
sw/source/ui/vba/vbacolumn.cxx | 4
sw/source/ui/vba/vbacolumns.cxx | 8 -
sw/source/ui/vba/vbacontentcontrol.cxx | 124 +++++++++----------
sw/source/ui/vba/vbacontentcontrollistentries.cxx | 4
sw/source/ui/vba/vbacontentcontrollistentry.cxx | 6
sw/source/ui/vba/vbacontentcontrols.cxx | 4
sw/source/ui/vba/vbadialog.cxx | 4
sw/source/ui/vba/vbadialogs.cxx | 4
sw/source/ui/vba/vbadocument.cxx | 38 ++---
sw/source/ui/vba/vbadocumentproperties.cxx | 14 +-
sw/source/ui/vba/vbadocuments.cxx | 4
sw/source/ui/vba/vbaeventshelper.cxx | 6
sw/source/ui/vba/vbafield.cxx | 18 +-
sw/source/ui/vba/vbafilterpropsfromformat.hxx | 12 -
sw/source/ui/vba/vbafind.cxx | 38 ++---
sw/source/ui/vba/vbafont.cxx | 6
sw/source/ui/vba/vbaformfield.cxx | 16 +-
sw/source/ui/vba/vbaformfieldcheckbox.cxx | 6
sw/source/ui/vba/vbaformfielddropdown.cxx | 6
sw/source/ui/vba/vbaformfielddropdownlistentries.cxx | 4
sw/source/ui/vba/vbaformfielddropdownlistentry.cxx | 4
sw/source/ui/vba/vbaformfields.cxx | 4
sw/source/ui/vba/vbaformfieldtextinput.cxx | 8 -
sw/source/ui/vba/vbaframe.cxx | 4
sw/source/ui/vba/vbaframes.cxx | 4
sw/source/ui/vba/vbaglobals.cxx | 8 -
sw/source/ui/vba/vbaheaderfooter.cxx | 4
sw/source/ui/vba/vbaheaderfooterhelper.cxx | 12 -
sw/source/ui/vba/vbaheadersfooters.cxx | 4
sw/source/ui/vba/vbainformationhelper.cxx | 2
sw/source/ui/vba/vbalistformat.cxx | 68 +++++-----
sw/source/ui/vba/vbalistgalleries.cxx | 6
sw/source/ui/vba/vbalistgallery.cxx | 4
sw/source/ui/vba/vbalisthelper.cxx | 18 +-
sw/source/ui/vba/vbalistlevel.cxx | 50 +++----
sw/source/ui/vba/vbalistlevels.cxx | 6
sw/source/ui/vba/vbalisttemplate.cxx | 6
sw/source/ui/vba/vbalisttemplates.cxx | 6
sw/source/ui/vba/vbamailmerge.cxx | 4
sw/source/ui/vba/vbaoptions.cxx | 4
sw/source/ui/vba/vbapagesetup.cxx | 82 ++++++------
sw/source/ui/vba/vbapane.cxx | 6
sw/source/ui/vba/vbapanes.cxx | 4
sw/source/ui/vba/vbaparagraph.cxx | 12 -
sw/source/ui/vba/vbaparagraphformat.cxx | 74 +++++------
sw/source/ui/vba/vbarange.cxx | 20 +--
sw/source/ui/vba/vbarange.hxx | 2
sw/source/ui/vba/vbareplacement.cxx | 4
sw/source/ui/vba/vbarevision.cxx | 4
sw/source/ui/vba/vbarevisions.cxx | 4
sw/source/ui/vba/vbarow.cxx | 12 -
sw/source/ui/vba/vbarows.cxx | 40 +++---
sw/source/ui/vba/vbasection.cxx | 4
sw/source/ui/vba/vbasections.cxx | 8 -
sw/source/ui/vba/vbaselection.cxx | 62 ++++-----
sw/source/ui/vba/vbastyle.cxx | 32 ++--
sw/source/ui/vba/vbastyle.hxx | 2
sw/source/ui/vba/vbastyles.cxx | 12 -
sw/source/ui/vba/vbasystem.cxx | 10 -
sw/source/ui/vba/vbatable.cxx | 20 +--
sw/source/ui/vba/vbatablehelper.cxx | 6
sw/source/ui/vba/vbatableofcontents.cxx | 16 +-
sw/source/ui/vba/vbatables.cxx | 6
sw/source/ui/vba/vbatablesofcontents.cxx | 8 -
sw/source/ui/vba/vbatabstop.cxx | 4
sw/source/ui/vba/vbatabstops.cxx | 8 -
sw/source/ui/vba/vbatemplate.cxx | 8 -
sw/source/ui/vba/vbavariable.cxx | 6
sw/source/ui/vba/vbavariables.cxx | 4
sw/source/ui/vba/vbaview.cxx | 24 +--
sw/source/ui/vba/vbawindow.cxx | 12 -
sw/source/ui/vba/vbawordbasic.cxx | 12 -
sw/source/ui/vba/vbawrapformat.cxx | 32 ++--
sw/source/ui/vba/wordvbahelper.cxx | 14 +-
83 files changed, 605 insertions(+), 603 deletions(-)
New commits:
commit dddba389b79647f69f447e576cf7e880be5661c6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 22 12:46:02 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 23 08:37:41 2024 +0200
loplugin:ostr in sw/../vba
Change-Id: I73491b481fb82785a21f7239fff62f812dd7440c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167953
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index 8fdfb0048008..d05e978c2516 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -44,7 +44,7 @@ OUString SAL_CALL SwVbaAddin::getName()
void SAL_CALL
SwVbaAddin::setName( const OUString& )
{
- throw uno::RuntimeException(" Fail to set name" );
+ throw uno::RuntimeException(u" Fail to set name"_ustr );
}
OUString SAL_CALL SwVbaAddin::getPath()
@@ -76,7 +76,7 @@ void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed )
OUString
SwVbaAddin::getServiceImplName()
{
- return "SwVbaAddin";
+ return u"SwVbaAddin"_ustr;
}
uno::Sequence< OUString >
@@ -84,7 +84,7 @@ SwVbaAddin::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Addin"
+ u"ooo.vba.word.Addin"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index 6fd6e42f8634..52207b314518 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -80,7 +80,7 @@ SwVbaAddins::createCollectionObject( const css::uno::Any&
aSource )
OUString
SwVbaAddins::getServiceImplName()
{
- return "SwVbaAddins";
+ return u"SwVbaAddins"_ustr;
}
css::uno::Sequence<OUString>
@@ -88,7 +88,7 @@ SwVbaAddins::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.Addins"
+ u"ooo.vba.word.Addins"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbaapplication.cxx
b/sw/source/ui/vba/vbaapplication.cxx
index d3f290db28ab..ac519b9d7afd 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -107,7 +107,7 @@ SwVbaApplication::RemoveSink( sal_uInt32 nNumber )
OUString SAL_CALL
SwVbaApplication::getName()
{
- return "Microsoft Word";
+ return u"Microsoft Word"_ustr;
}
uno::Reference< word::XDocument > SAL_CALL
@@ -314,7 +314,7 @@ void SAL_CALL SwVbaApplication::setTop( sal_Int32 _top )
OUString SAL_CALL SwVbaApplication::getStatusBar()
{
- return "";
+ return u""_ustr;
}
uno::Any SAL_CALL SwVbaApplication::getCustomizationContext()
@@ -443,7 +443,7 @@ void SAL_CALL SwVbaApplication::Move( sal_Int32 Left,
sal_Int32 Top )
OUString SAL_CALL
SwVbaApplication::getIID()
{
- return "{82154421-0FBF-11d4-8313-005004526AB4}";
+ return u"{82154421-0FBF-11d4-8313-005004526AB4}"_ustr;
}
// XConnectable
@@ -451,7 +451,7 @@ SwVbaApplication::getIID()
OUString SAL_CALL
SwVbaApplication::GetIIDForClassItselfNotCoclass()
{
- return "{82154423-0FBF-11D4-8313-005004526AB4}";
+ return u"{82154423-0FBF-11D4-8313-005004526AB4}"_ustr;
}
TypeAndIID SAL_CALL
@@ -459,7 +459,7 @@ SwVbaApplication::GetConnectionPoint()
{
TypeAndIID aResult =
{ cppu::UnoType<word::XApplicationOutgoing>::get(),
- "{82154422-0FBF-11D4-8313-005004526AB4}"
+ u"{82154422-0FBF-11D4-8313-005004526AB4}"_ustr
};
return aResult;
@@ -475,7 +475,7 @@ SwVbaApplication::FindConnectionPoint()
OUString
SwVbaApplication::getServiceImplName()
{
- return "SwVbaApplication";
+ return u"SwVbaApplication"_ustr;
}
uno::Sequence< OUString >
@@ -483,7 +483,7 @@ SwVbaApplication::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Application"
+ u"ooo.vba.word.Application"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx
b/sw/source/ui/vba/vbaautotextentry.cxx
index dd1f17f16ff4..051943cd1f41 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -41,14 +41,14 @@ uno::Reference< word::XRange > SAL_CALL
SwVbaAutoTextEntry::Insert( const uno::R
if( pWhere )
{
uno::Reference< text::XTextRange > xTextRange =
pWhere->getXTextRange();
- xTextRange->setString( "x" ); // set marker
+ xTextRange->setString( u"x"_ustr ); // set marker
uno::Reference< text::XTextRange > xEndMarker = xTextRange->getEnd();
- xEndMarker->setString( "x" ); // set marker
+ xEndMarker->setString( u"x"_ustr ); // set marker
uno::Reference< text::XText > xText = pWhere->getXText();
mxEntry->applyTo( xEndMarker->getStart() );
uno::Reference< text::XTextCursor > xTC =
xText->createTextCursorByRange( xTextRange->getStart() );
xTC->goRight( 1, true );
- xTC->setString( "" ); // remove marker
+ xTC->setString( u""_ustr ); // remove marker
// remove the blank paragraph if it is a rich text
bool bRich = false;
_richtext >>= bRich;
@@ -63,11 +63,11 @@ uno::Reference< word::XRange > SAL_CALL
SwVbaAutoTextEntry::Insert( const uno::R
uno::Reference< text::XTextViewCursor > xTVCursor =
word::getXTextViewCursor( xModel );
uno::Reference< text::XTextRange > xCurrentRange(
xTC->getEnd(), uno::UNO_SET_THROW );
xTVCursor->gotoRange( xCurrentRange, false );
- dispatchRequests( xModel,".uno:Delete" );
+ dispatchRequests( xModel,u".uno:Delete"_ustr );
xTVCursor->gotoRange( xEndMarker->getEnd(), false );
}
}
- xEndMarker->setString( "" ); // remove marker
+ xEndMarker->setString( u""_ustr ); // remove marker
xTC = xText->createTextCursorByRange( xEndMarker->getEnd() );
pWhere->setXTextCursor( xTC );
}
@@ -77,7 +77,7 @@ uno::Reference< word::XRange > SAL_CALL
SwVbaAutoTextEntry::Insert( const uno::R
OUString
SwVbaAutoTextEntry::getServiceImplName()
{
- return "SwVbaAutoTextEntry";
+ return u"SwVbaAutoTextEntry"_ustr;
}
uno::Sequence< OUString >
@@ -85,7 +85,7 @@ SwVbaAutoTextEntry::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.AutoTextEntry"
+ u"ooo.vba.word.AutoTextEntry"_ustr
};
return aServiceNames;
}
@@ -103,7 +103,7 @@ SwVbaAutoTextEntries::getElementType()
uno::Reference< container::XEnumeration >
SwVbaAutoTextEntries::createEnumeration()
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
uno::Any
@@ -116,7 +116,7 @@ SwVbaAutoTextEntries::createCollectionObject( const
css::uno::Any& aSource )
OUString
SwVbaAutoTextEntries::getServiceImplName()
{
- return "SwVbaAutoTextEntries";
+ return u"SwVbaAutoTextEntries"_ustr;
}
css::uno::Sequence<OUString>
@@ -124,7 +124,7 @@ SwVbaAutoTextEntries::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.AutoTextEntries"
+ u"ooo.vba.word.AutoTextEntries"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index aecc0760bc1f..e03050b190f9 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -43,7 +43,7 @@ SwVbaBookmark::~SwVbaBookmark()
void SwVbaBookmark::checkVality()
{
if( !mbValid )
- throw uno::RuntimeException("The bookmark is not valid" );
+ throw uno::RuntimeException(u"The bookmark is not valid"_ustr );
}
void SAL_CALL SwVbaBookmark::Delete()
@@ -83,7 +83,7 @@ uno::Any SAL_CALL SwVbaBookmark::Range()
OUString
SwVbaBookmark::getServiceImplName()
{
- return "SwVbaBookmark";
+ return u"SwVbaBookmark"_ustr;
}
uno::Sequence< OUString >
@@ -91,7 +91,7 @@ SwVbaBookmark::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Bookmark"
+ u"ooo.vba.word.Bookmark"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbabookmarks.cxx
b/sw/source/ui/vba/vbabookmarks.cxx
index 601ed759dff0..386373cbdb9f 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -145,7 +145,7 @@ void SwVbaBookmarks::removeBookmarkByName( const OUString&
rName )
void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >&
xModel, const OUString& rName, const uno::Reference< text::XTextRange >&
rTextRange )
{
uno::Reference< lang::XMultiServiceFactory > xDocMSF( xModel,
uno::UNO_QUERY_THROW );
- uno::Reference< text::XTextContent > xBookmark(
xDocMSF->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY_THROW );
+ uno::Reference< text::XTextContent > xBookmark(
xDocMSF->createInstance(u"com.sun.star.text.Bookmark"_ustr),
uno::UNO_QUERY_THROW );
uno::Reference< container::XNamed > xNamed( xBookmark,
uno::UNO_QUERY_THROW );
xNamed->setName( rName );
rTextRange->getText()->insertTextContent( rTextRange, xBookmark, false );
@@ -211,7 +211,7 @@ SwVbaBookmarks::Exists( const OUString& rName )
OUString
SwVbaBookmarks::getServiceImplName()
{
- return "SwVbaBookmarks";
+ return u"SwVbaBookmarks"_ustr;
}
css::uno::Sequence<OUString>
@@ -219,7 +219,7 @@ SwVbaBookmarks::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.Bookmarks"
+ u"ooo.vba.word.Bookmarks"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 9e780fe2103f..89fc7c011688 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -50,7 +50,7 @@ private:
void setBorderLine( table::BorderLine const & rBorderLine )
{
table::TableBorder aTableBorder;
- m_xProps->getPropertyValue( "TableBorder" ) >>= aTableBorder;
+ m_xProps->getPropertyValue( u"TableBorder"_ustr ) >>= aTableBorder;
switch ( m_LineType )
{
@@ -87,13 +87,13 @@ private:
default:
return;
}
- m_xProps->setPropertyValue( "TableBorder", uno::Any(aTableBorder) );
+ m_xProps->setPropertyValue( u"TableBorder"_ustr,
uno::Any(aTableBorder) );
}
bool getBorderLine( table::BorderLine& rBorderLine )
{
table::TableBorder aTableBorder;
- m_xProps->getPropertyValue( "TableBorder" ) >>= aTableBorder;
+ m_xProps->getPropertyValue( u"TableBorder"_ustr ) >>= aTableBorder;
switch ( m_LineType )
{
case word::WdBorderType::wdBorderLeft:
@@ -135,14 +135,14 @@ private:
protected:
virtual OUString getServiceImplName() override
{
- return "SwVbaBorder";
+ return u"SwVbaBorder"_ustr;
}
virtual css::uno::Sequence<OUString> getServiceNames() override
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Border"
+ u"ooo.vba.word.Border"_ustr
};
return aServiceNames;
}
@@ -178,7 +178,7 @@ public:
_linestyle >>= nLineStyle;
table::BorderLine aBorderLine;
if ( !getBorderLine( aBorderLine ) )
- throw uno::RuntimeException("Method failed" );
+ throw uno::RuntimeException(u"Method failed"_ustr );
switch ( nLineStyle )
{
@@ -218,7 +218,7 @@ public:
break;
}
default:
- throw uno::RuntimeException("Bad param" );
+ throw uno::RuntimeException(u"Bad param"_ustr );
}
setBorderLine( aBorderLine );
@@ -350,7 +350,7 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/
)
OUString
SwVbaBorders::getServiceImplName()
{
- return "SwVbaBorders";
+ return u"SwVbaBorders"_ustr;
}
uno::Sequence< OUString >
@@ -358,7 +358,7 @@ SwVbaBorders::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Borders"
+ u"ooo.vba.word.Borders"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx
index a24dd3dd1c3c..a243264836e6 100644
--- a/sw/source/ui/vba/vbacell.cxx
+++ b/sw/source/ui/vba/vbacell.cxx
@@ -86,7 +86,7 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32
heightrule )
OUString
SwVbaCell::getServiceImplName()
{
- return "SwVbaCell";
+ return u"SwVbaCell"_ustr;
}
uno::Sequence< OUString >
@@ -94,7 +94,7 @@ SwVbaCell::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Cell"
+ u"ooo.vba.word.Cell"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index e30c2ed370ff..a41a154da977 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -198,7 +198,7 @@ SwVbaCells::createCollectionObject( const uno::Any& aSource
)
OUString
SwVbaCells::getServiceImplName()
{
- return "SwVbaCells";
+ return u"SwVbaCells"_ustr;
}
uno::Sequence<OUString>
@@ -206,7 +206,7 @@ SwVbaCells::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.Cells"
+ u"ooo.vba.word.Cells"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index c4411bfab493..fe7837c0f64e 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -75,7 +75,7 @@ void SwVbaColumn::SelectColumn( const uno::Reference<
frame::XModel >& xModel, c
OUString
SwVbaColumn::getServiceImplName()
{
- return "SwVbaColumn";
+ return u"SwVbaColumn"_ustr;
}
uno::Sequence< OUString >
@@ -83,7 +83,7 @@ SwVbaColumn::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Column"
+ u"ooo.vba.word.Column"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index ffaf662029f0..9622c9068ae2 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -105,11 +105,11 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any&
Index1, const uno::Any& /*
{
if( nIndex <= 0 || nIndex > getCount() )
{
- throw lang::IndexOutOfBoundsException("Index out of bounds" );
+ throw lang::IndexOutOfBoundsException(u"Index out of bounds"_ustr
);
}
return uno::Any( uno::Reference< word::XColumn >( new SwVbaColumn(
this, mxContext, mxTextTable, nIndex - 1 ) ) );
}
- throw uno::RuntimeException("Index out of bounds" );
+ throw uno::RuntimeException(u"Index out of bounds"_ustr );
}
// XEnumerationAccess
@@ -133,7 +133,7 @@ SwVbaColumns::createCollectionObject( const uno::Any&
aSource )
OUString
SwVbaColumns::getServiceImplName()
{
- return "SwVbaColumns";
+ return u"SwVbaColumns"_ustr;
}
uno::Sequence<OUString>
@@ -141,7 +141,7 @@ SwVbaColumns::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.Columns"
+ u"ooo.vba.word.Columns"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbacontentcontrol.cxx
b/sw/source/ui/vba/vbacontentcontrol.cxx
index 9cbf097090ee..3646804436c7 100644
--- a/sw/source/ui/vba/vbacontentcontrol.cxx
+++ b/sw/source/ui/vba/vbacontentcontrol.cxx
@@ -241,181 +241,181 @@ void SwVbaContentControl::setColor(sal_Int32 nWdColor)
switch (nWdColor)
{
case word::WdColor::wdColorAqua:
- m_pCC->SetColor("wdColorAqua");
+ m_pCC->SetColor(u"wdColorAqua"_ustr);
break;
case word::WdColor::wdColorAutomatic:
- m_pCC->SetColor("wdColorAutomatic");
+ m_pCC->SetColor(u"wdColorAutomatic"_ustr);
break;
case word::WdColor::wdColorBlack:
- m_pCC->SetColor("wdColorBlack");
+ m_pCC->SetColor(u"wdColorBlack"_ustr);
break;
case word::WdColor::wdColorBlue:
- m_pCC->SetColor("wdColorBlue");
+ m_pCC->SetColor(u"wdColorBlue"_ustr);
break;
case word::WdColor::wdColorBlueGray:
- m_pCC->SetColor("wdColorBlueGray");
+ m_pCC->SetColor(u"wdColorBlueGray"_ustr);
break;
case word::WdColor::wdColorBrightGreen:
- m_pCC->SetColor("wdColorBrightGreen");
+ m_pCC->SetColor(u"wdColorBrightGreen"_ustr);
break;
case word::WdColor::wdColorBrown:
- m_pCC->SetColor("wdColorBrown");
+ m_pCC->SetColor(u"wdColorBrown"_ustr);
break;
case word::WdColor::wdColorDarkBlue:
- m_pCC->SetColor("wdColorDarkBlue");
+ m_pCC->SetColor(u"wdColorDarkBlue"_ustr);
break;
case word::WdColor::wdColorDarkGreen:
- m_pCC->SetColor("wdColorDarkGreen");
+ m_pCC->SetColor(u"wdColorDarkGreen"_ustr);
break;
case word::WdColor::wdColorDarkRed:
- m_pCC->SetColor("wdColorDarkRed");
+ m_pCC->SetColor(u"wdColorDarkRed"_ustr);
break;
case word::WdColor::wdColorDarkTeal:
- m_pCC->SetColor("wdColorDarkTeal");
+ m_pCC->SetColor(u"wdColorDarkTeal"_ustr);
break;
case word::WdColor::wdColorDarkYellow:
- m_pCC->SetColor("wdColorDarkYellow");
+ m_pCC->SetColor(u"wdColorDarkYellow"_ustr);
break;
case word::WdColor::wdColorGold:
- m_pCC->SetColor("wdColorGold");
+ m_pCC->SetColor(u"wdColorGold"_ustr);
break;
case word::WdColor::wdColorGray05:
- m_pCC->SetColor("wdColorGray05");
+ m_pCC->SetColor(u"wdColorGray05"_ustr);
break;
case word::WdColor::wdColorGray10:
- m_pCC->SetColor("wdColorGray10");
+ m_pCC->SetColor(u"wdColorGray10"_ustr);
break;
case word::WdColor::wdColorGray125:
- m_pCC->SetColor("wdColorGray125");
+ m_pCC->SetColor(u"wdColorGray125"_ustr);
break;
case word::WdColor::wdColorGray15:
- m_pCC->SetColor("wdColorGray15");
+ m_pCC->SetColor(u"wdColorGray15"_ustr);
break;
case word::WdColor::wdColorGray20:
- m_pCC->SetColor("wdColorGray20");
+ m_pCC->SetColor(u"wdColorGray20"_ustr);
break;
case word::WdColor::wdColorGray25:
- m_pCC->SetColor("wdColorGray25");
+ m_pCC->SetColor(u"wdColorGray25"_ustr);
break;
case word::WdColor::wdColorGray30:
- m_pCC->SetColor("wdColorGray30");
+ m_pCC->SetColor(u"wdColorGray30"_ustr);
break;
case word::WdColor::wdColorGray35:
- m_pCC->SetColor("wdColorGray35");
+ m_pCC->SetColor(u"wdColorGray35"_ustr);
break;
case word::WdColor::wdColorGray375:
- m_pCC->SetColor("wdColorGray375");
+ m_pCC->SetColor(u"wdColorGray375"_ustr);
break;
case word::WdColor::wdColorGray40:
- m_pCC->SetColor("wdColorGray40");
+ m_pCC->SetColor(u"wdColorGray40"_ustr);
break;
case word::WdColor::wdColorGray45:
- m_pCC->SetColor("wdColorGray45");
+ m_pCC->SetColor(u"wdColorGray45"_ustr);
break;
case word::WdColor::wdColorGray50:
- m_pCC->SetColor("wdColorGray50");
+ m_pCC->SetColor(u"wdColorGray50"_ustr);
break;
case word::WdColor::wdColorGray55:
- m_pCC->SetColor("wdColorGray55");
+ m_pCC->SetColor(u"wdColorGray55"_ustr);
break;
case word::WdColor::wdColorGray60:
- m_pCC->SetColor("wdColorGray60");
+ m_pCC->SetColor(u"wdColorGray60"_ustr);
break;
case word::WdColor::wdColorGray625:
- m_pCC->SetColor("wdColorGray625");
+ m_pCC->SetColor(u"wdColorGray625"_ustr);
break;
case word::WdColor::wdColorGray65:
- m_pCC->SetColor("wdColorGray65");
+ m_pCC->SetColor(u"wdColorGray65"_ustr);
break;
case word::WdColor::wdColorGray70:
- m_pCC->SetColor("wdColorGray70");
+ m_pCC->SetColor(u"wdColorGray70"_ustr);
break;
case word::WdColor::wdColorGray75:
- m_pCC->SetColor("wdColorGray75");
+ m_pCC->SetColor(u"wdColorGray75"_ustr);
break;
case word::WdColor::wdColorGray80:
- m_pCC->SetColor("wdColorGray80");
+ m_pCC->SetColor(u"wdColorGray80"_ustr);
break;
case word::WdColor::wdColorGray85:
- m_pCC->SetColor("wdColorGray85");
+ m_pCC->SetColor(u"wdColorGray85"_ustr);
break;
case word::WdColor::wdColorGray875:
- m_pCC->SetColor("wdColorGray875");
+ m_pCC->SetColor(u"wdColorGray875"_ustr);
break;
case word::WdColor::wdColorGray90:
- m_pCC->SetColor("wdColorGray90");
+ m_pCC->SetColor(u"wdColorGray90"_ustr);
break;
case word::WdColor::wdColorGray95:
- m_pCC->SetColor("wdColorGray95");
+ m_pCC->SetColor(u"wdColorGray95"_ustr);
break;
case word::WdColor::wdColorGreen:
- m_pCC->SetColor("wdColorGreen");
+ m_pCC->SetColor(u"wdColorGreen"_ustr);
break;
case word::WdColor::wdColorIndigo:
- m_pCC->SetColor("wdColorIndigo");
+ m_pCC->SetColor(u"wdColorIndigo"_ustr);
break;
case word::WdColor::wdColorLavender:
- m_pCC->SetColor("wdColorLavender");
+ m_pCC->SetColor(u"wdColorLavender"_ustr);
break;
case word::WdColor::wdColorLightBlue:
- m_pCC->SetColor("wdColorLightBlue");
+ m_pCC->SetColor(u"wdColorLightBlue"_ustr);
break;
case word::WdColor::wdColorLightGreen:
- m_pCC->SetColor("wdColorLightGreen");
+ m_pCC->SetColor(u"wdColorLightGreen"_ustr);
break;
case word::WdColor::wdColorLightOrange:
- m_pCC->SetColor("wdColorLightOrange");
+ m_pCC->SetColor(u"wdColorLightOrange"_ustr);
break;
case word::WdColor::wdColorLightTurquoise:
- m_pCC->SetColor("wdColorLightTurquoise");
+ m_pCC->SetColor(u"wdColorLightTurquoise"_ustr);
break;
case word::WdColor::wdColorLightYellow:
- m_pCC->SetColor("wdColorLightYellow");
+ m_pCC->SetColor(u"wdColorLightYellow"_ustr);
break;
case word::WdColor::wdColorLime:
- m_pCC->SetColor("wdColorLime");
+ m_pCC->SetColor(u"wdColorLime"_ustr);
break;
case word::WdColor::wdColorOliveGreen:
- m_pCC->SetColor("wdColorOliveGreen");
+ m_pCC->SetColor(u"wdColorOliveGreen"_ustr);
break;
case word::WdColor::wdColorOrange:
- m_pCC->SetColor("wdColorOrange");
+ m_pCC->SetColor(u"wdColorOrange"_ustr);
break;
case word::WdColor::wdColorPaleBlue:
- m_pCC->SetColor("wdColorPaleBlue");
+ m_pCC->SetColor(u"wdColorPaleBlue"_ustr);
break;
case word::WdColor::wdColorPink:
- m_pCC->SetColor("wdColorPink");
+ m_pCC->SetColor(u"wdColorPink"_ustr);
break;
case word::WdColor::wdColorPlum:
- m_pCC->SetColor("wdColorPlum");
+ m_pCC->SetColor(u"wdColorPlum"_ustr);
break;
case word::WdColor::wdColorRed:
- m_pCC->SetColor("wdColorRed");
+ m_pCC->SetColor(u"wdColorRed"_ustr);
break;
case word::WdColor::wdColorRose:
- m_pCC->SetColor("wdColorRose");
+ m_pCC->SetColor(u"wdColorRose"_ustr);
break;
case word::WdColor::wdColorSeaGreen:
- m_pCC->SetColor("wdColorSeaGreen");
+ m_pCC->SetColor(u"wdColorSeaGreen"_ustr);
break;
case word::WdColor::wdColorSkyBlue:
- m_pCC->SetColor("wdColorSkyBlue");
+ m_pCC->SetColor(u"wdColorSkyBlue"_ustr);
break;
case word::WdColor::wdColorTan:
- m_pCC->SetColor("wdColorTan");
+ m_pCC->SetColor(u"wdColorTan"_ustr);
break;
case word::WdColor::wdColorTeal:
- m_pCC->SetColor("wdColorTeal");
+ m_pCC->SetColor(u"wdColorTeal"_ustr);
break;
case word::WdColor::wdColorTurquoise:
- m_pCC->SetColor("wdColorTurquoise");
+ m_pCC->SetColor(u"wdColorTurquoise"_ustr);
break;
case word::WdColor::wdColorViolet:
- m_pCC->SetColor("wdColorViolet");
+ m_pCC->SetColor(u"wdColorViolet"_ustr);
break;
case word::WdColor::wdColorWhite:
- m_pCC->SetColor("wdColorWhite");
+ m_pCC->SetColor(u"wdColorWhite"_ustr);
break;
default:;
}
@@ -732,7 +732,7 @@ void SwVbaContentControl::SetPlaceholderText(const
uno::Any& BuildingBlock, cons
else
{
// Remove placeholder text.
- m_pCC->SetPlaceholderDocPart("");
+ m_pCC->SetPlaceholderDocPart(u""_ustr);
}
if (m_pCC->GetShowingPlaceHolder() && !getLockContents() &&
m_pCC->GetTextAttr())
{
@@ -742,11 +742,11 @@ void SwVbaContentControl::SetPlaceholderText(const
uno::Any& BuildingBlock, cons
void SwVbaContentControl::Ungroup() { SAL_INFO("sw.vba",
"SwVbaContentControl::UnGroup stub"); }
-OUString SwVbaContentControl::getServiceImplName() { return
"SwVbaContentControl"; }
+OUString SwVbaContentControl::getServiceImplName() { return
u"SwVbaContentControl"_ustr; }
uno::Sequence<OUString> SwVbaContentControl::getServiceNames()
{
- static uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.ContentControl" };
+ static uno::Sequence<OUString> const aServiceNames{
u"ooo.vba.word.ContentControl"_ustr };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacontentcontrollistentries.cxx
b/sw/source/ui/vba/vbacontentcontrollistentries.cxx
index c2e6e7e5f91b..8f222fe93bf2 100644
--- a/sw/source/ui/vba/vbacontentcontrollistentries.cxx
+++ b/sw/source/ui/vba/vbacontentcontrollistentries.cxx
@@ -154,12 +154,12 @@ uno::Any
SwVbaContentControlListEntries::createCollectionObject(const uno::Any&
OUString SwVbaContentControlListEntries::getServiceImplName()
{
- return "SwVbaContentControlListEntries";
+ return u"SwVbaContentControlListEntries"_ustr;
}
uno::Sequence<OUString> SwVbaContentControlListEntries::getServiceNames()
{
- static uno::Sequence<OUString> const sNames{
"ooo.vba.word.ContentControlListEntries" };
+ static uno::Sequence<OUString> const sNames{
u"ooo.vba.word.ContentControlListEntries"_ustr };
return sNames;
}
diff --git a/sw/source/ui/vba/vbacontentcontrollistentry.cxx
b/sw/source/ui/vba/vbacontentcontrollistentry.cxx
index c3071f0c4b6e..311ab513c2f5 100644
--- a/sw/source/ui/vba/vbacontentcontrollistentry.cxx
+++ b/sw/source/ui/vba/vbacontentcontrollistentry.cxx
@@ -149,12 +149,14 @@ void SwVbaContentControlListEntry::Select()
// XHelperInterface
OUString SwVbaContentControlListEntry::getServiceImplName()
{
- return "SwVbaContentControlListEntry";
+ return u"SwVbaContentControlListEntry"_ustr;
}
uno::Sequence<OUString> SwVbaContentControlListEntry::getServiceNames()
{
- static uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.ContentControlListEntry" };
+ static uno::Sequence<OUString> const aServiceNames{
+ u"ooo.vba.word.ContentControlListEntry"_ustr
+ };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbacontentcontrols.cxx
b/sw/source/ui/vba/vbacontentcontrols.cxx
index 37199e2cec2d..5a7dccef17f5 100644
--- a/sw/source/ui/vba/vbacontentcontrols.cxx
+++ b/sw/source/ui/vba/vbacontentcontrols.cxx
@@ -257,11 +257,11 @@ uno::Reference<container::XEnumeration>
SwVbaContentControls::createEnumeration(
uno::Any SwVbaContentControls::createCollectionObject(const uno::Any& aSource)
{ return aSource; }
-OUString SwVbaContentControls::getServiceImplName() { return
"SwVbaContentControls"; }
+OUString SwVbaContentControls::getServiceImplName() { return
u"SwVbaContentControls"_ustr; }
uno::Sequence<OUString> SwVbaContentControls::getServiceNames()
{
- static uno::Sequence<OUString> const sNames{
"ooo.vba.word.ContentControls" };
+ static uno::Sequence<OUString> const sNames{
u"ooo.vba.word.ContentControls"_ustr };
return sNames;
}
diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx
index f6af8f113e87..5661851e7661 100644
--- a/sw/source/ui/vba/vbadialog.cxx
+++ b/sw/source/ui/vba/vbadialog.cxx
@@ -57,7 +57,7 @@ SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
OUString
SwVbaDialog::getServiceImplName()
{
- return "SwVbaDialog";
+ return u"SwVbaDialog"_ustr;
}
uno::Sequence< OUString >
@@ -65,7 +65,7 @@ SwVbaDialog::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Dialog"
+ u"ooo.vba.word.Dialog"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx
index 2b26a4cfaac4..c77fd0de91cd 100644
--- a/sw/source/ui/vba/vbadialogs.cxx
+++ b/sw/source/ui/vba/vbadialogs.cxx
@@ -35,7 +35,7 @@ SwVbaDialogs::Item( const uno::Any &aItem )
OUString
SwVbaDialogs::getServiceImplName()
{
- return "SwVbaDialogs";
+ return u"SwVbaDialogs"_ustr;
}
uno::Sequence< OUString >
@@ -43,7 +43,7 @@ SwVbaDialogs::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Dialogs"
+ u"ooo.vba.word.Dialogs"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 49e40dc49f08..2588c153788a 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -223,7 +223,7 @@ SwVbaDocument::Bookmarks( const uno::Any& rIndex )
uno::Any SwVbaDocument::ContentControls(const uno::Any& index)
{
uno::Reference<XCollection> xContentControls(
- new SwVbaContentControls(this, mxContext, mxTextDocument, "", ""));
+ new SwVbaContentControls(this, mxContext, mxTextDocument, u""_ustr,
u""_ustr));
if (index.hasValue())
{
try
@@ -252,7 +252,7 @@ uno::Any SwVbaDocument::SelectContentControlsByTag(const
uno::Any& index)
OUString sTag;
index >>= sTag;
return uno::Any(uno::Reference<XCollection>(
- new SwVbaContentControls(this, mxContext,
mxTextDocument, sTag, "")));
+ new SwVbaContentControls(this, mxContext,
mxTextDocument, sTag, u""_ustr)));
}
uno::Any SwVbaDocument::SelectContentControlsByTitle(const uno::Any& index)
@@ -260,7 +260,7 @@ uno::Any SwVbaDocument::SelectContentControlsByTitle(const
uno::Any& index)
OUString sTitle;
index >>= sTitle;
return uno::Any(uno::Reference<XCollection>(
- new SwVbaContentControls(this, mxContext,
mxTextDocument, "", sTitle)));
+ new SwVbaContentControls(this, mxContext,
mxTextDocument, u""_ustr, sTitle)));
}
uno::Reference<word::XWindow> SwVbaDocument::getActiveWindow()
@@ -368,7 +368,7 @@ SwVbaDocument::PageSetup( )
OUString
SwVbaDocument::getServiceImplName()
{
- return "SwVbaDocument";
+ return u"SwVbaDocument"_ustr;
}
uno::Any SAL_CALL
@@ -449,7 +449,7 @@ sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation()
// check this property only in default paragraph style
bool IsAutoHyphenation = false;
uno::Reference< beans::XPropertySet > xParaProps(
word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->getPropertyValue("ParaIsHyphenation") >>= IsAutoHyphenation;
+ xParaProps->getPropertyValue(u"ParaIsHyphenation"_ustr) >>=
IsAutoHyphenation;
return IsAutoHyphenation;
}
@@ -457,7 +457,7 @@ void SAL_CALL SwVbaDocument::setAutoHyphenation( sal_Bool
_autohyphenation )
{
//TODO
uno::Reference< beans::XPropertySet > xParaProps(
word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->setPropertyValue("ParaIsHyphenation", uno::Any(
_autohyphenation ) );
+ xParaProps->setPropertyValue(u"ParaIsHyphenation"_ustr, uno::Any(
_autohyphenation ) );
}
::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone()
@@ -476,7 +476,7 @@ void SAL_CALL SwVbaDocument::setHyphenationZone(
::sal_Int32 /*_hyphenationzone*
//TODO
sal_Int16 nHyphensLimit = 0;
uno::Reference< beans::XPropertySet > xParaProps(
word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->getPropertyValue("ParaHyphenationMaxHyphens") >>=
nHyphensLimit;
+ xParaProps->getPropertyValue(u"ParaHyphenationMaxHyphens"_ustr) >>=
nHyphensLimit;
return nHyphensLimit;
}
@@ -484,7 +484,7 @@ void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit(
::sal_Int32 _consecutiv
{
sal_Int16 nHyphensLimit = static_cast< sal_Int16 >(
_consecutivehyphenslimit );
uno::Reference< beans::XPropertySet > xParaProps(
word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
- xParaProps->setPropertyValue("ParaHyphenationMaxHyphens", uno::Any(
nHyphensLimit ) );
+ xParaProps->setPropertyValue(u"ParaHyphenationMaxHyphens"_ustr, uno::Any(
nHyphensLimit ) );
}
uno::Reference< ooo::vba::word::XMailMerge > SAL_CALL
SwVbaDocument::getMailMerge()
@@ -505,12 +505,12 @@ void SAL_CALL SwVbaDocument::PrintOut( const uno::Any&
/*Background*/, const uno
void SAL_CALL SwVbaDocument::PrintPreview( )
{
- dispatchRequests( mxModel,".uno:PrintPreview" );
+ dispatchRequests( mxModel,u".uno:PrintPreview"_ustr );
}
void SAL_CALL SwVbaDocument::ClosePrintPreview( )
{
- dispatchRequests( mxModel,".uno:ClosePreview" );
+ dispatchRequests( mxModel,u".uno:ClosePreview"_ustr );
}
uno::Any SAL_CALL
@@ -560,7 +560,7 @@ SwVbaDocument::SaveAs2000( const uno::Any& FileName, const
uno::Any& FileFormat,
// Based on SwVbaOptions::getValueEvent()
uno::Reference< util::XPathSettings > xPathSettings =
util::thePathSettings::get( comphelper::getProcessComponentContext() );
OUString sPathUrl;
- xPathSettings->getPropertyValue( "Work" ) >>= sPathUrl;
+ xPathSettings->getPropertyValue( u"Work"_ustr ) >>= sPathUrl;
// Path could be a multipath, Microsoft doesn't support this
feature in Word currently.
// Only the last path is from interest.
sal_Int32 nIndex = sPathUrl.lastIndexOf( ';' );
@@ -583,7 +583,7 @@ SwVbaDocument::SaveAs2000( const uno::Any& FileName, const
uno::Any& FileFormat,
sal_Int32 nFileFormat = word::WdSaveFormat::wdFormatDocument;
FileFormat >>= nFileFormat;
- uno::Sequence storeProps{ comphelper::makePropertyValue("FilterName",
uno::Any()) };
+ uno::Sequence storeProps{
comphelper::makePropertyValue(u"FilterName"_ustr, uno::Any()) };
setFilterPropsFromFormat( nFileFormat, storeProps );
@@ -611,8 +611,8 @@ SwVbaDocument::SavePreviewPngAs( const uno::Any& FileName )
OUString sURL;
osl::FileBase::getFileURLFromSystemPath( sFileName, sURL );
- uno::Sequence storeProps{ comphelper::makePropertyValue("FilterName",
-
OUString("writer_png_Export")) };
+ uno::Sequence storeProps{ comphelper::makePropertyValue(u"FilterName"_ustr,
+
u"writer_png_Export"_ustr) };
uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW
);
xStor->storeToURL( sURL, storeProps );
@@ -666,7 +666,7 @@ SwVbaDocument::getValue( const OUString& aPropertyName )
uno::Reference< drawing::XControlShape > xControlShape( getControlShape(
aPropertyName ), uno::UNO_QUERY_THROW );
uno::Reference<lang::XMultiComponentFactory > xServiceManager(
mxContext->getServiceManager(), uno::UNO_SET_THROW );
- uno::Reference< XControlProvider > xControlProvider(
xServiceManager->createInstanceWithContext("ooo.vba.ControlProvider", mxContext
), uno::UNO_QUERY_THROW );
+ uno::Reference< XControlProvider > xControlProvider(
xServiceManager->createInstanceWithContext(u"ooo.vba.ControlProvider"_ustr,
mxContext ), uno::UNO_QUERY_THROW );
uno::Reference< msforms::XControl > xControl(
xControlProvider->createControl( xControlShape, getModel() ) );
return uno::Any( xControl );
}
@@ -711,7 +711,7 @@ SwVbaDocument::getFormControls() const
OUString SAL_CALL
SwVbaDocument::getIID()
{
- return "{82154424-0FBF-11d4-8313-005004526AB4}";
+ return u"{82154424-0FBF-11d4-8313-005004526AB4}"_ustr;
}
// XConnectable
@@ -719,7 +719,7 @@ SwVbaDocument::getIID()
OUString SAL_CALL
SwVbaDocument::GetIIDForClassItselfNotCoclass()
{
- return "{82154428-0FBF-11D4-8313-005004526AB4}";
+ return u"{82154428-0FBF-11D4-8313-005004526AB4}"_ustr;
}
TypeAndIID SAL_CALL
@@ -727,7 +727,7 @@ SwVbaDocument::GetConnectionPoint()
{
TypeAndIID aResult =
{ cppu::UnoType<word::XDocumentOutgoing>::get(),
- "{82154429-0FBF-11D4-8313-005004526AB4}"
+ u"{82154429-0FBF-11D4-8313-005004526AB4}"_ustr
};
return aResult;
@@ -778,7 +778,7 @@ SwVbaDocument::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Document"
+ u"ooo.vba.word.Document"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx
b/sw/source/ui/vba/vbadocumentproperties.cxx
index 6d5f06830f47..3cdeba36e5ac 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -463,7 +463,7 @@ public:
virtual OUString SAL_CALL getLinkSource( ) override;
virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) override;
//XDefaultProperty
- virtual OUString SAL_CALL getDefaultPropertyName( ) override { return
"Value"; }
+ virtual OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
// XHelperInterface
virtual OUString getServiceImplName() override;
virtual uno::Sequence<OUString> getServiceNames() override;
@@ -622,7 +622,7 @@ SwVbaBuiltInDocumentProperty::setLinkSource( const
OUString& /*LinkSource*/ )
OUString
SwVbaBuiltInDocumentProperty::getServiceImplName()
{
- return "SwVbaBuiltinDocumentProperty";
+ return u"SwVbaBuiltinDocumentProperty"_ustr;
}
uno::Sequence<OUString>
@@ -630,7 +630,7 @@ SwVbaBuiltInDocumentProperty::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.DocumentProperty"
+ u"ooo.vba.word.DocumentProperty"_ustr
};
return aServiceNames;
}
@@ -751,7 +751,7 @@
SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Refer
uno::Reference< XDocumentProperty > SAL_CALL
SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, sal_Bool
/*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const
uno::Any& /*LinkSource*/ )
{
- throw uno::RuntimeException( "not supported for Builtin properties" );
+ throw uno::RuntimeException( u"not supported for Builtin properties"_ustr
);
}
// XEnumerationAccess
@@ -780,7 +780,7 @@ SwVbaBuiltinDocumentProperties::createCollectionObject(
const uno::Any& aSource
OUString
SwVbaBuiltinDocumentProperties::getServiceImplName()
{
- return "SwVbaBuiltinDocumentProperties";
+ return u"SwVbaBuiltinDocumentProperties"_ustr;
}
uno::Sequence<OUString>
@@ -788,7 +788,7 @@ SwVbaBuiltinDocumentProperties::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.DocumentProperties"
+ u"ooo.vba.word.DocumentProperties"_ustr
};
return aServiceNames;
}
@@ -915,7 +915,7 @@ SwVbaCustomDocumentProperties::Add( const OUString& Name,
sal_Bool LinkToContent
OUString
SwVbaCustomDocumentProperties::getServiceImplName()
{
- return "SwVbaCustomDocumentProperties";
+ return u"SwVbaCustomDocumentProperties"_ustr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbadocuments.cxx
b/sw/source/ui/vba/vbadocuments.cxx
index ca5f2985553f..47fdce3cf913 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -145,7 +145,7 @@ SwVbaDocuments::OpenOld( const OUString& FileName, const
uno::Any& ConfirmConver
OUString
SwVbaDocuments::getServiceImplName()
{
- return "SwVbaDocuments";
+ return u"SwVbaDocuments"_ustr;
}
uno::Sequence<OUString>
@@ -153,7 +153,7 @@ SwVbaDocuments::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.Documents"
+ u"ooo.vba.word.Documents"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx
b/sw/source/ui/vba/vbaeventshelper.cxx
index d928eaba16f2..de1ff39c0a93 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -66,13 +66,13 @@ OUString SwVbaEventsHelper::implGetDocumentModuleName(
const EventHandlerInfo& /
const uno::Sequence< uno::Any >& /*rArgs*/ ) const
{
// TODO: get actual codename from document
- return "ThisDocument";
+ return u"ThisDocument"_ustr;
}
// XServiceInfo
OUString SwVbaEventsHelper::getImplementationName()
{
- return "SwVbaEventsHelper";
+ return u"SwVbaEventsHelper"_ustr;
}
sal_Bool SwVbaEventsHelper::supportsService( const OUString& ServiceName )
{
@@ -80,7 +80,7 @@ sal_Bool SwVbaEventsHelper::supportsService( const OUString&
ServiceName )
}
css::uno::Sequence< OUString > SwVbaEventsHelper::getSupportedServiceNames()
{
- return { "com.sun.star.script.vba.VBATextEventProcessor" };
+ return { u"com.sun.star.script.vba.VBATextEventProcessor"_ustr };
}
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index ded84a6d8b21..75e5ee5ce965 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -54,7 +54,7 @@ sal_Bool SAL_CALL SwVbaField::Update()
OUString
SwVbaField::getServiceImplName()
{
- return "SwVbaField";
+ return u"SwVbaField"_ustr;
}
uno::Sequence<OUString>
@@ -62,7 +62,7 @@ SwVbaField::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Field"
+ u"ooo.vba.word.Field"_ustr
};
return aServiceNames;
}
@@ -337,7 +337,7 @@ SwVbaFields::Add( const css::uno::Reference<
::ooo::vba::word::XRange >& Range,
}
else
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
SwVbaRange& rVbaRange = dynamic_cast<SwVbaRange&>(*Range);
@@ -349,7 +349,7 @@ SwVbaFields::Add( const css::uno::Reference<
::ooo::vba::word::XRange >& Range,
uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const
OUString& _text )
{
- uno::Reference< text::XTextField > xTextField(
mxMSF->createInstance("com.sun.star.text.TextField.FileName"),
uno::UNO_QUERY_THROW );
+ uno::Reference< text::XTextField > xTextField(
mxMSF->createInstance(u"com.sun.star.text.TextField.FileName"_ustr),
uno::UNO_QUERY_THROW );
sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT;
if( !_text.isEmpty() )
{
@@ -374,7 +374,7 @@ uno::Reference< text::XTextField >
SwVbaFields::Create_Field_FileName( const OUS
}
uno::Reference< beans::XPropertySet > xProps( xTextField,
uno::UNO_QUERY_THROW );
- xProps->setPropertyValue("FileFormat", uno::Any( nFileFormat ) );
+ xProps->setPropertyValue(u"FileFormat"_ustr, uno::Any( nFileFormat ) );
return xTextField;
}
@@ -466,7 +466,7 @@ uno::Reference< text::XTextField >
SwVbaFields::Create_Field_DocProperty( const
}
else if( sFieldService.isEmpty() )
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
uno::Reference< text::XTextField > xTextField( mxMSF->createInstance(
sFieldService ), uno::UNO_QUERY_THROW );
@@ -474,7 +474,7 @@ uno::Reference< text::XTextField >
SwVbaFields::Create_Field_DocProperty( const
if( bCustom )
{
uno::Reference< beans::XPropertySet > xProps( xTextField,
uno::UNO_QUERY_THROW );
- xProps->setPropertyValue("Name", uno::Any( aDocProperty ) );
+ xProps->setPropertyValue(u"Name"_ustr, uno::Any( aDocProperty ) );
}
return xTextField;
@@ -515,7 +515,7 @@ sal_Int32 SAL_CALL SwVbaFields::Update()
OUString
SwVbaFields::getServiceImplName()
{
- return "SwVbaFields";
+ return u"SwVbaFields"_ustr;
}
// XEnumerationAccess
@@ -530,7 +530,7 @@ SwVbaFields::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Fields"
+ u"ooo.vba.word.Fields"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbafilterpropsfromformat.hxx
b/sw/source/ui/vba/vbafilterpropsfromformat.hxx
index cde1da0b4dc0..f6b17dd98698 100644
--- a/sw/source/ui/vba/vbafilterpropsfromformat.hxx
+++ b/sw/source/ui/vba/vbafilterpropsfromformat.hxx
@@ -40,7 +40,7 @@ inline bool setFilterPropsFromFormat(sal_Int32 nFormat,
switch (nFormat)
{
case ooo::vba::word::WdSaveFormat::wdFormatDocument:
- pProp->Value <<= OUString("MS Word 97");
+ pProp->Value <<= u"MS Word 97"_ustr;
break;
// Just save all the text formats as "Text"
case ooo::vba::word::WdSaveFormat::wdFormatDOSText:
@@ -48,22 +48,22 @@ inline bool setFilterPropsFromFormat(sal_Int32 nFormat,
case ooo::vba::word::WdSaveFormat::wdFormatEncodedText:
case ooo::vba::word::WdSaveFormat::wdFormatText:
case ooo::vba::word::WdSaveFormat::wdFormatTextLineBreaks:
- pProp->Value <<= OUString("Text");
+ pProp->Value <<= u"Text"_ustr;
break;
case ooo::vba::word::WdSaveFormat::wdFormatFilteredHTML:
case ooo::vba::word::WdSaveFormat::wdFormatHTML:
- pProp->Value <<= OUString("HTML");
+ pProp->Value <<= u"HTML"_ustr;
break;
case ooo::vba::word::WdSaveFormat::wdFormatRTF:
- pProp->Value <<= OUString("Rich Text Format");
+ pProp->Value <<= u"Rich Text Format"_ustr;
break;
case ooo::vba::word::WdSaveFormat::wdFormatTemplate:
- pProp->Value <<= OUString("MS Word 97 Vorlage");
+ pProp->Value <<= u"MS Word 97 Vorlage"_ustr;
break;
// Default to "MS Word 97"
default:
- pProp->Value <<= OUString("MS Word 97");
+ pProp->Value <<= u"MS Word 97"_ustr;
break;
}
return true;
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 892e062f3cdf..bd80d19c4fba 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -212,20 +212,20 @@ uno::Any SAL_CALL SwVbaFind::getReplacement()
void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ )
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
sal_Bool SAL_CALL SwVbaFind::getForward()
{
bool bBackward = false;
- mxPropertyReplace->getPropertyValue("SearchBackwards") >>= bBackward;
+ mxPropertyReplace->getPropertyValue(u"SearchBackwards"_ustr) >>= bBackward;
return !bBackward;
}
void SAL_CALL SwVbaFind::setForward( sal_Bool _forward )
{
bool bBackward = !_forward;
- mxPropertyReplace->setPropertyValue("SearchBackwards", uno::Any( bBackward
) );
+ mxPropertyReplace->setPropertyValue(u"SearchBackwards"_ustr, uno::Any(
bBackward ) );
}
::sal_Int32 SAL_CALL SwVbaFind::getWrap()
@@ -253,76 +253,76 @@ void SAL_CALL SwVbaFind::setFormat( sal_Bool _format )
sal_Bool SAL_CALL SwVbaFind::getMatchCase()
{
bool value = false;
- mxPropertyReplace->getPropertyValue("SearchCaseSensitive") >>= value;
+ mxPropertyReplace->getPropertyValue(u"SearchCaseSensitive"_ustr) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase )
{
- mxPropertyReplace->setPropertyValue("SearchCaseSensitive", uno::Any(
_matchcase ) );
+ mxPropertyReplace->setPropertyValue(u"SearchCaseSensitive"_ustr, uno::Any(
_matchcase ) );
}
sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord()
{
bool value = false;
- mxPropertyReplace->getPropertyValue("SearchWords") >>= value;
+ mxPropertyReplace->getPropertyValue(u"SearchWords"_ustr) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword )
{
- mxPropertyReplace->setPropertyValue("SearchWords", uno::Any(
_matchwholeword ) );
+ mxPropertyReplace->setPropertyValue(u"SearchWords"_ustr, uno::Any(
_matchwholeword ) );
}
sal_Bool SAL_CALL SwVbaFind::getMatchWildcards()
{
bool value = false;
- mxPropertyReplace->getPropertyValue("SearchRegularExpression") >>= value;
+ mxPropertyReplace->getPropertyValue(u"SearchRegularExpression"_ustr) >>=
value;
return value;
}
void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards )
{
- mxPropertyReplace->setPropertyValue("SearchRegularExpression", uno::Any(
_matchwildcards ) );
+ mxPropertyReplace->setPropertyValue(u"SearchRegularExpression"_ustr,
uno::Any( _matchwildcards ) );
}
sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike()
{
bool value = false;
- mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
+ mxPropertyReplace->getPropertyValue(u"SearchSimilarity"_ustr) >>= value;
return value;
}
void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike )
{
// seems not accurate
- mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::Any(
_matchsoundslike ) );
+ mxPropertyReplace->setPropertyValue(u"SearchSimilarity"_ustr, uno::Any(
_matchsoundslike ) );
}
sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms()
{
bool value = false;
- mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
+ mxPropertyReplace->getPropertyValue(u"SearchSimilarity"_ustr) >>= value;
if( value )
- mxPropertyReplace->getPropertyValue("SearchSimilarityRelax") >>= value;
+ mxPropertyReplace->getPropertyValue(u"SearchSimilarityRelax"_ustr) >>=
value;
return value;
}
void SAL_CALL SwVbaFind::setMatchAllWordForms( sal_Bool _matchallwordforms )
{
// seems not accurate
- mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::Any(
_matchallwordforms ) );
- mxPropertyReplace->setPropertyValue("SearchSimilarityRelax", uno::Any(
_matchallwordforms ) );
+ mxPropertyReplace->setPropertyValue(u"SearchSimilarity"_ustr, uno::Any(
_matchallwordforms ) );
+ mxPropertyReplace->setPropertyValue(u"SearchSimilarityRelax"_ustr,
uno::Any( _matchallwordforms ) );
}
uno::Any SAL_CALL SwVbaFind::getStyle()
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ )
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
sal_Bool SAL_CALL
@@ -415,7 +415,7 @@ SwVbaFind::ClearFormatting( )
OUString
SwVbaFind::getServiceImplName()
{
- return "SwVbaFind";
+ return u"SwVbaFind"_ustr;
}
uno::Sequence< OUString >
@@ -423,7 +423,7 @@ SwVbaFind::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Find"
+ u"ooo.vba.word.Find"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index 91a31ec66470..2fec9d3b0ba0 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -82,7 +82,7 @@ private:
public:
static OUString propName()
{
- return "CharUnderline";
+ return u"CharUnderline"_ustr;
}
static UnderLineMapper& instance()
@@ -139,7 +139,7 @@ SwVbaFont::setUnderline( const uno::Any& _underline )
OUString
SwVbaFont::getServiceImplName()
{
- return "SwVbaFont";
+ return u"SwVbaFont"_ustr;
}
uno::Any SAL_CALL
@@ -227,7 +227,7 @@ SwVbaFont::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Font"
+ u"ooo.vba.word.Font"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaformfield.cxx
b/sw/source/ui/vba/vbaformfield.cxx
index cb1351fa74b9..faecbd60f9b9 100644
--- a/sw/source/ui/vba/vbaformfield.cxx
+++ b/sw/source/ui/vba/vbaformfield.cxx
@@ -132,7 +132,7 @@ uno::Reference<word::XRange> SwVbaFormField::Range()
return xRet;
}
-OUString SwVbaFormField::getDefaultPropertyName() { return "Type"; }
+OUString SwVbaFormField::getDefaultPropertyName() { return u"Type"_ustr; }
sal_Int32 SwVbaFormField::getType()
{
@@ -169,25 +169,25 @@ void SwVbaFormField::setEnabled(sal_Bool /*bSet*/)
OUString SwVbaFormField::getEntryMacro()
{
OUString sMacro;
- (*m_rFormField.GetParameters())["EntryMacro"] >>= sMacro;
+ (*m_rFormField.GetParameters())[u"EntryMacro"_ustr] >>= sMacro;
return sMacro;
}
void SwVbaFormField::setEntryMacro(const OUString& rSet)
{
- (*m_rFormField.GetParameters())["EntryMacro"] <<= rSet;
+ (*m_rFormField.GetParameters())[u"EntryMacro"_ustr] <<= rSet;
}
OUString SwVbaFormField::getExitMacro()
{
OUString sMacro;
- (*m_rFormField.GetParameters())["ExitMacro"] >>= sMacro;
+ (*m_rFormField.GetParameters())[u"ExitMacro"_ustr] >>= sMacro;
return sMacro;
}
void SwVbaFormField::setExitMacro(const OUString& rSet)
{
- (*m_rFormField.GetParameters())["ExitMacro"] <<= rSet;
+ (*m_rFormField.GetParameters())[u"ExitMacro"_ustr] <<= rSet;
}
OUString SwVbaFormField::getHelpText() { return
m_rFormField.GetFieldHelptext(); }
@@ -217,7 +217,7 @@ OUString SwVbaFormField::getResult() { return
m_rFormField.GetContent(); }
void SwVbaFormField::setResult(const OUString& rSet)
{
if (dynamic_cast<sw::mark::ICheckboxFieldmark*>(&m_rFormField))
- m_rFormField.ReplaceContent("false");
+ m_rFormField.ReplaceContent(u"false"_ustr);
else
m_rFormField.ReplaceContent(rSet);
}
@@ -244,11 +244,11 @@ void SwVbaFormField::setOwnStatus(sal_Bool /*bSet*/)
SAL_INFO("sw.vba", "SwVbaFormField::setOwnStatus stub");
}
-OUString SwVbaFormField::getServiceImplName() { return "SwVbaFormField"; }
+OUString SwVbaFormField::getServiceImplName() { return u"SwVbaFormField"_ustr;
}
uno::Sequence<OUString> SwVbaFormField::getServiceNames()
{
- static uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.FormField" };
+ static uno::Sequence<OUString> const aServiceNames{
u"ooo.vba.word.FormField"_ustr };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaformfieldcheckbox.cxx
b/sw/source/ui/vba/vbaformfieldcheckbox.cxx
index 5a32e7e426a4..caf9d96397e8 100644
--- a/sw/source/ui/vba/vbaformfieldcheckbox.cxx
+++ b/sw/source/ui/vba/vbaformfieldcheckbox.cxx
@@ -31,7 +31,7 @@ SwVbaFormFieldCheckBox::SwVbaFormFieldCheckBox(
SwVbaFormFieldCheckBox::~SwVbaFormFieldCheckBox() {}
-OUString SwVbaFormFieldCheckBox::getDefaultPropertyName() { return "Valid"; }
+OUString SwVbaFormFieldCheckBox::getDefaultPropertyName() { return
u"Valid"_ustr; }
sal_Bool SwVbaFormFieldCheckBox::getValid()
{
@@ -106,11 +106,11 @@ void SwVbaFormFieldCheckBox::setValue(sal_Bool bSet)
m_pCheckBox->SetChecked(bSet);
}
-OUString SwVbaFormFieldCheckBox::getServiceImplName() { return
"SwVbaFormFieldCheckBox"; }
+OUString SwVbaFormFieldCheckBox::getServiceImplName() { return
u"SwVbaFormFieldCheckBox"_ustr; }
uno::Sequence<OUString> SwVbaFormFieldCheckBox::getServiceNames()
{
- static uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.CheckBox" };
+ static uno::Sequence<OUString> const aServiceNames{
u"ooo.vba.word.CheckBox"_ustr };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaformfielddropdown.cxx
b/sw/source/ui/vba/vbaformfielddropdown.cxx
index f1edc8140357..08648fb05065 100644
--- a/sw/source/ui/vba/vbaformfielddropdown.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdown.cxx
@@ -32,7 +32,7 @@ SwVbaFormFieldDropDown::SwVbaFormFieldDropDown(
SwVbaFormFieldDropDown::~SwVbaFormFieldDropDown() {}
-OUString SwVbaFormFieldDropDown::getDefaultPropertyName() { return "Valid"; }
+OUString SwVbaFormFieldDropDown::getDefaultPropertyName() { return
u"Valid"_ustr; }
sal_Bool SwVbaFormFieldDropDown::getValid()
{
@@ -88,11 +88,11 @@ uno::Any SwVbaFormFieldDropDown::ListEntries(const
uno::Any& rIndex)
return uno::Any(xCol);
}
-OUString SwVbaFormFieldDropDown::getServiceImplName() { return
"SwVbaFormFieldDropDown"; }
+OUString SwVbaFormFieldDropDown::getServiceImplName() { return
u"SwVbaFormFieldDropDown"_ustr; }
uno::Sequence<OUString> SwVbaFormFieldDropDown::getServiceNames()
{
- static uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.DropDown" };
+ static uno::Sequence<OUString> const aServiceNames{
u"ooo.vba.word.DropDown"_ustr };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
index aba385aef820..6f77079e1b6d 100644
--- a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
@@ -150,12 +150,12 @@ uno::Any
SwVbaFormFieldDropDownListEntries::createCollectionObject(const uno::An
OUString SwVbaFormFieldDropDownListEntries::getServiceImplName()
{
- return "SwVbaFormFieldDropDownListEntries";
+ return u"SwVbaFormFieldDropDownListEntries"_ustr;
}
uno::Sequence<OUString> SwVbaFormFieldDropDownListEntries::getServiceNames()
{
- static uno::Sequence<OUString> const sNames{ "ooo.vba.word.ListEntries" };
+ static uno::Sequence<OUString> const sNames{
u"ooo.vba.word.ListEntries"_ustr };
return sNames;
}
diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx
b/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx
index bc02439ed5fd..10d58e113eb7 100644
--- a/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx
@@ -44,12 +44,12 @@ void SwVbaFormFieldDropDownListEntry::Delete() {
m_rDropDown.DelContent(m_nZInde
// XHelperInterface
OUString SwVbaFormFieldDropDownListEntry::getServiceImplName()
{
- return "SwVbaFormFieldDropDownListEntry";
+ return u"SwVbaFormFieldDropDownListEntry"_ustr;
}
uno::Sequence<OUString> SwVbaFormFieldDropDownListEntry::getServiceNames()
{
- static uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.ListEntry" };
+ static uno::Sequence<OUString> const aServiceNames{
u"ooo.vba.word.ListEntry"_ustr };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaformfields.cxx
b/sw/source/ui/vba/vbaformfields.cxx
index 9c8af450d345..426bb78a53c8 100644
--- a/sw/source/ui/vba/vbaformfields.cxx
+++ b/sw/source/ui/vba/vbaformfields.cxx
@@ -224,11 +224,11 @@ uno::Reference<container::XEnumeration>
SwVbaFormFields::createEnumeration()
uno::Any SwVbaFormFields::createCollectionObject(const uno::Any& aSource) {
return aSource; }
-OUString SwVbaFormFields::getServiceImplName() { return "SwVbaFormFields"; }
+OUString SwVbaFormFields::getServiceImplName() { return
u"SwVbaFormFields"_ustr; }
uno::Sequence<OUString> SwVbaFormFields::getServiceNames()
{
- static uno::Sequence<OUString> const sNames{ "ooo.vba.word.FormFields" };
+ static uno::Sequence<OUString> const sNames{
u"ooo.vba.word.FormFields"_ustr };
return sNames;
}
diff --git a/sw/source/ui/vba/vbaformfieldtextinput.cxx
b/sw/source/ui/vba/vbaformfieldtextinput.cxx
index 4f78761f4eb1..c4188491ca3f 100644
--- a/sw/source/ui/vba/vbaformfieldtextinput.cxx
+++ b/sw/source/ui/vba/vbaformfieldtextinput.cxx
@@ -33,7 +33,7 @@ SwVbaFormFieldTextInput::SwVbaFormFieldTextInput(
SwVbaFormFieldTextInput::~SwVbaFormFieldTextInput() {}
-OUString SwVbaFormFieldTextInput::getDefaultPropertyName() { return "Valid"; }
+OUString SwVbaFormFieldTextInput::getDefaultPropertyName() { return
u"Valid"_ustr; }
sal_Bool SwVbaFormFieldTextInput::getValid()
{
@@ -102,7 +102,7 @@ void SwVbaFormFieldTextInput::Clear()
if (!getValid() || m_rTextInput.GetContent().isEmpty())
return;
- m_rTextInput.ReplaceContent("");
+ m_rTextInput.ReplaceContent(u""_ustr);
}
void SwVbaFormFieldTextInput::EditType(sal_Int32 nType, const uno::Any&
rDefault,
@@ -119,11 +119,11 @@ void SwVbaFormFieldTextInput::EditType(sal_Int32 nType,
const uno::Any& rDefault
<< "] bEnabled[" << bEnabled << "] stub");
}
-OUString SwVbaFormFieldTextInput::getServiceImplName() { return
"SwVbaFormFieldTextInput"; }
+OUString SwVbaFormFieldTextInput::getServiceImplName() { return
u"SwVbaFormFieldTextInput"_ustr; }
uno::Sequence<OUString> SwVbaFormFieldTextInput::getServiceNames()
{
- static uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.TextInput" };
+ static uno::Sequence<OUString> const aServiceNames{
u"ooo.vba.word.TextInput"_ustr };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx
index b3a0180fb1d5..009fdec250a7 100644
--- a/sw/source/ui/vba/vbaframe.cxx
+++ b/sw/source/ui/vba/vbaframe.cxx
@@ -42,7 +42,7 @@ void SAL_CALL SwVbaFrame::Select()
OUString
SwVbaFrame::getServiceImplName()
{
- return "SwVbaFrame";
+ return u"SwVbaFrame"_ustr;
}
uno::Sequence< OUString >
@@ -50,7 +50,7 @@ SwVbaFrame::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Frame"
+ u"ooo.vba.word.Frame"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index 376082054b18..ff15f17f6827 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -84,7 +84,7 @@ SwVbaFrames::createCollectionObject( const css::uno::Any&
aSource )
OUString
SwVbaFrames::getServiceImplName()
{
- return "SwVbaFrames";
+ return u"SwVbaFrames"_ustr;
}
css::uno::Sequence<OUString>
@@ -92,7 +92,7 @@ SwVbaFrames::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.Frames"
+ u"ooo.vba.word.Frames"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 3e9f7dbefef0..e6c585576345 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -193,13 +193,13 @@ float SAL_CALL SwVbaGlobals::PointsToPicas( float Points )
OUString
SwVbaGlobals::getServiceImplName()
{
- return "SwVbaGlobals";
+ return u"SwVbaGlobals"_ustr;
}
uno::Sequence< OUString >
SwVbaGlobals::getServiceNames()
{
- return { "ooo.vba.word.Globals" };
+ return { u"ooo.vba.word.Globals"_ustr };
}
uno::Sequence< OUString >
@@ -207,10 +207,10 @@ SwVbaGlobals::getAvailableServiceNames( )
{
static const uno::Sequence<OUString> serviceNames =
comphelper::concatSequences(
SwVbaGlobals_BASE::getAvailableServiceNames(),
- uno::Sequence<OUString>{ "ooo.vba.word.Document",
+ uno::Sequence<OUString>{ u"ooo.vba.word.Document"_ustr,
// "ooo.vba.word.Globals",
// "ooo.vba.word.WrapFormat",
-
"com.sun.star.script.vba.VBATextEventProcessor" });
+
u"com.sun.star.script.vba.VBATextEventProcessor"_ustr });
return serviceNames;
}
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx
b/sw/source/ui/vba/vbaheaderfooter.cxx
index a031b0ecdaab..9b25ce7bb52c 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -86,7 +86,7 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index )
OUString
SwVbaHeaderFooter::getServiceImplName()
{
- return "SwVbaHeaderFooter";
+ return u"SwVbaHeaderFooter"_ustr;
}
uno::Sequence< OUString >
@@ -94,7 +94,7 @@ SwVbaHeaderFooter::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Pane"
+ u"ooo.vba.word.Pane"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index 987088b6a5ad..11f93f456b7c 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -48,11 +48,11 @@ bool HeaderFooterHelper::isHeader( const uno::Reference<
frame::XModel >& xModel
if( !isHeaderFooter( xCurrentText ) )
return false;
- OUString aPropText = "HeaderText";
+ OUString aPropText = u"HeaderText"_ustr;
uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle(
xModel );
uno::Reference< beans::XPropertySet > xPageProps( xPageStyle,
uno::UNO_QUERY_THROW );
bool isShared = true;
- xPageProps->getPropertyValue( "HeaderIsShared" ) >>= isShared;
+ xPageProps->getPropertyValue( u"HeaderIsShared"_ustr ) >>= isShared;
if( !isShared )
{
uno::Reference< text::XPageCursor > xPageCursor(
word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
@@ -97,7 +97,7 @@ bool HeaderFooterHelper::isEvenPagesHeader( const
uno::Reference< frame::XModel
{
uno::Reference< beans::XPropertySet > xStyleProps(
word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
bool isShared = false;
- xStyleProps->getPropertyValue("HeaderIsShared") >>= isShared;
+ xStyleProps->getPropertyValue(u"HeaderIsShared"_ustr) >>= isShared;
if( !isShared )
{
uno::Reference< text::XPageCursor > xPageCursor(
word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
@@ -113,11 +113,11 @@ bool HeaderFooterHelper::isFooter( const uno::Reference<
frame::XModel >& xModel
if( !isHeaderFooter( xCurrentText ) )
return false;
- OUString aPropText = "FooterText";
+ OUString aPropText = u"FooterText"_ustr;
uno::Reference< style::XStyle > xPageStyle = word::getCurrentPageStyle(
xModel );
uno::Reference< beans::XPropertySet > xPageProps( xPageStyle,
uno::UNO_QUERY_THROW );
bool isShared = true;
- xPageProps->getPropertyValue( "FooterIsShared" ) >>= isShared;
+ xPageProps->getPropertyValue( u"FooterIsShared"_ustr ) >>= isShared;
if( !isShared )
{
uno::Reference< text::XPageCursor > xPageCursor(
word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
@@ -161,7 +161,7 @@ bool HeaderFooterHelper::isEvenPagesFooter( const
uno::Reference< frame::XModel
{
uno::Reference< beans::XPropertySet > xStyleProps(
word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
bool isShared = false;
- xStyleProps->getPropertyValue("FooterIsShared") >>= isShared;
+ xStyleProps->getPropertyValue(u"FooterIsShared"_ustr) >>= isShared;
if( !isShared )
{
uno::Reference< text::XPageCursor > xPageCursor(
word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx
b/sw/source/ui/vba/vbaheadersfooters.cxx
index be205d8e13db..a683060a1492 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -125,7 +125,7 @@ SwVbaHeadersFooters::createCollectionObject( const
uno::Any& aSource )
OUString
SwVbaHeadersFooters::getServiceImplName()
{
- return "SwVbaHeadersFooters";
+ return u"SwVbaHeadersFooters"_ustr;
}
uno::Sequence<OUString>
@@ -133,7 +133,7 @@ SwVbaHeadersFooters::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.HeadersFooters"
+ u"ooo.vba.word.HeadersFooters"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbainformationhelper.cxx
b/sw/source/ui/vba/vbainformationhelper.cxx
index 9cda14b7b237..a38d7c058acd 100644
--- a/sw/source/ui/vba/vbainformationhelper.cxx
+++ b/sw/source/ui/vba/vbainformationhelper.cxx
@@ -48,7 +48,7 @@ double
SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css
xTVCursor->collapseToStart();
uno::Reference< beans::XPropertySet > xStyleProps(
word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
sal_Int32 nTopMargin = 0;
- xStyleProps->getPropertyValue( "TopMargin" ) >>= nTopMargin;
+ xStyleProps->getPropertyValue( u"TopMargin"_ustr ) >>= nTopMargin;
sal_Int32 nCurrentPos = xTVCursor->getPosition().Y;
sal_Int32 nCurrentPage = handleWdActiveEndPageNumber( xTVCursor );
diff --git a/sw/source/ui/vba/vbalistformat.cxx
b/sw/source/ui/vba/vbalistformat.cxx
index efcbf2dbe874..229c9c459e63 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -84,16 +84,16 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const
css::uno::Reference< wor
if( isFirstElement )
{
bool isNumberingRestart = !bContinuePreviousList;
- xProps->setPropertyValue("ParaIsNumberingRestart", uno::Any(
isNumberingRestart ) );
+ xProps->setPropertyValue(u"ParaIsNumberingRestart"_ustr, uno::Any(
isNumberingRestart ) );
if( isNumberingRestart )
{
- xProps->setPropertyValue("NumberingStartValue", uno::Any(
sal_Int16(1) ) );
+ xProps->setPropertyValue(u"NumberingStartValue"_ustr,
uno::Any( sal_Int16(1) ) );
}
isFirstElement = false;
}
else
{
- xProps->setPropertyValue("ParaIsNumberingRestart", uno::Any( false
) );
+ xProps->setPropertyValue(u"ParaIsNumberingRestart"_ustr, uno::Any(
false ) );
}
rListTemplate.applyListTemplate( xProps );
}
@@ -106,11 +106,11 @@ static void addParagraphsToList(const Ref& a,
{
if (css::uno::Reference<css::lang::XServiceInfo> xInfo{ a,
css::uno::UNO_QUERY })
{
- if (xInfo->supportsService("com.sun.star.text.Paragraph"))
+ if (xInfo->supportsService(u"com.sun.star.text.Paragraph"_ustr))
{
rList.emplace_back(xInfo, css::uno::UNO_QUERY_THROW);
}
- else if (xInfo->supportsService("com.sun.star.text.TextTable"))
+ else if (xInfo->supportsService(u"com.sun.star.text.TextTable"_ustr))
{
css::uno::Reference<css::text::XTextTable> xTable(xInfo,
css::uno::UNO_QUERY_THROW);
const auto aNames = xTable->getCellNames();
@@ -135,7 +135,7 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
css::uno::Reference<css::document::XUndoManagerSupplier> xUndoSupplier(
xModel, css::uno::UNO_QUERY_THROW);
css::uno::Reference<css::document::XUndoManager>
xUndoManager(xUndoSupplier->getUndoManager());
- xUndoManager->enterUndoContext("ConvertNumbersToText");
+ xUndoManager->enterUndoContext(u"ConvertNumbersToText"_ustr);
xModel->lockControllers();
comphelper::ScopeGuard g([xModel, xUndoManager]() {
xModel->unlockControllers();
@@ -149,11 +149,11 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
for (auto iter = aParagraphs.rbegin(); iter != aParagraphs.rend(); ++iter)
{
auto& rPropertySet = *iter;
- if (bool bNumber; (rPropertySet->getPropertyValue("NumberingIsNumber")
>>= bNumber) && bNumber)
+ if (bool bNumber;
(rPropertySet->getPropertyValue(u"NumberingIsNumber"_ustr) >>= bNumber) &&
bNumber)
{
css::uno::Reference<css::text::XTextRange> xRange(rPropertySet,
css::uno::UNO_QUERY_THROW);
OUString sLabelString;
- rPropertySet->getPropertyValue("ListLabelString") >>= sLabelString;
+ rPropertySet->getPropertyValue(u"ListLabelString"_ustr) >>=
sLabelString;
// sal_Int16 nAdjust = SAL_MAX_INT16; // TODO?
sal_Int16 nNumberingType = SAL_MAX_INT16; //
css::style::NumberingType
sal_Int16 nPositionAndSpaceMode = SAL_MAX_INT16;
@@ -172,31 +172,31 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
{
sal_uInt16 nLevel = SAL_MAX_UINT16;
- rPropertySet->getPropertyValue("NumberingLevel") >>= nLevel;
+ rPropertySet->getPropertyValue(u"NumberingLevel"_ustr) >>=
nLevel;
css::uno::Reference<css::container::XIndexAccess>
xNumberingRules;
- rPropertySet->getPropertyValue("NumberingRules") >>=
xNumberingRules;
+ rPropertySet->getPropertyValue(u"NumberingRules"_ustr) >>=
xNumberingRules;
comphelper::SequenceAsHashMap
aLevelRule(xNumberingRules->getByIndex(nLevel));
// See offapi/com/sun/star/text/NumberingLevel.idl
- aLevelRule["CharStyleName"] >>= sCharStyleName;
- aLevelRule["NumberingType"] >>= nNumberingType;
+ aLevelRule[u"CharStyleName"_ustr] >>= sCharStyleName;
+ aLevelRule[u"NumberingType"_ustr] >>= nNumberingType;
// TODO: aLevelRule["Adjust"] >>= nAdjust; //
HoriOrientation::LEFT/RIGHT/CENTER
- aLevelRule["PositionAndSpaceMode"] >>= nPositionAndSpaceMode;
+ aLevelRule[u"PositionAndSpaceMode"_ustr] >>=
nPositionAndSpaceMode;
// for css::text::PositionAndSpaceMode::LABEL_ALIGNMENT
- aLevelRule["LabelFollowedBy"] >>= nLabelFollowedBy;
- aLevelRule["ListtabStopPosition"] >>= nListtabStopPosition;
- aLevelRule["FirstLineIndent"] >>= nFirstLineIndent;
- aLevelRule["IndentAt"] >>= nIndentAt;
+ aLevelRule[u"LabelFollowedBy"_ustr] >>= nLabelFollowedBy;
+ aLevelRule[u"ListtabStopPosition"_ustr] >>=
nListtabStopPosition;
+ aLevelRule[u"FirstLineIndent"_ustr] >>= nFirstLineIndent;
+ aLevelRule[u"IndentAt"_ustr] >>= nIndentAt;
// for
css::text::PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION
- aLevelRule["LeftMargin"] >>= nLeftMargin;
- aLevelRule["SymbolTextDistance"] >>= nSymbolTextDistance;
- aLevelRule["FirstLineOffset"] >>= nFirstLineOffset;
+ aLevelRule[u"LeftMargin"_ustr] >>= nLeftMargin;
+ aLevelRule[u"SymbolTextDistance"_ustr] >>= nSymbolTextDistance;
+ aLevelRule[u"FirstLineOffset"_ustr] >>= nFirstLineOffset;
- aLevelRule["BulletChar"] >>= sBulletChar;
- bHasFont = (aLevelRule["BulletFont"] >>= aBulletFont);
- bHasColor = (aLevelRule["BulletColor"] >>= aBulletColor);
+ aLevelRule[u"BulletChar"_ustr] >>= sBulletChar;
+ bHasFont = (aLevelRule[u"BulletFont"_ustr] >>= aBulletFont);
+ bHasColor = (aLevelRule[u"BulletColor"_ustr] >>= aBulletColor);
}
if (nNumberingType != css::style::NumberingType::BITMAP) // TODO
@@ -228,7 +228,7 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
css::uno::Reference<css::beans::XPropertySet> xNumberProps(
xNumberText, css::uno::UNO_QUERY_THROW);
if (!sCharStyleName.isEmpty())
- xNumberProps->setPropertyValue("CharStyleName",
css::uno::Any(sCharStyleName));
+ xNumberProps->setPropertyValue(u"CharStyleName"_ustr,
css::uno::Any(sCharStyleName));
if (nNumberingType == css::style::NumberingType::CHAR_SPECIAL)
{
@@ -253,11 +253,11 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
std::round(aBulletFont.Orientation * 10))) },
});
if (aBulletFont.Height)
- aNameValues["CharHeight"] <<= aBulletFont.Height;
+ aNameValues[u"CharHeight"_ustr] <<=
aBulletFont.Height;
}
if (bHasColor)
{
- aNameValues["CharColor"] <<= aBulletColor;
+ aNameValues[u"CharColor"_ustr] <<= aBulletColor;
}
if (css::uno::Reference<css::beans::XMultiPropertySet>
xBulletMultiProps{
@@ -280,17 +280,17 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
// TODO: css::style::NumberingType::BITMAP
}
- rPropertySet->setPropertyValue("ParaLeftMargin",
css::uno::Any(nIndentAt));
- rPropertySet->setPropertyValue("ParaFirstLineIndent",
css::uno::Any(nFirstLineIndent));
+ rPropertySet->setPropertyValue(u"ParaLeftMargin"_ustr,
css::uno::Any(nIndentAt));
+ rPropertySet->setPropertyValue(u"ParaFirstLineIndent"_ustr,
css::uno::Any(nFirstLineIndent));
if (nLabelFollowedBy ==
SvxNumberFormat::LabelFollowedBy::LISTTAB)
{
css::uno::Sequence<css::style::TabStop> stops;
- rPropertySet->getPropertyValue("ParaTabStops") >>= stops;
+ rPropertySet->getPropertyValue(u"ParaTabStops"_ustr) >>=
stops;
css::style::TabStop tabStop{};
tabStop.Position = nListtabStopPosition;
tabStop.Alignment =
com::sun::star::style::TabAlign::TabAlign_LEFT;
tabStop.FillChar = ' ';
- rPropertySet->setPropertyValue("ParaTabStops",
+ rPropertySet->setPropertyValue(u"ParaTabStops"_ustr,
css::uno::Any(comphelper::combineSequences({ tabStop }, stops)));
// FIXME: What if added tap stop is greater than already
defined ones?
}
@@ -301,9 +301,9 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
}
// In case of higher outline levels, each assignment of empty
value just sets level 1
- while (rPropertySet->getPropertyValue("NumberingRules") !=
css::uno::Any())
+ while (rPropertySet->getPropertyValue(u"NumberingRules"_ustr) !=
css::uno::Any())
{
- rPropertySet->setPropertyValue("NumberingRules",
css::uno::Any());
+ rPropertySet->setPropertyValue(u"NumberingRules"_ustr,
css::uno::Any());
}
}
}
@@ -312,7 +312,7 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( )
OUString
SwVbaListFormat::getServiceImplName()
{
- return "SwVbaListFormat";
+ return u"SwVbaListFormat"_ustr;
}
uno::Sequence< OUString >
@@ -320,7 +320,7 @@ SwVbaListFormat::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.ListFormat"
+ u"ooo.vba.word.ListFormat"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalistgalleries.cxx
b/sw/source/ui/vba/vbalistgalleries.cxx
index 9c047b1b6490..ecc4fd51b883 100644
--- a/sw/source/ui/vba/vbalistgalleries.cxx
+++ b/sw/source/ui/vba/vbalistgalleries.cxx
@@ -67,7 +67,7 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any&
Index1, const uno::A
|| nIndex == word::WdListGalleryType::wdOutlineNumberGallery )
return uno::Any( uno::Reference< word::XListGallery >( new
SwVbaListGallery( this, mxContext, mxTextDocument, nIndex ) ) );
}
- throw uno::RuntimeException("Index out of bounds" );
+ throw uno::RuntimeException(u"Index out of bounds"_ustr );
}
// XEnumerationAccess
@@ -92,7 +92,7 @@ SwVbaListGalleries::createCollectionObject( const
css::uno::Any& aSource )
OUString
SwVbaListGalleries::getServiceImplName()
{
- return "SwVbaListGalleries";
+ return u"SwVbaListGalleries"_ustr;
}
css::uno::Sequence<OUString>
@@ -100,7 +100,7 @@ SwVbaListGalleries::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.ListGalleries"
+ u"ooo.vba.word.ListGalleries"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbalistgallery.cxx
b/sw/source/ui/vba/vbalistgallery.cxx
index 8eae71df8ec2..8869112ad88d 100644
--- a/sw/source/ui/vba/vbalistgallery.cxx
+++ b/sw/source/ui/vba/vbalistgallery.cxx
@@ -44,7 +44,7 @@ SwVbaListGallery::ListTemplates( const uno::Any& index )
OUString
SwVbaListGallery::getServiceImplName()
{
- return "SwVbaListGallery";
+ return u"SwVbaListGallery"_ustr;
}
uno::Sequence< OUString >
@@ -52,7 +52,7 @@ SwVbaListGallery::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.ListGallery"
+ u"ooo.vba.word.ListGallery"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalisthelper.cxx
b/sw/source/ui/vba/vbalisthelper.cxx
index 4b3ca1304e16..fc915de4dd9d 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -82,25 +82,25 @@ void SwVbaListHelper::Init()
// get the numbering style
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier(
mxTextDocument, uno::UNO_QUERY_THROW );
- mxStyleFamily.set(
xStyleSupplier->getStyleFamilies()->getByName("NumberingStyles"),
uno::UNO_QUERY_THROW );
+ mxStyleFamily.set(
xStyleSupplier->getStyleFamilies()->getByName(u"NumberingStyles"_ustr),
uno::UNO_QUERY_THROW );
SAL_INFO("sw.vba", "numbering style name: " << msStyleName );
if( mxStyleFamily->hasByName( msStyleName ) )
{
mxStyleProps.set( mxStyleFamily->getByName( msStyleName ),
uno::UNO_QUERY_THROW );
- mxNumberingRules.set(
mxStyleProps->getPropertyValue("NumberingRules"), uno::UNO_QUERY_THROW );
+ mxNumberingRules.set(
mxStyleProps->getPropertyValue(u"NumberingRules"_ustr), uno::UNO_QUERY_THROW );
}
else
{
// create new numbering style
uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument,
uno::UNO_QUERY_THROW );
- mxStyleProps.set(
xDocMSF->createInstance("com.sun.star.style.NumberingStyle"),
uno::UNO_QUERY_THROW );
+ mxStyleProps.set(
xDocMSF->createInstance(u"com.sun.star.style.NumberingStyle"_ustr),
uno::UNO_QUERY_THROW );
// insert this style into style family, or the property NumberingRules
doesn't exist.
mxStyleFamily->insertByName( msStyleName, uno::Any( mxStyleProps ) );
- mxStyleProps->getPropertyValue("NumberingRules") >>= mxNumberingRules;
+ mxStyleProps->getPropertyValue(u"NumberingRules"_ustr) >>=
mxNumberingRules;
CreateListTemplate();
- mxStyleProps->setPropertyValue("NumberingRules", uno::Any(
mxNumberingRules ) );
+ mxStyleProps->setPropertyValue(u"NumberingRules"_ustr, uno::Any(
mxNumberingRules ) );
}
}
@@ -136,7 +136,7 @@ void SwVbaListHelper::CreateBulletListTemplate()
sal_Int32 nLevel = 0;
uno::Sequence< beans::PropertyValue > aPropertyValues;
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
- setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME,
uno::Any( OUString( "Bullet Symbols" ) ) );
+ setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME,
uno::Any( u"Bullet Symbols"_ustr ) );
setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE,
uno::Any( sal_Int16(style::NumberingType::CHAR_SPECIAL) ) );
OUString aBulletChar;
@@ -406,7 +406,7 @@ void SwVbaListHelper::CreateOutlineNumberForType3()
{
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE,
uno::Any( sal_Int16(style::NumberingType::CHAR_SPECIAL) ) );
- setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME,
uno::Any( OUString("Bullet Symbols") ) );
+ setOrAppendPropertyValue( aPropertyValues, UNO_NAME_CHAR_STYLE_NAME,
uno::Any( u"Bullet Symbols"_ustr ) );
switch( nLevel )
{
case 0:
@@ -637,7 +637,7 @@ void SwVbaListHelper::CreateOutlineNumberForType7()
{
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
setOrAppendPropertyValue( aPropertyValues, UNO_NAME_NUMBERING_TYPE,
uno::Any( sal_Int16(style::NumberingType::ARABIC) ) );
- setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::Any(
OUString("Chapter ") ) );
+ setOrAppendPropertyValue( aPropertyValues, UNO_NAME_PREFIX, uno::Any(
u"Chapter "_ustr ) );
mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues )
);
}
}
@@ -655,7 +655,7 @@ void SwVbaListHelper::setPropertyValueWithNameAndLevel(
sal_Int32 nLevel, const
mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
setOrAppendPropertyValue( aPropertyValues, sName, aValue );
mxNumberingRules->replaceByIndex( nLevel, uno::Any( aPropertyValues ) );
- mxStyleProps->setPropertyValue("NumberingRules", uno::Any(
mxNumberingRules ) );
+ mxStyleProps->setPropertyValue(u"NumberingRules"_ustr, uno::Any(
mxNumberingRules ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbalistlevel.cxx
b/sw/source/ui/vba/vbalistlevel.cxx
index 43f16e85243f..d90a94f77148 100644
--- a/sw/source/ui/vba/vbalistlevel.cxx
+++ b/sw/source/ui/vba/vbalistlevel.cxx
@@ -38,7 +38,7 @@ SwVbaListLevel::~SwVbaListLevel()
::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment()
{
sal_Int16 nAlignment = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "Adjust" ) >>=
nAlignment;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, u"Adjust"_ustr )
>>= nAlignment;
switch( nAlignment )
{
case text::HoriOrientation::LEFT:
@@ -89,17 +89,17 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32
_alignment )
throw uno::RuntimeException();
}
}
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "Adjust",
uno::Any( nAlignment ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, u"Adjust"_ustr,
uno::Any( nAlignment ) );
}
uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont()
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
void SAL_CALL SwVbaListLevel::setFont( const uno::Reference<
::ooo::vba::word::XFont >& /*_font*/ )
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getIndex()
@@ -134,8 +134,8 @@ float SAL_CALL SwVbaListLevel::getNumberPosition()
// indentAt + firstlineindent
sal_Int32 nIndentAt = 0;
sal_Int32 nFirstLineIndent = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent" ) >>= nFirstLineIndent;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, u"IndentAt"_ustr
) >>= nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
u"FirstLineIndent"_ustr ) >>= nFirstLineIndent;
sal_Int32 nResult = nIndentAt + nFirstLineIndent;
@@ -147,16 +147,16 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float
_numberposition )
sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter(
_numberposition );
sal_Int32 nIndentAt = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, u"IndentAt"_ustr
) >>= nIndentAt;
sal_Int32 nFirstLineIndent = nNumberPosition - nIndentAt;
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent", uno::Any( nFirstLineIndent ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
u"FirstLineIndent"_ustr, uno::Any( nFirstLineIndent ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle()
{
sal_Int16 nNumberingType = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "NumberingType"
) >>= nNumberingType;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
u"NumberingType"_ustr ) >>= nNumberingType;
switch( nNumberingType )
{
case style::NumberingType::CHAR_SPECIAL:
@@ -211,7 +211,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float
_numberposition )
}
default:
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
}
return nNumberingType;
@@ -284,11 +284,11 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32
_numberstyle )
}
default:
{
- throw uno::RuntimeException("Not implemented" );
+ throw uno::RuntimeException(u"Not implemented"_ustr );
}
}
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "NumberingType",
uno::Any( nNumberingType ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
u"NumberingType"_ustr, uno::Any( nNumberingType ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher()
@@ -305,20 +305,20 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher(
::sal_Int32 /*_resetonhigher*/ )
::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt()
{
sal_Int16 nStartWith = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "StartWith" )
>>= nStartWith;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
u"StartWith"_ustr ) >>= nStartWith;
return nStartWith;
}
void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat )
{
sal_Int16 nStartWith = static_cast<sal_Int16>(_startat);
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith",
uno::Any( nStartWith ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
u"StartWith"_ustr, uno::Any( nStartWith ) );
}
float SAL_CALL SwVbaListLevel::getTabPosition()
{
sal_Int32 nTabPosition = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"ListtabStopPosition" ) >>= nTabPosition;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
u"ListtabStopPosition"_ustr ) >>= nTabPosition;
return static_cast< float >( Millimeter::getInPoints( nTabPosition ) );
}
@@ -326,14 +326,14 @@ float SAL_CALL SwVbaListLevel::getTabPosition()
void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition )
{
sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter(
_tabposition );
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"ListtabStopPosition", uno::Any( nTabPosition ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
u"ListtabStopPosition"_ustr, uno::Any( nTabPosition ) );
}
float SAL_CALL SwVbaListLevel::getTextPosition()
{
// indentAt
sal_Int32 nIndentAt = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, u"IndentAt"_ustr
) >>= nIndentAt;
return static_cast< float >( Millimeter::getInPoints( nIndentAt ) );
}
@@ -342,21 +342,21 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float
_textposition )
{
sal_Int32 nIndentAt = 0;
sal_Int32 nFirstLineIndent = 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent" ) >>= nFirstLineIndent;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, u"IndentAt"_ustr
) >>= nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
u"FirstLineIndent"_ustr ) >>= nFirstLineIndent;
sal_Int32 nAlignedAt = nIndentAt + nFirstLineIndent;
nIndentAt = Millimeter::getInHundredthsOfOneMillimeter( _textposition );
nFirstLineIndent = nAlignedAt - nIndentAt;
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "IndentAt",
uno::Any( nIndentAt ) );
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent", uno::Any( nFirstLineIndent ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
u"IndentAt"_ustr, uno::Any( nIndentAt ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
u"FirstLineIndent"_ustr, uno::Any( nFirstLineIndent ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter()
{
sal_Int16 nLabelFollowedBy= 0;
- m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"LabelFollowedBy" ) >>= nLabelFollowedBy;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
u"LabelFollowedBy"_ustr ) >>= nLabelFollowedBy;
return nLabelFollowedBy;
}
@@ -364,13 +364,13 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float
_textposition )
void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32
_trailingcharacter )
{
sal_Int16 nLabelFollowedBy = static_cast<sal_Int16>(_trailingcharacter);
- m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"LabelFollowedBy", uno::Any( nLabelFollowedBy ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
u"LabelFollowedBy"_ustr, uno::Any( nLabelFollowedBy ) );
}
OUString
SwVbaListLevel::getServiceImplName()
{
- return "SwVbaListLevel";
+ return u"SwVbaListLevel"_ustr;
}
uno::Sequence< OUString >
@@ -378,7 +378,7 @@ SwVbaListLevel::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.ListLevel"
+ u"ooo.vba.word.ListLevel"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalistlevels.cxx
b/sw/source/ui/vba/vbalistlevels.cxx
index 3f0d83e47896..2d13970fbe65 100644
--- a/sw/source/ui/vba/vbalistlevels.cxx
+++ b/sw/source/ui/vba/vbalistlevels.cxx
@@ -68,7 +68,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any&
Index1, const uno::Any&
if( !( Index1 >>= nIndex ) )
throw uno::RuntimeException();
if( nIndex <=0 || nIndex > getCount() )
- throw uno::RuntimeException("Index out of bounds" );
+ throw uno::RuntimeException(u"Index out of bounds"_ustr );
return uno::Any( uno::Reference< word::XListLevel >( new SwVbaListLevel(
this, mxContext, m_pListHelper, nIndex - 1 ) ) );
}
@@ -95,7 +95,7 @@ SwVbaListLevels::createCollectionObject( const css::uno::Any&
aSource )
OUString
SwVbaListLevels::getServiceImplName()
{
- return "SwVbaListLevels";
+ return u"SwVbaListLevels"_ustr;
}
css::uno::Sequence<OUString>
@@ -103,7 +103,7 @@ SwVbaListLevels::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.ListLevels"
+ u"ooo.vba.word.ListLevels"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx
b/sw/source/ui/vba/vbalisttemplate.cxx
index 032bc98162f5..e0c4045a3e5d 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -44,13 +44,13 @@ SwVbaListTemplate::ListLevels( const uno::Any& index )
void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet
> const & xProps )
{
uno::Reference< container::XIndexReplace > xNumberingRules =
m_pListHelper->getNumberingRules();
- xProps->setPropertyValue("NumberingRules", uno::Any( xNumberingRules ) );
+ xProps->setPropertyValue(u"NumberingRules"_ustr, uno::Any( xNumberingRules
) );
}
OUString
SwVbaListTemplate::getServiceImplName()
{
- return "SwVbaListTemplate";
+ return u"SwVbaListTemplate"_ustr;
}
uno::Sequence< OUString >
@@ -58,7 +58,7 @@ SwVbaListTemplate::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.ListTemplate"
+ u"ooo.vba.word.ListTemplate"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbalisttemplates.cxx
b/sw/source/ui/vba/vbalisttemplates.cxx
index a9cc52d4bc9a..1f662dae865e 100644
--- a/sw/source/ui/vba/vbalisttemplates.cxx
+++ b/sw/source/ui/vba/vbalisttemplates.cxx
@@ -63,7 +63,7 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any&
Index1, const uno::A
if( !( Index1 >>= nIndex ) )
throw uno::RuntimeException();
if( nIndex <=0 || nIndex > getCount() )
- throw uno::RuntimeException("Index out of bounds" );
+ throw uno::RuntimeException(u"Index out of bounds"_ustr );
return uno::Any( uno::Reference< word::XListTemplate >( new
SwVbaListTemplate( this, mxContext, mxTextDocument, mnGalleryType, nIndex ) ) );
}
@@ -90,7 +90,7 @@ SwVbaListTemplates::createCollectionObject( const
css::uno::Any& aSource )
OUString
SwVbaListTemplates::getServiceImplName()
{
- return "SwVbaListTemplates";
+ return u"SwVbaListTemplates"_ustr;
}
css::uno::Sequence<OUString>
@@ -98,7 +98,7 @@ SwVbaListTemplates::getServiceNames()
{
static uno::Sequence< OUString > const sNames
{
- "ooo.vba.word.ListTemplates"
+ u"ooo.vba.word.ListTemplates"_ustr
};
return sNames;
}
diff --git a/sw/source/ui/vba/vbamailmerge.cxx
b/sw/source/ui/vba/vbamailmerge.cxx
index 479f5dfd7d30..d237f3b5a3f0 100644
--- a/sw/source/ui/vba/vbamailmerge.cxx
+++ b/sw/source/ui/vba/vbamailmerge.cxx
@@ -45,11 +45,11 @@ void SAL_CALL SwVbaMailMerge::OpenDataSource(
{
}
-OUString SwVbaMailMerge::getServiceImplName() { return "SwVbaMailMerge"; }
+OUString SwVbaMailMerge::getServiceImplName() { return u"SwVbaMailMerge"_ustr;
}
css::uno::Sequence<OUString> SwVbaMailMerge::getServiceNames()
{
- static css::uno::Sequence<OUString> const aServiceNames{
"ooo.vba.word.MailMerge" };
+ static css::uno::Sequence<OUString> const aServiceNames{
u"ooo.vba.word.MailMerge"_ustr };
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index ef74dcd8a6f0..a9f9088ff7c0 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -258,7 +258,7 @@ void SAL_CALL
SwVbaOptions::setAutoFormatApplyBulletedLists( sal_Bool /*_autofor
OUString
SwVbaOptions::getServiceImplName()
{
- return "SwVbaOptions";
+ return u"SwVbaOptions"_ustr;
}
uno::Sequence< OUString >
@@ -266,7 +266,7 @@ SwVbaOptions::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.word.Options"
+ u"ooo.vba.word.Options"_ustr
};
return aServiceNames;
}
diff --git a/sw/source/ui/vba/vbapagesetup.cxx
b/sw/source/ui/vba/vbapagesetup.cxx
index b22437dbd260..8163ff48239d 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -57,9 +57,9 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter )
double SAL_CALL SwVbaPageSetup::getHeaderDistance()
{
bool isHeaderOn = false;
-e
... etc. - the rest is truncated
