summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-05-19 17:16:44 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-05-19 17:16:44 +0200
commitdd44fd294cfb5eabe4c8382acdd82d323d8e8dd1 (patch)
tree75d30fe7481d8f23e19e922746e25d695ae5ea3c /svx
parent713843bebb27f09b5af9190cf84c57f6076e54aa (diff)
loplugin:stringcopy: svx
Change-Id: Ic1874b2bfe28149deab3e6903ef7d7dac77cfc4b
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx8
-rw-r--r--svx/source/accessibility/ShapeTypeHandler.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx4
-rw-r--r--svx/source/form/fmvwimp.cxx8
-rw-r--r--svx/source/items/grfitem.cxx8
-rw-r--r--svx/source/sidebar/nbdtmg.cxx4
-rw-r--r--svx/source/svdraw/svdomedia.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx6
-rw-r--r--svx/source/xoutdev/xattr2.cxx2
11 files changed, 24 insertions, 24 deletions
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 1f51bf425960..d4dcb985ab95 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -73,7 +73,7 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId)
OUString sPrefix;
{
SolarMutexGuard aGuard;
- sPrefix = OUString (SvxResId (nResourceId));
+ sPrefix = SvxResId (nResourceId);
}
// Forward the call with the resulting string.
@@ -90,10 +90,10 @@ void DescriptionGenerator::Initialize (const OUString& sPrefix)
SolarMutexGuard aGuard;
msDescription.append(' ');
- msDescription.append(OUString (SvxResId(RID_SVXSTR_A11Y_WITH)));
+ msDescription.append(SvxResId(RID_SVXSTR_A11Y_WITH));
msDescription.append(' ');
- msDescription.append(OUString (SvxResId (RID_SVXSTR_A11Y_STYLE)));
+ msDescription.append(SvxResId (RID_SVXSTR_A11Y_STYLE));
msDescription.append('=');
}
@@ -155,7 +155,7 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName,
SolarMutexGuard aGuard;
msDescription.append(' ');
- msDescription.append(OUString (SvxResId(RID_SVXSTR_A11Y_AND)));
+ msDescription.append(SvxResId(RID_SVXSTR_A11Y_AND));
msDescription.append(' ');
mbIsFirstProperty = false;
}
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 021592269fc8..68937f67c18b 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -318,7 +318,7 @@ OUString
if (nResourceId != -1)
{
SolarMutexGuard aGuard;
- sName = OUString (SvxResId((unsigned short)nResourceId));
+ sName = SvxResId((unsigned short)nResourceId);
}
return sName;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index c52e4764da5d..b66dee52e38d 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4122,7 +4122,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getItemCount()
OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos)
{
::osl::MutexGuard aGuard( m_aMutex );
- return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString();
+ return m_pBox ? m_pBox->GetEntry(nPos) : OUString();
}
css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems()
@@ -4450,7 +4450,7 @@ sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount()
OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 Pos )
{
::osl::MutexGuard aGuard( m_aMutex );
- return m_pComboBox ? OUString(m_pComboBox->GetEntry(Pos)) : OUString();
+ return m_pComboBox ? m_pComboBox->GetEntry(Pos) : OUString();
}
Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems()
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 4ce10fd6f692..5403bcc1b6ec 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1433,11 +1433,11 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
// The service name decides which control should be created
sal_uInt16 nOBJID = OBJ_FM_EDIT;
- if(OUString(_rDesc.szServiceName) == FM_SUN_COMPONENT_NUMERICFIELD)
+ if(_rDesc.szServiceName == FM_SUN_COMPONENT_NUMERICFIELD)
nOBJID = OBJ_FM_NUMERICFIELD;
- if(OUString(_rDesc.szServiceName) == FM_SUN_COMPONENT_CHECKBOX)
+ if(_rDesc.szServiceName == FM_SUN_COMPONENT_CHECKBOX)
nOBJID = OBJ_FM_CHECKBOX;
- if(OUString(_rDesc.szServiceName) == FM_COMPONENT_COMMANDBUTTON)
+ if(_rDesc.szServiceName == FM_COMPONENT_COMMANDBUTTON)
nOBJID = OBJ_FM_BUTTON;
Reference< css::form::submission::XSubmission > xSubmission(_rDesc.xPropSet, UNO_QUERY);
@@ -1493,7 +1493,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
// set the button label
Reference< XPropertySet > xControlSet(pControl->GetUnoControlModel(), UNO_QUERY);
- xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(OUString(_rDesc.szName)));
+ xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(_rDesc.szName));
// connect the submission with the submission supplier (aka the button)
xControlSet->setPropertyValue( FM_PROP_BUTTON_TYPE,
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 21360b8adfd5..96bb8bf660ca 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -145,10 +145,10 @@ bool SvxGrfCrop::GetPresentation(
case SfxItemPresentation::Nameless:
return true;
case SfxItemPresentation::Complete:
- rText = "L: " + OUString(::GetMetricText( GetLeft(), eCoreUnit, MapUnit::MapMM, pIntl )) +
- " R: " + OUString(::GetMetricText( GetRight(), eCoreUnit, MapUnit::MapMM, pIntl )) +
- " T: " + OUString(::GetMetricText( GetTop(), eCoreUnit, MapUnit::MapMM, pIntl )) +
- " B: " + OUString(::GetMetricText( GetBottom(), eCoreUnit, MapUnit::MapMM, pIntl ));
+ rText = "L: " + ::GetMetricText( GetLeft(), eCoreUnit, MapUnit::MapMM, pIntl ) +
+ " R: " + ::GetMetricText( GetRight(), eCoreUnit, MapUnit::MapMM, pIntl ) +
+ " T: " + ::GetMetricText( GetTop(), eCoreUnit, MapUnit::MapMM, pIntl ) +
+ " B: " + ::GetMetricText( GetBottom(), eCoreUnit, MapUnit::MapMM, pIntl );
return true;
break;
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index a07634897d1f..686fcf2c6510 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -772,7 +772,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
OUString sChar(cChar);
_pSet->sBulletChar = sChar;
if ( aFmt.GetBulletFont() )
- _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
+ _pSet->sBulletFont = aFmt.GetBulletFont()->GetFamilyName();
_pSet->nNumberType = eNumType;
pItemArr->bIsCustomized = true;
}else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
@@ -790,7 +790,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
_pSet->sSuffix = aFmt.GetSuffix();
_pSet->nNumberType = eNumType;
if ( aFmt.GetBulletFont() )
- _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
+ _pSet->sBulletFont = aFmt.GetBulletFont()->GetFamilyName();
pItemArr->bIsCustomized = true;
}
}
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index d80f5206ac17..3e0ae0fa02d7 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -393,7 +393,7 @@ static bool lcl_HandlePackageURL(
}
catch (container::NoSuchElementException const&)
{
- SAL_INFO("svx", "not found: '" << OUString(rURL) << "'");
+ SAL_INFO("svx", "not found: '" << rURL << "'");
return false;
}
catch (uno::Exception const& e)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index a617fedb1013..50af48d13d1a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -475,7 +475,7 @@ void SvxStyleBox_Impl::Select()
pPool->SetSearchMask( eStyleFamily );
pStyle = pPool->First();
- while ( pStyle && OUString( pStyle->GetName() ) != aSearchEntry )
+ while ( pStyle && pStyle->GetName() != aSearchEntry )
pStyle = pPool->Next();
}
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 48c0158b8fb9..434c261c09f4 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1477,7 +1477,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
{
if( static_cast< SdrGrafObj*>( mpObj.get() )->IsLinkedGraphic() )
{
- rValue <<= OUString( static_cast< SdrGrafObj*>( mpObj.get() )->GetFileName() );
+ rValue <<= static_cast< SdrGrafObj*>( mpObj.get() )->GetFileName();
}
else
{
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index a696df7eb5b2..4a71280cd9ec 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -232,7 +232,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt
if( pObj )
{
- if( OUString( pObj->GetTitle() ) != aNewTitle )
+ if( pObj->GetTitle() != aNewTitle )
{
pObj->SetTitle( aNewTitle );
pGalTheme->InsertObject( *pObj );
@@ -270,7 +270,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
::GalleryTheme* pGalTheme = ( isValid() ? mpTheme->implGetTheme() : nullptr );
if( pGalTheme )
- *pValue <<= OUString( implGetObject()->aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
+ *pValue <<= implGetObject()->aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE );
}
break;
@@ -284,7 +284,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
if( pObj )
{
- *pValue <<= OUString( pObj->GetTitle() );
+ *pValue <<= pObj->GetTitle();
::GalleryTheme::ReleaseObject( pObj );
}
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index f5116b0eef25..e8338699f6e5 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -67,7 +67,7 @@ bool XLineTransparenceItem::GetPresentation
switch ( ePres )
{
case SfxItemPresentation::Complete:
- rText = OUString( SvxResId(RID_SVXSTR_TRANSPARENCE) ) + ": ";
+ rText = SvxResId(RID_SVXSTR_TRANSPARENCE) + ": ";
SAL_FALLTHROUGH;
case SfxItemPresentation::Nameless:
rText += unicode::formatPercent(GetValue(),