mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some unnecessary use of OUString constructor

Browse Source 
found with
   git grep -nP '<<= OUString\(\w*[A-Za-z]+'

Change-Id: I43354842f1e0418fb292f2e8e0cb30f1229d1c67
Reviewed-on: https://gerrit.libreoffice.org/34864
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-03-03 16:01:45 +02:00
parent 6b58caf059
commit aadf790bbc
27 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/source/extended/accessibletablistboxtable.cxx
View File

@ -226,7 +226,7 @@ namespace accessibility
Reference< XAccessible > xChild =
m_pTabListBox->CreateAccessibleCell( nRow, nCol );
uno::Any aOldValue, aNewValue;
aOldValue <<= OUString( pData->m_sOldText );
aOldValue <<= pData->m_sOldText;
OUString sNewText( m_pTabListBox->GetCellText( nRow, nCol ) );
aNewValue <<= sNewText;
TriState eState = TRISTATE_INDET;

2
dbaccess/source/ui/dlg/paramdialog.cxx
View File

@ -305,7 +305,7 @@ namespace dbaui
return true;
}
m_aFinalValues[m_nCurrentlySelected].Value <<= OUString(m_pParam->GetText());
m_aFinalValues[m_nCurrentlySelected].Value <<= m_pParam->GetText();
}
// initialize the controls with the new values

4
editeng/source/uno/unonrule.cxx
View File

