summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-25 12:36:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-25 12:36:06 +0000
commitc8b81c36a0e6f9ece3f02743e3b9f8aab7208cd4 (patch)
tree137dbda10003953f0affc639890a44c557731d00 /cui
parent6045d6569db222192063c3fb9176cfdb9d1c36bf (diff)
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/optgdlg.cxx6
-rw-r--r--cui/source/options/treeopt.cxx4
2 files changed, 1 insertions, 9 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f77989d0e598..6d6ba6cd3c71 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1346,7 +1346,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW );
seqInstalledLanguages = theNameAccess->getElementNames();
LanguageType aLang = LANGUAGE_DONTKNOW;
- for (sal_Int32 i=0; i<seqInstalledLanguages.getLength(); i++)
+ for (sal_IntPtr i=0; i<seqInstalledLanguages.getLength(); i++)
{
aLang = MsLangId::convertIsoStringToLanguage(seqInstalledLanguages[i]);
if (aLang != LANGUAGE_DONTKNOW)
@@ -1616,7 +1616,6 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
if ( sOldCurr != sNewCurr )
pLangConfig->aSysLocaleOptions.SetCurrencyConfigString( sNewCurr );
- BOOL bRet = FALSE;
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY );
BOOL bCurrentDocCBChecked = aCurrentDocCB.IsChecked();
@@ -1642,7 +1641,6 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
SID_ATTR_LANGUAGE));
- bRet = TRUE;
}
}
bValChanged = aAsianLanguageLB.GetSavedValue() != aAsianLanguageLB.GetSelectEntryPos();
@@ -1663,7 +1661,6 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
SID_ATTR_CHAR_CJK_LANGUAGE));
- bRet = TRUE;
}
}
bValChanged = aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos();
@@ -1684,7 +1681,6 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
SID_ATTR_CHAR_CTL_LANGUAGE));
- bRet = TRUE;
}
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index a731536e1b20..29a5e87a1a99 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1949,12 +1949,10 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
DBG_ASSERT( sTemp == aFactory, "S H I T!!!" );
// Writer and Writer/Web options
- sal_Bool bHasAnyFilter = sal_False;
SvtModuleOptions aModuleOpt;
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
{
// Textdokument
- bHasAnyFilter = sal_True;
ResStringArray& rTextArray = aDlgResource.GetTextArray();
if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) )
|| aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) )
@@ -2004,7 +2002,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
// Calc options
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
{
- bHasAnyFilter = sal_True;
if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
{
if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) )
@@ -2032,7 +2029,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) );
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
{
- bHasAnyFilter = sal_True;
if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ))
{
if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) )