summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-03-25 09:53:33 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-03-25 10:06:26 +0100
commita0656ec6fc2b41e65f1b40dbd64f546175e2762f (patch)
treec0d3443a27d9dc10266760110e96b50cce46ef02 /sd/source/ui
parente9c6fd6b4d09ee59b6a86942cbf001f2ba9782e6 (diff)
const OUString -> const OUStringLiteral
Mostly automated rewrite Change-Id: Ie020a083f898bc126b8fb039d4ecb2e687172da1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112965 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx4
-rw-r--r--sd/source/ui/docshell/docshel3.cxx8
-rw-r--r--sd/source/ui/docshell/docshel4.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationTracer.cxx2
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx8
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.cxx2
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sd/source/ui/view/drviewsf.cxx8
11 files changed, 24 insertions, 24 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index b202ddbfc931..7f0e74f358e6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1563,7 +1563,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container*
if( !xCurrentPage.is() )
return;
- const OUString aStrIsEmptyPresObj( "IsEmptyPresentationObject" );
+ static const OUStringLiteral aStrIsEmptyPresObj( u"IsEmptyPresentationObject" );
sal_Int32 nShape, nCount = xCurrentPage->getCount();
for( nShape = 0; nShape < nCount; nShape++ )
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index d4fcbb1c852b..3c67edc5c831 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -132,13 +132,13 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
Reference<XPropertySetInfo> xInfo(xSet->getPropertySetInfo());
if (xInfo.is())
{
- const OUString aPropName1("Name");
+ static const OUStringLiteral aPropName1(u"Name");
if(xInfo->hasPropertyByName(aPropName1))
xSet->getPropertyValue(aPropName1) >>= aDescription;
bAppendIndex = aDescription.isEmpty();
- const OUString aPropName2("UINameSingular");
+ static const OUStringLiteral aPropName2(u"UINameSingular");
if(xInfo->hasPropertyByName(aPropName2))
xSet->getPropertyValue(aPropName2) >>= aDescription;
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 4d1481872ae4..485d4de91e3d 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -931,7 +931,7 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32 nType, const CustomAnimati
case nPropertyTypeCharHeight:
{
- const OUString aAttributeName( "CharHeight" );
+ static const OUStringLiteral aAttributeName( u"CharHeight" );
Any aValue( pEffect->getProperty( AnimationNodeType::SET, aAttributeName, EValue::To ) );
if( !aValue.hasValue() )
aValue = pEffect->getProperty( AnimationNodeType::ANIMATE, aAttributeName, EValue::To );
@@ -1003,7 +1003,7 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, const CustomAnimat
case nPropertyTypeCharHeight:
{
- const OUString aAttributeName( "CharHeight" );
+ static const OUStringLiteral aAttributeName( u"CharHeight" );
bEffectChanged = pEffect->setProperty( AnimationNodeType::SET, aAttributeName, EValue::To, rValue );
if( !bEffectChanged )
bEffectChanged = pEffect->setProperty( AnimationNodeType::ANIMATE, aAttributeName, EValue::To, rValue );
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 0d1b336acd02..b3c142d06750 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -297,9 +297,9 @@ void DrawDocShell::Execute( SfxRequest& rReq )
// setting the new language...
if (!aNewLangTxt.isEmpty())
{
- const OUString aSelectionLangPrefix("Current_");
- const OUString aParagraphLangPrefix("Paragraph_");
- const OUString aDocumentLangPrefix("Default_");
+ static const OUStringLiteral aSelectionLangPrefix(u"Current_");
+ static const OUStringLiteral aParagraphLangPrefix(u"Paragraph_");
+ static const OUStringLiteral aDocumentLangPrefix(u"Default_");
bool bSelection = false;
bool bParagraph = false;
@@ -406,7 +406,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
if (pItem2)
sApplyText = pItem2->GetValue();
- const OUString sSpellingRule("Spelling_");
+ static const OUStringLiteral sSpellingRule(u"Spelling_");
sal_Int32 nPos = 0;
if(-1 != (nPos = sApplyText.indexOf( sSpellingRule )))
{
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index f616e1da2157..8175c00892b3 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -698,10 +698,10 @@ void DrawDocShell::GotoBookmark(const OUString& rBookmark)
sal_uInt16 nPageNumber = SDRPAGE_NOTFOUND;
SdrObject* pObj = nullptr;
- const OUString sInteraction( "action?" );
+ static const OUStringLiteral sInteraction( u"action?" );
if ( rBookmark.match( sInteraction ) )
{
- const OUString sJump( "jump=" );
+ static const OUStringLiteral sJump( u"jump=" );
if ( rBookmark.match( sJump, sInteraction.getLength() ) )
{
OUString aDestination( rBookmark.copy( sInteraction.getLength() + sJump.getLength() ) );
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 11533fde3e2a..00ddd5ff1b39 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -56,7 +56,7 @@ void ConfigurationTracer::TraceBoundResources (
{
const Sequence<Reference<XResourceId> > aResourceList (
rxConfiguration->getResources(rxResourceId, OUString(), AnchorBindingMode_DIRECT));
- const OUString sIndentation (" ");
+ static const OUStringLiteral sIndentation (u" ");
for (Reference<XResourceId> const & resourceId : aResourceList)
{
OUString sLine (resourceId->getResourceURL());
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index bb170c0d845d..07fafaa667c7 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -118,8 +118,8 @@ void RecentlyUsedMasterPages::LoadPersistentValues()
if ( ! xSet.is())
return;
- const OUString sURLMemberName("URL");
- const OUString sNameMemberName("Name");
+ static const OUStringLiteral sURLMemberName(u"URL");
+ static const OUStringLiteral sNameMemberName(u"Name");
OUString sURL;
OUString sName;
@@ -186,8 +186,8 @@ void RecentlyUsedMasterPages::SavePersistentValues()
xSet->removeByName (rKey);
// Fill it with the URLs of this object.
- const OUString sURLMemberName("URL");
- const OUString sNameMemberName("Name");
+ static const OUStringLiteral sURLMemberName(u"URL");
+ static const OUStringLiteral sNameMemberName(u"Name");
Any aValue;
Reference<lang::XSingleServiceFactory> xChildFactory (
xSet, UNO_QUERY);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 62b35a5cbfe9..62df5ec84a62 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2007,8 +2007,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
// exporting transition effects to pdf
if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && pPDFExtOutDevData->GetIsExportTransitionEffects() )
{
- const OUString sEffect( "Effect" );
- const OUString sSpeed ( "Speed" );
+ static const OUStringLiteral sEffect( u"Effect" );
+ static const OUStringLiteral sSpeed ( u"Speed" );
sal_Int32 nTime = 800;
presentation::AnimationSpeed aAs;
if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 26db26b2a12e..0eed74c000ab 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -405,7 +405,7 @@ SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShap
return nullptr;
OUString aType( xShape->getShapeType() );
- const OUString aPrefix( "com.sun.star.presentation." );
+ static const OUStringLiteral aPrefix( u"com.sun.star.presentation." );
if( !aType.startsWith( aPrefix ) )
{
SdrObject* pObj = SvxFmDrawPage::CreateSdrObject_( xShape );
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 7d8e8c6fdb25..747521ec210e 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -980,7 +980,7 @@ namespace {
SdPage& rHandoutPage (*rDocument.GetSdPage(0, PageKind::Handout));
Reference< css::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY );
- const OUString sPageNumber( "Number" );
+ static const OUStringLiteral sPageNumber( u"Number" );
// Collect the page objects of the handout master.
std::vector<SdrPageObj*> aHandoutPageObjects;
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 58b5ca0da82a..c9cbbbd0b77d 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -120,13 +120,13 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo(), uno::UNO_SET_THROW );
form::FormButtonType eButtonType = form::FormButtonType_URL;
- const OUString sButtonType( "ButtonType" );
+ static const OUStringLiteral sButtonType( u"ButtonType" );
if(xPropInfo->hasPropertyByName( sButtonType ) && (xPropSet->getPropertyValue( sButtonType ) >>= eButtonType ) )
{
OUString aString;
// Label
- const OUString sLabel( "Label" );
+ static const OUStringLiteral sLabel( u"Label" );
if(xPropInfo->hasPropertyByName(sLabel))
{
if( xPropSet->getPropertyValue(sLabel) >>= aString )
@@ -134,7 +134,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
}
// URL
- const OUString sTargetURL( "TargetURL" );
+ static const OUStringLiteral sTargetURL( u"TargetURL" );
if(xPropInfo->hasPropertyByName(sTargetURL))
{
if( xPropSet->getPropertyValue(sTargetURL) >>= aString )
@@ -142,7 +142,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
}
// Target
- const OUString sTargetFrame( "TargetFrame" );
+ static const OUStringLiteral sTargetFrame( u"TargetFrame" );
if(xPropInfo->hasPropertyByName(sTargetFrame) )
{
if( xPropSet->getPropertyValue(sTargetFrame) >>= aString )