diff options
Diffstat (limited to 'cui/source/options/optinet2.cxx')
| -rw-r--r-- | cui/source/options/optinet2.cxx | 289 |
1 files changed, 110 insertions, 179 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index f94ea15edf0a..87979ed9b402 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -134,43 +134,19 @@ const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)"; // ----------------------------------------------------------------------- -String lcl_MakeTabEntry(const SfxFilter* pFilter) -{ - String sEntry(pFilter->GetMimeType()); - sEntry += '\t'; - sEntry += pFilter->GetWildcard().GetWildCard(); - sEntry += '\t'; - sEntry += pFilter->GetName(); -#if defined(OS2) - sEntry += '\t'; - sEntry += pFilter->GetTypeName(); -#endif - return sEntry; -} - -// ----------------------------------------------------------------------- - -BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ ) -{ - BOOL bRet = FALSE; - return bRet; -} - -// ----------------------------------------------------------------------- - void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) { if ( bOnlyNumeric ) { const KeyCode& rKeyCode = rKEvent.GetKeyCode(); - USHORT nGroup = rKeyCode.GetGroup(); - USHORT nKey = rKeyCode.GetCode(); - BOOL bValid = ( KEYGROUP_NUM == nGroup || KEYGROUP_CURSOR == nGroup || + sal_uInt16 nGroup = rKeyCode.GetGroup(); + sal_uInt16 nKey = rKeyCode.GetCode(); + sal_Bool bValid = ( KEYGROUP_NUM == nGroup || KEYGROUP_CURSOR == nGroup || ( KEYGROUP_MISC == nGroup && ( nKey < KEY_ADD || nKey > KEY_EQUAL ) ) ); if ( !bValid && ( rKeyCode.IsMod1() && ( KEY_A == nKey || KEY_C == nKey || KEY_V == nKey || KEY_X == nKey || KEY_Z == nKey ) ) ) // Erase, Copy, Paste, Select All und Undo soll funktionieren - bValid = TRUE; + bValid = sal_True; if ( bValid ) Edit::KeyInput(rKEvent); @@ -211,17 +187,17 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )), aHttpProxyED (this, CUI_RES( ED_HTTP_PROXY )), aHttpPortFT (this, CUI_RES( FT_HTTP_PORT )), - aHttpPortED (this, CUI_RES( ED_HTTP_PORT ), TRUE), + aHttpPortED (this, CUI_RES( ED_HTTP_PORT ), sal_True), aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )), aHttpsProxyED (this, CUI_RES( ED_HTTPS_PROXY )), aHttpsPortFT (this, CUI_RES( FT_HTTPS_PORT )), - aHttpsPortED (this, CUI_RES( ED_HTTPS_PORT ), TRUE), + aHttpsPortED (this, CUI_RES( ED_HTTPS_PORT ), sal_True), aFtpProxyFT (this, CUI_RES( FT_FTP_PROXY )), aFtpProxyED (this, CUI_RES( ED_FTP_PROXY )), aFtpPortFT (this, CUI_RES( FT_FTP_PORT )), - aFtpPortED (this, CUI_RES( ED_FTP_PORT ), TRUE), + aFtpPortED (this, CUI_RES( ED_FTP_PORT ), sal_True), aNoProxyForFT (this, CUI_RES( FT_NOPROXYFOR )), aNoProxyForED (this, CUI_RES( ED_NOPROXYFOR )), @@ -300,7 +276,7 @@ void SvxProxyTabPage::ReadConfigData_Impl() if( xNameAccess->getByName(aProxyModePN) >>= nIntValue ) { - aProxyModeLB.SelectEntryPos( (USHORT) nIntValue ); + aProxyModeLB.SelectEntryPos( (sal_uInt16) nIntValue ); } if( xNameAccess->getByName(aHttpProxyPN) >>= aStringValue ) @@ -462,74 +438,74 @@ void SvxProxyTabPage::Reset(const SfxItemSet&) EnableControls_Impl( aProxyModeLB.GetSelectEntryPos() == 2 ); } -BOOL SvxProxyTabPage::FillItemSet(SfxItemSet& ) +sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) { - BOOL bModified=FALSE; + sal_Bool bModified=sal_False; try { Reference< beans::XPropertySet > xPropertySet(m_xConfigurationUpdateAccess, UNO_QUERY_THROW ); - USHORT nSelPos = aProxyModeLB.GetSelectEntryPos(); + sal_uInt16 nSelPos = aProxyModeLB.GetSelectEntryPos(); if(aProxyModeLB.GetSavedValue() != nSelPos) { if( nSelPos == 1 ) { RestoreConfigDefaults_Impl(); - return TRUE; + return sal_True; } xPropertySet->setPropertyValue(aProxyModePN, makeAny((sal_Int32) nSelPos)); - bModified = TRUE; + bModified = sal_True; } if(aHttpProxyED.GetSavedValue() != aHttpProxyED.GetText()) { xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(rtl::OUString(aHttpProxyED.GetText()))); - bModified = TRUE; + bModified = sal_True; } if ( aHttpPortED.GetSavedValue() != aHttpPortED.GetText() ) { xPropertySet->setPropertyValue( aHttpPortPN, makeAny(aHttpPortED.GetText().ToInt32())); - bModified = TRUE; + bModified = sal_True; } if(aHttpsProxyED.GetSavedValue() != aHttpsProxyED.GetText()) { xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(rtl::OUString(aHttpsProxyED.GetText()))); - bModified = TRUE; + bModified = sal_True; } if ( aHttpsPortED.GetSavedValue() != aHttpsPortED.GetText() ) { xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(aHttpsPortED.GetText().ToInt32())); - bModified = TRUE; + bModified = sal_True; } if(aFtpProxyED.GetSavedValue() != aFtpProxyED.GetText()) { xPropertySet->setPropertyValue( aFtpProxyPN, makeAny( rtl::OUString(aFtpProxyED.GetText()))); - bModified = TRUE; + bModified = sal_True; } if ( aFtpPortED.GetSavedValue() != aFtpPortED.GetText() ) { xPropertySet->setPropertyValue( aFtpPortPN, makeAny(aFtpPortED.GetText().ToInt32())); - bModified = TRUE; + bModified = sal_True; } if ( aNoProxyForED.GetSavedValue() != aNoProxyForED.GetText() ) { xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( rtl::OUString(aNoProxyForED.GetText()))); - bModified = TRUE; + bModified = sal_True; } Reference< util::XChangesBatch > xChangesBatch(m_xConfigurationUpdateAccess, UNO_QUERY_THROW); @@ -609,7 +585,7 @@ void SvxProxyTabPage::ArrangeControls_Impl() } } -void SvxProxyTabPage::EnableControls_Impl(BOOL bEnable) +void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable) { aHttpProxyFT.Enable(bEnable); aHttpProxyED.Enable(bEnable); @@ -635,7 +611,7 @@ void SvxProxyTabPage::EnableControls_Impl(BOOL bEnable) IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox ) { - USHORT nPos = pBox->GetSelectEntryPos(); + sal_uInt16 nPos = pBox->GetSelectEntryPos(); // Restore original system values if( nPos == 1 ) @@ -759,11 +735,11 @@ void SvxSearchTabPage::Reset( const SfxItemSet& ) // ----------------------------------------------------------------------- -BOOL SvxSearchTabPage::FillItemSet( SfxItemSet& ) +sal_Bool SvxSearchTabPage::FillItemSet( SfxItemSet& ) { if(aSearchConfig.IsModified()) aSearchConfig.Commit(); - return TRUE; + return sal_True; } /*--------------------------------------------------------------------*/ @@ -785,21 +761,21 @@ int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet ) // ----------------------------------------------------------------------- -BOOL SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) +sal_Bool SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) { if(aChangePB.IsEnabled()) { QueryBox aQuery(this, WB_YES_NO_CANCEL|WB_DEF_YES, sModifyMsg); - USHORT nRet = aQuery.Execute(); + sal_uInt16 nRet = aQuery.Execute(); if(RET_CANCEL == nRet) { if(rStringSelection.Len()) aSearchLB.SelectEntry(sLastSelectedEntry); - return FALSE; + return sal_False; } else if(RET_YES == nRet) { - USHORT nEntryPos = aSearchLB.GetEntryPos( aSearchNameED.GetText() ); + sal_uInt16 nEntryPos = aSearchLB.GetEntryPos( aSearchNameED.GetText() ); if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND ) aSearchLB.SelectEntryPos(nEntryPos); else @@ -810,19 +786,19 @@ BOOL SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) } else if(RET_NO == nRet) { - aChangePB.Enable(FALSE); - aAddPB.Enable(FALSE); + aChangePB.Enable(sal_False); + aAddPB.Enable(sal_False); SearchEntryHdl_Impl(&aSearchLB); } } if(aAddPB.IsEnabled()) { QueryBox aQuery(this, WB_YES_NO_CANCEL|WB_DEF_YES, sModifyMsg); - USHORT nRet = aQuery.Execute(); + sal_uInt16 nRet = aQuery.Execute(); if(RET_CANCEL == nRet) { aSearchLB.SetNoSelection(); - return FALSE; + return sal_False; } else if(RET_YES == nRet) { @@ -833,13 +809,13 @@ BOOL SvxSearchTabPage::ConfirmLeave( const String& rStringSelection) } else if(RET_NO == nRet) { - aAddPB.Enable(FALSE); - aChangePB.Enable(FALSE); + aAddPB.Enable(sal_False); + aChangePB.Enable(sal_False); NewSearchHdl_Impl(0); } } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- @@ -897,7 +873,7 @@ IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) aSearchNameED.SetText( String() ); aSearchLB.SetNoSelection(); aCurrentSrchData = SvxSearchEngineData(); - aAndRB.Check( TRUE ); + aAndRB.Check( sal_True ); SearchEntryHdl_Impl( &aSearchLB ); SearchPartHdl_Impl( &aAndRB ); return 0; @@ -907,8 +883,8 @@ IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) { - aAddPB.Enable(FALSE); - aChangePB.Enable(FALSE); + aAddPB.Enable(sal_False); + aChangePB.Enable(sal_False); aCurrentSrchData.sEngineName = aSearchNameED.GetText(); aSearchConfig.SetData(aCurrentSrchData); aSearchLB.InsertEntry( aCurrentSrchData.sEngineName ); @@ -921,9 +897,9 @@ IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) { - aChangePB.Enable(FALSE); - aAddPB.Enable(FALSE); - USHORT nPos = aSearchLB.GetSelectEntryPos(); + aChangePB.Enable(sal_False); + aAddPB.Enable(sal_False); + sal_uInt16 nPos = aSearchLB.GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { String sEngine = aSearchLB.GetSelectEntry(); @@ -934,7 +910,7 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) } else { - SetUpdateMode(FALSE); + SetUpdateMode(sal_False); String sEntry = aSearchNameED.GetText(); // im AddHdl wird sLastSelectedEntry umgesetzt String sTemp(sLastSelectedEntry); @@ -943,7 +919,7 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) DeleteSearchHdl_Impl(0); aSearchLB.SelectEntry(sEntry); SearchEntryHdl_Impl(&aSearchLB); - SetUpdateMode(TRUE); + SetUpdateMode(sal_True); } return 0; } @@ -952,8 +928,8 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG ) IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG) { - aChangePB.Enable(FALSE); - USHORT nPos = aSearchLB.GetSelectEntryPos(); + aChangePB.Enable(sal_False); + sal_uInt16 nPos = aSearchLB.GetSelectEntryPos(); DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!"); aSearchConfig.RemoveData(aSearchLB.GetSelectEntry()); aSearchLB.RemoveEntry(nPos); @@ -966,7 +942,7 @@ IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG) IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox ) { - USHORT nEntryPos = pBox->GetSelectEntryPos(); + sal_uInt16 nEntryPos = pBox->GetSelectEntryPos(); if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND ) { String sSelection(pBox->GetSelectEntry()); @@ -986,18 +962,18 @@ IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox ) aSeparatorED.SetText( bAnd ? pData->sAndSeparator : bOr ? pData->sOrSeparator : pData->sExactSeparator); aPostFixED.SetText(bAnd ? pData->sAndSuffix : bOr ? pData->sOrSuffix : pData->sExactSuffix ); sal_Int32 nCase = bAnd ? pData->nAndCaseMatch : bOr ? pData->nOrCaseMatch : pData->nExactCaseMatch; - aCaseED.SelectEntryPos( (USHORT)nCase ); + aCaseED.SelectEntryPos( (sal_uInt16)nCase ); aCurrentSrchData = *pData; } aDeletePB.Enable(); } else { - aDeletePB.Enable(FALSE); + aDeletePB.Enable(sal_False); sLastSelectedEntry.Erase(); } - aChangePB.Enable(FALSE); - aAddPB.Enable(FALSE); + aChangePB.Enable(sal_False); + aAddPB.Enable(sal_False); return 0; } @@ -1007,11 +983,11 @@ IMPL_LINK( SvxSearchTabPage, SearchModifyHdl_Impl, SvxNoSpaceEdit*, pEdit ) { if ( pEdit == &aSearchNameED ) { - BOOL bTextLen = ( 0 != pEdit->GetText().Len() ); - BOOL bFound = FALSE; + sal_Bool bTextLen = ( 0 != pEdit->GetText().Len() ); + sal_Bool bFound = sal_False; if ( bTextLen ) { - USHORT nEntryPos = aSearchLB.GetEntryPos( pEdit->GetText() ); + sal_uInt16 nEntryPos = aSearchLB.GetEntryPos( pEdit->GetText() ); bFound = ( nEntryPos != LISTBOX_ENTRY_NOTFOUND ); if ( bFound ) aSearchLB.SelectEntryPos(nEntryPos); @@ -1063,51 +1039,16 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG ) aSeparatorED.SetText( bAnd ? aCurrentSrchData.sAndSeparator : bOr ? aCurrentSrchData.sOrSeparator : aCurrentSrchData.sExactSeparator); aPostFixED.SetText(bAnd ? aCurrentSrchData.sAndSuffix : bOr ? aCurrentSrchData.sOrSuffix : aCurrentSrchData.sExactSuffix ); sal_Int32 nCase = bAnd ? aCurrentSrchData.nAndCaseMatch : bOr ? aCurrentSrchData.nOrCaseMatch : aCurrentSrchData.nExactCaseMatch; - aCaseED.SelectEntryPos( (USHORT)nCase ); + aCaseED.SelectEntryPos( (sal_uInt16)nCase ); return 0; } -// class JavaScriptDisableQueryBox_Impl -------------------------------------- - -class JavaScriptDisableQueryBox_Impl : public ModalDialog -{ -private: - FixedImage aImage; - FixedText aWarningFT; - CheckBox aDisableCB; - OKButton aYesBtn; - CancelButton aNoBtn; - -public: - JavaScriptDisableQueryBox_Impl( Window* pParent ); - - BOOL IsWarningDisabled() const { return aDisableCB.IsChecked(); } -}; - -JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) : - - ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ), - - aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), - aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), - aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), - aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), - aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) - -{ - FreeResource(); - - aYesBtn.SetText( Button::GetStandardText( BUTTON_YES ) ); - aNoBtn.SetText( Button::GetStandardText( BUTTON_NO ) ); - aImage.SetImage( WarningBox::GetStandardImage() ); -} - //#98647#---------------------------------------------- void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) { // try to show tips just like as on toolbars - USHORT nPos=LISTBOX_ENTRY_NOTFOUND; - USHORT nTop = GetTopEntry(); - USHORT nCount = GetDisplayLineCount(); // Attention: Not GetLineCount() + sal_uInt16 nPos=LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nTop = GetTopEntry(); + sal_uInt16 nCount = GetDisplayLineCount(); // Attention: Not GetLineCount() Point aPt = ScreenToOutputPixel( rHEvt.GetMousePosPixel() ); Rectangle aItemRect; if( nCount > 0 ) // if there're some entries, find it. @@ -1211,37 +1152,37 @@ IMPL_LINK( SvxSecurityTabPage, SavePasswordHdl, void*, EMPTYARG ) xMasterPasswd->removeMasterPassword(); if ( xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { - maMasterPasswordPB.Enable( TRUE ); - maMasterPasswordCB.Check( TRUE ); - maMasterPasswordCB.Enable( TRUE ); - maMasterPasswordFI.Enable( TRUE ); - maShowConnectionsPB.Enable( TRUE ); + maMasterPasswordPB.Enable( sal_True ); + maMasterPasswordCB.Check( sal_True ); + maMasterPasswordCB.Enable( sal_True ); + maMasterPasswordFI.Enable( sal_True ); + maShowConnectionsPB.Enable( sal_True ); } else { xMasterPasswd->allowPersistentStoring( bOldValue ); - maSavePasswordsCB.Check( FALSE ); + maSavePasswordsCB.Check( sal_False ); } } else { QueryBox aQuery( this, WB_YES_NO|WB_DEF_NO, msPasswordStoringDeactivateStr ); - USHORT nRet = aQuery.Execute(); + sal_uInt16 nRet = aQuery.Execute(); if( RET_YES == nRet ) { xMasterPasswd->allowPersistentStoring( sal_False ); - maMasterPasswordCB.Check( TRUE ); - maMasterPasswordPB.Enable( FALSE ); - maMasterPasswordCB.Enable( FALSE ); - maMasterPasswordFI.Enable( FALSE ); - maShowConnectionsPB.Enable( FALSE ); + maMasterPasswordCB.Check( sal_True ); + maMasterPasswordPB.Enable( sal_False ); + maMasterPasswordCB.Enable( sal_False ); + maMasterPasswordFI.Enable( sal_False ); + maShowConnectionsPB.Enable( sal_False ); } else { - maSavePasswordsCB.Check( TRUE ); - maMasterPasswordPB.Enable( TRUE ); - maShowConnectionsPB.Enable( TRUE ); + maSavePasswordsCB.Check( sal_True ); + maMasterPasswordPB.Enable( sal_True ); + maShowConnectionsPB.Enable( sal_True ); } } } @@ -1284,28 +1225,28 @@ IMPL_LINK( SvxSecurityTabPage, MasterPasswordCBHdl, void*, EMPTYARG ) { if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { - maMasterPasswordPB.Enable( TRUE ); - maMasterPasswordFI.Enable( TRUE ); + maMasterPasswordPB.Enable( sal_True ); + maMasterPasswordFI.Enable( sal_True ); } else { - maMasterPasswordCB.Check( FALSE ); - maMasterPasswordPB.Enable( TRUE ); - maMasterPasswordFI.Enable( TRUE ); + maMasterPasswordCB.Check( sal_False ); + maMasterPasswordPB.Enable( sal_True ); + maMasterPasswordFI.Enable( sal_True ); } } else { if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->useDefaultMasterPassword( Reference< task::XInteractionHandler >() ) ) { - maMasterPasswordPB.Enable( FALSE ); - maMasterPasswordFI.Enable( FALSE ); + maMasterPasswordPB.Enable( sal_False ); + maMasterPasswordFI.Enable( sal_False ); } else { - maMasterPasswordCB.Check( TRUE ); - maMasterPasswordPB.Enable( TRUE ); - maShowConnectionsPB.Enable( TRUE ); + maMasterPasswordCB.Check( sal_True ); + maMasterPasswordPB.Enable( sal_True ); + maShowConnectionsPB.Enable( sal_True ); } } } @@ -1420,11 +1361,11 @@ void SvxSecurityTabPage::InitControls() } } - maMasterPasswordPB.Enable( FALSE ); - maMasterPasswordCB.Enable( FALSE ); - maMasterPasswordCB.Check( TRUE ); - maMasterPasswordFI.Enable( FALSE ); - maShowConnectionsPB.Enable( FALSE ); + maMasterPasswordPB.Enable( sal_False ); + maMasterPasswordCB.Enable( sal_False ); + maMasterPasswordCB.Check( sal_True ); + maMasterPasswordFI.Enable( sal_False ); + maShowConnectionsPB.Enable( sal_False ); // initialize the password saving checkbox try @@ -1436,24 +1377,24 @@ void SvxSecurityTabPage::InitControls() if ( xMasterPasswd->isPersistentStoringAllowed() ) { - maMasterPasswordCB.Enable( TRUE ); - maShowConnectionsPB.Enable( TRUE ); - maSavePasswordsCB.Check( TRUE ); + maMasterPasswordCB.Enable( sal_True ); + maShowConnectionsPB.Enable( sal_True ); + maSavePasswordsCB.Check( sal_True ); Reference< task::XMasterPasswordHandling2 > xMasterPasswd2( xMasterPasswd, UNO_QUERY ); if ( xMasterPasswd2.is() && xMasterPasswd2->isDefaultMasterPasswordUsed() ) - maMasterPasswordCB.Check( FALSE ); + maMasterPasswordCB.Check( sal_False ); else { - maMasterPasswordPB.Enable( TRUE ); - maMasterPasswordCB.Check( TRUE ); - maMasterPasswordFI.Enable( TRUE ); + maMasterPasswordPB.Enable( sal_True ); + maMasterPasswordCB.Check( sal_True ); + maMasterPasswordFI.Enable( sal_True ); } } } catch( Exception& ) { - maSavePasswordsCB.Enable( FALSE ); + maSavePasswordsCB.Enable( sal_False ); } @@ -1477,16 +1418,6 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) namespace { - bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, - CheckBox& _rCtrl, FixedImage& _rImg ) - { - bool b = _rOpt.IsOptionEnabled( _eOpt ); - _rCtrl.Enable( b ); - _rImg.Show( !b ); - _rCtrl.Check( _rOpt.IsOptionSet( _eOpt ) ); - return b; - } - bool CheckAndSave( SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, const bool _bIsChecked, bool& _rModfied ) { bool bModified = false; @@ -1504,7 +1435,7 @@ namespace } } -BOOL SvxSecurityTabPage::FillItemSet( SfxItemSet& ) +sal_Bool SvxSecurityTabPage::FillItemSet( SfxItemSet& ) { bool bModified = false; @@ -1549,10 +1480,10 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent, { return new MozPluginTabPage( pParent, rAttrSet ); } -BOOL MozPluginTabPage::FillItemSet( SfxItemSet& ) +sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& ) { - BOOL hasInstall = isInstalled(); - BOOL hasChecked = aWBasicCodeCB.IsChecked(); + sal_Bool hasInstall = isInstalled(); + sal_Bool hasChecked = aWBasicCodeCB.IsChecked(); if(hasInstall && (!hasChecked)){ //try to uninstall uninstallPlugin(); @@ -1564,7 +1495,7 @@ BOOL MozPluginTabPage::FillItemSet( SfxItemSet& ) else{ // do nothing } - return TRUE; + return sal_True; } void MozPluginTabPage::Reset( const SfxItemSet& ) { @@ -1595,7 +1526,7 @@ inline bool getDllURL(rtl::OString * path) return true; } -BOOL MozPluginTabPage::isInstalled() +sal_Bool MozPluginTabPage::isInstalled() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1631,7 +1562,7 @@ BOOL MozPluginTabPage::isInstalled() #endif #ifdef WNT // get the value from registry - BOOL ret = true; + sal_Bool ret = true; ::rtl::OString tempString; char realFilePath[NPP_PATH_MAX] = {0}; if (!getDllURL(&tempString)){ @@ -1646,7 +1577,7 @@ BOOL MozPluginTabPage::isInstalled() #endif } -BOOL MozPluginTabPage::installPlugin() +sal_Bool MozPluginTabPage::installPlugin() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1695,7 +1626,7 @@ BOOL MozPluginTabPage::installPlugin() #endif } -BOOL MozPluginTabPage::uninstallPlugin() +sal_Bool MozPluginTabPage::uninstallPlugin() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1878,26 +1809,26 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe /* -------------------------------------------------------------------------*/ -BOOL SvxEMailTabPage::FillItemSet( SfxItemSet& ) +sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) { - BOOL bMailModified = FALSE; + sal_Bool bMailModified = sal_False; if(!pImpl->aMailConfig.bROProgram && aMailerURLED.GetSavedValue() != aMailerURLED.GetText()) { pImpl->aMailConfig.sProgram = aMailerURLED.GetText(); - bMailModified = TRUE; + bMailModified = sal_True; } if ( bMailModified ) pImpl->aMailConfig.Commit(); - return FALSE; + return sal_False; } /* -------------------------------------------------------------------------*/ void SvxEMailTabPage::Reset( const SfxItemSet& ) { - aMailerURLED.Enable(TRUE ); - aMailerURLPB.Enable(TRUE ); + aMailerURLED.Enable(sal_True ); + aMailerURLPB.Enable(sal_True ); if(pImpl->aMailConfig.bROProgram) aMailerURLFI.Show(); |