diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-16 11:39:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-16 11:51:51 +0200 |
| commit | 5b1b1e55ce492ceb1a907833f7073b46451760c6 (patch) | |
| tree | 6f1ff57b2cb011702eb79c41d180063ab16d9463 /cui/source/options | |
| parent | 199d333f131474729a105afa5a3da61205f61df2 (diff) | |
cui: sal_Bool->bool
Change-Id: Ib7dd1f27d4909d30ee794936364a472a9755c609
Diffstat (limited to 'cui/source/options')
37 files changed, 342 insertions, 342 deletions
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index fe2fbd04c9b4..8e755a47737b 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -177,7 +177,7 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const SvxChartOptions::SvxChartOptions() : ::utl::ConfigItem( OUString("Office.Chart") ), - mbIsInitialized( sal_False ) + mbIsInitialized( false ) { maPropertyNames.realloc( 1 ); maPropertyNames[ 0 ] = "DefaultColor/Series"; @@ -200,7 +200,7 @@ void SvxChartOptions::SetDefaultColors( const SvxChartColorTable& aCol ) SetModified(); } -sal_Bool SvxChartOptions::RetrieveOptions() +bool SvxChartOptions::RetrieveOptions() { // get sequence containing all properties @@ -240,9 +240,9 @@ sal_Bool SvxChartOptions::RetrieveOptions() maDefColors.append( XColorEntry( aCol, aName )); } - return sal_True; + return true; } - return sal_False; + return false; } void SvxChartOptions::Commit() diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 836b2f61389f..134661abc4bd 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -67,14 +67,14 @@ class SvxChartOptions : public ::utl::ConfigItem { private: SvxChartColorTable maDefColors; - sal_Bool mbIsInitialized; + bool mbIsInitialized; ::com::sun::star::uno::Sequence< OUString > maPropertyNames; inline ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const { return maPropertyNames; } - sal_Bool RetrieveOptions(); + bool RetrieveOptions(); public: SvxChartOptions(); diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index f9b9fc17c52f..621f699379a3 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -90,7 +90,7 @@ namespace offapp // the global "enabled" flag Any aEnabled = aConnectionPoolRoot.getNodeValue(getEnablePoolingNodeName()); - sal_Bool bEnabled = sal_True; + bool bEnabled = true; aEnabled >>= bEnabled; _rFillItems.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, bEnabled)); @@ -103,7 +103,7 @@ namespace offapp ++aLoopDrivers ) { - aSettings.push_back(DriverPooling(*aLoopDrivers, sal_False, 120)); + aSettings.push_back(DriverPooling(*aLoopDrivers, false, 120)); } // then look for which of them settings are stored in the configuration @@ -131,7 +131,7 @@ namespace offapp if (aLookup == aSettings.end()) { // do not know the driver - add it - aSettings.push_back(DriverPooling(sThisDriverName, sal_False, 120)); + aSettings.push_back(DriverPooling(sThisDriverName, false, 120)); // and the position of the new entry aLookup = aSettings.end(); @@ -157,7 +157,7 @@ namespace offapp // already asserted by the OConfigurationTreeRoot return; - sal_Bool bNeedCommit = sal_False; + bool bNeedCommit = false; // the global "enabled" flag SFX_ITEMSET_GET( _rSourceItems, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true ); @@ -165,7 +165,7 @@ namespace offapp { sal_Bool bEnabled = pEnabled->GetValue(); aConnectionPoolRoot.setNodeValue(getEnablePoolingNodeName(), Any(&bEnabled, ::getBooleanCppuType())); - bNeedCommit = sal_True; + bNeedCommit = true; } // the settings for the single drivers @@ -199,7 +199,7 @@ namespace offapp aThisDriverSettings.setNodeValue(getEnableNodeName(), Any(&aLoop->bEnabled, ::getBooleanCppuType())); aThisDriverSettings.setNodeValue(getTimeoutNodeName(), makeAny(aLoop->nTimeoutSeconds)); } - bNeedCommit = sal_True; + bNeedCommit = true; } if (bNeedCommit) aConnectionPoolRoot.commit(); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 6dff2f00340c..6cc3fe62d911 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -61,7 +61,7 @@ namespace offapp const DriverPoolingSettings& getSettings() const { return m_aSettings; } void saveValue() { m_aSavedSettings = m_aSettings; } - sal_Bool isModified() const; + bool isModified() const; protected: virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; @@ -111,10 +111,10 @@ namespace offapp } - sal_Bool DriverListControl::isModified() const + bool DriverListControl::isModified() const { if (m_aSettings.size() != m_aSavedSettings.size()) - return sal_True; + return true; DriverPoolingSettings::const_iterator aCurrent = m_aSettings.begin(); DriverPoolingSettings::const_iterator aCurrentEnd = m_aSettings.end(); @@ -122,10 +122,10 @@ namespace offapp for (;aCurrent != aCurrentEnd; ++aCurrent, ++aSaved) { if (*aCurrent != *aSaved) - return sal_True; + return true; } - return sal_False; + return false; } @@ -332,7 +332,7 @@ namespace offapp } - void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bFromReset*/) + void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, bool /*_bFromReset*/) { // the enabled flag SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true ); @@ -393,19 +393,19 @@ namespace offapp void ConnectionPoolOptionsPage::ActivatePage( const SfxItemSet& _rSet) { SfxTabPage::ActivatePage(_rSet); - implInitControls(_rSet, sal_False); + implInitControls(_rSet, false); } void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet) { - implInitControls(_rSet, sal_True); + implInitControls(_rSet, true); } IMPL_LINK( ConnectionPoolOptionsPage, OnDriverRowChanged, const void*, _pRowIterator ) { - sal_Bool bValidRow = (NULL != _pRowIterator); + bool bValidRow = (NULL != _pRowIterator); m_pDriverPoolingEnabled->Enable(bValidRow && m_pEnablePooling->IsChecked()); m_pTimeoutLabel->Enable(bValidRow); m_pTimeout->Enable(bValidRow); @@ -441,8 +441,8 @@ namespace offapp IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, const CheckBox*, _pCheckBox ) { - sal_Bool bGloballyEnabled = m_pEnablePooling->IsChecked(); - sal_Bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox; + bool bGloballyEnabled = m_pEnablePooling->IsChecked(); + bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox; if (m_pEnablePooling == _pCheckBox) { diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 10f0003b3421..cd80ccfc578c 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -64,7 +64,7 @@ namespace offapp DECL_LINK( OnEnabledDisabled, const CheckBox* ); DECL_LINK( OnDriverRowChanged, const void* ); - void implInitControls(const SfxItemSet& _rSet, sal_Bool _bFromReset); + void implInitControls(const SfxItemSet& _rSet, bool _bFromReset); void commitTimeoutField(); }; diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 623906daf4f4..639ee0e804b8 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -28,7 +28,7 @@ namespace offapp //= DriverPooling - DriverPooling::DriverPooling( const OUString& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ) + DriverPooling::DriverPooling( const OUString& _rName, bool _bEnabled, const sal_Int32 _nTimeout ) :sName(_rName) ,bEnabled(_bEnabled) ,nTimeoutSeconds(_nTimeout) @@ -36,7 +36,7 @@ namespace offapp } - sal_Bool DriverPooling::operator == (const DriverPooling& _rR) const + bool DriverPooling::operator == (const DriverPooling& _rR) const { return (sName == _rR.sName) && (bEnabled == _rR.bEnabled) diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 59a4a8d6e47b..1cb0205683b6 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -38,13 +38,13 @@ namespace offapp struct DriverPooling { OUString sName; - sal_Bool bEnabled; + bool bEnabled; sal_Int32 nTimeoutSeconds; - DriverPooling( const OUString& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ); + DriverPooling( const OUString& _rName, bool _bEnabled, const sal_Int32 _nTimeout ); - sal_Bool operator == (const DriverPooling& _rR) const; - sal_Bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); } + bool operator == (const DriverPooling& _rR) const; + bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); } }; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index d71d7927054f..7af151db533d 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -110,7 +110,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox ( NULL ), m_pCurEntry ( NULL ), m_nOldCount ( 0 ), - m_bModified ( sal_False ) + m_bModified ( false ) { get(m_pPathCtrl, "pathctrl"); Size aControlSize(248, 147); @@ -238,7 +238,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) rBar.SetItemSize( ITEMID_TYPE, aUserData.getToken(0, ';').toInt32() ); HeaderEndDrag_Impl( &rBar ); // restore sort direction - sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.getToken(1, ';').toInt32(); + bool bUp = aUserData.getToken(1, ';').toInt32() != 0; HeaderBarItemBits nBits = rBar.GetItemBits(ITEMID_TYPE); if ( bUp ) @@ -264,7 +264,7 @@ void DbRegistrationOptionsPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += (bUp ? OUString("1") : OUString("0")); SetUserData( aUserData ); } @@ -319,7 +319,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) @@ -430,7 +430,7 @@ void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const O pPathBox->GetModel()->Remove( _pEntry ); } insertNewEntry( sNewName, sNewLocation, false ); - m_bModified = sal_True; + m_bModified = true; } } } diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 687b87a6695c..2fdc4436b714 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -42,7 +42,7 @@ namespace svx { } - DatabaseRegistration( const OUString& _rLocation, const sal_Bool _bReadOnly ) + DatabaseRegistration( const OUString& _rLocation, const bool _bReadOnly ) :sLocation( _rLocation ) ,bReadOnly( _bReadOnly ) { diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index d6fb3e528e45..7c8c2e0eeb40 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -43,7 +43,7 @@ namespace svx //= ODocumentLinkDialog - ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ) + ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ) : ModalDialog(_pParent, "DatabaseLinkDialog", "cui/ui/databaselinkdialog.ui") ,m_bCreatingNew(_bCreateNew) @@ -101,12 +101,12 @@ namespace svx sURL = aTransformer.get(OFileNotation::N_URL); // check for the existence of the selected file - sal_Bool bFileExists = sal_False; + bool bFileExists = false; try { ::ucbhelper::Content aFile(sURL, Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext()); if (aFile.isDocument()) - bFileExists = sal_True; + bFileExists = true; } catch(Exception&) { diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 8113da3347a3..d14566902e3c 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -45,12 +45,12 @@ namespace svx Edit* m_pName; OKButton* m_pOK; - sal_Bool m_bCreatingNew; + bool m_bCreatingNew; Link m_aNameValidator; public: - ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ); + ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ); // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 86fe6b513ae3..b169718e3b12 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -319,7 +319,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) { OUString sFontName = m_pFontNameLB->GetSelectEntry(); - sal_Bool bNonPropOnly = pBox->IsChecked(); + bool bNonPropOnly = pBox->IsChecked(); m_pFontNameLB->Clear(); FontList aFntLst( Application::GetDefaultDevice() ); m_pFontNameLB->InsertEntry(m_sAutomatic); @@ -336,11 +336,11 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) void SvxFontSubstTabPage::CheckEnable() { - sal_Bool bEnableAll = m_pUseTableCB->IsChecked(); + bool bEnableAll = m_pUseTableCB->IsChecked(); m_pReplacements->Enable(bEnableAll); if (bEnableAll) { - sal_Bool bApply, bDelete; + bool bApply, bDelete; SvTreeListEntry* pEntry = m_pCheckLB->FirstSelected(); @@ -350,15 +350,15 @@ void SvxFontSubstTabPage::CheckEnable() // because of OS/2 optimization error (Bug #56267) a bit more intricate: if (m_pFont1CB->GetText().isEmpty() || m_pFont2CB->GetText().isEmpty()) - bApply = sal_False; + bApply = false; else if(m_pFont1CB->GetText() == m_pFont2CB->GetText()) - bApply = sal_False; + bApply = false; else if(m_pCheckLB->GetEntryPos(sEntry) != 0xffffffff) - bApply = sal_False; + bApply = false; else if(pEntry != 0 && m_pCheckLB->NextSelected(pEntry) != 0) - bApply = sal_False; + bApply = false; else - bApply = sal_True; + bApply = true; bDelete = pEntry != 0; @@ -454,7 +454,7 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvSimpleTable::KeyInput(rKEvt); } -void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) +void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -464,7 +464,7 @@ void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sa SvButtonState( SV_BUTTON_UNCHECKED ) ); } -void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) +void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, bool bChecked) { if ( pEntry ) SetCheckButtonState( @@ -474,12 +474,12 @@ void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nC SvButtonState( SV_BUTTON_UNCHECKED ) ); } -sal_Bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) +bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) { return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } -sal_Bool SvxFontSubstCheckListBox::IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol) +bool SvxFontSubstCheckListBox::IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol) { return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED; } diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index c111689a01e9..415f59c83317 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -49,10 +49,10 @@ class SvxFontSubstCheckListBox : public SvSimpleTable inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); } inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } - sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); - sal_Bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0); - void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); - void CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked); + bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); + bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0); + void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); + void CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, bool bChecked); SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 0ac465444a23..de0b47778da0 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -182,7 +182,7 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ ) m_pPrefBox->GetModel()->SetSortMode( SortNone ); m_pPrefBox->SetUpdateMode(false); - Reference< XNameAccess > xConfigAccess = getConfigAccess( "/", sal_False ); + Reference< XNameAccess > xConfigAccess = getConfigAccess( "/", false ); FillItems( xConfigAccess ); m_pPrefBox->SetUpdateMode(true); } @@ -194,7 +194,7 @@ bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter; for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter ) { - Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , sal_True ); + Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , true ); Reference< XNameReplace > xNameReplace( xUpdateAccess, UNO_QUERY_THROW ); xNameReplace->replaceByName( (*pIter)->Property, (*pIter)->Value ); @@ -381,7 +381,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces } } -Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate ) +Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& sNodePath, bool bUpdate ) { uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 55c614e628e0..6761e3c1ddfb 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -62,7 +62,7 @@ public: void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue); void Reset(/* const SfxItemSet&*/ ); void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess); - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate ); + com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, bool bUpdate ); virtual bool FillItemSet( /* SfxItemSet& rSet*/ ); virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 88c2a2aea1cd..d8f062de37ee 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -115,12 +115,12 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) IMPL_LINK(SvxAccessibilityOptionsTabPage, TipHelpHdl, CheckBox*, pBox) { - sal_Bool bChecked = pBox->IsChecked(); + bool bChecked = pBox->IsChecked(); m_pTipHelpNF->Enable(bChecked); return 0; } -void SvxAccessibilityOptionsTabPage::EnableTipHelp(sal_Bool bCheck) +void SvxAccessibilityOptionsTabPage::EnableTipHelp(bool bCheck) { m_pTipHelpCB->Check(bCheck); m_pTipHelpNF->Enable(bCheck); diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 1cdc671a053f..97bd44e21dd4 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -36,7 +36,7 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage CheckBox* m_pPagePreviews; DECL_LINK(TipHelpHdl, CheckBox*); - void EnableTipHelp(sal_Bool bCheck); + void EnableTipHelp(bool bCheck); SvxAccessibilityOptionsTabPage_Impl* m_pImpl; diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 953e742629a8..5316e0a61a3e 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -50,7 +50,7 @@ struct SvxForbiddenChars_Impl { ~SvxForbiddenChars_Impl(); - sal_Bool bRemoved; + bool bRemoved; ForbiddenCharacters* pCharacters; }; @@ -73,7 +73,7 @@ struct SvxAsianLayoutPage_Impl Reference< XPropertySetInfo > xPrSetInfo; SvxForbiddenCharacterMap_Impl aChangedLanguagesMap; - sal_Bool hasForbiddenCharacters(LanguageType eLang); + bool hasForbiddenCharacters(LanguageType eLang); SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang); void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); }; @@ -87,7 +87,7 @@ SvxAsianLayoutPage_Impl::~SvxAsianLayoutPage_Impl() } } -sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) +bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) { return aChangedLanguagesMap.count( eLang ); } @@ -231,7 +231,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) if( pImpl->xPrSet.is() ) pImpl->xPrSetInfo = pImpl->xPrSet->getPropertySetInfo(); OUString sForbidden("ForbiddenCharacters"); - sal_Bool bKernWesternText = pImpl->aConfig.IsKerningWesternTextOnly(); + bool bKernWesternText = pImpl->aConfig.IsKerningWesternTextOnly(); sal_Int16 nCompress = pImpl->aConfig.GetCharDistanceCompression(); if(pImpl->xPrSetInfo.is()) { @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) Locale aLocale( aLanguageTag.getLocale()); OUString sStart, sEnd; - sal_Bool bAvail; + bool bAvail; if(pImpl->xForbidden.is()) { bAvail = pImpl->hasForbiddenCharacters(eSelectLanguage); @@ -311,7 +311,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) SvxForbiddenChars_Impl* pElement = pImpl->getForbiddenCharacters(eSelectLanguage); if(pElement->bRemoved || !pElement->pCharacters) { - bAvail = sal_False; + bAvail = false; } else { @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox) { - sal_Bool bCheck = pBox->IsChecked(); + bool bCheck = pBox->IsChecked(); m_pStartED->Enable(!bCheck); m_pEndED->Enable(!bCheck); m_pStartFT->Enable(!bCheck); @@ -377,7 +377,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage )); OUString sStart = m_pStartED->GetText(); OUString sEnd = m_pEndED->GetText(); - sal_Bool bEnable = pEdit->IsEnabled(); + bool bEnable = pEdit->IsEnabled(); if(pImpl->xForbidden.is()) { try diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 051d7c2932b5..435c54e25903 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1081,7 +1081,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) { - bFillItemSetCalled = sal_True; + bFillItemSetCalled = true; if(m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos()) { pColorConfig->SetModified(); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 7d062095fd7c..b3033bade873 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -36,7 +36,7 @@ class SvxColorOptionsTabPage : public SfxTabPage PushButton* m_pDeleteSchemePB; ColorConfigCtrl_Impl* m_pColorConfigCT; - sal_Bool bFillItemSetCalled; + bool bFillItemSetCalled; svtools::EditableColorConfig* pColorConfig; svtools::EditableExtendedColorConfig* pExtColorConfig; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 96e95a53d554..d743800f615a 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -26,7 +26,7 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl) { - sal_Bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); + bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); m_pRestrictedCB->Enable( bIsSequenceChecking ); m_pTypeReplaceCB->Enable( bIsSequenceChecking ); // #i48117#: by default restricted and type&replace have to be switched on @@ -72,21 +72,21 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) SvtCTLOptions aCTLOptions; // Sequence checking - sal_Bool bChecked = m_pSequenceCheckingCB->IsChecked(); - if ( bChecked != m_pSequenceCheckingCB->GetSavedValue() ) + bool bChecked = m_pSequenceCheckingCB->IsChecked(); + if ( (bChecked ? 1 : 0) != m_pSequenceCheckingCB->GetSavedValue() ) { aCTLOptions.SetCTLSequenceChecking( bChecked ); bModified = true; } bChecked = m_pRestrictedCB->IsChecked(); - if( bChecked != m_pRestrictedCB->GetSavedValue() ) + if( (bChecked ? 1 : 0) != m_pRestrictedCB->GetSavedValue() ) { aCTLOptions.SetCTLSequenceCheckingRestricted( bChecked ); bModified = true; } bChecked = m_pTypeReplaceCB->IsChecked(); - if( bChecked != m_pTypeReplaceCB->GetSavedValue()) + if( (bChecked ? 1 : 0) != m_pTypeReplaceCB->GetSavedValue()) { aCTLOptions.SetCTLSequenceCheckingTypeAndReplace(bChecked); bModified = true; @@ -147,7 +147,7 @@ void SvxCTLOptionsPage::Reset( const SfxItemSet& ) m_pMovementVisualRB->SaveValue(); m_pNumeralsLB->SaveValue(); - sal_Bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); + bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); m_pRestrictedCB->Enable( bIsSequenceChecking ); m_pTypeReplaceCB->Enable( bIsSequenceChecking ); } diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 189a5114c02e..e0f46bdce70f 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -59,16 +59,16 @@ static OUString getNormDicEntry_Impl(const OUString &rText) if (aTmp.indexOf('[') > -1) { OUStringBuffer aTmp2 ( aTmp.getLength() ); - sal_Bool bSkip = sal_False; + bool bSkip = false; for (sal_Int32 i = 0; i < aTmp.getLength(); i++) { sal_Unicode cTmp = aTmp[i]; if (cTmp == '[') - bSkip = sal_True; + bSkip = true; else if (!bSkip) aTmp2.append( cTmp ); else if (cTmp == ']') - bSkip = sal_False; + bSkip = false; } aTmp = aTmp2.makeStringAndClear(); } @@ -133,11 +133,11 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) const Reference< XDictionary > *pDic = aDics.getConstArray(); sal_Int32 nCount = aDics.getLength(); - sal_Bool bFound = sal_False; + bool bFound = false; sal_Int32 i; for (i = 0; !bFound && i < nCount; ++i ) if ( sDict.equalsIgnoreAsciiCase( pDic[i]->getName()) ) - bFound = sal_True; + bFound = true; if ( bFound ) { @@ -227,8 +227,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( aDecoView ( this), xSpell ( xSpl ), nOld ( NOACTDICT ), - bFirstSelect (sal_True), - bDoNothing (sal_False) + bFirstSelect (true), + bDoNothing (false) { get(pAllDictsLB,"book"); @@ -294,8 +294,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( pLangLB->SetLanguageList( LANG_LIST_ALL, true, true ); - pReplaceED->SetSpaces(sal_True); - pWordED->SetSpaces(sal_True); + pReplaceED->SetSpaces(true); + pWordED->SetSpaces(true); if ( nCount > 0 ) { @@ -315,7 +315,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( // check if dictionary is read-only SetDicReadonly_Impl(xDic); - sal_Bool bEnable = !IsDicReadonly_Impl(); + bool bEnable = !IsDicReadonly_Impl(); pNewReplacePB->Enable( false ); pDeletePB->Enable( false ); pLangFT->Enable( bEnable ); @@ -354,7 +354,7 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( Reference< XDictionary > &xDic ) { // enable or disable new and delete button according to file attributes - bDicIsReadonly = sal_True; + bDicIsReadonly = true; if (xDic.is()) { Reference< frame::XStorable > xStor( xDic, UNO_QUERY ); @@ -362,7 +362,7 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( || !xStor->hasLocation() // not yet persistent || !xStor->isReadonly() ) { - bDicIsReadonly = sal_False; + bDicIsReadonly = false; } } } @@ -432,7 +432,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl) SetLanguage_Impl( LanguageTag( xDic->getLocale() ).getLanguageType() ); SetDicReadonly_Impl(xDic); - sal_Bool bEnable = !IsDicReadonly_Impl(); + bool bEnable = !IsDicReadonly_Impl(); pLangFT->Enable( bEnable ); pLangLB->Enable( bEnable ); } @@ -563,7 +563,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) pReplaceED->SetText(pBox->GetEntryText(pEntry, 1)); } else - bFirstSelect = sal_False; + bFirstSelect = false; // entries in the list box should exactly correspond to those from the // dictionary. Thus: @@ -609,7 +609,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) //! ...IsVisible should reflect whether the dictionary is a negativ //! or not (hopefully...) - sal_Bool bIsNegEntry = pReplaceFT->IsVisible(); + bool bIsNegEntry = pReplaceFT->IsVisible(); OUString aRplcText; if(bIsNegEntry) aRplcText = aReplaceStr; @@ -681,16 +681,16 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) sal_Int32 nWordLen = rEntry.getLength(); const OUString& rRepString = pReplaceED->GetText(); - sal_Bool bEnableNewReplace = sal_False; - sal_Bool bEnableDelete = sal_False; + bool bEnableNewReplace = false; + bool bEnableDelete = false; OUString aNewReplaceText = sNew; if(pEdt == pWordED) { if(nWordLen>0) { - sal_Bool bFound = sal_False; - sal_Bool bTmpSelEntry=sal_False; + bool bFound = false; + bool bTmpSelEntry=false; CDE_RESULT eCmpRes = CDE_DIFFERENT; for(sal_uLong i = 0; i < pWordsLB->GetEntryCount(); i++) @@ -701,32 +701,32 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) if(CDE_DIFFERENT != eCmpRes) { if(!rRepString.isEmpty()) - bFirstSelect = sal_True; - bDoNothing=sal_True; + bFirstSelect = true; + bDoNothing=true; pWordsLB->SetCurEntry(pEntry); - bDoNothing=sal_False; + bDoNothing=false; pFirstSel = pEntry; pReplaceED->SetText(pWordsLB->GetEntryText(pEntry, 1)); if (CDE_SIMILAR == eCmpRes) { aNewReplaceText = sModify; - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } - bFound= sal_True; + bFound= true; break; } else if(getNormDicEntry_Impl(aTestStr).indexOf( getNormDicEntry_Impl( rEntry ) ) == 0 && !bTmpSelEntry) { - bDoNothing=sal_True; + bDoNothing=true; pWordsLB->MakeVisible(pEntry); - bDoNothing=sal_False; - bTmpSelEntry=sal_True; + bDoNothing=false; + bTmpSelEntry=true; aNewReplaceText = sNew; - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } } @@ -736,16 +736,16 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) pFirstSel = 0; aNewReplaceText = sNew; - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } bEnableDelete = CDE_DIFFERENT != eCmpRes; } else if(pWordsLB->GetEntryCount()>0) { SvTreeListEntry* pEntry = pWordsLB->GetEntry( 0 ); - bDoNothing=sal_True; + bDoNothing=true; pWordsLB->MakeVisible(pEntry); - bDoNothing=sal_False; + bDoNothing=false; } } else if(pEdt == pReplaceED) @@ -758,13 +758,13 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) aReplaceText = pWordsLB->GetEntryText( pFirstSel, 1 ); aNewReplaceText = sModify; - bEnableDelete = sal_True; + bEnableDelete = true; } - sal_Bool bIsChange = + bool bIsChange = CDE_EQUAL != cmpDicEntry_Impl(pWordED->GetText(), aWordText) || CDE_EQUAL != cmpDicEntry_Impl(pReplaceED->GetText(), aReplaceText); if (!pWordED->GetText().isEmpty() && bIsChange) - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } pNewReplacePB->SetText( aNewReplaceText ); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index f0f58ea1e90a..d732661dbdf2 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -80,24 +80,24 @@ bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); - sal_Bool bFlag; - if( aWBasicCodeCB->GetSavedValue() != (bFlag = aWBasicCodeCB->IsChecked())) + bool bFlag; + if( (aWBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicCodeCB->IsChecked())) rOpt.SetLoadWordBasicCode( bFlag ); - if( aWBasicWbctblCB->GetSavedValue() != (bFlag = aWBasicWbctblCB->IsChecked())) + if( (aWBasicWbctblCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicWbctblCB->IsChecked())) rOpt.SetLoadWordBasicExecutable( bFlag ); - if( aWBasicStgCB->GetSavedValue() != (bFlag = aWBasicStgCB->IsChecked())) + if( (aWBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicStgCB->IsChecked())) rOpt.SetLoadWordBasicStorage( bFlag ); - if( aEBasicCodeCB->GetSavedValue() != (bFlag = aEBasicCodeCB->IsChecked())) + if( (aEBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicCodeCB->IsChecked())) rOpt.SetLoadExcelBasicCode( bFlag ); - if( aEBasicExectblCB->GetSavedValue() != (bFlag = aEBasicExectblCB->IsChecked())) + if( (aEBasicExectblCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicExectblCB->IsChecked())) rOpt.SetLoadExcelBasicExecutable( bFlag ); - if( aEBasicStgCB->GetSavedValue() != (bFlag = aEBasicStgCB->IsChecked())) + if( (aEBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicStgCB->IsChecked())) rOpt.SetLoadExcelBasicStorage( bFlag ); - if( aPBasicCodeCB->GetSavedValue() != (bFlag = aPBasicCodeCB->IsChecked())) + if( (aPBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aPBasicCodeCB->IsChecked())) rOpt.SetLoadPPointBasicCode( bFlag ); - if( aPBasicStgCB->GetSavedValue() != (bFlag = aPBasicStgCB->IsChecked())) + if( (aPBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aPBasicStgCB->IsChecked())) rOpt.SetLoadPPointBasicStorage( bFlag ); return false; @@ -260,7 +260,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) { InvalidCBEntry, NULL } }; - sal_Bool bFirst = sal_True; + bool bFirst = true; for( const ChkCBoxEntries* pArr = aChkArr; InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst ) { @@ -288,7 +288,7 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType } void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, - sal_Bool loadEnabled, sal_Bool saveEnabled ) + bool loadEnabled, bool saveEnabled ) { SvTreeListEntry* pEntry = new SvTreeListEntry; @@ -386,7 +386,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( return eState; } -void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) +void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -406,7 +406,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) if ( nCol < 2 ) { SvTreeListEntry* pEntry = GetEntry( nSelPos ); - sal_Bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED ); + bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED ); CheckEntryPos( nSelPos, nCol, !bIsChecked ); CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, (void*)pEntry ); } diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index fe01a122a480..30b58f011a94 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -58,7 +58,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage using SvTreeListBox::SetCheckButtonState; using SvSimpleTable::SetTabs; - void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); + void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); protected: @@ -88,7 +88,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType ); void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, - sal_Bool loadEnabled, sal_Bool saveEnabled ); + bool loadEnabled, bool saveEnabled ); SvTreeListEntry* GetEntry4Type( sal_IntPtr _nType ) const; public: diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 08586e846141..7ae17fd96049 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -244,42 +244,42 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; SvtHelpOptions aHelpOptions; - sal_Bool bChecked = m_pToolTipsCB->IsChecked(); - if ( bChecked != m_pToolTipsCB->GetSavedValue() ) + bool bChecked = m_pToolTipsCB->IsChecked(); + if ( bChecked != (m_pToolTipsCB->GetSavedValue() == TRISTATE_TRUE) ) aHelpOptions.SetHelpTips( bChecked ); bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() ); - if ( bChecked != m_pExtHelpCB->GetSavedValue() ) + if ( bChecked != (m_pExtHelpCB->GetSavedValue() == TRISTATE_TRUE) ) aHelpOptions.SetExtendedHelp( bChecked ); if ( TriState(m_pFileDlgCB->IsChecked()) != m_pFileDlgCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetUseSystemFileDialog( !m_pFileDlgCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if ( TriState(m_pPrintDlgCB->IsChecked()) != m_pPrintDlgCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetUseSystemPrintDialog( !m_pPrintDlgCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if ( TriState(m_pDocStatusCB->IsChecked()) != m_pDocStatusCB->GetSavedValue() ) { SvtPrintWarningOptions aPrintOptions; aPrintOptions.SetModifyDocumentOnPrintingAllowed( m_pDocStatusCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if ( TriState(m_pSaveAlwaysCB->IsChecked()) != m_pSaveAlwaysCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetSaveAlwaysAllowed( m_pSaveAlwaysCB->IsChecked() ); - bModified = sal_True; + bModified = true; } const SfxUInt16Item* pUInt16Item = @@ -287,7 +287,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32(); if ( pUInt16Item && pUInt16Item->GetValue() != nNum ) { - bModified = sal_True; + bModified = true; rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) ); } @@ -380,24 +380,24 @@ class CanvasSettings public: CanvasSettings(); - sal_Bool IsHardwareAccelerationEnabled() const; - sal_Bool IsHardwareAccelerationAvailable() const; - void EnabledHardwareAcceleration( sal_Bool _bEnabled ) const; + bool IsHardwareAccelerationEnabled() const; + bool IsHardwareAccelerationAvailable() const; + void EnabledHardwareAcceleration( bool _bEnabled ) const; private: typedef std::vector< std::pair<OUString,Sequence<OUString> > > ServiceVector; Reference<XNameAccess> mxForceFlagNameAccess; ServiceVector maAvailableImplementations; - mutable sal_Bool mbHWAccelAvailable; - mutable sal_Bool mbHWAccelChecked; + mutable bool mbHWAccelAvailable; + mutable bool mbHWAccelChecked; }; CanvasSettings::CanvasSettings() : mxForceFlagNameAccess(), - mbHWAccelAvailable(sal_False), - mbHWAccelChecked(sal_False) + mbHWAccelAvailable(false), + mbHWAccelChecked(false) { try { @@ -453,7 +453,7 @@ CanvasSettings::CanvasSettings() : } -sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const +bool CanvasSettings::IsHardwareAccelerationAvailable() const { if( !mbHWAccelChecked ) { @@ -500,7 +500,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const } -sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const +bool CanvasSettings::IsHardwareAccelerationEnabled() const { bool bForceLastEntry(false); if( !mxForceFlagNameAccess.is() ) @@ -513,7 +513,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const } -void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const +void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const { Reference< XNameReplace > xNameReplace( mxForceFlagNameAccess, UNO_QUERY ); @@ -629,7 +629,7 @@ IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN ) { (void)NOTINTERESTEDIN; - sal_Bool bAAEnabled = m_pFontAntiAliasing->IsChecked(); + bool bAAEnabled = m_pFontAntiAliasing->IsChecked(); m_pAAPointLimitLabel->Enable( bAAEnabled ); m_pAAPointLimit->Enable( bAAEnabled ); @@ -657,8 +657,8 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) SvtFontOptions aFontOpt; SvtMenuOptions aMenuOpt; - sal_Bool bModified = sal_False; - sal_Bool bMenuOptModified = sal_False; + bool bModified = false; + bool bMenuOptModified = false; bool bRepaintWindows(false); SvtMiscOptions aMiscOptions; @@ -693,7 +693,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) nStyleLB_InitialSelection = nStyleLB_NewSelection; } - sal_Bool bAppearanceChanged = sal_False; + bool bAppearanceChanged = false; // Screen Scaling @@ -703,7 +703,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if ( nNewScale != nOldScale ) { pAppearanceCfg->SetScaleFactor(nNewScale); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } // Mouse Snap Mode @@ -715,7 +715,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if ( eNewSnap != eOldSnap ) { pAppearanceCfg->SetSnapMode(eNewSnap ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } // Middle Mouse Button @@ -727,27 +727,27 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if ( eNewMiddleMouse != eOldMiddleMouse ) { pAppearanceCfg->SetMiddleMouseButton( eNewMiddleMouse ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } #if defined( UNX ) if ( TriState(m_pFontAntiAliasing->IsChecked()) != m_pFontAntiAliasing->GetSavedValue() ) { pAppearanceCfg->SetFontAntiAliasing( m_pFontAntiAliasing->IsChecked() ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } if ( m_pAAPointLimit->GetValue() != m_pAAPointLimit->GetSavedValue().toInt32() ) { pAppearanceCfg->SetFontAntialiasingMinPixelHeight( m_pAAPointLimit->GetValue() ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } #endif if ( TriState(m_pFontShowCB->IsChecked()) != m_pFontShowCB->GetSavedValue() ) { aFontOpt.EnableFontWYSIWYG( m_pFontShowCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if(m_pMenuIconsLB->GetSelectEntryPos() != m_pMenuIconsLB->GetSavedValue()) @@ -755,15 +755,15 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectEntryPos() == 0 ? TRISTATE_INDET : static_cast<TriState>(m_pMenuIconsLB->GetSelectEntryPos() - 1)); - bModified = sal_True; - bMenuOptModified = sal_True; - bAppearanceChanged = sal_True; + bModified = true; + bMenuOptModified = true; + bAppearanceChanged = true; } if ( TriState(m_pFontHistoryCB->IsChecked()) != m_pFontHistoryCB->GetSavedValue() ) { aFontOpt.EnableFontHistory( m_pFontHistoryCB->IsChecked() ); - bModified = sal_True; + bModified = true; } // #i95644# if disabled, do not use value, see in ::Reset() @@ -772,7 +772,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(TriState(m_pUseHardwareAccell->IsChecked()) != m_pUseHardwareAccell->GetSavedValue()) { pCanvasSettings->EnabledHardwareAcceleration(m_pUseHardwareAccell->IsChecked()); - bModified = sal_True; + bModified = true; } } @@ -782,7 +782,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(m_pUseAntiAliase->IsChecked() != mpDrawinglayerOpt->IsAntiAliasing()) { mpDrawinglayerOpt->SetAntiAliasing(m_pUseAntiAliase->IsChecked()); - bModified = sal_True; + bModified = true; bRepaintWindows = true; } } @@ -796,7 +796,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(bNewSelection != (bool)mpDrawinglayerOpt->IsTransparentSelection()) { mpDrawinglayerOpt->SetTransparentSelection(m_pSelectionCB->IsChecked()); - bModified = sal_True; + bModified = true; bRepaintWindows = true; } @@ -805,7 +805,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(nNewTransparence != mpDrawinglayerOpt->GetTransparentSelectionPercent()) { mpDrawinglayerOpt->SetTransparentSelectionPercent(nNewTransparence); - bModified = sal_True; + bModified = true; bRepaintWindows = true; } } @@ -815,8 +815,8 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) m_pSystemFont->IsEnabled() ) { aAccessibilityOptions.SetIsSystemFont( m_pSystemFont->IsChecked() ); - bModified = sal_True; - bMenuOptModified = sal_True; + bModified = true; + bMenuOptModified = true; } if( bMenuOptModified ) @@ -970,7 +970,7 @@ struct LanguageConfig_Impl SvtLinguConfig aLinguConfig; }; -static sal_Bool bLanguageCurrentDoc_Impl = sal_False; +static bool bLanguageCurrentDoc_Impl = false; // some things we'll need... static const OUString sAccessSrvc("com.sun.star.configuration.ConfigurationAccess"); @@ -1132,7 +1132,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe m_bOldAsian = pLangConfig->aLanguageOptions.IsAnyEnabled(); m_pAsianSupportCB->Check(m_bOldAsian); m_pAsianSupportCB->SaveValue(); - sal_Bool bReadonly = pLangConfig->aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_ALLCJK); + bool bReadonly = pLangConfig->aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_ALLCJK); m_pAsianSupportCB->Enable(!bReadonly); SupportHdl( m_pAsianSupportCB ); @@ -1201,7 +1201,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { //sequence checking has to be switched on depending on the selected CTL language LanguageType eCTLLang = m_pComplexLanguageLB->GetSelectLanguage(); - sal_Bool bOn = MsLangId::needsSequenceChecking( eCTLLang); + bool bOn = MsLangId::needsSequenceChecking( eCTLLang); pLangConfig->aLanguageOptions.SetCTLSequenceCheckingRestricted(bOn); pLangConfig->aLanguageOptions.SetCTLSequenceChecking(bOn); pLangConfig->aLanguageOptions.SetCTLSequenceCheckingTypeAndReplace(bOn); @@ -1305,12 +1305,12 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); Reference< css::linguistic2::XLinguProperties > xLinguProp = LinguMgr::GetLinguPropertySet(); - sal_Bool bCurrentDocCBChecked = m_pCurrentDocCB->IsChecked(); + bool bCurrentDocCBChecked = m_pCurrentDocCB->IsChecked(); if(m_pCurrentDocCB->IsEnabled()) bLanguageCurrentDoc_Impl = bCurrentDocCBChecked; - sal_Bool bCurrentDocCBChanged = bCurrentDocCBChecked != m_pCurrentDocCB->GetSavedValue(); + bool bCurrentDocCBChanged = bCurrentDocCBChecked != (m_pCurrentDocCB->GetSavedValue() == TRISTATE_TRUE); - sal_Bool bValChanged = m_pWesternLanguageLB->GetSavedValue() != m_pWesternLanguageLB->GetSelectEntryPos(); + bool bValChanged = m_pWesternLanguageLB->GetSavedValue() != m_pWesternLanguageLB->GetSelectEntryPos(); if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged) { LanguageType eSelectLang = m_pWesternLanguageLB->GetSelectLanguage(); @@ -1373,7 +1373,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) if(m_pAsianSupportCB->GetSavedValue() != TriState(m_pAsianSupportCB->IsChecked()) ) { - sal_Bool bChecked = m_pAsianSupportCB->IsChecked(); + bool bChecked = m_pAsianSupportCB->IsChecked(); pLangConfig->aLanguageOptions.SetAll(bChecked); //iterate over all bindings to invalidate vertical text direction @@ -1425,7 +1425,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pLocaleSettingLB->SelectLanguage(LanguageTag::convertToLanguageTypeWithFallback(sLang)); else m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG ); - sal_Bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); + bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); m_pLocaleSettingLB->Enable(!bReadonly); m_pLocaleSettingFT->Enable(!bReadonly); @@ -1551,7 +1551,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pIgnoreLanguageChangeCB->SaveValue(); m_pCurrentDocCB->SaveValue(); - sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale" ); + bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale" ); m_pWesternLanguageFT->Enable( bEnable ); m_pWesternLanguageLB->Enable( bEnable ); @@ -1580,10 +1580,10 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) { DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); - sal_Bool bCheck = pBox->IsChecked(); + bool bCheck = pBox->IsChecked(); if ( m_pAsianSupportCB == pBox ) { - sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CJK"); + bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CJK"); bCheck = ( bCheck && !bReadonly ); m_pAsianLanguageLB->Enable( bCheck ); if( pBox->IsEnabled() ) @@ -1591,7 +1591,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) } else if ( m_pCTLSupportCB == pBox ) { - sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CTL"); + bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CTL"); bCheck = ( bCheck && !bReadonly ); m_pComplexLanguageLB->Enable( bCheck ); if( pBox->IsEnabled() ) @@ -1605,7 +1605,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) namespace { - void lcl_checkLanguageCheckBox(CheckBox* _rCB,sal_Bool _bNewValue,sal_Bool _bOldValue) + void lcl_checkLanguageCheckBox(CheckBox* _rCB,bool _bNewValue,bool _bOldValue) { if ( _bNewValue ) _rCB->Check(true); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 44130a772a1d..e015f4c4728e 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -150,8 +150,8 @@ class OfaLanguagesTabPage : public SfxTabPage CheckBox* m_pCTLSupportCB; CheckBox* m_pIgnoreLanguageChangeCB; - sal_Bool m_bOldAsian; - sal_Bool m_bOldCtl; + bool m_bOldAsian; + bool m_bOldCtl; LanguageConfig_Impl* pLangConfig; OUString m_sUserLocaleValue; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index bd37cc5c6aee..653c6038586a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -483,7 +483,7 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) return bModified; } -void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable) +void SvxProxyTabPage::EnableControls_Impl(bool bEnable) { m_pHttpProxyFT->Enable(bEnable); m_pHttpProxyED->Enable(bEnable); @@ -643,7 +643,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) if ( m_pSavePasswordsCB->IsChecked() ) { - sal_Bool bOldValue = xMasterPasswd->allowPersistentStoring( sal_True ); + bool bOldValue = xMasterPasswd->allowPersistentStoring( sal_True ); xMasterPasswd->removeMasterPassword(); if ( xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { @@ -933,8 +933,8 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent, bool MozPluginTabPage::FillItemSet( SfxItemSet& ) { - sal_Bool hasInstall = isInstalled(); - sal_Bool hasChecked = m_pWBasicCodeCB->IsChecked(); + bool hasInstall = isInstalled(); + bool hasChecked = m_pWBasicCodeCB->IsChecked(); if(hasInstall && (!hasChecked)){ //try to uninstall uninstallPlugin(); @@ -978,7 +978,7 @@ inline bool getDllURL(OString * path) return true; } -sal_Bool MozPluginTabPage::isInstalled() +bool MozPluginTabPage::isInstalled() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1027,7 +1027,7 @@ sal_Bool MozPluginTabPage::isInstalled() #endif } -sal_Bool MozPluginTabPage::installPlugin() +bool MozPluginTabPage::installPlugin() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1074,7 +1074,7 @@ sal_Bool MozPluginTabPage::installPlugin() #endif } -sal_Bool MozPluginTabPage::uninstallPlugin() +bool MozPluginTabPage::uninstallPlugin() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1107,7 +1107,7 @@ class MailerProgramCfg_Impl : public utl::ConfigItem // variables OUString sProgram; // readonly states - sal_Bool bROProgram; + bool bROProgram; const Sequence<OUString> GetPropertyNames(); public: @@ -1122,7 +1122,7 @@ public: MailerProgramCfg_Impl::MailerProgramCfg_Impl() : utl::ConfigItem("Office.Common/ExternalMailer"), - bROProgram(sal_False) + bROProgram(false) { const Sequence< OUString > aNames = GetPropertyNames(); const Sequence< Any > aValues = GetProperties(aNames); @@ -1236,11 +1236,11 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) { - sal_Bool bMailModified = sal_False; + bool bMailModified = false; if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->GetSavedValue() != m_pMailerURLED->GetText()) { pImpl->aMailConfig.sProgram = m_pMailerURLED->GetText(); - bMailModified = sal_True; + bMailModified = true; } if ( bMailModified ) pImpl->aMailConfig.Commit(); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 2d42cbf50d01..c76a8eb97a92 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -92,7 +92,7 @@ private: uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess; - void EnableControls_Impl(sal_Bool bEnable); + void EnableControls_Impl(bool bEnable); void ReadConfigData_Impl(); void ReadConfigDefaults_Impl(); void RestoreConfigDefaults_Impl(); @@ -183,9 +183,9 @@ class MozPluginTabPage : public SfxTabPage { CheckBox* m_pWBasicCodeCB; - sal_Bool isInstalled(void); - sal_Bool installPlugin(void); - sal_Bool uninstallPlugin(void); + bool isInstalled(void); + bool installPlugin(void); + bool uninstallPlugin(void); MozPluginTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~MozPluginTabPage(); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 41a82f6f436f..cda9b33696eb 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -221,7 +221,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) { - sal_Bool bEnable = m_pJavaEnableCB->IsChecked(); + bool bEnable = m_pJavaEnableCB->IsChecked(); m_pJavaBox->Enable(bEnable); bEnable ? m_pJavaList->EnableTable() : m_pJavaList->DisableTable(); return 0; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 10bb9e68a474..54482d40048f 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -52,7 +52,7 @@ SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& get( m_pIgnoreWhitespace, "ignorewhitespace"); get( m_pIgnoreMiddleDot, "ignoremiddledot"); - bSaveOptions = sal_True; + bSaveOptions = true; nTransliterationFlags = 0x00000000; } @@ -70,7 +70,7 @@ SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet& r void SvxJSearchOptionsPage::SetTransliterationFlags( sal_Int32 nSettings ) { - sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); + bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); m_pMatchCase ->Check( bVal ); //! treat as equal uppercase/lowercase bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH); m_pMatchFullHalfWidth ->Check( bVal ); @@ -222,136 +222,136 @@ bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) bModified = false; SvtSearchOptions aOpt; - sal_Bool bNewVal, bChanged; + bool bNewVal, bChanged; bNewVal = m_pMatchCase->IsChecked(); //! treat as equal uppercase/lowercase - bChanged = bNewVal != m_pMatchCase->GetSavedValue(); + bChanged = bNewVal != (m_pMatchCase->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchCase(!bNewVal ); bModified = true; } bNewVal = m_pMatchFullHalfWidth->IsChecked(); - bChanged = bNewVal != m_pMatchFullHalfWidth->GetSavedValue(); + bChanged = bNewVal != (m_pMatchFullHalfWidth->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchFullHalfWidthForms( bNewVal ); bModified = true; } bNewVal = m_pMatchHiraganaKatakana->IsChecked(); - bChanged = bNewVal != m_pMatchHiraganaKatakana->GetSavedValue(); + bChanged = bNewVal != (m_pMatchHiraganaKatakana->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchHiraganaKatakana( bNewVal ); bModified = true; } bNewVal = m_pMatchContractions->IsChecked(); - bChanged = bNewVal != m_pMatchContractions->GetSavedValue(); + bChanged = bNewVal != (m_pMatchContractions->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchContractions( bNewVal ); bModified = true; } bNewVal = m_pMatchMinusDashChoon->IsChecked(); - bChanged = bNewVal != m_pMatchMinusDashChoon->GetSavedValue(); + bChanged = bNewVal != (m_pMatchMinusDashChoon->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchMinusDashChoon( bNewVal ); bModified = true; } bNewVal = m_pMatchRepeatCharMarks->IsChecked(); - bChanged = bNewVal != m_pMatchRepeatCharMarks->GetSavedValue(); + bChanged = bNewVal != (m_pMatchRepeatCharMarks->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchRepeatCharMarks( bNewVal ); bModified = true; } bNewVal = m_pMatchVariantFormKanji->IsChecked(); - bChanged = bNewVal != m_pMatchVariantFormKanji->GetSavedValue(); + bChanged = bNewVal != (m_pMatchVariantFormKanji->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchVariantFormKanji( bNewVal ); bModified = true; } bNewVal = m_pMatchOldKanaForms->IsChecked(); - bChanged = bNewVal != m_pMatchOldKanaForms->GetSavedValue(); + bChanged = bNewVal != (m_pMatchOldKanaForms->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchOldKanaForms( bNewVal ); bModified = true; } bNewVal = m_pMatchDiziDuzu->IsChecked(); - bChanged = bNewVal != m_pMatchDiziDuzu->GetSavedValue(); + bChanged = bNewVal != (m_pMatchDiziDuzu->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchDiziDuzu( bNewVal ); bModified = true; } bNewVal = m_pMatchBavaHafa->IsChecked(); - bChanged = bNewVal != m_pMatchBavaHafa->GetSavedValue(); + bChanged = bNewVal != (m_pMatchBavaHafa->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchBavaHafa( bNewVal ); bModified = true; } bNewVal = m_pMatchTsithichiDhizi->IsChecked(); - bChanged = bNewVal != m_pMatchTsithichiDhizi->GetSavedValue(); + bChanged = bNewVal != (m_pMatchTsithichiDhizi->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchTsithichiDhizi( bNewVal ); bModified = true; } bNewVal = m_pMatchHyuiyuByuvyu->IsChecked(); - bChanged = bNewVal != m_pMatchHyuiyuByuvyu->GetSavedValue(); + bChanged = bNewVal != (m_pMatchHyuiyuByuvyu->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchHyuiyuByuvyu( bNewVal ); bModified = true; } bNewVal = m_pMatchSesheZeje->IsChecked(); - bChanged = bNewVal != m_pMatchSesheZeje->GetSavedValue(); + bChanged = bNewVal != (m_pMatchSesheZeje->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchSesheZeje( bNewVal ); bModified = true; } bNewVal = m_pMatchIaiya->IsChecked(); - bChanged = bNewVal != m_pMatchIaiya->GetSavedValue(); + bChanged = bNewVal != (m_pMatchIaiya->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchIaiya( bNewVal ); bModified = true; } bNewVal = m_pMatchKiku->IsChecked(); - bChanged = bNewVal != m_pMatchKiku->GetSavedValue(); + bChanged = bNewVal != (m_pMatchKiku->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchKiku( bNewVal ); bModified = true; } bNewVal = m_pIgnorePunctuation->IsChecked(); - bChanged = bNewVal != m_pIgnorePunctuation->GetSavedValue(); + bChanged = bNewVal != (m_pIgnorePunctuation->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnorePunctuation( bNewVal ); bModified = true; } bNewVal = m_pIgnoreWhitespace->IsChecked(); - bChanged = bNewVal != m_pIgnoreWhitespace->GetSavedValue(); + bChanged = bNewVal != (m_pIgnoreWhitespace->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnoreWhitespace( bNewVal ); bModified = true; } bNewVal = m_pMatchProlongedSoundMark->IsChecked(); - bChanged = bNewVal != m_pMatchProlongedSoundMark->GetSavedValue(); + bChanged = bNewVal != (m_pMatchProlongedSoundMark->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnoreProlongedSoundMark( bNewVal ); bModified = true; } bNewVal = m_pIgnoreMiddleDot->IsChecked(); - bChanged = bNewVal != m_pIgnoreMiddleDot->GetSavedValue(); + bChanged = bNewVal != (m_pIgnoreMiddleDot->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnoreMiddleDot( bNewVal ); diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 6445b39bc55e..4c20a5c178a5 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -54,7 +54,7 @@ private: CheckBox* m_pIgnoreMiddleDot; sal_Int32 nTransliterationFlags; - sal_Bool bSaveOptions; + bool bSaveOptions; sal_Int32 GetTransliterationFlags_Impl(); @@ -69,8 +69,8 @@ public: virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; - sal_Bool IsSaveOptions() const { return bSaveOptions; } - void EnableSaveOptions( sal_Bool bVal ) { bSaveOptions = bVal; } + bool IsSaveOptions() const { return bSaveOptions; } + void EnableSaveOptions( bool bVal ) { bSaveOptions = bVal; } sal_Int32 GetTransliterationFlags() const { return nTransliterationFlags; } void SetTransliterationFlags( sal_Int32 nSettings ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c2c4b110823d..6a279b8e64d2 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -159,23 +159,23 @@ static sal_uInt16 pRanges[] = 0 }; -sal_Bool KillFile_Impl( const OUString& rURL ) +bool KillFile_Impl( const OUString& rURL ) { - sal_Bool bRet = sal_True; + bool bRet = true; try { Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete"), makeAny( true ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { SAL_WARN( "cui.options", "KillFile: CommandAbortedException" ); - bRet = sal_False; + bRet = false; } catch( ... ) { SAL_WARN( "cui.options", "KillFile: Any other exception" ); - bRet = sal_False; + bRet = false; } return bRet; @@ -194,14 +194,14 @@ sal_Bool KillFile_Impl( const OUString& rURL ) class ModuleUserData_Impl { - sal_Bool bParent; - sal_Bool bIsChecked; + bool bParent; + bool bIsChecked; sal_uInt8 nType; sal_uInt8 nIndex; OUString sImplName; public: - ModuleUserData_Impl( const OUString& sImpName, sal_Bool bIsParent, sal_Bool bChecked, sal_uInt8 nSetType, sal_uInt8 nSetIndex ) : + ModuleUserData_Impl( const OUString& sImpName, bool bIsParent, bool bChecked, sal_uInt8 nSetType, sal_uInt8 nSetIndex ) : bParent(bIsParent), bIsChecked(bChecked), nType(nSetType), @@ -209,9 +209,9 @@ public: sImplName(sImpName) { } - sal_Bool IsParent() const {return bParent;} + bool IsParent() const {return bParent;} sal_uInt8 GetType() const {return nType;} - sal_Bool IsChecked() const {return bIsChecked;} + bool IsChecked() const {return bIsChecked;} sal_uInt8 GetIndex() const {return nIndex;} const OUString& GetImplName() const {return sImplName;} @@ -227,18 +227,18 @@ class DicUserData public: DicUserData( sal_uLong nUserData ) : nVal( nUserData ) {} DicUserData( sal_uInt16 nEID, - sal_Bool bChecked, sal_Bool bEditable, sal_Bool bDeletable ); + bool bChecked, bool bEditable, bool bDeletable ); sal_uLong GetUserData() const { return nVal; } sal_uInt16 GetEntryId() const { return (sal_uInt16)(nVal >> 16); } - sal_Bool IsChecked() const { return (sal_Bool)(nVal >> 8) & 0x01; } - sal_Bool IsDeletable() const { return (sal_Bool)(nVal >> 10) & 0x01; } + bool IsChecked() const { return (bool)((nVal >> 8) & 0x01); } + bool IsDeletable() const { return (bool)((nVal >> 10) & 0x01); } }; DicUserData::DicUserData( sal_uInt16 nEID, - sal_Bool bChecked, sal_Bool bEditable, sal_Bool bDeletable ) + bool bChecked, bool bEditable, bool bDeletable ) { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); nVal = ((sal_uLong)(0xFFFF & nEID) << 16) | @@ -250,7 +250,7 @@ DicUserData::DicUserData( // class BrwString_Impl ------------------------------------------------- -static void lcl_SetCheckButton( SvTreeListEntry* pEntry, sal_Bool bCheck ) +static void lcl_SetCheckButton( SvTreeListEntry* pEntry, bool bCheck ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); @@ -390,22 +390,22 @@ class OptionsUserData public: OptionsUserData( sal_uLong nUserData ) : nVal( nUserData ) {} OptionsUserData( sal_uInt16 nEID, - sal_Bool bHasNV, sal_uInt16 nNumVal, - sal_Bool bCheckable, sal_Bool bChecked ); + bool bHasNV, sal_uInt16 nNumVal, + bool bCheckable, bool bChecked ); sal_uLong GetUserData() const { return nVal; } sal_uInt16 GetEntryId() const { return (sal_uInt16)(nVal >> 16); } - sal_Bool HasNumericValue() const { return (sal_Bool)(nVal >> 10) & 0x01; } + bool HasNumericValue() const { return (bool)((nVal >> 10) & 0x01); } sal_uInt16 GetNumericValue() const { return (sal_uInt16)(nVal & 0xFF); } - sal_Bool IsCheckable() const { return (sal_Bool)(nVal >> 9) & 0x01; } - sal_Bool IsModified() const { return (sal_Bool)(nVal >> 11) & 0x01; } + bool IsCheckable() const { return (bool)((nVal >> 9) & 0x01); } + bool IsModified() const { return (bool)((nVal >> 11) & 0x01); } - void SetNumericValue( sal_uInt8 nNumVal ); + void SetNumericValue( sal_uInt8 nNumVal ); }; OptionsUserData::OptionsUserData( sal_uInt16 nEID, - sal_Bool bHasNV, sal_uInt16 nNumVal, - sal_Bool bCheckable, sal_Bool bChecked ) + bool bHasNV, sal_uInt16 nNumVal, + bool bCheckable, bool bChecked ) { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); DBG_ASSERT( nNumVal < 256, "value out of range" ); @@ -486,9 +486,9 @@ struct ServiceInfo_Impl uno::Reference< XHyphenator > xHyph; uno::Reference< XThesaurus > xThes; uno::Reference< XProofreader > xGrammar; - sal_Bool bConfigured; + bool bConfigured; - ServiceInfo_Impl() : bConfigured(sal_False) {} + ServiceInfo_Impl() : bConfigured(false) {} }; typedef std::vector< ServiceInfo_Impl > ServiceInfoArr; @@ -511,8 +511,8 @@ class SvxLinguData_Impl uno::Reference< XLinguServiceManager2 > xLinguSrvcMgr; - sal_Bool AddRemove( Sequence< OUString > &rConfigured, - const OUString &rImplName, sal_Bool bAdd ); + bool AddRemove( Sequence< OUString > &rConfigured, + const OUString &rImplName, bool bAdd ); public: SvxLinguData_Impl(); @@ -524,7 +524,7 @@ public: uno::Reference<XLinguServiceManager2> & GetManager() { return xLinguSrvcMgr; } void SetChecked( const Sequence< OUString > &rConfiguredServices ); - void Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ); + void Reconfigure( const OUString &rDisplayName, bool bEnable ); const Sequence<Locale> & GetAllSupportedLocales() const { return aAllServiceLocales; } @@ -644,7 +644,7 @@ static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Lo sal_Int32 i; for(i = 0; i < rAdd.getLength(); i++) { - sal_Bool bFound = sal_False; + bool bFound = false; for(sal_Int32 j = 0; j < aAllLocales.getLength() && !bFound; j++) { bFound = pAdd[i].Language == pAllLocales[j].Language && @@ -901,7 +901,7 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices pEntry->sHyphImplName == rSrvcImplName || pEntry->sThesImplName == rSrvcImplName)) { - pEntry->bConfigured = sal_True; + pEntry->bConfigured = true; break; } } @@ -909,11 +909,11 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices } } -sal_Bool SvxLinguData_Impl::AddRemove( +bool SvxLinguData_Impl::AddRemove( Sequence< OUString > &rConfigured, - const OUString &rImplName, sal_Bool bAdd ) + const OUString &rImplName, bool bAdd ) { - sal_Bool bRet = sal_False; // modified? + bool bRet = false; // modified? sal_Int32 nEntries = rConfigured.getLength(); sal_Int32 nPos = lcl_SeqGetEntryPos(rConfigured, rImplName); @@ -922,7 +922,7 @@ sal_Bool SvxLinguData_Impl::AddRemove( rConfigured.realloc( ++nEntries ); OUString *pConfigured = rConfigured.getArray(); pConfigured[nEntries - 1] = rImplName; - bRet = sal_True; + bRet = true; } else if (!bAdd && nPos >= 0) // remove existing entry { @@ -930,14 +930,14 @@ sal_Bool SvxLinguData_Impl::AddRemove( for (sal_Int32 i = nPos; i < nEntries - 1; ++i) pConfigured[i] = pConfigured[i + 1]; rConfigured.realloc(--nEntries); - bRet = sal_True; + bRet = true; } return bRet; } -void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ) +void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable ) { DBG_ASSERT( !rDisplayName.isEmpty(), "empty DisplayName" ); @@ -1237,12 +1237,12 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) DicUserData aData( (sal_uLong)pEntry->GetUserData() ); if (aData.GetEntryId() < nDics) { - sal_Bool bChecked = m_pLinguDicsCLB->IsChecked( i ); + bool bChecked = m_pLinguDicsCLB->IsChecked( i ); uno::Reference< XDictionary > xDic( aDics.getConstArray()[ i ] ); if (xDic.is()) { if (SvxGetIgnoreAllList() == xDic) - bChecked = sal_True; + bChecked = true; xDic->setActive( bChecked ); if (bChecked) @@ -1273,7 +1273,7 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) Any aAny; if (aData.IsCheckable()) { - sal_Bool bChecked = m_pLinguOptionsCLB->IsChecked( j ); + bool bChecked = m_pLinguOptionsCLB->IsChecked( j ); aAny <<= bChecked; } else if (aData.HasNumericValue()) @@ -1328,9 +1328,9 @@ sal_uLong SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > & { uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY ); - sal_Bool bChecked = rxDic->isActive(); - sal_Bool bEditable = !xStor.is() || !xStor->isReadonly(); - sal_Bool bDeletable = bEditable; + bool bChecked = rxDic->isActive(); + bool bEditable = !xStor.is() || !xStor->isReadonly(); + bool bDeletable = bEditable; nRes = DicUserData( nIdx, bChecked, bEditable, bDeletable ).GetUserData(); @@ -1429,7 +1429,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) SvTreeListEntry* pEntry = NULL; sal_Int16 nVal = 0; - sal_Bool bVal = sal_False; + bool bVal = false; sal_uLong nUserData = 0; pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); @@ -1437,42 +1437,42 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); if (pItem) bVal = ((SfxBoolItem *) pItem)->GetValue(); - nUserData = OptionsUserData( EID_SPELL_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_SPELL_AUTO, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_GRAMMAR_AUTO ) >>= bVal; - nUserData = OptionsUserData( EID_GRAMMAR_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_GRAMMAR_AUTO, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sCapitalWords, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_UPPER_CASE ) >>= bVal; - nUserData = OptionsUserData( EID_CAPITAL_WORDS, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_CAPITAL_WORDS, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_WITH_DIGITS ) >>= bVal; - nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sSpellSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_SPECIAL ) >>= bVal; - nUserData = OptionsUserData( EID_SPELL_SPECIAL, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_SPELL_SPECIAL, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sNumMinWordlen, CBCOL_SECOND ); aLngCfg.GetProperty( UPN_HYPH_MIN_WORD_LENGTH ) >>= nVal; - nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); + nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, true, (sal_uInt16)nVal, false, false).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1485,7 +1485,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) aLngCfg.GetProperty( UPN_HYPH_MIN_LEADING ) >>= nVal; if (pHyp) nVal = (sal_Int16) pHyp->GetMinLead(); - nUserData = OptionsUserData( EID_NUM_PRE_BREAK, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); + nUserData = OptionsUserData( EID_NUM_PRE_BREAK, true, (sal_uInt16)nVal, false, false).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1493,20 +1493,20 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) aLngCfg.GetProperty( UPN_HYPH_MIN_TRAILING ) >>= nVal; if (pHyp) nVal = (sal_Int16) pHyp->GetMinTrail(); - nUserData = OptionsUserData( EID_NUM_POST_BREAK, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); + nUserData = OptionsUserData( EID_NUM_POST_BREAK, true, (sal_uInt16)nVal, false, false).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); pEntry = CreateEntry( sHyphAuto, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_HYPH_AUTO ) >>= bVal; - nUserData = OptionsUserData( EID_HYPH_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_HYPH_AUTO, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sHyphSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_HYPH_SPECIAL ) >>= bVal; - nUserData = OptionsUserData( EID_HYPH_SPECIAL, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_HYPH_SPECIAL, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); @@ -1574,7 +1574,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { SvTreeListEntry* pEntry = m_pLinguDicsCLB->GetEntry( nPos ); if (pEntry) - lcl_SetCheckButton( pEntry, sal_True ); + lcl_SetCheckButton( pEntry, true ); } } } @@ -1598,7 +1598,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) // evaluate new status of 'bConfigured' flag sal_uLong nLen = pLinguData->GetDisplayServiceCount(); for (sal_uLong i = 0; i < nLen; ++i) - pLinguData->GetDisplayServiceArray()[i].bConfigured = sal_False; + pLinguData->GetDisplayServiceArray()[i].bConfigured = false; const Locale* pAllLocales = pLinguData->GetAllSupportedLocales().getConstArray(); sal_Int32 nLocales = pLinguData->GetAllSupportedLocales().getLength(); for (sal_Int32 k = 0; k < nLocales; ++k) @@ -1943,8 +1943,8 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) { if (m_pModulesCLB == pBox) { - sal_Bool bDisableUp = sal_True; - sal_Bool bDisableDown = sal_True; + bool bDisableUp = true; + bool bDisableDown = true; SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { @@ -1995,7 +1995,7 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) pData->GetType() == TYPE_HYPH && pEntry != pCurEntry) { - lcl_SetCheckButton( pEntry, sal_False ); + lcl_SetCheckButton( pEntry, false ); pBox->InvalidateEntry( pEntry ); } pEntry = pBox->Next( pEntry ); @@ -2054,7 +2054,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) OUString* pChange = aChange.getArray(); pChange[nStart] = pData->GetImplName(); bChanged |= pData->GetIndex() != nLocalIndex || - pData->IsChecked() != (m_pModulesCLB->IsChecked(i) ? 1 : 0); + pData->IsChecked() != m_pModulesCLB->IsChecked(i); if(m_pModulesCLB->IsChecked(i)) nStart++; ++nLocalIndex; @@ -2084,7 +2084,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) SvTreeListEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); ModuleUserData_Impl* pUserData = new ModuleUserData_Impl( - OUString(), sal_True, sal_False, TYPE_SPELL, 0 ); + OUString(), true, false, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2095,7 +2095,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2117,7 +2117,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_SPELL, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2128,7 +2128,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // grammar checker entries pEntry = CreateEntry( sGrammar, CBCOL_SECOND ); - pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_GRAMMAR, 0 ); + pUserData = new ModuleUserData_Impl( OUString(), true, false, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2139,7 +2139,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2161,7 +2161,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_GRAMMAR, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2172,7 +2172,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // hyphenator entries pEntry = CreateEntry( sHyph, CBCOL_SECOND ); - pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_HYPH, 0 ); + pUserData = new ModuleUserData_Impl( OUString(), true, false, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2183,7 +2183,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2205,7 +2205,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_HYPH, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2216,7 +2216,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // thesaurus entries pEntry = CreateEntry( sThes, CBCOL_SECOND ); - pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_THES, 0 ); + pUserData = new ModuleUserData_Impl( OUString(), true, false, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2227,7 +2227,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2249,7 +2249,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_THES, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2262,7 +2262,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { - sal_Bool bUp = m_pPrioUpPB == pBtn; + bool bUp = m_pPrioUpPB == pBtn; sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos(); SvTreeListEntry* pEntry; if (nCurPos != TREELIST_ENTRY_NOTFOUND && @@ -2275,7 +2275,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) OUString aStr(m_pModulesCLB->GetEntryText(pEntry)); SvTreeListEntry* pToInsert = CreateEntry( aStr, CBCOL_FIRST ); pToInsert->SetUserData( (void *)pData); - sal_Bool bIsChecked = m_pModulesCLB->IsChecked(nCurPos); + bool bIsChecked = m_pModulesCLB->IsChecked(nCurPos); pModel->Remove(pEntry); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 9d6f538701cf..1b065062d555 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -175,7 +175,7 @@ bool SvxControlFocusHelper::Notify( NotifyEvent& rNEvt ) // functions ------------------------------------------------------------- -sal_Bool IsMultiPath_Impl( const sal_uInt16 nIndex ) +bool IsMultiPath_Impl( const sal_uInt16 nIndex ) { #if OSL_DEBUG_LEVEL > 1 return ( SvtPathOptions::PATH_AUTOCORRECT == nIndex || @@ -312,7 +312,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); aStr += "\t"; OUString sInternal, sUser, sWritable; - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( i, sInternal, sUser, sWritable, bReadOnly ); OUString sTmpPath = sUser; if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() ) @@ -378,7 +378,7 @@ void SvxPathTabPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += bUp ? OUString("1") : OUString("0"); SetUserData( aUserData ); } @@ -394,7 +394,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) Image aEntryImage; if(pEntry) aEntryImage = pPathBox->GetCollapsedEntryBmp( pEntry ); - sal_Bool bEnable = !aEntryImage; + bool bEnable = !aEntryImage; while ( pEntry && ( nSelCount < 2 ) ) { nSelCount++; @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) if ( !aOldPath.isEmpty() ) { OUString sInternal, sUser, sWritable, sTemp; - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sal_uInt16 i; @@ -475,7 +475,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) OUString sInternal, sUser, sWritable; PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sUser = pPathImpl->sUserPath; sWritable = pPathImpl->sWritablePath; @@ -537,7 +537,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) if ( pEntry ) { PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sUser = pPathImpl->sUserPath; sWritable = pPathImpl->sWritablePath; @@ -641,7 +641,7 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) @@ -711,7 +711,7 @@ IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt ) void SvxPathTabPage::GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, - OUString& _rUserPath, OUString& _rWritablePath, sal_Bool& _rReadOnly ) + OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ) { OUString sCfgName = getCfgName_Impl( _nPathHandle ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 21a4474618be..5dd08661a907 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -65,13 +65,13 @@ struct SvxSaveTabPage_Impl Sequence< OUString > aUIFilterArr[APP_COUNT]; OUString aDefaultArr[APP_COUNT]; sal_Bool aDefaultReadonlyArr[APP_COUNT]; - sal_Bool bInitialized; + bool bInitialized; SvxSaveTabPage_Impl(); ~SvxSaveTabPage_Impl(); }; -SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( sal_False ) +SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( false ) { } @@ -345,7 +345,7 @@ bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) -sal_Bool isODFFormat( const OUString& sFilter ) +bool isODFFormat( const OUString& sFilter ) { static const char* aODFFormats[] = { @@ -365,13 +365,13 @@ sal_Bool isODFFormat( const OUString& sFilter ) NULL }; - sal_Bool bRet = sal_False; + bool bRet = false; int i = 0; while ( aODFFormats[i] != NULL ) { if ( sFilter.equalsAscii( aODFFormats[i++] ) ) { - bRet = sal_True; + bRet = true; break; } } @@ -457,13 +457,13 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) getStr()); } - pImpl->bInitialized = sal_True; + pImpl->bInitialized = true; } aDocInfoCB->Check(aSaveOpt.IsDocInfoSave()); aBackupCB->Check(aSaveOpt.IsBackup()); - sal_Bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); + bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); aBackupCB->Enable(!bBackupRO); aAutoSaveCB->Check(aSaveOpt.IsAutoSave()); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 788ef9399322..014076cb03f8 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -65,7 +65,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet m_xUpdateAccess = setup::UpdateCheckConfig::create( xContext ); - sal_Bool bDownloadSupported = sal_False; + bool bDownloadSupported = false; m_xUpdateAccess->getByName( "DownloadSupported" ) >>= bDownloadSupported; WinBits nStyle = m_pDestPath->GetStyle(); @@ -161,7 +161,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) { bool bModified = false; - sal_Bool bValue; + bool bValue; sal_Int64 nValue; if( m_pAutoCheckCheckBox->GetSavedValue() != TriState(m_pAutoCheckCheckBox->IsChecked()) ) @@ -222,7 +222,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) { - sal_Bool bValue = sal_Bool(); + bool bValue = false; m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue; m_pAutoCheckCheckBox->Check(bValue); @@ -270,7 +270,7 @@ void SvxOnlineUpdateTabPage::FillUserData() IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox ) { - sal_Bool bEnabled = pBox->IsChecked(); + bool bEnabled = pBox->IsChecked(); m_pEveryDayButton->Enable(bEnabled); m_pEveryWeekButton->Enable(bEnabled); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index e5b1bf37d82d..14dcccb8704d 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -250,7 +250,7 @@ class MailMergeCfg_Impl : public utl::ConfigItem { friend class SvxEMailTabPage; // variables - sal_Bool bIsEmailSupported; + bool bIsEmailSupported; public: MailMergeCfg_Impl(); @@ -259,13 +259,13 @@ public: virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; - sal_Bool IsEmailSupported() const {return bIsEmailSupported;} + bool IsEmailSupported() const {return bIsEmailSupported;} }; MailMergeCfg_Impl::MailMergeCfg_Impl() : utl::ConfigItem("Office.Writer/MailMergeWizard"), - bIsEmailSupported(sal_False) + bIsEmailSupported(false) { Sequence<OUString> aNames(1); aNames.getArray()[0] = "EMailSupported"; @@ -424,16 +424,16 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { NULL, NULL, 0 } }; -static sal_Bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName ) +static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nIdx = 0; while ( OptionsMap_Impl[nIdx].m_pGroupName != NULL ) { if ( _nPageId == OptionsMap_Impl[nIdx].m_nPageId ) { - bRet = sal_True; + bRet = true; _rGroupName = OUString::createFromAscii( OptionsMap_Impl[nIdx].m_pGroupName ); if ( OptionsMap_Impl[nIdx].m_pPageName != NULL ) _rPageName = OUString::createFromAscii( OptionsMap_Impl[nIdx].m_pPageName ); @@ -445,9 +445,9 @@ static sal_Bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, return bRet; } -static sal_Bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogOptions& _rOptOptions ) +static bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogOptions& _rOptOptions ) { - sal_Bool bIsHidden = sal_False; + bool bIsHidden = false; OUString sGroupName, sPageName; if ( lcl_getStringFromID( _nPageId, sGroupName, sPageName ) ) { @@ -477,13 +477,13 @@ struct OptionsGroupInfo SfxShell* m_pShell; // used to create the page SfxModule* m_pModule; // used to create the ItemSet sal_uInt16 m_nDialogId; // Id of the former dialog - sal_Bool m_bLoadError; // load fails? + bool m_bLoadError; // load fails? OUString m_sPageURL; ExtensionsTabPage* m_pExtPage; OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) : m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ), - m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( sal_False ), + m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( false ), m_sPageURL( OUString() ), m_pExtPage( NULL ) {} ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; @@ -502,7 +502,7 @@ struct OptionsGroupInfo sNotLoadedError ( CUI_RES( ST_LOAD_ERROR ) ),\ pColorPageItemSet ( NULL ),\ mpColorPage ( NULL ),\ - bForgetSelection ( sal_False ),\ + bForgetSelection ( false ),\ bIsFromExtensionManager( false ), \ bIsForSetDocumentLanguage( false ) @@ -798,7 +798,7 @@ void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId ) DBG_ASSERT( !bIsFromExtensionManager, "OfaTreeOptionsDialog::ActivatePage(): call from extension manager" ); if ( !pLastPageSaver ) pLastPageSaver = new LastPageSaver; - bForgetSelection = sal_True; + bForgetSelection = true; sal_uInt16 nTemp = pLastPageSaver->m_nLastPageId; pLastPageSaver->m_nLastPageId = nResId; ActivateLastSelection(); @@ -810,7 +810,7 @@ void OfaTreeOptionsDialog::ActivatePage( const OUString& rPageURL ) DBG_ASSERT( !bIsFromExtensionManager, "OfaTreeOptionsDialog::ActivatePage(): call from extension manager" ); if ( !pLastPageSaver ) pLastPageSaver = new LastPageSaver; - bForgetSelection = sal_True; + bForgetSelection = true; pLastPageSaver->m_nLastPageId = 0; pLastPageSaver->m_sLastPageURL_Tools = rPageURL; ActivateLastSelection(); @@ -1051,13 +1051,13 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() if(pGroupInfo->m_pModule /*&& !pGroupInfo->pModule->IsLoaded()*/) { SfxModule* pOldModule = pGroupInfo->m_pModule; - sal_Bool bIdentical = pGroupInfo->m_pModule == pGroupInfo->m_pShell; + bool bIdentical = pGroupInfo->m_pModule == pGroupInfo->m_pShell; WaitObject aWait(this); //pGroupInfo->pModule = pGroupInfo->pModule->Load(); if(!pGroupInfo->m_pModule) { - pGroupInfo->m_bLoadError = sal_True; + pGroupInfo->m_bLoadError = true; InfoBox(pBox, sNotLoadedError).Execute(); return; } @@ -1304,7 +1304,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) } else { - sal_Bool bVal = sal_False; + bool bVal = false; if (xProp.is()) { bVal = xProp->getIsSpellAuto(); @@ -1438,7 +1438,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet } void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) { - sal_Bool bSaveSpellCheck = sal_False; + bool bSaveSpellCheck = false; const SfxPoolItem* pItem; if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem ) ) @@ -1453,7 +1453,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) xProp->setHyphMinLeading( (sal_Int16) pHyphenItem->GetMinLead() ); xProp->setHyphMinTrailing( (sal_Int16) pHyphenItem->GetMinTrail() ); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } SfxViewFrame *pViewFrame = SfxViewFrame::Current(); @@ -1464,22 +1464,22 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem )) { pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, false, &pItem )) { pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, false, &pItem )) { pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false, &pItem )) { - sal_Bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue(); + bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue(); pDispatch->Execute(SID_AUTOSPELL_CHECK, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, pItem, 0L); @@ -2363,9 +2363,9 @@ void ExtensionsTabPage::CreateDialogWithHandler() -sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) +bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( m_xEventHdl.is() ) { try diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index b09a1ec302cc..427145a9e659 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -55,7 +55,7 @@ void PasswordTable::Resort( bool bForced ) if ( 0 == nColumn || bForced ) // only the first column is sorted { HeaderBarItemBits nBits = GetTheHeaderBar().GetItemBits(1); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) |