summaryrefslogtreecommitdiff
path: root/cui/source/dialogs
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-02-06 23:16:23 +0100
committerJulien Nabet <serval2412@yahoo.fr>2011-02-06 23:16:23 +0100
commitba11d549dca2a04a220b59aaf9223ee8f7043da0 (patch)
treea9f53b990de42784a72798c7e479b603a0880b04 /cui/source/dialogs
parentf6ae27e3f17a1cce5040d8e1a93992879a421fcf (diff)
Some cppcheck cleaning
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx5
2 files changed, 4 insertions, 3 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index bc16fa576d04..c082c79582f7 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1758,13 +1758,13 @@ namespace svx
//fill found entries into boxes
sal_uInt32 nCnt = aEntries.getLength();
- sal_uInt32 n = 0;
if( nCnt )
{
if( !m_pSuggestions )
m_pSuggestions = new SuggestionList( MAXNUM_SUGGESTIONS );
const OUString* pSugg = aEntries.getConstArray();
+ sal_uInt32 n = 0;
while( nCnt )
{
m_pSuggestions->Set( pSugg[ n ], sal_uInt16( n ) );
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index f8822c8d5f6f..2fa5101d95a6 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -877,6 +877,7 @@ void IconChoiceDialog::ActivatePageImpl ()
DBG_ASSERT( !maPageList.empty(), "keine Pages angemeldet" );
IconChoicePageData* pData = GetPageData ( mnCurrentPageId );
DBG_ASSERT( pData, "Id nicht bekannt" );
+ BOOL bReadOnly = FALSE;
if ( pData )
{
if ( !pData->pPage )
@@ -916,11 +917,11 @@ void IconChoiceDialog::ActivatePageImpl ()
if ( pExampleSet )
pData->pPage->ActivatePage( *pExampleSet );
+ SetHelpId( pData->pPage->GetHelpId() );
+ bReadOnly = pData->pPage->IsReadOnly();
}
- SetHelpId( pData->pPage->GetHelpId() );
- BOOL bReadOnly = pData->pPage->IsReadOnly();
if ( bReadOnly || bHideResetBtn )
aResetBtn.Hide();
else