Skip to content

C
core
Kaydet (Commit) 48b8898b authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

clang-tidy performance-unnecessary-value-param in basctl 

Change-Id: Ie48eb08edd1335661d1ef57ae652713143951317
üst f045c536
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 69 deletions
basctl/source/basicide/basides1.cxx
Dosyayı görüntüle @ 48b8898b
......@@ -345,7 +345,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
if ( aWindowTable.find( rTabId.GetValue() ) != aWindowTable.end() )
{
BaseWindow* pWin = aWindowTable[ rTabId.GetValue() ];
OUString aNewName( rModName.GetValue() );
const OUString& aNewName( rModName.GetValue() );
OUString aOldName( pWin->GetName() );
if ( aNewName != aOldName )
{
......@@ -431,7 +431,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
uno::Reference< frame::XModel > xModel( rShellItem.GetValue(), UNO_QUERY );
ScriptDocument aDocument( xModel.is() ? ScriptDocument( xModel ) : ScriptDocument::getApplicationScriptDocument() );
const SfxStringItem& rLibNameItem = static_cast<const SfxStringItem&>(rReq.GetArgs()->Get( SID_BASICIDE_ARG_LIBNAME ));
OUString aLibName( rLibNameItem.GetValue() );
const OUString& aLibName( rLibNameItem.GetValue() );
if ( nSlot == SID_BASICIDE_LIBSELECTED )
{
......
basctl/source/basicide/bastype2.cxx
Dosyayı görüntüle @ 48b8898b
......@@ -257,15 +257,14 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons
{
// check, if the module library is loaded
bool bModLibLoaded = false;
OUString aOULibName( aLibName );
Reference< script::XLibraryContainer > xModLibContainer( rDocument.getLibraryContainer( E_SCRIPTS ) );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) )
if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryLoaded( aLibName ) )
bModLibLoaded = true;
// check, if the dialog library is loaded
bool bDlgLibLoaded = false;
Reference< script::XLibraryContainer > xDlgLibContainer( rDocument.getLibraryContainer( E_DIALOGS ) );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) )
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryLoaded( aLibName ) )
bDlgLibLoaded = true;
bool bLoaded = bModLibLoaded || bDlgLibLoaded;
......@@ -273,11 +272,11 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons
// if only one of the libraries is loaded, load also the other
if ( bLoaded )
{
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && !xModLibContainer->isLibraryLoaded( aOULibName ) )
xModLibContainer->loadLibrary( aOULibName );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && !xModLibContainer->isLibraryLoaded( aLibName ) )
xModLibContainer->loadLibrary( aLibName );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && !xDlgLibContainer->isLibraryLoaded( aOULibName ) )
xDlgLibContainer->loadLibrary( aOULibName );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && !xDlgLibContainer->isLibraryLoaded( aLibName ) )
xDlgLibContainer->loadLibrary( aLibName );
}
// create tree list box entry
......
basctl/source/basicide/localizationmgr.cxx
Dosyayı görüntüle @ 48b8898b
......@@ -168,7 +168,7 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
OUString implCreatePureResourceId
( const OUString& aDialogName, const OUString& aCtrlName,
const OUString& aPropName,
Reference< XStringResourceManager > xStringResourceManager )
const Reference< XStringResourceManager >& xStringResourceManager )
{
sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
OUString aPureIdStr = OUString::number( nUniqueId );
......@@ -189,8 +189,8 @@ OUString implCreatePureResourceId
// either the first one for mode SET_IDS or the last one for mode RESET_IDS
sal_Int32 LocalizationMgr::implHandleControlResourceProperties
(const Any& rControlAny, const OUString& aDialogName, const OUString& aCtrlName,
Reference< XStringResourceManager > xStringResourceManager,
Reference< XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode )
const Reference< XStringResourceManager >& xStringResourceManager,
const Reference< XStringResourceResolver >& xSourceStringResolver, HandleResourceMode eMode )
{
sal_Int32 nChangedCount = 0;
......@@ -296,8 +296,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
// Rename resource id
else if( eMode == RENAME_DIALOG_IDS || eMode == RENAME_CONTROL_IDS )
{
OUString aSourceIdStr = aPropStr;
OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
OUString aPureSourceIdStr = aPropStr.copy( 1 );
OUString aPureIdStr = implCreatePureResourceId
( aDialogName, aCtrlName, aPropName, xStringResourceManager );
......@@ -329,8 +328,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
// Replace string by string from source StringResourceResolver
else if( eMode == MOVE_RESOURCES && xSourceStringResolver.is() )
{
OUString aSourceIdStr = aPropStr;
OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
OUString aPureSourceIdStr = aPropStr.copy( 1 );
OUString aPureIdStr = implCreatePureResourceId
( aDialogName, aCtrlName, aPropName, xStringResourceManager );
......@@ -366,8 +364,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
// Copy string from source to target resource
else if( eMode == COPY_RESOURCES && xSourceStringResolver.is() )
{
OUString aSourceIdStr = aPropStr;
OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
OUString aPureSourceIdStr = aPropStr.copy( 1 );
const Locale& rDefaultLocale = xSourceStringResolver->getDefaultLocale();
......@@ -899,7 +896,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
}
void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName,
const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel )
const OUString& aDlgName, const Reference< container::XNameContainer >& xDialogModel )
{
static const char aResourceResolverPropName[] = "ResourceResolver";
......@@ -931,7 +928,7 @@ void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument
}
void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName,
const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel )
const OUString& aDlgName, const Reference< container::XNameContainer >& xDialogModel )
{
// Get library
Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) );
......@@ -962,7 +959,7 @@ void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument,
}
void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName,
const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel )
const OUString& aDlgName, const Reference< container::XNameContainer >& xDialogModel )
{
// Get library
Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) );
......@@ -992,8 +989,8 @@ void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument,
}
}
void LocalizationMgr::resetResourceForDialog( Reference< container::XNameContainer > xDialogModel,
Reference< XStringResourceManager > xStringResourceManager )
void LocalizationMgr::resetResourceForDialog( const Reference< container::XNameContainer >& xDialogModel,
const Reference< XStringResourceManager >& xStringResourceManager )
{
if( !xStringResourceManager.is() )
return;
......@@ -1019,8 +1016,8 @@ void LocalizationMgr::resetResourceForDialog( Reference< container::XNameContain
}
}
void LocalizationMgr::setResourceIDsForDialog( Reference< container::XNameContainer > xDialogModel,
Reference< XStringResourceManager > xStringResourceManager )
void LocalizationMgr::setResourceIDsForDialog( const Reference< container::XNameContainer >& xDialogModel,
const Reference< XStringResourceManager >& xStringResourceManager )
{
if( !xStringResourceManager.is() )
return;
......@@ -1048,7 +1045,7 @@ void LocalizationMgr::setResourceIDsForDialog( Reference< container::XNameContai
void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor,
const Any& rControlAny, const OUString& aCtrlName,
Reference< XStringResourceResolver > xSourceStringResolver )
const Reference< XStringResourceResolver >& xSourceStringResolver )
{
// Get library for DlgEditor
DialogWindow* pDlgWin = FindDialogWindowForEditor( pEditor );
......@@ -1073,9 +1070,9 @@ void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor* pEditor,
xSourceStringResolver, MOVE_RESOURCES );
}
void LocalizationMgr::copyResourceForDroppedDialog( Reference< container::XNameContainer > xDialogModel,
const OUString& aDialogName, Reference< XStringResourceManager > xStringResourceManager,
Reference< XStringResourceResolver > xSourceStringResolver )
void LocalizationMgr::copyResourceForDroppedDialog( const Reference< container::XNameContainer >& xDialogModel,
const OUString& aDialogName, const Reference< XStringResourceManager >& xStringResourceManager,
const Reference< XStringResourceResolver >& xSourceStringResolver )
{
if( !xStringResourceManager.is() )
return;
......@@ -1129,7 +1126,7 @@ void LocalizationMgr::copyResourceForDialog(
}
Reference< XStringResourceManager > LocalizationMgr::getStringResourceFromDialogLibrary
( Reference< container::XNameContainer > xDialogLib )
( const Reference< container::XNameContainer >& xDialogLib )
{
Reference< XStringResourceManager > xStringResourceManager;
if( xDialogLib.is() )
......
basctl/source/basicide/moduldl2.cxx
Dosyayı görüntüle @ 48b8898b
......@@ -1011,8 +1011,7 @@ void LibPage::InsertLib()
{
try
{
OUString _aPassword( aPassword );
xPasswd->changeLibraryPassword( aLibName, OUString(), _aPassword );
xPasswd->changeLibraryPassword( aLibName, OUString(), aPassword );
}
catch (...)
{
......@@ -1101,16 +1100,15 @@ void LibPage::Export()
OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) );
// Password verification
OUString aOULibName( aLibName );
Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && !xModLibContainer->isLibraryLoaded( aOULibName ) )
if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && !xModLibContainer->isLibraryLoaded( aLibName ) )
{
bool bOK = true;
// check password
Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) )
{
OUString aPassword;
Reference< script::XLibraryContainer > xModLibContainer1( xModLibContainer, UNO_QUERY );
......@@ -1139,22 +1137,21 @@ void LibPage::Export()
void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetURL,
const Reference< task::XInteractionHandler >& Handler )
{
OUString aOULibName( aLibName );
Reference< script::XLibraryContainerExport > xModLibContainerExport
( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
Reference< script::XLibraryContainerExport > xDlgLibContainerExport
( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
if ( xModLibContainerExport.is() )
xModLibContainerExport->exportLibrary( aOULibName, aTargetURL, Handler );
xModLibContainerExport->exportLibrary( aLibName, aTargetURL, Handler );
if (!xDlgLibContainerExport.is())
return;
Reference<container::XNameAccess> xNameAcc(xDlgLibContainerExport, UNO_QUERY);
if (!xNameAcc.is())
return;
if (!xNameAcc->hasByName(aOULibName))
if (!xNameAcc->hasByName(aLibName))
return;
xDlgLibContainerExport->exportLibrary(aOULibName, aTargetURL, Handler);
xDlgLibContainerExport->exportLibrary(aLibName, aTargetURL, Handler);
}
// Implementation XCommandEnvironment
......@@ -1342,11 +1339,10 @@ void LibPage::DeleteCurrent()
// check, if library is link
bool bIsLibraryLink = false;
OUString aOULibName( aLibName );
Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLink( aOULibName ) ) ||
( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLink( aOULibName ) ) )
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryLink( aLibName ) ) ||
( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryLink( aLibName ) ) )
{
bIsLibraryLink = true;
}
......@@ -1361,10 +1357,10 @@ void LibPage::DeleteCurrent()
SfxCallMode::SYNCHRON, { &aDocItem, &aLibNameItem });
// remove library from module and dialog library containers
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
xModLibContainer->removeLibrary( aOULibName );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) )
xDlgLibContainer->removeLibrary( aOULibName );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) )
xModLibContainer->removeLibrary( aLibName );
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) )
xDlgLibContainer->removeLibrary( aLibName );
static_cast<SvTreeListBox&>(*m_pLibBox).GetModel()->Remove( pCurEntry );
MarkDocumentModified( m_aCurDocument );
......@@ -1442,14 +1438,13 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong
{
// check, if library is password protected
bool bProtected = false;
OUString aOULibName( rLibName );
Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
if ( xModLibContainer.is() && xModLibContainer->hasByName( rLibName ) )
{
Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
if ( xPasswd.is() )
{
bProtected = xPasswd->isLibraryPasswordProtected( aOULibName );
bProtected = xPasswd->isLibraryPasswordProtected( rLibName );
}
}
......@@ -1464,9 +1459,9 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong
}
// check, if library is link
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLink( aOULibName ) )
if ( xModLibContainer.is() && xModLibContainer->hasByName( rLibName ) && xModLibContainer->isLibraryLink( rLibName ) )
{
OUString aLinkURL = xModLibContainer->getLibraryLinkURL( aOULibName );
OUString aLinkURL = xModLibContainer->getLibraryLinkURL( rLibName );
m_pLibBox->SetEntryText( aLinkURL, pNewEntry, 1 );
}
......
basctl/source/dlged/dlged.cxx
Dosyayı görüntüle @ 48b8898b
......@@ -345,7 +345,7 @@ void DlgEditor::UpdateScrollBars()
}
void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoControlDialogModel )
void DlgEditor::SetDialog( const uno::Reference< container::XNameContainer >& xUnoControlDialogModel )
{
// set dialog model
m_xUnoControlDialogModel = xUnoControlDialogModel;
......@@ -645,7 +645,7 @@ void DlgEditor::Cut()
}
void implCopyStreamToByteSequence( Reference< XInputStream > xStream,
void implCopyStreamToByteSequence( const Reference< XInputStream >& xStream,
Sequence< sal_Int8 >& bytes )
{
xStream->readBytes( bytes, xStream->available() );
......
basctl/source/inc/dlged.hxx
Dosyayı görüntüle @ 48b8898b
......@@ -159,7 +159,7 @@ public:
void DoScroll( ScrollBar* pActScroll );
void UpdateScrollBars();
void SetDialog (css::uno::Reference<css::container::XNameContainer> xUnoControlDialogModel);
void SetDialog (const css::uno::Reference<css::container::XNameContainer>& xUnoControlDialogModel);
void ResetDialog ();
css::uno::Reference< css::container::XNameContainer > GetDialog() const
{return m_xUnoControlDialogModel;}
......
basctl/source/inc/localizationmgr.hxx
Dosyayı görüntüle @ 48b8898b
......@@ -54,8 +54,8 @@ class LocalizationMgr
static sal_Int32 implHandleControlResourceProperties(const css::uno::Any& rControlAny,
const OUString& aDialogName,
const OUString& aCtrlName,
css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager,
css::uno::Reference< css::resource::XStringResourceResolver > xSourceStringResolver,
const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
const css::uno::Reference< css::resource::XStringResourceResolver >& xSourceStringResolver,
HandleResourceMode eMode );
void enableResourceForAllLibraryDialogs()
......@@ -105,36 +105,35 @@ public:
const css::uno::Any& rControlAny, const OUString& aCtrlName);
static void setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
css::uno::Reference< css::container::XNameContainer > xDialogModel );
const css::uno::Reference< css::container::XNameContainer >& xDialogModel );
static void renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
css::uno::Reference< css::container::XNameContainer > xDialogModel );
const css::uno::Reference< css::container::XNameContainer >& xDialogModel );
static void removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
css::uno::Reference< css::container::XNameContainer > xDialogModel );
const css::uno::Reference< css::container::XNameContainer >& xDialogModel );
static css::uno::Reference< css::resource::XStringResourceManager >
getStringResourceFromDialogLibrary( css::uno::Reference
< css::container::XNameContainer > xDialogLib );
getStringResourceFromDialogLibrary( const css::uno::Reference< css::container::XNameContainer >& xDialogLib );
// Clipboard / Drag & Drop
static void resetResourceForDialog(
css::uno::Reference< css::container::XNameContainer > xDialogModel,
css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager );
const css::uno::Reference< css::container::XNameContainer >& xDialogModel,
const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager );
static void setResourceIDsForDialog(
css::uno::Reference< css::container::XNameContainer > xDialogModel,
css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager );
const css::uno::Reference< css::container::XNameContainer >& xDialogModel,
const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager );
static void copyResourcesForPastedEditorObject( DlgEditor* pEditor,
const css::uno::Any& rControlAny, const OUString& aCtrlName,
css::uno::Reference< css::resource::XStringResourceResolver > xSourceStringResolver );
const css::uno::Reference< css::resource::XStringResourceResolver >& xSourceStringResolver );
static void copyResourceForDroppedDialog(
css::uno::Reference< css::container::XNameContainer > xDialogModel,
const css::uno::Reference< css::container::XNameContainer >& xDialogModel,
const OUString& aDialogName,
css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager,
css::uno::Reference< css::resource::XStringResourceResolver > xSourceStringResolver );
const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
const css::uno::Reference< css::resource::XStringResourceResolver >& xSourceStringResolver );
static void copyResourceForDialog(
const css::uno::Reference< css::container::XNameContainer >& xDialogModel,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment