summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-05-19 17:18:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-05-19 17:18:38 +0200
commit1649c76401009574aeba725365186c102e86130d (patch)
treea2095446e8463b330437dd31a05e76c166756211 /cui
parent5de6294a94d2acd6b4cdf57c55dcbdbbf9e5e522 (diff)
loplugin:stringcopy: cui
Change-Id: I5166036e4173292c9a7291a1a846e661fbbcd010
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/cfg.cxx10
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx6
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx4
-rw-r--r--cui/source/dialogs/hldocntp.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx6
-rw-r--r--cui/source/dialogs/scriptdlg.cxx10
-rw-r--r--cui/source/options/connpooloptions.cxx6
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/personalization.cxx2
-rw-r--r--cui/source/options/treeopt.cxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx4
-rw-r--r--cui/source/tabpages/numfmt.cxx2
12 files changed, 28 insertions, 28 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index c28e5f4528fb..b70d6c57faf4 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -571,7 +571,7 @@ ConvertSvxConfigEntry( const SvxConfigEntry* pEntry )
uno::Sequence< beans::PropertyValue > aPropSeq( 3 );
aPropSeq[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
- aPropSeq[0].Value <<= OUString( pEntry->GetCommand() );
+ aPropSeq[0].Value <<= pEntry->GetCommand();
aPropSeq[1].Name = ITEM_DESCRIPTOR_TYPE;
aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT;
@@ -586,7 +586,7 @@ ConvertSvxConfigEntry( const SvxConfigEntry* pEntry )
}
else
{
- aPropSeq[2].Value <<= OUString( pEntry->GetName() );
+ aPropSeq[2].Value <<= pEntry->GetName();
}
return aPropSeq;
@@ -598,7 +598,7 @@ ConvertToolbarEntry( const SvxConfigEntry* pEntry )
uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
aPropSeq[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
- aPropSeq[0].Value <<= OUString( pEntry->GetCommand() );
+ aPropSeq[0].Value <<= pEntry->GetCommand();
aPropSeq[1].Name = ITEM_DESCRIPTOR_TYPE;
aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT;
@@ -613,7 +613,7 @@ ConvertToolbarEntry( const SvxConfigEntry* pEntry )
}
else
{
- aPropSeq[2].Value <<= OUString( pEntry->GetName() );
+ aPropSeq[2].Value <<= pEntry->GetName();
}
aPropSeq[3].Name = ITEM_DESCRIPTOR_ISVISIBLE;
@@ -5270,7 +5270,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
{
sal_uInt16 nId = pTbSymbol->GetItemId( n );
- if ( OUString( pTbSymbol->GetItemText( nId ) ) == aURL )
+ if ( pTbSymbol->GetItemText( nId ) == aURL )
{
try
{
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index e88feb3fafcf..fabefa73844d 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -247,7 +247,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
RID_STR_SEARCH_WHOLE
};
for (unsigned short nResId : nResIds)
- m_plbPosition->InsertEntry( OUString( CuiResId( nResId ) ) );
+ m_plbPosition->InsertEntry( CuiResId( nResId ) );
m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE);
// the field listbox
@@ -438,7 +438,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void)
// direction -> pass on and reset the checkbox-text for StartOver
else if (&rBox == m_pcbBackwards)
{
- m_pcbStartOver->SetText( OUString( CuiResId( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
+ m_pcbStartOver->SetText( CuiResId( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) );
m_pSearchEngine->SetDirection(!bChecked);
}
// similarity-search or regular expression
@@ -762,7 +762,7 @@ void FmSearchDialog::LoadParams()
// that way the data is handed on to the SearchEngine and all dependent settings are done
// current field
- sal_Int32 nInitialField = m_plbField->GetEntryPos( OUString( aParams.sSingleSearchField ) );
+ sal_Int32 nInitialField = m_plbField->GetEntryPos( aParams.sSingleSearchField );
if (nInitialField == LISTBOX_ENTRY_NOTFOUND)
nInitialField = 0;
m_plbField->SelectEntryPos(nInitialField);
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 273363e384cd..4015db7bc5e5 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -748,7 +748,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
m_pCbbFileType->EnableDDAutoWidth( false );
m_pLbxFound->SetDoubleClickHdl(LINK(this, TPGalleryThemeProperties, DClickFoundHdl));
m_pLbxFound->SetSelectHdl(LINK(this, TPGalleryThemeProperties, SelectFoundHdl));
- m_pLbxFound->InsertEntry(OUString(CuiResId(RID_SVXSTR_GALLERY_NOFILES)));
+ m_pLbxFound->InsertEntry(CuiResId(RID_SVXSTR_GALLERY_NOFILES));
m_pLbxFound->Show();
FillFilterList();
@@ -1182,7 +1182,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void)
}
else
{
- m_pLbxFound->InsertEntry( OUString( CuiResId( RID_SVXSTR_GALLERY_NOFILES ) ) );
+ m_pLbxFound->InsertEntry( CuiResId( RID_SVXSTR_GALLERY_NOFILES ) );
m_pBtnTakeAll->Disable();
m_pCbxPreview->Disable();
bEntriesFound = false;
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index d37c5991ce80..4be3c5269964 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -432,7 +432,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void)
INetURLObject aURL( aStrURL, INetProtocol::File );
OUString aStrName;
if( bHandleFileName )
- aStrName = bZeroPath? aTempStrURL : OUString(aURL.getName());
+ aStrName = bZeroPath? aTempStrURL : aURL.getName();
m_pCbbPath->SetBaseURL( xFolderPicker->getDirectory() );
OUString aStrTmp( xFolderPicker->getDirectory() );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 15e43da019e7..8dac3b062fbb 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -340,13 +340,13 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void)
SfxMacroTabPage *pMacroPage = static_cast<SfxMacroTabPage*>( aDlg->GetTabPage() );
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOverObject )
- pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT1) ),
+ pMacroPage->AddEvent( CuiResId(RID_SVXSTR_HYPDLG_MACROACT1),
SFX_EVENT_MOUSEOVER_OBJECT );
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseClickObject )
- pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT2) ),
+ pMacroPage->AddEvent( CuiResId(RID_SVXSTR_HYPDLG_MACROACT2),
SFX_EVENT_MOUSECLICK_OBJECT);
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOutObject )
- pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT3) ),
+ pMacroPage->AddEvent( CuiResId(RID_SVXSTR_HYPDLG_MACROACT3),
SFX_EVENT_MOUSEOUT_OBJECT);
if ( bIsInputEnabled )
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index bc625d315003..a880d40ec975 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1227,12 +1227,12 @@ OUString FormatErrorString(
if ( !type.isEmpty() )
{
- result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type;
+ result += "\n\n" + CuiResId(RID_SVXSTR_ERROR_TYPE_LABEL) + " " + type;
}
if ( !message.isEmpty() )
{
- result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message;
+ result += "\n\n" + CuiResId(RID_SVXSTR_ERROR_MESSAGE_LABEL) + " " + message;
}
return result;
@@ -1344,8 +1344,8 @@ OUString GetErrorMessage(
}
if ( sError.errorType == provider::ScriptFrameworkErrorType::NOTSUPPORTED )
{
- message = OUString(
- CuiResId( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
+ message =
+ CuiResId( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED );
message = ReplaceString(message, "%LANGUAGENAME", language );
}
@@ -1440,7 +1440,7 @@ IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void )
}
else
{
- message = OUString( CuiResId( RID_SVXSTR_ERROR_TITLE ) );
+ message = CuiResId( RID_SVXSTR_ERROR_TITLE );
}
ScopedVclPtrInstance<MessageDialog> pBox( nullptr, message, VclMessageType::Warning );
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 5e8d53471b15..850a05d8d2c2 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -128,11 +128,11 @@ namespace offapp
EditBrowseBox::Init();
Size aColWidth = LogicToPixel(Size(160, 0), MapUnit::MapAppFont);
- InsertDataColumn(1, OUString(CuiResId(RID_SVXSTR_DRIVER_NAME)), aColWidth.Width());
+ InsertDataColumn(1, CuiResId(RID_SVXSTR_DRIVER_NAME), aColWidth.Width());
aColWidth = LogicToPixel(Size(30, 0), MapUnit::MapAppFont);
- InsertDataColumn(2, OUString(CuiResId(RID_SVXSTR_POOLED_FLAG)), aColWidth.Width());
+ InsertDataColumn(2, CuiResId(RID_SVXSTR_POOLED_FLAG), aColWidth.Width());
aColWidth = LogicToPixel(Size(60, 0), MapUnit::MapAppFont);
- InsertDataColumn(3, OUString(CuiResId(RID_SVXSTR_POOL_TIMEOUT)), aColWidth.Width());
+ InsertDataColumn(3, CuiResId(RID_SVXSTR_POOL_TIMEOUT), aColWidth.Width());
// Attention: the resource of the string is local to the resource of the enclosing dialog!
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 292558a6365d..93e38013d35c 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -465,7 +465,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo const * _pInfo )
if ( ( _pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE ) == JFW_FEATURE_ACCESSBRIDGE )
sEntry.append(m_sAccessibilityText);
SvTreeListEntry* pEntry = m_pJavaList->InsertEntry(sEntry.makeStringAndClear());
- INetURLObject aLocObj( OUString( _pInfo->sLocation ) );
+ INetURLObject aLocObj( _pInfo->sLocation );
OUString* pLocation = new OUString( aLocObj.getFSysPath( FSysStyle::Detect ) );
pEntry->SetUserData( pLocation );
#else
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index fa4d7f452072..66f663d68fb4 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -209,7 +209,7 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, Button*, pButton, void )
// get the persona name from the setting variable to show in the progress.
sal_Int32 nNameIndex = m_aSelectedPersona.indexOf( ';' );
OUString aName = m_aSelectedPersona.copy( 0, nNameIndex );
- OUString aProgress = OUString(CuiResId(RID_SVXSTR_SELECTEDPERSONA)) + aName;
+ OUString aProgress = CuiResId(RID_SVXSTR_SELECTEDPERSONA) + aName;
SetProgress( aProgress );
}
break;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e0b799b73da8..96ac53d0f283 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -125,7 +125,7 @@ static char const VIEWOPT_DATANAME[] = "page data";
static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData )
{
- rOpt.SetUserItem( VIEWOPT_DATANAME, Any( OUString( rData ) ) );
+ rOpt.SetUserItem( VIEWOPT_DATANAME, Any( rData ) );
}
static inline OUString GetViewOptUserItem( const SvtViewOptions& rOpt )
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 758859897bf9..4353d654d5f9 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1613,10 +1613,10 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(bool bFromReset,
sal_Int32 i;
for(i = 0; i < m_pAbbrevLB->GetEntryCount(); i++)
- pArrays->aAbbrevStrings.push_back(OUString(m_pAbbrevLB->GetEntry(i)));
+ pArrays->aAbbrevStrings.push_back(m_pAbbrevLB->GetEntry(i));
for(i = 0; i < m_pDoubleCapsLB->GetEntryCount(); i++)
- pArrays->aDoubleCapsStrings.push_back(OUString(m_pDoubleCapsLB->GetEntry(i)));
+ pArrays->aDoubleCapsStrings.push_back(m_pDoubleCapsLB->GetEntry(i));
}
m_pDoubleCapsLB->Clear();
m_pAbbrevLB->Clear();
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 8e7944d5c625..ba67fc85c0c4 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1410,7 +1410,7 @@ bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB)
SetCategory(nCatLbSelPos );
FillFormatListBox_Impl( aEntryList );
- if(m_pEdComment->GetText()!=OUString(m_pLbCategory->GetEntry(1)))
+ if(m_pEdComment->GetText()!=m_pLbCategory->GetEntry(1))
{
pNumFmtShell->SetComment4Entry(nFmtLbSelPos,
m_pEdComment->GetText());