@ -190,13 +190,13 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal
}
{
aVal <<= OUString(rFmt.GetPrefix());
aVal <<= rFmt.GetPrefix();
beans::PropertyValue aPrefixProp( UNO_NAME_NRULE_PREFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aPrefixProp;
}
{
aVal <<= OUString(rFmt.GetSuffix());
aVal <<= rFmt.GetSuffix();
beans::PropertyValue aSuffixProp( UNO_NAME_NRULE_SUFFIX, -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aSuffixProp;
}

2
filter/source/flash/swfexporter.cxx
View File

@ -666,7 +666,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
aDescriptor[0].Value <<= bExportAsJPEG ? OUString("PNG") : OUString("SVM");
aDescriptor[1].Name = "URL";
aDescriptor[1].Value <<= OUString(aFile.GetURL());
aDescriptor[1].Value <<= aFile.GetURL();
aDescriptor[2].Name = "FilterData";
aDescriptor[2].Value <<= aFilterData;
if( bOnlyBackground )

2
filter/source/msfilter/msdffimp.cxx
View File

@ -6986,7 +6986,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo
aMedium[1].Name = "URL";
aMedium[1].Value <<= OUString( "private:stream" );
aMedium[2].Name = "DocumentBaseURL";
aMedium[2].Value <<= OUString(rBaseURL);
aMedium[2].Value <<= rBaseURL;
if ( !aFilterName.isEmpty() )
{

2
filter/source/xsltfilter/XSLTFilter.cxx
View File

@ -315,7 +315,7 @@ namespace XSLT
nv.Value <<= aURL;
args[1] <<= nv;
nv.Name = "SourceBaseURL";
nv.Value <<= OUString(INetURLObject(aURL).getBase());
nv.Value <<= INetURLObject(aURL).getBase();
args[2] <<= nv;
m_tcontrol = impl_createTransformer(msUserData[1], args);

2
reportdesign/source/ui/report/ReportController.cxx
View File

@ -3026,7 +3026,7 @@ void OReportController::insertGraphic()
xController->getValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bLink;
uno::Sequence<beans::PropertyValue> aArgs(2);
aArgs[0].Name = PROPERTY_IMAGEURL;
aArgs[0].Value <<= OUString(aDialog.GetPath());
aArgs[0].Value <<= aDialog.GetPath();
aArgs[1].Name = PROPERTY_PRESERVEIRI;
aArgs[1].Value <<= bLink;
createControl(aArgs,xSection,OUString(),OBJ_DLG_IMAGECONTROL);

4
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
View File

@ -220,10 +220,10 @@ void RecentlyUsedMasterPages::SavePersistentValues()
{
xSet->insertByName (sKey, makeAny(xChild));
aValue <<= OUString(iDescriptor->msURL);
aValue <<= iDescriptor->msURL;
xChild->replaceByName (sURLMemberName, aValue);
aValue <<= OUString(iDescriptor->msName);
aValue <<= iDescriptor->msName;
xChild->replaceByName (sNameMemberName, aValue);
}
}

8
sd/source/ui/unoidl/unomodel.cxx
View File

@ -1383,8 +1383,8 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property
{
const SvxFontItem *pFont = static_cast<const SvxFontItem *>(pItem);
aSeq[nSeqIndex++] <<= OUString(pFont->GetFamilyName());
aSeq[nSeqIndex++] <<= OUString(pFont->GetStyleName());
aSeq[nSeqIndex++] <<= pFont->GetFamilyName();
aSeq[nSeqIndex++] <<= pFont->GetStyleName();
aSeq[nSeqIndex++] <<= sal_Int16(pFont->GetFamily());
aSeq[nSeqIndex++] <<= sal_Int16(pFont->GetPitch());
aSeq[nSeqIndex++] <<= sal_Int16(pFont->GetCharSet());
@ -1393,8 +1393,8 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property
const SvxFontItem& rFont = static_cast<const SvxFontItem&>(rPool.GetDefaultItem( nWhichId ));
aSeq[nSeqIndex++] <<= OUString(rFont.GetFamilyName());
aSeq[nSeqIndex++] <<= OUString(rFont.GetStyleName());
aSeq[nSeqIndex++] <<= rFont.GetFamilyName();
aSeq[nSeqIndex++] <<= rFont.GetStyleName();
aSeq[nSeqIndex++] <<= sal_Int16(rFont.GetFamily());
aSeq[nSeqIndex++] <<= sal_Int16(rFont.GetPitch());
aSeq[nSeqIndex++] <<= sal_Int16(rFont.GetCharSet());

4
starmath/source/unomodel.cxx
View File

@ -703,7 +703,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
switch ( (*ppEntries)->mnHandle )
{
case HANDLE_FORMULA:
*pValue <<= OUString(pDocSh->GetText());
*pValue <<= pDocSh->GetText();
break;
case HANDLE_FONT_NAME_VARIABLES :
case HANDLE_FONT_NAME_FUNCTIONS :
@ -714,7 +714,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
case HANDLE_CUSTOM_FONT_NAME_FIXED :
{
const SmFace & rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
*pValue <<= OUString(rFace.GetFamilyName());
*pValue <<= rFace.GetFamilyName();
}
break;
case HANDLE_CUSTOM_FONT_FIXED_POSTURE:

6
svtools/source/config/helpopt.cxx
View File

@ -235,14 +235,14 @@ void SvtHelpOptions_Impl::ImplCommit()
break;
case HelpProperty::Locale:
pValues[nProp] <<= OUString(aLocale);
pValues[nProp] <<= aLocale;
break;
case HelpProperty::System:
pValues[nProp] <<= OUString(aSystem);
pValues[nProp] <<= aSystem;
break;
case HelpProperty::StyleSheet:
pValues[nProp] <<= OUString(sHelpStyleSheet);
pValues[nProp] <<= sHelpStyleSheet;
break;
}

4
svx/source/dialog/rubydialog.cxx
View File

@ -439,9 +439,9 @@ void SvxRubyDialog::GetRubyText()
for (sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
{
if (pProps[nProp].Name == cRubyBaseText)
pProps[nProp].Value <<= OUString(aEditArr[i]->GetText());
pProps[nProp].Value <<= aEditArr[i]->GetText();
else if (pProps[nProp].Name == cRubyText)
pProps[nProp].Value <<= OUString(aEditArr[i + 1]->GetText());
pProps[nProp].Value <<= aEditArr[i + 1]->GetText();
}
}
}

2
svx/source/dialog/srchdlg.cxx
View File

@ -1433,7 +1433,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
uno::Sequence < beans::PropertyValue > aArgs(2);
beans::PropertyValue* pArgs = aArgs.getArray();
pArgs[0].Name = "SearchString";
pArgs[0].Value <<= OUString(m_pSearchLB->GetText());
pArgs[0].Value <<= m_pSearchLB->GetText();
pArgs[1].Name = "ParentWindow";
pArgs[1].Value <<= VCLUnoHelper::GetInterface( this );
if(pBtn == m_pSearchComponent1PB)

2
svx/source/fmcomp/gridcell.cxx
View File

@ -1584,7 +1584,7 @@ bool DbFormattedField::commitControl()
// ein LeerString wird erst mal standardmaessig als void weitergereicht
}
else
aNewVal <<= OUString(rField.GetTextValue());
aNewVal <<= rField.GetTextValue();
m_rColumn.getModel()->setPropertyValue(FM_PROP_EFFECTIVE_VALUE, aNewVal);
return true;

2
sw/qa/extras/odfexport/odfexport.cxx
View File

@ -543,7 +543,7 @@ DECLARE_ODFEXPORT_TEST(testFdo58949, "fdo58949.docx")
save("writer8", aTempFile);
uno::Sequence<uno::Any> aArgs(1);
aArgs[0] <<= OUString(aTempFile.GetURL());
aArgs[0] <<= aTempFile.GetURL();
uno::Reference<container::XNameAccess> xNameAccess(m_xSFactory->createInstanceWithArguments("com.sun.star.packages.zip.ZipFileAccess", aArgs), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(true, bool(xNameAccess->hasByName("Obj102")));
}

2
sw/source/core/fields/expfld.cxx
View File

@ -1101,7 +1101,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
rAny <<= GetInputFlag();
break;
case FIELD_PROP_PAR4:
rAny <<= OUString(GetExpStr());
rAny <<= GetExpStr();
break;
default:
return SwField::QueryValue(rAny, nWhichId);

8
sw/source/core/unocore/unoframe.cxx
View File

@ -2134,7 +2134,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
}
else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID)
{
aAny <<= OUString(SwStyleNameMapper::GetProgName(pFormat->DerivedFrom()->GetName(), SwGetPoolIdFromName::FrmFmt ) );
aAny <<= SwStyleNameMapper::GetProgName(pFormat->DerivedFrom()->GetName(), SwGetPoolIdFromName::FrmFmt );
}
// #i73249#
else if( FN_UNO_TITLE == pEntry->nWID )
@ -2142,7 +2142,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject(rFlyFormat);
aAny <<= OUString(rFlyFormat.GetObjTitle());
aAny <<= rFlyFormat.GetObjTitle();
}
// New attribute Description
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
@ -2150,7 +2150,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
SwFlyFrameFormat& rFlyFormat = dynamic_cast<SwFlyFrameFormat&>(*pFormat);
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject(rFlyFormat);
aAny <<= OUString(rFlyFormat.GetObjDescription());
aAny <<= rFlyFormat.GetObjDescription();
}
else if(eType == FLYCNTTYPE_GRF &&
(rPropertyName == UNO_NAME_ACTUAL_SIZE))
@ -2223,7 +2223,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
aAny <<= aHexCLSID;
else if(FN_UNO_STREAM_NAME == pEntry->nWID)
{
aAny <<= OUString(pOleNode->GetOLEObj().GetCurrentPersistName());
aAny <<= pOleNode->GetOLEObj().GetCurrentPersistName();
}
else if(FN_EMBEDDED_OBJECT == pEntry->nWID)
{

10
sw/source/filter/html/htmlform.cxx
View File

@ -1321,7 +1321,7 @@ void SwHTMLParser::NewForm( bool bAppend )
uno::Reference< beans::XPropertySet > xFormPropSet( xForm, UNO_QUERY );
Any aTmp;
aTmp <<= OUString(sName);
aTmp <<= sName;
xFormPropSet->setPropertyValue("Name", aTmp );
if( !aAction.isEmpty() )
@ -1334,7 +1334,7 @@ void SwHTMLParser::NewForm( bool bAppend )
INetURLObject aURLObj( m_aPathToFile );
aAction = aURLObj.GetPartBeforeLastName();
}
aTmp <<= OUString(aAction);
aTmp <<= aAction;
xFormPropSet->setPropertyValue("TargetURL",
aTmp );
@ -1614,7 +1614,7 @@ void SwHTMLParser::InsertInput()
uno::Reference< beans::XPropertySet > xPropSet( xFComp, UNO_QUERY );
Any aTmp;
aTmp <<= OUString(sName);
aTmp <<= sName;
xPropSet->setPropertyValue("Name", aTmp );
if( HTML_IT_HIDDEN != eType )
@ -2004,7 +2004,7 @@ void SwHTMLParser::NewTextArea()
uno::Reference< beans::XPropertySet > xPropSet( xFComp, UNO_QUERY );
Any aTmp;
aTmp <<= OUString(sName);
aTmp <<= sName;
xPropSet->setPropertyValue("Name", aTmp );
aTmp <<= true;
@ -2272,7 +2272,7 @@ void SwHTMLParser::NewSelect()
uno::Reference< beans::XPropertySet > xPropSet( xFComp, UNO_QUERY );
Any aTmp;
aTmp <<= OUString(sName);
aTmp <<= sName;
xPropSet->setPropertyValue("Name", aTmp );
if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX )

2
sw/source/filter/ww8/ww8par.cxx
View File

@ -4704,7 +4704,7 @@ void SwWW8ImplReader::ReadDocVars()
{
const OUString &rName = aDocVarStrings[i];
uno::Any aValue;
aValue <<= OUString(aDocValueStrings[i]);
aValue <<= rName;
try {
xUserDefinedProps->addProperty( rName,
beans::PropertyAttribute::REMOVABLE,

6
sw/source/ui/dbui/mmresultdialogs.cxx
View File

@ -648,7 +648,7 @@ IMPL_LINK(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void)
uno::Sequence< beans::PropertyValue > aValues(1);
beans::PropertyValue* pValues = aValues.getArray();
pValues[0].Name = "FilterName";
pValues[0].Value <<= OUString(pSfxFlt->GetFilterName());
pValues[0].Value <<= pSfxFlt->GetFilterName();
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
sal_uInt32 nErrorCode = ERRCODE_NONE;
@ -1079,7 +1079,7 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void)
uno::Sequence< beans::PropertyValue > aValues(1);
beans::PropertyValue* pValues = aValues.getArray();
pValues[0].Name = "FilterName";
pValues[0].Value <<= OUString(pTargetSfxFlt->GetFilterName());
pValues[0].Value <<= pTargetSfxFlt->GetFilterName();
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
xStore->storeToURL( sTargetTempURL, aValues );
@ -1130,7 +1130,7 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void)
uno::Sequence< beans::PropertyValue > aFilterValues(withFilterOptions ? 2 : 1);
beans::PropertyValue* pFilterValues = aFilterValues.getArray();
pFilterValues[0].Name = "FilterName";
pFilterValues[0].Value <<= OUString(pSfxFlt->GetFilterName());
pFilterValues[0].Value <<= pSfxFlt->GetFilterName();
if(withFilterOptions)
{
pFilterValues[1].Name = "FilterOptions";

6
sw/source/ui/index/cntex.cxx
View File

@ -68,7 +68,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
if(xInfo->hasPropertyByName(aPropName))
{
uno::Any aValue;
aValue <<= OUString(rValue);
aValue <<= rValue;
xProps->setPropertyValue(aPropName, aValue);
}
}
@ -339,7 +339,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
pPropValArr[0].Name = "TokenType";
pPropValArr[0].Value <<= sTokenType;
pPropValArr[1].Name = "CharacterStyleName";
pPropValArr[1].Value <<= OUString(aToken.sCharStyleName);
pPropValArr[1].Value <<= aToken.sCharStyleName;
if(TOKEN_TAB_STOP == aToken.eTokenType)
{
pPropValArr[2].Name = "TabStopRightAligned";
@ -355,7 +355,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
else if(TOKEN_TEXT == aToken.eTokenType)
{
pPropValArr[2].Name = "Text";
pPropValArr[2].Value <<= OUString(aToken.sText);
pPropValArr[2].Value <<= aToken.sText;
}
beans::PropertyValues* pValues = aSequPropVals.getArray();
pValues[nTokenIndex] = aPropVals;

2
sw/source/uibase/config/fontcfg.cxx
View File

@ -152,7 +152,7 @@ void SwStdFontConfig::ImplCommit()
if( nProp < DEF_FONT_COUNT )
{
if(GetDefaultFor(nProp, lcl_LanguageOfType(nProp, eWestern, eCJK, eCTL)) != sDefaultFonts[nProp])
pValues[nProp] <<= OUString(sDefaultFonts[nProp]);
pValues[nProp] <<= sDefaultFonts[nProp];
}
else
{

2
sw/source/uibase/dbui/mailmergehelper.cxx
View File

@ -689,7 +689,7 @@ uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*
{
uno::Any aRet;
if( m_bIsBody )
aRet <<= OUString(m_sBody);
aRet <<= m_sBody;
else
{
Sequence<sal_Int8> aData;

2
sw/source/uibase/shells/drformsh.cxx
View File

@ -125,7 +125,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
OUString sLabel("Label");
if( xPropInfoSet->hasPropertyByName(sLabel) )
{
aTmp <<= OUString(rHLinkItem.GetName());
aTmp <<= rHLinkItem.GetName();
xPropSet->setPropertyValue(sLabel, aTmp );
}

4
sw/source/uibase/shells/textdrw.cxx
View File

@ -87,7 +87,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
uno::Any aTmp;
aTmp <<= OUString(rText);
aTmp <<= rText;
xPropSet->setPropertyValue( "Label", aTmp );
SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
@ -95,7 +95,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
if( pMedium )
aAbs = pMedium->GetURLObject();
aTmp <<= OUString(URIHelper::SmartRel2Abs(aAbs, rURL));
aTmp <<= URIHelper::SmartRel2Abs(aAbs, rURL);
xPropSet->setPropertyValue( "TargetURL", aTmp );
if( !rTarget.isEmpty() )

4
sw/source/uibase/uno/unoatxt.cxx
View File

@ -625,10 +625,10 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
switch(pEntry->nWID)
{
case WID_GROUP_PATH:
aAny <<= OUString(pGlosGroup->GetFileName());
aAny <<= pGlosGroup->GetFileName();
break;
case WID_GROUP_TITLE:
aAny <<= OUString(pGlosGroup->GetName());
aAny <<= pGlosGroup->GetName();
break;
}
return aAny;

4
sw/source/uibase/uno/unotxdoc.cxx
View File

@ -4064,7 +4064,7 @@ Any SwXLinkNameAccessWrapper::getPropertyValue(const OUString& rPropertyName)
Any aRet;
if( rPropertyName == UNO_LINK_DISPLAY_NAME )
{
aRet <<= OUString(sLinkDisplayName);
aRet <<= sLinkDisplayName;
}
else if( rPropertyName == UNO_LINK_DISPLAY_BITMAP )
{
@ -4138,7 +4138,7 @@ Any SwXOutlineTarget::getPropertyValue(const OUString& rPropertyName)
{
Any aRet;
if(rPropertyName == UNO_LINK_DISPLAY_NAME)
aRet <<= OUString(sOutlineText);
aRet <<= sOutlineText;
else
throw UnknownPropertyException();
return aRet;