Kaydet (Commit) 18af59fb authored tarafından Michael Stahl's avatar Michael Stahl

framework: clean up ugly _ prefixed identifiers

Change-Id: If965ad91e771c84e89c6690a4e1b733d4e70f1b4
üst 879bf788
...@@ -522,7 +522,8 @@ void SAL_CALL ToolBarManager::elementRemoved( const css::ui::ConfigurationEvent& ...@@ -522,7 +522,8 @@ void SAL_CALL ToolBarManager::elementRemoved( const css::ui::ConfigurationEvent&
{ {
impl_elementChanged(true,Event); impl_elementChanged(true,Event);
} }
void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::ConfigurationEvent& Event ) void ToolBarManager::impl_elementChanged(bool const isRemove,
const css::ui::ConfigurationEvent& Event)
{ {
SolarMutexGuard g; SolarMutexGuard g;
...@@ -551,7 +552,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::Configurat ...@@ -551,7 +552,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::Configurat
CommandToInfoMap::iterator pIter = m_aCommandMap.find( aSeq[i] ); CommandToInfoMap::iterator pIter = m_aCommandMap.find( aSeq[i] );
if ( pIter != m_aCommandMap.end() && ( pIter->second.nImageInfo >= nImageInfo )) if ( pIter != m_aCommandMap.end() && ( pIter->second.nImageInfo >= nImageInfo ))
{ {
if ( _bRemove ) if (isRemove)
{ {
Image aImage; Image aImage;
if (( pIter->second.nImageInfo == 0 ) && ( pIter->second.nImageInfo == nImageInfo )) if (( pIter->second.nImageInfo == 0 ) && ( pIter->second.nImageInfo == nImageInfo ))
...@@ -567,7 +568,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::Configurat ...@@ -567,7 +568,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::Configurat
} }
setToolBarImage(aImage,pIter); setToolBarImage(aImage,pIter);
} // if ( _bRemove ) } // if (isRemove)
else else
{ {
Reference< XGraphic > xGraphic; Reference< XGraphic > xGraphic;
...@@ -582,13 +583,14 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::Configurat ...@@ -582,13 +583,14 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const css::ui::Configurat
} }
} }
} }
void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter) void ToolBarManager::setToolBarImage(const Image& rImage,
const CommandToInfoMap::const_iterator& rIter)
{ {
const ::std::vector< sal_uInt16 >& _rIDs = _pIter->second.aIds; const ::std::vector<sal_uInt16>& rIDs = rIter->second.aIds;
m_pToolBar->SetItemImage( _pIter->second.nId, _aImage ); m_pToolBar->SetItemImage( rIter->second.nId, rImage );
for (auto const& it : _rIDs) for (auto const& it : rIDs)
{ {
m_pToolBar->SetItemImage(it, _aImage); m_pToolBar->SetItemImage(it, rImage);
} }
} }
......
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