diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-05 14:13:39 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:18 +0200 |
commit | c72ce293de07e2c8f13a3565fdd681773dc51144 (patch) | |
tree | 39017819e554037253d7065e330bbbc6fe480f79 | |
parent | c54b276beb30c36cee4d7cf2ccbd552c526777e7 (diff) |
svx: sal_Bool->bool
Change-Id: I5a6a57f708a3a5ce1f065e341ae9da24e0c91499
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optasian.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 8 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 6 | ||||
-rw-r--r-- | include/svx/langbox.hxx | 20 | ||||
-rw-r--r-- | include/svx/lathe3d.hxx | 10 | ||||
-rw-r--r-- | include/svx/linectrl.hxx | 10 | ||||
-rw-r--r-- | svx/source/dialog/langbox.cxx | 16 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 2 |
15 files changed, 51 insertions, 51 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index aeae64d3c98d..a89f7e94f715 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -291,7 +291,7 @@ void SpellDialog::Init_Impl() m_pExplainLink->SetClickHdl( LINK( this, SpellDialog, HandleHyperlink ) ); // initialize language ListBox - m_pLanguageLB->SetLanguageList( LANG_LIST_SPELL_USED, sal_False, sal_False, sal_True ); + m_pLanguageLB->SetLanguageList( LANG_LIST_SPELL_USED, false, false, true ); m_pSentenceED->ClearModifyFlag(); SvxGetChangeAllList()->clear(); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index db9ac45911ef..2681de82301e 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -147,7 +147,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet m_pStartED->SetModifyHdl(aLk); m_pEndED->SetModifyHdl(aLk); - m_pLanguageLB->SetLanguageList( LANG_LIST_FBD_CHARS, sal_False, sal_False ); + m_pLanguageLB->SetLanguageList( LANG_LIST_FBD_CHARS, false, false ); } SvxAsianLayoutPage::~SvxAsianLayoutPage() diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 63b7723b151d..e7c0911e722b 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -113,7 +113,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, pOKBtn->SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) ); // display languages - pLanguageLB->SetLanguageList( LANG_LIST_ALL, sal_True, sal_True ); + pLanguageLB->SetLanguageList( LANG_LIST_ALL, true, true ); pLanguageLB->SelectEntryPos(0); } @@ -292,7 +292,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( } } - pLangLB->SetLanguageList( LANG_LIST_ALL, sal_True, sal_True ); + pLangLB->SetLanguageList( LANG_LIST_ALL, true, true ); pReplaceED->SetSpaces(sal_True); pWordED->SetSpaces(sal_True); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 83a7935eab74..ace7a3c5a40f 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1089,14 +1089,14 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\""); } - m_pWesternLanguageLB->SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, sal_True, sal_False, sal_True ); + m_pWesternLanguageLB->SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, true, false, true ); m_pWesternLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::LATIN ); - m_pAsianLanguageLB->SetLanguageList( LANG_LIST_CJK | LANG_LIST_ONLY_KNOWN, sal_True, sal_False, sal_True ); + m_pAsianLanguageLB->SetLanguageList( LANG_LIST_CJK | LANG_LIST_ONLY_KNOWN, true, false, true ); m_pAsianLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::ASIAN ); - m_pComplexLanguageLB->SetLanguageList( LANG_LIST_CTL | LANG_LIST_ONLY_KNOWN, sal_True, sal_False, sal_True ); + m_pComplexLanguageLB->SetLanguageList( LANG_LIST_CTL | LANG_LIST_ONLY_KNOWN, true, false, true ); m_pComplexLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX ); - m_pLocaleSettingLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, sal_False, sal_False, sal_False); + m_pLocaleSettingLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false, false); m_pLocaleSettingLB->InsertSystemLanguage( ); const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 590cf022930c..8297b609965b 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -102,7 +102,7 @@ static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( const Sequence< Locale > &r } -static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > &rSeq, sal_Int16 nLang ) +static bool lcl_SeqHasLang( const Sequence< sal_Int16 > &rSeq, sal_Int16 nLang ) { sal_Int32 nLen = rSeq.getLength(); const sal_Int16 *pLang = rSeq.getConstArray(); @@ -112,7 +112,7 @@ static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > &rSeq, sal_Int16 nLa if (nLang == pLang[i]) nPos = i; } - return nPos < 0 ? sal_False : sal_True; + return nPos >= 0; } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 3334a2185998..8611fc758a19 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -114,7 +114,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) if( SvtLanguageOptions().IsCTLFontEnabled() ) nLangList |= LANG_LIST_CTL; - m_pLanguageLB->SetLanguageList( nLangList, sal_True, sal_True ); + m_pLanguageLB->SetLanguageList( nLangList, true, true ); m_pLanguageLB->SelectLanguage( LANGUAGE_NONE ); sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 530741d34214..652141c58109 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -353,9 +353,9 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) get(m_pPreviewWin, "preview"); - m_pWestFontLanguageLB->SetLanguageList(LANG_LIST_WESTERN, sal_True, sal_False, sal_True); - m_pEastFontLanguageLB->SetLanguageList(LANG_LIST_CJK, sal_True, sal_False, sal_True); - m_pCTLFontLanguageLB->SetLanguageList(LANG_LIST_CTL, sal_True, sal_False, sal_True); + m_pWestFontLanguageLB->SetLanguageList(LANG_LIST_WESTERN, true, false, true); + m_pEastFontLanguageLB->SetLanguageList(LANG_LIST_CJK, true, false, true); + m_pCTLFontLanguageLB->SetLanguageList(LANG_LIST_CTL, true, false, true); if (!bShowNonWestern) { diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index c6c6de6c8d3e..de5289b0b7b4 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -58,32 +58,32 @@ private: OUString m_aAllString; com::sun::star::uno::Sequence< sal_Int16 > *m_pSpellUsedLang; SvtLanguageTable* m_pLangTable; - sal_Int16 m_nLangList; - sal_Bool m_bHasLangNone; - sal_Bool m_bLangNoneIsLangAll; - sal_Bool m_bWithCheckmark; + sal_Int16 m_nLangList; + bool m_bHasLangNone; + bool m_bLangNoneIsLangAll; + bool m_bWithCheckmark; SVX_DLLPRIVATE void Init(); SVX_DLLPRIVATE sal_Int32 ImplInsertImgEntry( const OUString& rEntry, sal_Int32 nPos, bool bChecked ); SVX_DLLPRIVATE sal_Int32 ImplInsertLanguage(LanguageType, sal_Int32 nPos, sal_Int16 nType); public: - SvxLanguageBox(Window* pParent, WinBits nBits, sal_Bool bCheck = sal_False); + SvxLanguageBox(Window* pParent, WinBits nBits, bool bCheck = false); ~SvxLanguageBox(); void SetLanguageList( sal_Int16 nLangList, - sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll = sal_False, - sal_Bool bCheckSpellAvail = sal_False ); + bool bHasLangNone, bool bLangNoneIsLangAll = false, + bool bCheckSpellAvail = false ); sal_Int32 InsertLanguage( const LanguageType eLangType, sal_Int32 nPos = LISTBOX_APPEND ); sal_Int32 InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos = LISTBOX_APPEND ); sal_Int32 InsertSystemLanguage( sal_Int32 nPos = LISTBOX_APPEND ); sal_Int32 InsertLanguage( const LanguageType eLangType, - sal_Bool bCheckEntry, sal_Int32 nPos = LISTBOX_APPEND ); + bool bCheckEntry, sal_Int32 nPos = LISTBOX_APPEND ); void RemoveLanguage( const LanguageType eLangType ); - void SelectLanguage( const LanguageType eLangType, sal_Bool bSelect = sal_True ); + void SelectLanguage( const LanguageType eLangType, bool bSelect = true ); LanguageType GetSelectLanguage() const; - sal_Bool IsLanguageSelected( const LanguageType eLangType ) const; + bool IsLanguageSelected( const LanguageType eLangType ) const; }; #endif diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index 108a8553fb96..ae2f2b2eb9e3 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -71,23 +71,23 @@ private: { return ((const Svx3DEndAngleItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue(); } // #107245# GetSmoothNormals() for bLatheSmoothed - sal_Bool GetSmoothNormals() const + bool GetSmoothNormals() const { return ((const Svx3DSmoothNormalsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SMOOTH_NORMALS)).GetValue(); } // #107245# GetSmoothLids() for bLatheSmoothFrontBack - sal_Bool GetSmoothLids() const + bool GetSmoothLids() const { return ((const Svx3DSmoothLidsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SMOOTH_LIDS)).GetValue(); } // #107245# GetCharacterMode() for bLatheCharacterMode - sal_Bool GetCharacterMode() const + bool GetCharacterMode() const { return ((const Svx3DCharacterModeItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CHARACTER_MODE)).GetValue(); } // #107245# GetCloseFront() for bLatheCloseFront - sal_Bool GetCloseFront() const + bool GetCloseFront() const { return ((const Svx3DCloseFrontItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_FRONT)).GetValue(); } // #107245# GetCloseBack() for bLatheCloseBack - sal_Bool GetCloseBack() const + bool GetCloseBack() const { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); } virtual sal_uInt16 GetObjIdentifier() const; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 0744085c59ff..9581386c2de5 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -42,7 +42,7 @@ private: XLineStyleItem* pStyleItem; XLineDashItem* pDashItem; - sal_Bool bUpdate; + bool bUpdate; public: SFX_DECL_TOOLBOX_CONTROL(); @@ -101,11 +101,11 @@ class SvxLineEndWindow : public SfxPopupWindow private: XLineEndListRef pLineEndList; ValueSet aLineEndSet; - sal_uInt16 nCols; - sal_uInt16 nLines; - sal_uIntPtr nLineEndWidth; + sal_uInt16 nCols; + sal_uInt16 nLines; + sal_uIntPtr nLineEndWidth; Size aBmpSize; - sal_Bool bPopupMode; + bool bPopupMode; bool mbInResize; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 1766b3d3f3aa..8ca41722d27c 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -119,7 +119,7 @@ sal_Int32 TypeToPos_Impl( LanguageType eType, const ListBox& rLb ) return nPos; } -SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nBits, sal_Bool bCheck ) +SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nBits, bool bCheck ) : ListBox( pParent, nBits ) , m_pSpellUsedLang( NULL ) , m_bWithCheckmark( bCheck ) @@ -148,8 +148,8 @@ void SvxLanguageBox::Init() m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); m_aAllString = SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ); m_nLangList = LANG_LIST_EMPTY; - m_bHasLangNone = sal_False; - m_bLangNoneIsLangAll = sal_False; + m_bHasLangNone = false; + m_bLangNoneIsLangAll = false; // display entries sorted SetStyle( GetStyle() | WB_SORT ); @@ -198,7 +198,7 @@ sal_Int32 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, sal_Int32 void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList, - sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail ) + bool bHasLangNone, bool bLangNoneIsLangAll, bool bCheckSpellAvail ) { Clear(); @@ -398,7 +398,7 @@ sal_Int32 SvxLanguageBox::InsertSystemLanguage( sal_Int32 nPos ) sal_Int32 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, - sal_Bool bCheckEntry, sal_Int32 nPos ) + bool bCheckEntry, sal_Int32 nPos ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); // For obsolete and to be replaced languages check whether an entry of the @@ -445,7 +445,7 @@ LanguageType SvxLanguageBox::GetSelectLanguage() const -void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect ) +void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, bool bSelect ) { // If the core uses a LangID of an imported MS document and wants to select // a language that is replaced, we need to select the replacement instead. @@ -462,7 +462,7 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSel -sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const +bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const { // Same here, work on the replacement if applicable. LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType); @@ -472,7 +472,7 @@ sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) cons if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nAt ); else - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index d2a6d51b0ed8..f86821cfa079 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -63,7 +63,7 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, SfxToolBoxControl( nSlotId, nId, rTbx ), pStyleItem ( NULL ), pDashItem ( NULL ), - bUpdate ( sal_False ) + bUpdate ( false ) { addStatusListener( OUString( ".uno:LineDash" )); addStatusListener( OUString( ".uno:DashListState" )); @@ -109,7 +109,7 @@ void SvxLineStyleToolBoxControl::StateChanged ( pDashItem = (XLineDashItem*)pState->Clone(); } - bUpdate = sal_True; + bUpdate = true; Update( pState ); } else if ( nSID != SID_DASH_LIST ) @@ -126,7 +126,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) { if ( pState && bUpdate ) { - bUpdate = sal_False; + bUpdate = false; SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() ); DBG_ASSERT( pBox, "Window not found!" ); @@ -357,7 +357,7 @@ SvxLineEndWindow::SvxLineEndWindow( nCols ( 2 ), nLines ( 12 ), nLineEndWidth ( 400 ), - bPopupMode ( sal_True ), + bPopupMode ( true ), mbInResize ( false ), mxFrame ( rFrame ) { @@ -378,7 +378,7 @@ SvxLineEndWindow::SvxLineEndWindow( nCols ( 2 ), nLines ( 12 ), nLineEndWidth ( 400 ), - bPopupMode ( sal_True ), + bPopupMode ( true ), mbInResize ( false ), mxFrame ( rFrame ) { @@ -657,7 +657,7 @@ void SvxLineEndWindow::PopupModeEnd() { if ( IsVisible() ) { - bPopupMode = sal_False; + bPopupMode = false; SetSize(); } SfxPopupWindow::PopupModeEnd(); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 10615365e400..1b09a0b73040 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -162,7 +162,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, } } - m_pLanguageLB->SetLanguageList( LANG_LIST_ALL, sal_True, sal_False ); + m_pLanguageLB->SetLanguageList( LANG_LIST_ALL, true, false ); m_pLanguageLB->SelectLanguage( aOpt.GetLanguage() ); } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 3dda87016be2..28743137aa99 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -865,7 +865,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS pIndexEntryWrapper = new IndexEntrySupplierWrapper(); m_pLanguageLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, - sal_False, sal_False, sal_False ); + false, false, false ); sAddStyleContent = m_pAddStylesCB->GetText(); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 3eb2e52cb831..c28cf09619c2 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -204,7 +204,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) if( LANGUAGE_NONE == nLang || LANGUAGE_DONTKNOW == nLang ) nLang = (sal_uInt16)GetAppLanguage(); - m_pLangLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, sal_True, sal_False); + m_pLangLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, true, false); m_pLangLB->SelectLanguage( nLang ); LanguageHdl( 0 ); |