diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-20 10:34:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-04-21 08:32:47 +0200 |
commit | 5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch) | |
tree | 2407c6fc040a795e6ffc69de02ba940285c04c7f /cui | |
parent | 5bb308a9ad16f6002486a60e4a753693818580b6 (diff) |
new plugin stylepolice
check for local variables which follow our member field naming
convention, which is highly confusing
Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/cfg.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 24 | ||||
-rw-r--r-- | cui/source/options/optjava.cxx | 20 |
3 files changed, 26 insertions, 26 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index c3c16d6f3157..92f4761933e4 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -5030,18 +5030,18 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, m_xImportedImageManager = css::ui::ImageManager::create( xComponentContext ); m_xImportedImageManager->initialize(aProp); - ImageInfo mImageInfo; + ImageInfo aImageInfo1; uno::Sequence< OUString > names; if ( m_xImportedImageManager.is() ) { names = m_xImportedImageManager->getAllImageNames( GetImageType() ); for ( sal_Int32 n = 0; n < names.getLength(); ++n ) - mImageInfo.insert( ImageInfo::value_type( names[n], false )); + aImageInfo1.insert( ImageInfo::value_type( names[n], false )); } sal_uInt16 nId = 1; - ImageInfo::const_iterator pConstIter = mImageInfo.begin(); + ImageInfo::const_iterator pConstIter = aImageInfo1.begin(); uno::Sequence< OUString > name( 1 ); - while ( pConstIter != mImageInfo.end() ) + while ( pConstIter != aImageInfo1.end() ) { name[ 0 ] = pConstIter->first; uno::Sequence< uno::Reference< graphic::XGraphic> > graphics = m_xImportedImageManager->getImages( GetImageType(), name ); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 6175603eccdc..4a10d6f6c434 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -365,14 +365,14 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void) if (maTakeThread.is()) maTakeThread->join(); - TPGalleryThemeProperties* mpBrowser = static_cast<TPGalleryThemeProperties*>( GetParent() ); - ::std::vector<bool, std::allocator<bool> > aRemoveEntries( mpBrowser->aFoundList.size(), false ); + TPGalleryThemeProperties* pBrowser = static_cast<TPGalleryThemeProperties*>( GetParent() ); + ::std::vector<bool, std::allocator<bool> > aRemoveEntries( pBrowser->aFoundList.size(), false ); ::std::vector< OUString > aRemainingVector; sal_uInt32 i, nCount; GetParent()->EnterWait(); - mpBrowser->m_pLbxFound->SetUpdateMode( false ); - mpBrowser->m_pLbxFound->SetNoSelection(); + pBrowser->m_pLbxFound->SetUpdateMode( false ); + pBrowser->m_pLbxFound->SetNoSelection(); // mark all taken positions in aRemoveEntries for( i = 0, nCount = maTakenList.size(); i < nCount; ++i ) @@ -382,29 +382,29 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void) // refill found list for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i ) if( !aRemoveEntries[ i ] ) - aRemainingVector.push_back( mpBrowser->aFoundList[i] ); + aRemainingVector.push_back( pBrowser->aFoundList[i] ); - mpBrowser->aFoundList.clear(); + pBrowser->aFoundList.clear(); for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i ) - mpBrowser->aFoundList.push_back( aRemainingVector[ i ] ); + pBrowser->aFoundList.push_back( aRemainingVector[ i ] ); aRemainingVector.clear(); // refill list box for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i ) if( !aRemoveEntries[ i ] ) - aRemainingVector.push_back( mpBrowser->m_pLbxFound->GetEntry( (sal_uInt16) i ) ); + aRemainingVector.push_back( pBrowser->m_pLbxFound->GetEntry( (sal_uInt16) i ) ); - mpBrowser->m_pLbxFound->Clear(); + pBrowser->m_pLbxFound->Clear(); for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i ) - mpBrowser->m_pLbxFound->InsertEntry( aRemainingVector[ i ] ); + pBrowser->m_pLbxFound->InsertEntry( aRemainingVector[ i ] ); aRemainingVector.clear(); - mpBrowser->m_pLbxFound->SetUpdateMode( true ); - mpBrowser->SelectFoundHdl( *mpBrowser->m_pLbxFound ); + pBrowser->m_pLbxFound->SetUpdateMode( true ); + pBrowser->SelectFoundHdl( *pBrowser->m_pLbxFound ); GetParent()->LeaveWait(); EndDialog( RET_OK ); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 14e750c21a04..c9955912d3ef 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -422,15 +422,15 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) { - ScopedVclPtrInstance< CuiAboutConfigTabPage > m_pExpertConfigDlg(this); - m_pExpertConfigDlg->Reset();//initialize and reset function + ScopedVclPtrInstance< CuiAboutConfigTabPage > pExpertConfigDlg(this); + pExpertConfigDlg->Reset();//initialize and reset function - if( RET_OK == m_pExpertConfigDlg->Execute() ) + if( RET_OK == pExpertConfigDlg->Execute() ) { - m_pExpertConfigDlg->FillItemSet();//save changes if there are any + pExpertConfigDlg->FillItemSet();//save changes if there are any } - m_pExpertConfigDlg.disposeAndClear(); + pExpertConfigDlg.disposeAndClear(); } @@ -890,14 +890,14 @@ void SvxJavaParameterDlg::EditParameter() if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { - ScopedVclPtrInstance< InputDialog > m_pParamEditDlg( CUI_RES( RID_SVXSTR_JAVA_START_PARAM ).toString(), this); + ScopedVclPtrInstance< InputDialog > pParamEditDlg( CUI_RES( RID_SVXSTR_JAVA_START_PARAM ).toString(), this); OUString editableClassPath = m_pAssignedList->GetSelectEntry(); - m_pParamEditDlg->SetEntryText( editableClassPath ); - m_pParamEditDlg->HideHelpBtn(); + pParamEditDlg->SetEntryText( editableClassPath ); + pParamEditDlg->HideHelpBtn(); - if(!m_pParamEditDlg->Execute()) + if(!pParamEditDlg->Execute()) return; - OUString editedClassPath = comphelper::string::strip( m_pParamEditDlg->GetEntryText(), ' '); + OUString editedClassPath = comphelper::string::strip( pParamEditDlg->GetEntryText(), ' '); if ( !editedClassPath.isEmpty() && editableClassPath != editedClassPath ) { |