summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-05-19 17:18:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-05-19 17:18:13 +0200
commit97d5293ccaf12ceae0c6d7e79b73cd783038c95c (patch)
treea22441bc147d6b212442bd5b04f5983256f58754
parentca149259eb8bba5c306fd4b174a7eeeb84a3bef7 (diff)
loplugin:stringcopy: extensions
Change-Id: I6abf8ec16f39db9226efa7e2c7f82644da100c81
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx6
-rw-r--r--extensions/source/dbpilots/optiongrouplayouter.cxx6
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx4
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx2
-rw-r--r--extensions/source/resource/oooresourceloader.cxx2
6 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index b3bb2e6ffbad..3b8e09a9b9ab 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -181,8 +181,8 @@ namespace dbp
// build the statement to set as list source
OUString sStatement = "SELECT " +
- OUString( getSettings().sListContentField ) + ", " + OUString( getSettings().sLinkedListField ) +
- " FROM " + OUString( getSettings().sListContentTable );
+ getSettings().sListContentField + ", " + getSettings().sLinkedListField +
+ " FROM " + getSettings().sListContentTable;
Sequence< OUString > aListSource { sStatement };
getContext().xObjectModel->setPropertyValue("ListSource", makeAny(aListSource));
}
@@ -196,7 +196,7 @@ namespace dbp
}
// the bound field
- getContext().xObjectModel->setPropertyValue("DataField", makeAny(OUString(getSettings().sLinkedFormField)));
+ getContext().xObjectModel->setPropertyValue("DataField", makeAny(getSettings().sLinkedFormField));
}
catch(const Exception&)
{
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 266edb89e721..b8c90319b4c9 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -119,9 +119,9 @@ namespace dbp
UNO_QUERY);
// the label
- xRadioModel->setPropertyValue("Label", makeAny(OUString(*aLabelIter)));
+ xRadioModel->setPropertyValue("Label", makeAny(*aLabelIter));
// the value
- xRadioModel->setPropertyValue("RefValue", makeAny(OUString(*aValueIter)));
+ xRadioModel->setPropertyValue("RefValue", makeAny(*aValueIter));
// default selection
if (_rSettings.sDefaultField == *aLabelIter)
@@ -129,7 +129,7 @@ namespace dbp
// the connection to the database field
if (!_rSettings.sDBField.isEmpty())
- xRadioModel->setPropertyValue("DataField", makeAny(OUString(_rSettings.sDBField)));
+ xRadioModel->setPropertyValue("DataField", makeAny(_rSettings.sDBField));
// the name for the model
xRadioModel->setPropertyValue("Name", makeAny(sElementsName));
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 88721feffa37..c393654fbdce 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -313,8 +313,8 @@ namespace pcr
const SvxFontItem& rFontItem =
static_cast<const SvxFontItem&>(_rSet.Get(CFID_FONT));
- lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(OUString(rFontItem.GetFamilyName())));
- lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(OUString(rFontItem.GetStyleName())));
+ lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(rFontItem.GetFamilyName()));
+ lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(rFontItem.GetStyleName()));
lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_FAMILY , makeAny((sal_Int16)rFontItem.GetFamily()));
lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_CHARSET , makeAny((sal_Int16)rFontItem.GetCharSet()));
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index b3e760c447c5..17282faae69c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -523,7 +523,7 @@ namespace pcr
if ( !xDatabaseContext->hasByName( sControlValue ) )
{
::svt::OFileNotation aTransformer(sControlValue);
- aPropertyValue <<= OUString( aTransformer.get( ::svt::OFileNotation::N_URL ) );
+ aPropertyValue <<= aTransformer.get( ::svt::OFileNotation::N_URL );
}
}
}
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 556435ad829e..4fdecfc2dd67 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -812,7 +812,7 @@ namespace pcr
Any SAL_CALL OComboboxControl::getValue()
{
- return makeAny( OUString( getTypedControlWindow()->GetText() ) );
+ return makeAny( getTypedControlWindow()->GetText() );
}
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index 4c94aab56856..1f86f1460b5b 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -70,7 +70,7 @@ namespace extensions { namespace resource
{
OSL_PRECOND( _resourceManager.IsAvailable( getResourceType(), _resourceId ), "StringResourceAccess::getResource: precondition not met!" );
Any aResource;
- aResource <<= OUString( _resourceManager.ReadString( _resourceId ) );
+ aResource <<= _resourceManager.ReadString( _resourceId );
return aResource;
}