diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 23:58:22 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 23:58:22 -0600 |
commit | 2d67395639c89c8dc4aa914e987478f8e6a2a8b9 (patch) | |
tree | 64e7124ba093f8dac707b27db270f59584f05210 /cui/source/dialogs | |
parent | 9ddf05522849d28ec15d66c0b2aff4585eb912fe (diff) |
mis-merge: mostly remove remaining tools types
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 3 | ||||
-rw-r--r-- | cui/source/dialogs/about.cxx | 5 | ||||
-rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index b185e3191aa7..175cde07daa1 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -928,7 +928,6 @@ void SpellDialog::InitUserDicts() } SvtLinguConfig aCfg; - const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); // list suitable dictionaries bool bEnable = false; @@ -958,7 +957,7 @@ void SpellDialog::InitUserDicts() if (xSvcInfo.is()) { OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage( - xSvcInfo->getImplementationName(), bHC) ); + xSvcInfo->getImplementationName()) ); if (aDictionaryImageUrl.getLength() > 0) { Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) ); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index b530005f32b8..4f4fce97ba97 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -164,7 +164,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId ) : if ( pResMgr ) { aCopyrightTextStr = String( ResId( ABOUT_STR_COPYRIGHT, *pResMgr ) ); - pDeveloperAry = new ResStringArray( ResId( ABOUT_STR_DEVELOPER_ARY, *pResMgr ) ); +// pDeveloperAry = new ResStringArray( ResId( ABOUT_STR_DEVELOPER_ARY, *pResMgr ) ); delete pResMgr; } @@ -375,7 +375,8 @@ void AboutDialog::Paint( const Rectangle& rRect ) const int nFullWidth = GetOutputSizePixel().Width(); int nY = nOff; - const int nDevCnt = static_cast<int>( pDeveloperAry->Count() ); +// const int nDevCnt = static_cast<int>( pDeveloperAry->Count() ); + const int nDevCnt = 0; for( int i = 0; i < nDevCnt; ++i ) { if( nY >= rRect.Bottom() ) diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 8adc57ddc7ba..f981edef298b 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -305,7 +305,7 @@ IconChoiceDialog ::~IconChoiceDialog () } // remove Userdata from Icons - for ( ULONG i=0; i < maIconCtrl.GetEntryCount(); i++) + for ( sal_uLong i=0; i < maIconCtrl.GetEntryCount(); i++) { SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); @@ -392,8 +392,8 @@ void IconChoiceDialog::RemoveTabPage( sal_uInt16 nId ) } // remove Icon - bool bFound = FALSE; - for ( ULONG i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++) + bool bFound = false; + for ( sal_uLong i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++) { SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i ); sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData(); @@ -499,7 +499,7 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) void IconChoiceDialog::RemoveResetButton() { aResetBtn.Hide(); - bHideResetBtn = TRUE; + bHideResetBtn = true; } // ----------------------------------------------------------------------- @@ -817,7 +817,7 @@ void IconChoiceDialog::ActivatePageImpl () DBG_ASSERT( !maPageList.empty(), "keine Pages angemeldet" ); IconChoicePageData* pData = GetPageData ( mnCurrentPageId ); DBG_ASSERT( pData, "Id nicht bekannt" ); - BOOL bReadOnly = FALSE; + bool bReadOnly = false; if ( pData ) { if ( !pData->pPage ) @@ -1271,4 +1271,4 @@ void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId ) } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |