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/tabpages | |
| parent | 199d333f131474729a105afa5a3da61205f61df2 (diff) | |
cui: sal_Bool->bool
Change-Id: Ib7dd1f27d4909d30ee794936364a472a9755c609
Diffstat (limited to 'cui/source/tabpages')
27 files changed, 697 insertions, 697 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 43edca3a5a18..d4dc26119309 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -67,18 +67,18 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) get(m_pLanguageBox, "langbox"); get(m_pLanguageLB, "lang"); - sal_Bool bShowSWOptions = sal_False; - sal_Bool bOpenSmartTagOptions = sal_False; + bool bShowSWOptions = false; + bool bOpenSmartTagOptions = false; if ( _pSet ) { SFX_ITEMSET_ARG( _pSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, false ); if ( pItem && pItem->GetValue() ) - bShowSWOptions = sal_True; + bShowSWOptions = true; SFX_ITEMSET_ARG( _pSet, pItem2, SfxBoolItem, SID_OPEN_SMARTTAGOPTIONS, false ); if ( pItem2 && pItem2->GetValue() ) - bOpenSmartTagOptions = sal_True; + bOpenSmartTagOptions = true; } AddTabPage("options", OfaAutocorrOptionsPage::Create, 0); @@ -141,7 +141,7 @@ void OfaAutoCorrDlg::EnableLanguage(bool bEnable) m_pLanguageBox->Enable(bEnable); } -static sal_Bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, +static bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, CollatorWrapper& rCmpClass ) { sal_Int32 nCount = rLB.GetEntryCount(); @@ -152,12 +152,12 @@ static sal_Bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, if( 0 == rCmpClass.compareString(rEntry, rLB.GetEntry(i) )) { rLB.SelectEntryPos(i, true); - return sal_True; + return true; } } if(LISTBOX_ENTRY_NOTFOUND != nSelPos) rLB.SelectEntryPos(nSelPos, false); - return sal_False; + return false; } IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) @@ -212,7 +212,7 @@ bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, m_pCheckLB->IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(CorrectCapsLock, m_pCheckLB->IsChecked(nPos++)); - sal_Bool bReturn = nFlags != pAutoCorrect->GetFlags(); + bool bReturn = nFlags != pAutoCorrect->GetFlags(); if(bReturn ) { SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); @@ -332,7 +332,7 @@ void OfaImpBrwString::Paint( } aFont.SetWeight( WEIGHT_BOLD ); - sal_Bool bFett = sal_True; + bool bFett = true; sal_Int32 nPos = 0; do { OUString sTxt( pUserData->pString->getToken( 0, 1, nPos )); @@ -743,7 +743,7 @@ void OfaACorrCheckListBox::SetTabs() } } -void OfaACorrCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) +void OfaACorrCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -753,7 +753,7 @@ void OfaACorrCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bo SvButtonState( SV_BUTTON_UNCHECKED ) ); } -sal_Bool OfaACorrCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) +bool OfaACorrCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) { return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } @@ -962,7 +962,7 @@ bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) return false; } -void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, +void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage) { @@ -1008,7 +1008,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, for( sal_uInt32 i = 0; i < rArray.size(); i++ ) { DoubleString& rDouble = rArray[i]; - sal_Bool bTextOnly = 0 == rDouble.pUserData; + bool bTextOnly = 0 == rDouble.pUserData; // formatted text is only in Writer if(bSWriter || bTextOnly) { @@ -1036,7 +1036,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, it != aContent.end(); ++it ) { SvxAutocorrWord* pWordPtr = *it; - sal_Bool bTextOnly = pWordPtr->IsTextOnly(); + bool bTextOnly = pWordPtr->IsTextOnly(); // formatted text is only in Writer if(bSWriter || bTextOnly) { @@ -1061,7 +1061,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, SfxViewShell* pViewShell = SfxViewShell::Current(); if( pViewShell && pViewShell->HasSelection( true ) ) { - bHasSelectionText = sal_True; + bHasSelectionText = true; const OUString sSelection( pViewShell->GetSelectionText() ); m_pReplaceED->SetText( sSelection ); m_pTextOnlyCB->Check( !bSWriter ); @@ -1075,7 +1075,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, void OfaAutocorrReplacePage::Reset( const SfxItemSet& ) { - RefillReplaceBox(sal_True, eLang, eLang); + RefillReplaceBox(true, eLang, eLang); m_pShortED->GrabFocus(); } @@ -1084,7 +1084,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) //save old settings an refill if(eSet != eLang) { - RefillReplaceBox(sal_False, eLang, eSet); + RefillReplaceBox(false, eLang, eSet); eLastDialogLanguage = eSet; delete pCompareClass; delete pCharClass; @@ -1105,7 +1105,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) OUString sTmpShort(pBox->GetEntryText(pEntry, 0)); // if the text is set via ModifyHdl, the cursor is always at the beginning // of a word, although you're editing here - sal_Bool bSameContent = 0 == pCompareClass->compareString( sTmpShort, m_pShortED->GetText() ); + bool bSameContent = 0 == pCompareClass->compareString( sTmpShort, m_pShortED->GetText() ); Selection aSel = m_pShortED->GetSelection(); if(m_pShortED->GetText() != sTmpShort) { @@ -1122,7 +1122,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) } else { - bFirstSelect = sal_False; + bFirstSelect = false; } m_pNewReplacePB->Enable(false); @@ -1262,7 +1262,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) { SvTreeListEntry* pFirstSel = m_pReplaceTLB->FirstSelected(); - sal_Bool bShort = pEdt == m_pShortED; + bool bShort = pEdt == m_pShortED; const OUString rEntry = pEdt->GetText(); const OUString rRepString = m_pReplaceED->GetText(); OUString aWordStr( pCharClass->lowercase( rEntry )); @@ -1271,8 +1271,8 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) { if(!rEntry.isEmpty()) { - sal_Bool bFound = sal_False; - sal_Bool bTmpSelEntry=sal_False; + bool bFound = false; + bool bTmpSelEntry=false; for(sal_uInt32 i = 0; i < m_pReplaceTLB->GetEntryCount(); i++) { @@ -1282,12 +1282,12 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) { if( !rRepString.isEmpty() ) { - bFirstSelect = sal_True; + bFirstSelect = true; } m_pReplaceTLB->SetCurEntry(pEntry); pFirstSel = pEntry; m_pNewReplacePB->SetText(sModify); - bFound = sal_True; + bFound = true; break; } else @@ -1296,7 +1296,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) if( aTestStr.startsWith(aWordStr) && !bTmpSelEntry ) { m_pReplaceTLB->MakeVisible( pEntry ); - bTmpSelEntry = sal_True; + bTmpSelEntry = true; } } } @@ -1319,7 +1319,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) } else if( !bShort ) { - bReplaceEditChanged = sal_True; + bReplaceEditChanged = true; if( pFirstSel ) { m_pNewReplacePB->SetText( sModify ); @@ -1327,7 +1327,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) } const OUString& rShortTxt = m_pShortED->GetText(); - sal_Bool bEnableNew = !rShortTxt.isEmpty() && + bool bEnableNew = !rShortTxt.isEmpty() && ( !rRepString.isEmpty() || ( bHasSelectionText && bSWriter )) && ( !pFirstSel || rRepString != @@ -1338,7 +1338,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) { if((*i).equals(rShortTxt)) { - bEnableNew = sal_False; + bEnableNew = false; break; } } @@ -1348,16 +1348,16 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) return 0; } -static sal_Bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rString) +static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rString) { for(std::vector<OUString>::iterator i = rStrings.begin(); i != rStrings.end(); ++i) { if((*i).equals(rString)) { - return sal_True; + return true; } } - return sal_False; + return false; } OfaAutocorrExceptPage::OfaAutocorrExceptPage(Window* pParent, const SfxItemSet& rSet) @@ -1534,7 +1534,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) if(eLang != eSet) { // save old settings and fill anew - RefillReplaceBoxes(sal_False, eLang, eSet); + RefillReplaceBoxes(false, eLang, eSet); eLastDialogLanguage = eSet; delete pCompareClass; pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); @@ -1544,7 +1544,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) } } -void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, +void OfaAutocorrExceptPage::RefillReplaceBoxes(bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage) { @@ -1609,7 +1609,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool bFromReset, void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); - RefillReplaceBoxes(sal_True, eLang, eLang); + RefillReplaceBoxes(true, eLang, eLang); m_pAutoAbbrevCB-> Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst )); m_pAutoCapsCB-> Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst )); m_pAutoAbbrevCB->SaveValue(); @@ -1664,10 +1664,10 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) { // sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry(); const OUString& sEntry = pEdt->GetText(); - sal_Bool bEntryLen = !sEntry.isEmpty(); + bool bEntryLen = !sEntry.isEmpty(); if(pEdt == m_pAbbrevED) { - sal_Bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass); + bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass); if(bSame && sEntry != m_pAbbrevLB->GetSelectEntry()) pEdt->SetText(m_pAbbrevLB->GetSelectEntry()); m_pNewAbbrevPB->Enable(!bSame && bEntryLen); @@ -1675,7 +1675,7 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) } else { - sal_Bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass); + bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass); if(bSame && sEntry != m_pDoubleCapsLB->GetSelectEntry()) pEdt->SetText(m_pDoubleCapsLB->GetSelectEntry()); m_pNewDoublePB->Enable(!bSame && bEntryLen); @@ -1774,11 +1774,11 @@ OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) m_sEndQuoteDlg = strip(get<FixedText>("endquoteft")->GetText(), ':'); m_sStandard = get<FixedText>("singlestartex")->GetText(); - sal_Bool bShowSWOptions = sal_False; + bool bShowSWOptions = false; SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, false ); if ( pItem && pItem->GetValue() ) - bShowSWOptions = sal_True; + bShowSWOptions = true; if ( bShowSWOptions ) { @@ -1856,28 +1856,28 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(ChgQuotes, m_pDoubleTypoCB->IsChecked()); pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes, m_pSingleTypoCB->IsChecked()); - sal_Bool bReturn = nFlags != pAutoCorrect->GetFlags(); + bool bReturn = nFlags != pAutoCorrect->GetFlags(); if(cStartQuote != pAutoCorrect->GetStartDoubleQuote()) { - bReturn = sal_True; + bReturn = true; sal_Unicode cUCS2 = static_cast<sal_Unicode>(cStartQuote); //TODO pAutoCorrect->SetStartDoubleQuote(cUCS2); } if(cEndQuote != pAutoCorrect->GetEndDoubleQuote()) { - bReturn = sal_True; + bReturn = true; sal_Unicode cUCS2 = static_cast<sal_Unicode>(cEndQuote); //TODO pAutoCorrect->SetEndDoubleQuote(cUCS2); } if(cSglStartQuote != pAutoCorrect->GetStartSingleQuote()) { - bReturn = sal_True; + bReturn = true; sal_Unicode cUCS2 = static_cast<sal_Unicode>(cSglStartQuote); //TODO pAutoCorrect->SetStartSingleQuote(cUCS2); } if(cSglEndQuote != pAutoCorrect->GetEndSingleQuote()) { - bReturn = sal_True; + bReturn = true; sal_Unicode cUCS2 = static_cast<sal_Unicode>(cSglEndQuote); //TODO pAutoCorrect->SetEndSingleQuote(cUCS2); } @@ -1969,7 +1969,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) else if (pBtn == m_pDblEndQuotePB) nMode = DBL_END; // start character selection dialog - SvxCharacterMap* pMap = new SvxCharacterMap( this, sal_True ); + SvxCharacterMap* pMap = new SvxCharacterMap( this, true ); pMap->SetCharFont( OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 )); pMap->SetText(nMode < SGL_END ? m_sStartQuoteDlg : m_sEndQuoteDlg ); @@ -2272,7 +2272,7 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl) IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox*, pBox ) { - sal_Bool bEnable = pBox->IsChecked(); + bool bEnable = pBox->IsChecked(); if (pBox == m_pCBActiv) { m_pCBAppendSpace->Enable( bEnable ); @@ -2480,7 +2480,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl) */ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl) { - const sal_Bool bEnable = m_pMainCB->IsChecked(); + const bool bEnable = m_pMainCB->IsChecked(); m_pSmartTagTypesLB->Enable( bEnable ); m_pSmartTagTypesLB->Invalidate(); m_pPropertiesPB->Enable( false ); @@ -2529,7 +2529,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) if ( !pSmartTagMgr ) return false; - sal_Bool bModifiedSmartTagTypes = sal_False; + bool bModifiedSmartTagTypes = false; std::vector< OUString > aDisabledSmartTagTypes; const sal_uLong nCount = m_pSmartTagTypesLB->GetEntryCount(); @@ -2538,8 +2538,8 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) { const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(i); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); - const sal_Bool bChecked = m_pSmartTagTypesLB->IsChecked(i); - const sal_Bool bIsCurrentlyEnabled = pSmartTagMgr->IsSmartTagTypeEnabled( pUserData->maSmartTagType ); + const bool bChecked = m_pSmartTagTypesLB->IsChecked(i); + const bool bIsCurrentlyEnabled = pSmartTagMgr->IsSmartTagTypeEnabled( pUserData->maSmartTagType ); bModifiedSmartTagTypes = bModifiedSmartTagTypes || ( !bChecked != !bIsCurrentlyEnabled ); @@ -2549,7 +2549,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) delete pUserData; } - const sal_Bool bModifiedRecognize = ( !m_pMainCB->IsChecked() != !pSmartTagMgr->IsLabelTextWithSmartTags() ); + const bool bModifiedRecognize = ( !m_pMainCB->IsChecked() != !pSmartTagMgr->IsLabelTextWithSmartTags() ); if ( bModifiedSmartTagTypes || bModifiedRecognize ) { bool bLabelTextWithSmartTags = m_pMainCB->IsChecked() ? true : false; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index d33597a2b139..c4b5fd669f95 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -105,11 +105,11 @@ struct SvxBackgroundPara_Impl struct SvxBackgroundPage_Impl { Timer* pLoadTimer; - sal_Bool bIsImportDlgInExecute; + bool bIsImportDlgInExecute; SvxBackgroundPage_Impl() : pLoadTimer(NULL) - , bIsImportDlgInExecute(sal_False) + , bIsImportDlgInExecute(false) {} }; @@ -149,7 +149,7 @@ static void lcl_setFillStyle(ListBox* pLbSelect, XFillStyle eStyle) sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) { - sal_Bool bFound = sal_False; + bool bFound = false; sal_uInt16 nCount = rValueSet.GetItemCount(); sal_uInt16 n = 1; @@ -485,7 +485,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) m_pBtnPreview->Check( !aUserData.isEmpty() && '1' == aUserData[0] ); // don't be allowed to call ShowSelector() after reset anymore - bAllowShowSelector = sal_False; + bAllowShowSelector = false; // get and evaluate Input-BrushItem @@ -690,7 +690,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) } // We now have always a link to the background - bLinkOnly = sal_True; + bLinkOnly = true; m_pBtnLink->Check( true ); m_pBtnLink->Show( false ); @@ -768,12 +768,12 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, false); const SfxItemSet& rOldSet = GetItemSet(); - sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue()); + bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue()); if ( pOld ) { const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld; SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); - const sal_Bool bIsBrush = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) ); + const bool bIsBrush = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) ); // transparency has to be set if enabled, the color not already set to "No fill" and if( bColTransparency && @@ -803,8 +803,8 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) // Bitmap-treatment: SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const sal_Bool bIsLink = m_pBtnLink->IsChecked(); - const sal_Bool bWasLink = (NULL != rOldItem.GetGraphicLink() ); + const bool bIsLink = m_pBtnLink->IsChecked(); + const bool bWasLink = (NULL != rOldItem.GetGraphicLink() ); if ( !bIsLink && !bIsGraphicValid ) @@ -981,8 +981,8 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich ); SvxGraphicPosition eOldPos = rOldItem.GetGraphicPos(); - const sal_Bool bIsBrush = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) ); - sal_Bool bModified = sal_False; + const bool bIsBrush = ( XFILL_SOLID == lcl_getFillStyle(m_pLbSelect) ); + bool bModified = false; if ( ( (GPOS_NONE == eOldPos) && bIsBrush ) || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap changed? @@ -994,7 +994,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s // Brush-treatment: if ( rOldItem.GetColor() != aBgdColor ) { - bModified = sal_True; + bModified = true; CntWallpaperItem aItem( nWhich ); aItem.SetColor( aBgdColor ); rCoreSet.Put( aItem ); @@ -1012,7 +1012,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s bool bBrushChanged = ( rOldItem.GetColor() != aBgdColor ); if( bBitmapChanged || bBrushChanged ) { - bModified = sal_True; + bModified = true; CntWallpaperItem aItem( nWhich ); WallpaperStyle eWallStyle = SvxBrushItem::GraphicPos2WallpaperStyle(eNewPos); @@ -1043,7 +1043,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s rCoreSet.Put( aItem ); } - bModified = sal_True; + bModified = true; } return bModified; } @@ -1097,7 +1097,7 @@ void SvxBackgroundTabPage::ShowSelector() pPageImpl->pLoadTimer->SetTimeoutHdl( LINK( this, SvxBackgroundTabPage, LoadTimerHdl_Impl ) ); - bAllowShowSelector = sal_False; + bAllowShowSelector = false; if(nHtmlMode & HTMLMODE_ON) { @@ -1124,9 +1124,9 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() -sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl() +bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl() { - sal_Bool bResult = ( !aBgdGraphicPath.isEmpty() ) && + bool bResult = ( !aBgdGraphicPath.isEmpty() ) && ( GRFILTER_OK == GraphicFilter::LoadGraphic( aBgdGraphicPath, aBgdGraphicFilter, aBgdGraphic ) ); @@ -1319,7 +1319,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl) Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : Color( COL_TRANSPARENT ); aBgdColor = aColor; m_pPreviewWin1->NotifyChange( aBgdColor ); - sal_Bool bEnableTransp = aBgdColor.GetTransparency() < 0xff; + bool bEnableTransp = aBgdColor.GetTransparency() < 0xff; m_pColTransFT->Enable(bEnableTransp); m_pColTransMF->Enable(bEnableTransp); return 0; @@ -1422,7 +1422,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) { if ( pPageImpl->pLoadTimer->IsActive() ) return 0; - sal_Bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); + bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); OUString aStrBrowse(get<Window>("findgraphicsft")->GetText()); pImportDlg = new SvxOpenGraphicDialog( aStrBrowse ); @@ -1430,9 +1430,9 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) pImportDlg->EnableLink(false); pImportDlg->SetPath( aBgdGraphicPath, m_pBtnLink->IsChecked() ); - pPageImpl->bIsImportDlgInExecute = sal_True; + pPageImpl->bIsImportDlgInExecute = true; short nErr = pImportDlg->Execute(); - pPageImpl->bIsImportDlgInExecute = sal_False; + pPageImpl->bIsImportDlgInExecute = false; if( !nErr ) { @@ -1476,7 +1476,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) // new file chosen aBgdGraphicPath = pImportDlg->GetPath(); aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); - sal_Bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? sal_True : pImportDlg->IsAsLink(); + bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? sal_True : pImportDlg->IsAsLink(); m_pBtnLink->Check( bLink ); m_pBtnLink->Enable(); @@ -1484,17 +1484,17 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) { if( !pImportDlg->GetGraphic(aBgdGraphic) ) { - bIsGraphicValid = sal_True; + bIsGraphicValid = true; } else { aBgdGraphicFilter = ""; aBgdGraphicPath = ""; - bIsGraphicValid = sal_False; + bIsGraphicValid = false; } } else - bIsGraphicValid = sal_False; // load graphic not until preview click + bIsGraphicValid = false; // load graphic not until preview click if ( m_pBtnPreview->IsChecked() && bIsGraphicValid ) { @@ -1525,7 +1525,7 @@ void SvxBackgroundTabPage::ShowTblControl() -void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly) +void SvxBackgroundTabPage::ShowParaControl(bool bCharOnly) { m_pParaLBox->SetSelectHdl(HDL(ParaDestinationHdl_Impl)); m_pParaLBox->SelectEntryPos(0); @@ -1578,7 +1578,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) else { SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const sal_Bool bIsLink = m_pBtnLink->IsChecked(); + const bool bIsLink = m_pBtnLink->IsChecked(); if ( !bIsLink && !bIsGraphicValid ) bIsGraphicValid = LoadLinkedGraphic_Impl(); @@ -1659,7 +1659,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) else { SvxGraphicPosition eNewPos = GetGraphicPosition_Impl(); - const sal_Bool bIsLink = m_pBtnLink->IsChecked(); + const bool bIsLink = m_pBtnLink->IsChecked(); if ( !bIsLink && !bIsGraphicValid ) bIsGraphicValid = LoadLinkedGraphic_Impl(); @@ -1704,7 +1704,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, { m_pColTransMF->SetValue(lcl_TransparencyToPercent(rColor.GetTransparency())); m_pColTransMF->SaveValue(); - sal_Bool bEnableTransp = rColor.GetTransparency() < 0xff; + bool bEnableTransp = rColor.GetTransparency() < 0xff; m_pColTransFT->Enable(bEnableTransp); m_pColTransMF->Enable(bEnableTransp); //the default setting should be "no transparency" @@ -1797,7 +1797,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, else if ( pGraphic ) { aBgdGraphic = *pGraphic; - bIsGraphicValid = sal_True; + bIsGraphicValid = true; if ( rUserData.isEmpty() ) m_pBtnPreview->Check(); @@ -1805,7 +1805,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, else { RaiseLoadError_Impl(); - bIsGraphicValid = sal_False; + bIsGraphicValid = false; if ( rUserData.isEmpty() ) m_pBtnPreview->Check( false ); @@ -1824,7 +1824,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, } } -void SvxBackgroundTabPage::EnableTransparency(sal_Bool bColor, sal_Bool bGraphic) +void SvxBackgroundTabPage::EnableTransparency(bool bColor, bool bGraphic) { bColTransparency = bColor; bGraphTransparency = bGraphic; @@ -1846,7 +1846,7 @@ void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) if ( ( nFlags & SVX_SHOW_SELECTOR ) == SVX_SHOW_SELECTOR ) ShowSelector(); if ( ( nFlags & SVX_ENABLE_TRANSPARENCY ) == SVX_ENABLE_TRANSPARENCY ) - EnableTransparency(sal_True, sal_True); + EnableTransparency(true, true); } } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index d6a35e41a241..d06a4be1b02a 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -215,7 +215,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs SetFieldUnit(*m_pEdShadowSize, eFUnit); sal_uInt16 nWhich = GetWhich( SID_ATTR_BORDER_INNER, false ); - sal_Bool bIsDontCare = sal_True; + bool bIsDontCare = true; if ( rCoreAttrs.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { @@ -429,7 +429,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) { if( rSet.GetItemState( nWhichBox, true ) >= SFX_ITEM_DEFAULT ) { - sal_Bool bIsAnyBorderVisible = m_pFrameSel->IsAnyBorderVisible(); + bool bIsAnyBorderVisible = m_pFrameSel->IsAnyBorderVisible(); if( !bIsAnyBorderVisible || !pBoxInfoItem->IsMinDist() ) { m_pLeftMF->SetMin( 0 ); @@ -454,7 +454,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) // or it is null with an active border line // no automatic changes should be made const long nDefDist = bIsAnyBorderVisible ? pBoxInfoItem->GetDefDist() : 0; - sal_Bool bDiffDist = (nDefDist != nLeftDist || + bool bDiffDist = (nDefDist != nLeftDist || nDefDist != nRightDist || nDefDist != nTopDist || nDefDist != nBottomDist); @@ -534,7 +534,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) SelColHdl_Impl(m_pLbLineColor); } - sal_Bool bEnable = m_pWndShadows->GetSelectItemId() > 1 ; + bool bEnable = m_pWndShadows->GetSelectItemId() > 1 ; m_pFtShadowSize->Enable(bEnable); m_pEdShadowSize->Enable(bEnable); m_pFtShadowColor->Enable(bEnable); @@ -827,7 +827,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl) IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl) { - sal_Bool bEnable = m_pWndShadows->GetSelectItemId() > 1; + bool bEnable = m_pWndShadows->GetSelectItemId() > 1; m_pFtShadowSize->Enable(bEnable); m_pEdShadowSize->Enable(bEnable); m_pFtShadowColor->Enable(bEnable); @@ -1088,9 +1088,9 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) { if(!mbUseMarginItem && m_pLeftMF->IsVisible()) { - sal_Bool bLineSet = m_pFrameSel->IsAnyBorderVisible(); - sal_Bool bMinAllowed = 0 != (nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_TABLE)); - sal_Bool bSpaceModified = m_pLeftMF->IsModified()|| + bool bLineSet = m_pFrameSel->IsAnyBorderVisible(); + bool bMinAllowed = 0 != (nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_TABLE)); + bool bSpaceModified = m_pLeftMF->IsModified()|| m_pRightMF->IsModified()|| m_pTopMF->IsModified()|| m_pBottomMF->IsModified(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 28c118f9521a..95fbfc6e2929 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -177,7 +177,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset ) , m_pPreviewWin(NULL) - , m_bPreviewBackgroundToCharacter( sal_False ) + , m_bPreviewBackgroundToCharacter( false ) { } @@ -238,15 +238,15 @@ struct SvxCharNamePage_Impl OUString m_aNoStyleText; const FontList* m_pFontList; sal_Int32 m_nExtraEntryPos; - sal_Bool m_bMustDelete; - sal_Bool m_bInSearchMode; + bool m_bMustDelete; + bool m_bInSearchMode; SvxCharNamePage_Impl() : m_pFontList ( NULL ), m_nExtraEntryPos( COMBOBOX_ENTRY_NOTFOUND ), - m_bMustDelete ( sal_False ), - m_bInSearchMode ( sal_False ) + m_bMustDelete ( false ), + m_bInSearchMode ( false ) { m_aUpdateTimer.SetTimeout( 350 ); @@ -268,9 +268,9 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) m_pImpl->m_aNoStyleText = CUI_RES( RID_SVXSTR_CHARNAME_NOSTYLE ); SvtLanguageOptions aLanguageOptions; - sal_Bool bShowCJK = aLanguageOptions.IsCJKFontEnabled(); - sal_Bool bShowCTL = aLanguageOptions.IsCTLFontEnabled(); - sal_Bool bShowNonWestern = bShowCJK || bShowCTL; + bool bShowCJK = aLanguageOptions.IsCJKFontEnabled(); + bool bShowCTL = aLanguageOptions.IsCTLFontEnabled(); + bool bShowNonWestern = bShowCJK || bShowCTL; if (bShowNonWestern) { @@ -418,14 +418,14 @@ const FontList* SvxCharNamePage::GetFontList() const DBG_ASSERT(NULL != ( (SvxFontListItem*)pItem )->GetFontList(), "Where is the font list?"); m_pImpl->m_pFontList = static_cast<const SvxFontListItem*>(pItem )->GetFontList()->Clone(); - m_pImpl->m_bMustDelete = sal_True; + m_pImpl->m_bMustDelete = true; } } if(!m_pImpl->m_pFontList) { m_pImpl->m_pFontList = new FontList( Application::GetDefaultDevice() ); - m_pImpl->m_bMustDelete = sal_True; + m_pImpl->m_bMustDelete = true; } } @@ -449,7 +449,7 @@ namespace aSize.Width() = 0; FontInfo aFontInfo; OUString sFontName(_pFontNameLB->GetText()); - sal_Bool bFontAvailable = _pFontList->IsAvailable( sFontName ); + bool bFontAvailable = _pFontList->IsAvailable( sFontName ); if (bFontAvailable || _pFontNameLB->GetSavedValue() != sFontName) aFontInfo = _pFontList->Get( sFontName, _pFontStyleLB->GetText() ); else @@ -754,7 +754,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp if( rItem.GetProp() != 100 || SFX_MAPUNIT_RELATIVE != rItem.GetPropUnit() ) { - sal_Bool bPtRel = SFX_MAPUNIT_POINT == rItem.GetPropUnit(); + bool bPtRel = SFX_MAPUNIT_POINT == rItem.GetPropUnit(); pSizeBox->SetPtRelative( bPtRel ); pSizeBox->SetValue( bPtRel ? ((short)rItem.GetProp()) * 10 : rItem.GetProp() ); } @@ -1196,7 +1196,7 @@ void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem ) delete m_pImpl->m_pFontList; } m_pImpl->m_pFontList = rItem.GetFontList()->Clone(); - m_pImpl->m_bMustDelete = sal_True; + m_pImpl->m_bMustDelete = true; } @@ -1232,7 +1232,7 @@ void SvxCharNamePage::EnableRelativeMode() void SvxCharNamePage::EnableSearchMode() { - m_pImpl->m_bInSearchMode = sal_True; + m_pImpl->m_bInSearchMode = true; } void SvxCharNamePage::DisableControls( sal_uInt16 nDisable ) @@ -1261,7 +1261,7 @@ void SvxCharNamePage::DisableControls( sal_uInt16 nDisable ) void SvxCharNamePage::SetPreviewBackgroundToCharacter() { - m_bPreviewBackgroundToCharacter = sal_True; + m_bPreviewBackgroundToCharacter = true; } @@ -1451,7 +1451,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCTLFont.SetStrikeout( eStrikeout ); nPos = m_pPositionLB->GetSelectEntryPos(); - sal_Bool bUnder = ( CHRDLG_POSITION_UNDER == (sal_uLong)m_pPositionLB->GetEntryData( nPos ) ); + bool bUnder = ( CHRDLG_POSITION_UNDER == (sal_uLong)m_pPositionLB->GetEntryData( nPos ) ); FontEmphasisMark eMark = (FontEmphasisMark)m_pEmphasisLB->GetSelectEntryPos(); eMark |= bUnder ? EMPHASISMARK_POS_BELOW : EMPHASISMARK_POS_ABOVE; rFont.SetEmphasisMark( eMark ); @@ -1483,7 +1483,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCTLFont.SetCaseMap( static_cast<SvxCaseMap>( nCapsPos == SVX_CASEMAP_KAPITAELCHEN ? SVX_CASEMAP_NOT_MAPPED : (SvxCaseMap)nCapsPos) ); } - sal_Bool bWordLine = m_pIndividualWordsBtn->IsChecked(); + bool bWordLine = m_pIndividualWordsBtn->IsChecked(); rFont.SetWordLineMode( bWordLine ); rCJKFont.SetWordLineMode( bWordLine ); rCTLFont.SetWordLineMode( bWordLine ); @@ -1567,12 +1567,12 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) -sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) +bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); const SvxColorItem* pOld = (const SvxColorItem*)GetOldItem( rSet, SID_ATTR_CHAR_COLOR ); const SvxColorItem* pItem = NULL; - sal_Bool bChanged = sal_True; + bool bChanged = true; const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; const SfxItemSet& rOldSet = GetItemSet(); @@ -1583,7 +1583,7 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) aSelectedColor = m_pFontColorLB->GetSelectEntryColor(); if ( pOld && pOld->GetValue() == aSelectedColor ) - bChanged = sal_False; + bChanged = false; if ( !bChanged ) bChanged = ( m_pFontColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND ); @@ -1591,14 +1591,14 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET && ( (SvxColorItem*)pItem )->GetValue() != aSelectedColor ) - bChanged = sal_True; + bChanged = true; - sal_Bool bModified = sal_False; + bool bModified = false; if ( bChanged && m_pFontColorLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxColorItem( aSelectedColor, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1613,13 +1613,13 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) if ( m_pEmphasisLB == pBox ) { sal_Int32 nEPos = m_pEmphasisLB->GetSelectEntryPos(); - sal_Bool bEnable = ( nEPos > 0 && nEPos != LISTBOX_ENTRY_NOTFOUND ); + bool bEnable = ( nEPos > 0 && nEPos != LISTBOX_ENTRY_NOTFOUND ); m_pPositionFT->Enable( bEnable ); m_pPositionLB->Enable( bEnable ); } else if( m_pReliefLB == pBox) { - sal_Bool bEnable = ( pBox->GetSelectEntryPos() == 0 ); + bool bEnable = ( pBox->GetSelectEntryPos() == 0 ); m_pOutlineBtn->Enable( bEnable ); m_pShadowBtn->Enable( bEnable ); } @@ -1628,8 +1628,8 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox ) sal_Int32 nUPos = m_pUnderlineLB->GetSelectEntryPos(), nOPos = m_pOverlineLB->GetSelectEntryPos(), nSPos = m_pStrikeoutLB->GetSelectEntryPos(); - sal_Bool bUEnable = ( nUPos > 0 && nUPos != LISTBOX_ENTRY_NOTFOUND ); - sal_Bool bOEnable = ( nOPos > 0 && nOPos != LISTBOX_ENTRY_NOTFOUND ); + bool bUEnable = ( nUPos > 0 && nUPos != LISTBOX_ENTRY_NOTFOUND ); + bool bOEnable = ( nOPos > 0 && nOPos != LISTBOX_ENTRY_NOTFOUND ); m_pUnderlineColorFT->Enable( bUEnable ); m_pUnderlineColorLB->Enable( bUEnable ); m_pOverlineColorFT->Enable( bOEnable ); @@ -1720,7 +1720,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) SvxFont& rCJKFont = GetPreviewCJKFont(); SvxFont& rCTLFont = GetPreviewCTLFont(); - sal_Bool bEnable = sal_False; + bool bEnable = false; // Underline sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); @@ -1750,7 +1750,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(sal_uLong)m_pUnderlineLB->GetEntryData(i) == eUnderline ) { m_pUnderlineLB->SelectEntryPos(i); - bEnable = sal_True; + bEnable = true; break; } } @@ -1807,7 +1807,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontUnderline)(sal_uLong)m_pOverlineLB->GetEntryData(i) == eOverline ) { m_pOverlineLB->SelectEntryPos(i); - bEnable = sal_True; + bEnable = true; break; } } @@ -1864,7 +1864,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) if ( (FontStrikeout)(sal_uLong)m_pStrikeoutLB->GetEntryData(i) == eStrikeout ) { m_pStrikeoutLB->SelectEntryPos(i); - bEnable = sal_True; + bEnable = true; break; } } @@ -2165,7 +2165,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); - sal_Bool bModified = sal_False; + bool bModified = false; bool bChanged = true; // Underline @@ -2180,7 +2180,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) //! item-state in the 'rOldSet' will be invalid. In this case //! changing the underline style will be allowed if a style is //! selected in the listbox. - sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && + bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true ); const SvxUnderlineItem& rItem = *( (const SvxUnderlineItem*)pOld ); @@ -2195,7 +2195,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxUnderlineItem aNewItem( eUnder, nWhich ); aNewItem.SetColor( m_pUnderlineColorLB->GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2214,7 +2214,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) //! item-state in the 'rOldSet' will be invalid. In this case //! changing the underline style will be allowed if a style is //! selected in the listbox. - sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && + bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true ); const SvxOverlineItem& rItem = *( (const SvxOverlineItem*)pOld ); @@ -2229,7 +2229,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) SvxOverlineItem aNewItem( eOver, nWhich ); aNewItem.SetColor( m_pOverlineColorLB->GetSelectEntryColor() ); rSet.Put( aNewItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2248,7 +2248,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) //! item-state in the 'rOldSet' will be invalid. In this case //! changing the strikeout style will be allowed if a style is //! selected in the listbox. - sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && + bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true ); const SvxCrossedOutItem& rItem = *( (const SvxCrossedOutItem*)pOld ); @@ -2260,7 +2260,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2285,7 +2285,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { rSet.Put( SvxWordLineModeItem( m_pIndividualWordsBtn->IsChecked(), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2321,7 +2321,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2346,7 +2346,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) //! item-state in the 'rOldSet' will be invalid. In this case //! changing the effect style will be allowed if a style is //! selected in the listbox. - sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && + bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos && SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true ); const SvxCaseMapItem& rItem = *( (const SvxCaseMapItem*)pOld ); @@ -2357,7 +2357,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && bChecked ) { rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2394,7 +2394,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && eState != TRISTATE_INDET ) { rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2420,7 +2420,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && eState != TRISTATE_INDET ) { rSet.Put( SvxShadowedItem( StateToAttr( eState ), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2471,7 +2471,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && eState != TRISTATE_INDET ) { rSet.Put( SvxCharHiddenItem( StateToAttr( eState ), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -2514,7 +2514,7 @@ void SvxCharEffectsPage::EnableFlash() void SvxCharEffectsPage::SetPreviewBackgroundToCharacter() { - m_bPreviewBackgroundToCharacter = sal_True; + m_bPreviewBackgroundToCharacter = true; } @@ -2692,9 +2692,9 @@ IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn ) IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) { - sal_Bool bEnable = sal_False; + bool bEnable = false; if (m_p90degRB == pBtn || m_p270degRB == pBtn) - bEnable = sal_True; + bEnable = true; else OSL_ENSURE( m_p0degRB == pBtn, "unexpected button" ); m_pFitToLineCB->Enable( bEnable ); @@ -2814,9 +2814,9 @@ IMPL_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl) IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) { #ifdef DBG_UTIL - sal_Bool bHigh = m_pHighPosBtn->IsChecked(); + bool bHigh = m_pHighPosBtn->IsChecked(); #endif - sal_Bool bLow = m_pLowPosBtn->IsChecked(); + bool bLow = m_pLowPosBtn->IsChecked(); DBG_ASSERT( bHigh || bLow, "normal position is not valid" ); if ( m_pHighLowMF == pField ) @@ -2947,7 +2947,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_pFontSizeMF->Enable(); short nFac; - sal_Bool bAutomatic(sal_False); + bool bAutomatic(false); if ( nEsc > 0 ) { @@ -2956,7 +2956,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) if ( nEsc == DFLT_ESC_AUTO_SUPER ) { nEsc = DFLT_ESC_SUPER; - bAutomatic = sal_True; + bAutomatic = true; } } else @@ -2966,7 +2966,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) if ( nEsc == DFLT_ESC_AUTO_SUB ) { nEsc = DFLT_ESC_SUB; - bAutomatic = sal_True; + bAutomatic = true; } } if (!m_pHighLowRB->IsEnabled()) @@ -3143,7 +3143,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { // Position (high, normal or low) const SfxItemSet& rOldSet = GetItemSet(); - sal_Bool bModified = sal_False, bChanged = sal_True; + bool bModified = false, bChanged = true; sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_ESCAPEMENT ); const bool bHigh = m_pHighPosBtn->IsChecked(); @@ -3171,23 +3171,23 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { const SvxEscapementItem& rItem = *( (const SvxEscapementItem*)pOld ); if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && !m_pHighPosBtn->GetSavedValue() && !m_pNormalPosBtn->GetSavedValue() && !m_pLowPosBtn->GetSavedValue() ) - bChanged = sal_True; + bChanged = true; if ( bChanged && ( m_pHighPosBtn->IsChecked() || m_pNormalPosBtn->IsChecked() || m_pLowPosBtn->IsChecked() ) ) { rSet.Put( SvxEscapementItem( nEsc, nEscProp, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Kerning nWhich = GetWhich( SID_ATTR_CHAR_KERNING ); @@ -3210,23 +3210,23 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { const SvxKerningItem& rItem = *( (const SvxKerningItem*)pOld ); if ( rItem.GetValue() == nKerning ) - bChanged = sal_False; + bChanged = false; } if ( !bChanged && ( m_pKerningLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND || ( m_pKerningMF->GetSavedValue().isEmpty() && m_pKerningMF->IsEnabled() ) ) ) - bChanged = sal_True; + bChanged = true; if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxKerningItem( nKerning, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; - bChanged = sal_True; + bChanged = true; // Pair-Kerning nWhich = GetWhich( SID_ATTR_CHAR_AUTOKERN ); @@ -3234,7 +3234,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( TriState(m_pPairKerningBtn->IsChecked()) != m_pPairKerningBtn->GetSavedValue() ) { rSet.Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -3244,7 +3244,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_pScaleWidthMF->GetText() != m_pScaleWidthMF->GetSavedValue() ) { rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -3262,7 +3262,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) else if (m_p270degRB->IsChecked()) aItem.SetTopToBotton(); rSet.Put( aItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -3286,7 +3286,7 @@ void SvxCharPositionPage::FillUserData() void SvxCharPositionPage::SetPreviewBackgroundToCharacter() { - m_bPreviewBackgroundToCharacter = sal_True; + m_bPreviewBackgroundToCharacter = true; } void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) @@ -3363,7 +3363,7 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) -void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) +void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) { sal_Int32 nEntryPos = 0; ListBox* pBox = bStart ? m_pStartBracketLB : m_pEndBracketLB; @@ -3403,7 +3403,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl) { - sal_Bool bChecked = m_pTwoLinesBtn->IsChecked(); + bool bChecked = m_pTwoLinesBtn->IsChecked(); m_pEnclosingFrame->Enable( bChecked ); UpdatePreview_Impl(); @@ -3474,8 +3474,8 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) if ( rItem.GetValue() ) { - SetBracket( rItem.GetStartBracket(), sal_True ); - SetBracket( rItem.GetEndBracket(), sal_False ); + SetBracket( rItem.GetStartBracket(), true ); + SetBracket( rItem.GetEndBracket(), false ); } } TwoLinesHdl_Impl( NULL ); @@ -3488,7 +3488,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) { const SfxItemSet& rOldSet = GetItemSet(); - sal_Bool bModified = sal_False, bChanged = sal_True; + bool bModified = false, bChanged = true; sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES ); const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES ); bool bOn = m_pTwoLinesBtn->IsChecked(); @@ -3502,13 +3502,13 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) const SvxTwoLinesItem& rItem = *( (const SvxTwoLinesItem*)pOld ); if ( rItem.GetValue() == bOn && ( !bOn || ( rItem.GetStartBracket() == cStart && rItem.GetEndBracket() == cEnd ) ) ) - bChanged = sal_False; + bChanged = false; } if ( bChanged ) { rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -3529,7 +3529,7 @@ void SvxCharTwoLinesPage::UpdatePreview_Impl() void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter() { - m_bPreviewBackgroundToCharacter = sal_True; + m_bPreviewBackgroundToCharacter = true; } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 0c673b167c38..3beb9a7829e9 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -195,7 +195,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) MapMode( (MapUnit)rSet.GetPool()->GetMetric( nW ) ) ); } - sal_Bool bFound = sal_False; + bool bFound = false; if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) { OUString referer; @@ -220,7 +220,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) m_pExampleWN->SetGraphic( *pGrf ); m_pExampleWN->SetFrameSize( aOrigSize ); - bFound = sal_True; + bFound = true; if( !((SvxBrushItem*)pItem)->GetGraphicLink().isEmpty() ) aGraphicName = ((SvxBrushItem*)pItem)->GetGraphicLink(); } @@ -228,9 +228,9 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) } GraphicHasChanged( bFound ); - bReset = sal_True; + bReset = true; ActivatePage( rSet ); - bReset = sal_False; + bReset = false; } bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) @@ -293,7 +293,7 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) SID_ATTR_GRAF_KEEP_ZOOM), m_pZoomConstRB->IsChecked() ) ); } - bInitialized = sal_False; + bInitialized = false; return bModified; } @@ -305,7 +305,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) DBG_ASSERT( pPool, "Wo ist der Pool" ); #endif - bSetOrigSize = sal_False; + bSetOrigSize = false; // Size Size aSize; @@ -344,7 +344,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) m_pHeightMF->SetValue(nHeight, FUNIT_TWIP); } m_pHeightMF->SaveValue(); - bInitialized = sal_True; + bInitialized = true; if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) { @@ -373,7 +373,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) CalcMinMaxBorder(); } else - GraphicHasChanged( sal_False ); + GraphicHasChanged( false ); } CalcZoom(); @@ -466,7 +466,7 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) FieldUnit eUnit = MapToFieldUnit( pPool->GetMetric( pPool->GetWhich( SID_ATTR_GRAF_CROP ) ) ); - sal_Bool bZoom = m_pZoomConstRB->IsChecked(); + bool bZoom = m_pZoomConstRB->IsChecked(); if( pField == m_pLeftMF || pField == m_pRightMF ) { long nLeft = lcl_GetValue( *m_pLeftMF, eUnit ); @@ -553,7 +553,7 @@ IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl) m_pHeightMF->SetValue( m_pHeightMF->Normalize( nHeight ), eUnit ); m_pWidthZoomMF->SetValue(100); m_pHeightZoomMF->SetValue(100); - bSetOrigSize = sal_True; + bSetOrigSize = true; return 0; } /*-------------------------------------------------------------------- @@ -618,7 +618,7 @@ void SvxGrfCropPage::CalcMinMaxBorder() fill FixedText with the original size --------------------------------------------------------------------*/ -void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound ) +void SvxGrfCropPage::GraphicHasChanged( bool bFound ) { if( bFound ) { diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 1f9307854dd9..159389d57f38 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -54,9 +54,9 @@ public: VclFrame* pMacroFrame; SfxConfigFunctionListBox* pMacroLB; - sal_Bool bReadOnly; + bool bReadOnly; Timer maFillGroupTimer; - sal_Bool bGotEvents; + bool bGotEvents; bool m_bDummyActivated; ///< has this tab page already been activated }; @@ -214,7 +214,7 @@ void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet) const SfxPoolItem* pEventsItem; if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) ) { - mpImpl->bGotEvents = sal_True; + mpImpl->bGotEvents = true; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo ) { @@ -233,7 +233,7 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pEventsItem; if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) ) { - mpImpl->bGotEvents = sal_True; + mpImpl->bGotEvents = true; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); for ( size_t nNo = 0, nCnt = rList.size(); nNo < nCnt; ++nNo ) { @@ -308,7 +308,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) return 0; } - const sal_Bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled(); + const bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled(); // remove from the table sal_uInt16 nEvent = (sal_uInt16)(sal_uLong)pE->GetUserData(); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 79ba0843c44e..e9f71eed3a0e 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -88,7 +88,7 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : rOutAttrs ( rInAttrs ), aAttrSet ( *rInAttrs.GetPool() ), pView( 0 ), - bPositionModified ( sal_False ) + bPositionModified ( false ) { get(m_pMtrFldLineDist, "MTR_LINE_DIST"); get(m_pMtrFldHelplineOverhang, "MTR_FLD_HELPLINE_OVERHANG"); @@ -409,7 +409,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) ChangeAttrHdl_Impl( m_pTsbShowUnit ); m_pCtlPreview->SetAttributes( rAttrs ); - bPositionModified = sal_False; + bPositionModified = false; } /************************************************************************* @@ -420,7 +420,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) { - sal_Bool bModified = sal_False; + bool bModified = false; sal_Int32 nValue; TriState eState; @@ -428,42 +428,42 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) { nValue = GetCoreValue( *m_pMtrFldLineDist, eUnit ); rAttrs.Put( SdrMeasureLineDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldHelplineOverhang->GetText() != m_pMtrFldHelplineOverhang->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHelplineOverhang, eUnit ); rAttrs.Put( SdrMeasureHelplineOverhangItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldHelplineDist->GetText() != m_pMtrFldHelplineDist->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHelplineDist, eUnit ); rAttrs.Put( SdrMeasureHelplineDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldHelpline1Len->GetText() != m_pMtrFldHelpline1Len->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHelpline1Len, eUnit ); rAttrs.Put( SdrMeasureHelpline1LenItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldHelpline2Len->GetText() != m_pMtrFldHelpline2Len->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHelpline2Len, eUnit ); rAttrs.Put( SdrMeasureHelpline2LenItem( nValue ) ); - bModified = sal_True; + bModified = true; } eState = m_pTsbBelowRefEdge->GetState(); if( eState != m_pTsbBelowRefEdge->GetSavedValue() ) { - rAttrs.Put( SdrMeasureBelowRefEdgeItem( (sal_Bool) TRISTATE_TRUE == eState ) ); - bModified = sal_True; + rAttrs.Put( SdrMeasureBelowRefEdgeItem( TRISTATE_TRUE == eState ) ); + bModified = true; } if( m_pMtrFldDecimalPlaces->GetText() != m_pMtrFldDecimalPlaces->GetSavedValue() ) @@ -472,21 +472,21 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) rAttrs.Put( SdrMeasureDecimalPlacesItem( sal::static_int_cast< sal_Int16 >( nValue ) ) ); - bModified = sal_True; + bModified = true; } eState = m_pTsbParallel->GetState(); if( eState != m_pTsbParallel->GetSavedValue() ) { - rAttrs.Put( SdrMeasureTextRota90Item( (sal_Bool) TRISTATE_FALSE == eState ) ); - bModified = sal_True; + rAttrs.Put( SdrMeasureTextRota90Item( TRISTATE_FALSE == eState ) ); + bModified = true; } eState = m_pTsbShowUnit->GetState(); if( eState != m_pTsbShowUnit->GetSavedValue() ) { - rAttrs.Put( SdrMeasureShowUnitItem( (sal_Bool) TRISTATE_TRUE == eState ) ); - bModified = sal_True; + rAttrs.Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) ); + bModified = true; } sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos(); @@ -497,7 +497,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbUnit->GetEntryData( nPos ); FieldUnit _eUnit = (FieldUnit) nFieldUnit; rAttrs.Put( SdrMeasureUnitItem( _eUnit ) ); - bModified = sal_True; + bModified = true; } } @@ -543,13 +543,13 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) if( eOldVPos != eVPos ) { rAttrs.Put( SdrMeasureTextVPosItem( eVPos ) ); - bModified = sal_True; + bModified = true; } } else { rAttrs.Put( SdrMeasureTextVPosItem( eVPos ) ); - bModified = sal_True; + bModified = true; } if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE ) @@ -559,13 +559,13 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) if( eOldHPos != eHPos ) { rAttrs.Put( SdrMeasureTextHPosItem( eHPos ) ); - bModified = sal_True; + bModified = true; } } else { rAttrs.Put( SdrMeasureTextHPosItem( eHPos ) ); - bModified = sal_True; + bModified = true; } } @@ -695,7 +695,7 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) { TriState eState = m_pTsbBelowRefEdge->GetState(); if( eState != TRISTATE_INDET ) - aAttrSet.Put( SdrMeasureBelowRefEdgeItem( (sal_Bool) TRISTATE_TRUE == eState ) ); + aAttrSet.Put( SdrMeasureBelowRefEdgeItem( TRISTATE_TRUE == eState ) ); } if( p == m_pMtrFldDecimalPlaces ) @@ -709,14 +709,14 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) { TriState eState = m_pTsbParallel->GetState(); if( eState != TRISTATE_INDET ) - aAttrSet.Put( SdrMeasureTextRota90Item( (sal_Bool) TRISTATE_FALSE == eState ) ); + aAttrSet.Put( SdrMeasureTextRota90Item( TRISTATE_FALSE == eState ) ); } if( p == m_pTsbShowUnit ) { TriState eState = m_pTsbShowUnit->GetState(); if( eState != TRISTATE_INDET ) - aAttrSet.Put( SdrMeasureShowUnitItem( (sal_Bool) TRISTATE_TRUE == eState ) ); + aAttrSet.Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) ); } if( p == m_pLbUnit ) @@ -732,7 +732,7 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) if( p == m_pTsbAutoPosV || p == m_pTsbAutoPosH || p == m_pCtlPosition ) { - bPositionModified = sal_True; + bPositionModified = true; // Position RECT_POINT eRP = m_pCtlPosition->GetActualRP(); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 550711ed2803..a8eeaae98ff7 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -84,7 +84,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) aFont.SetTransparent( true ); aFont.SetColor( Application::GetSettings().GetStyleSettings().GetFieldColor() ); SetFont( aFont ); - InitSettings( sal_True, sal_True ); + InitSettings( true, true ); SetBorderStyle( WINDOW_BORDER_MONO ); } @@ -164,7 +164,7 @@ void SvxNumberPreview::Paint( const Rectangle& ) -void SvxNumberPreview::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) +void SvxNumberPreview::InitSettings( bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -193,9 +193,9 @@ void SvxNumberPreview::InitSettings( sal_Bool bForeground, sal_Bool bBackground void SvxNumberPreview::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( sal_True, sal_False ); + InitSettings( true, false ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( sal_False, sal_True ); + InitSettings( false, true ); Window::StateChanged( nType ); } @@ -207,7 +207,7 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( sal_True, sal_True ); + InitSettings( true, true ); } // class SvxNumberFormatTabPage ------------------------------------------ @@ -275,8 +275,8 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage() void SvxNumberFormatTabPage::Init_Impl() { - bNumItemFlag=sal_True; - bOneAreaFlag=sal_False; + bNumItemFlag=true; + bOneAreaFlag=false; m_pIbAdd->Enable(false ); m_pIbRemove->Enable(false ); @@ -405,7 +405,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } else { - HideLanguage(sal_False); + HideLanguage(false); } } @@ -416,17 +416,17 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) { if(pNumItem==NULL) { - bNumItemFlag=sal_True; + bNumItemFlag=true; pNumItem= (SvxNumberInfoItem *) pItem->Clone(); } else { - bNumItemFlag=sal_False; + bNumItemFlag=false; } } else { - bNumItemFlag=sal_False; + bNumItemFlag=false; } @@ -458,7 +458,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } else { - sal_Bool bInit = sal_False; // set to sal_True for debug test + bool bInit = false; // set to sal_True for debug test m_pCbSourceFormat->Check( bInit ); m_pCbSourceFormat->Enable( bInit ); m_pCbSourceFormat->Show( bInit ); @@ -560,7 +560,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) m_pLbLanguage->SelectLanguage( eLangType ); if(pAutoEntryAttr) AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue()); - UpdateFormatListBox_Impl(sal_False,sal_True); + UpdateFormatListBox_Impl(sal_False,true); //! This spoils everything because it rematches currency formats based on //! the selected m_pLbCurrency entry instead of the current format. @@ -634,7 +634,7 @@ void SvxNumberFormatTabPage::Obstructing() #************************************************************************/ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl() { - sal_Bool bEnable = !m_pCbSourceFormat->IsChecked(); + bool bEnable = !m_pCbSourceFormat->IsChecked(); if ( !bEnable ) m_pCbSourceFormat->GrabFocus(); m_pFtCategory->Enable( bEnable ); @@ -667,7 +667,7 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl() #* #************************************************************************/ -void SvxNumberFormatTabPage::HideLanguage(sal_Bool nFlag) +void SvxNumberFormatTabPage::HideLanguage(bool nFlag) { m_pFtLanguage->Show(!nFlag); m_pLbLanguage->Show(!nFlag); @@ -688,7 +688,7 @@ void SvxNumberFormatTabPage::HideLanguage(sal_Bool nFlag) bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { - sal_Bool bDataChanged = m_pFtLanguage->IsEnabled() || m_pCbSourceFormat->IsEnabled(); + bool bDataChanged = m_pFtLanguage->IsEnabled() || m_pCbSourceFormat->IsEnabled(); if ( bDataChanged ) { const SfxItemSet& rMyItemSet = GetItemSet(); @@ -742,7 +742,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) pNumFmtShell->GetUpdateData( pDelArr.get(), nDelCount ); pNumItem->SetDelFormatArray( pDelArr.get(), nDelCount ); - if(bNumItemFlag==sal_True) + if(bNumItemFlag) { rCoreAttrs.Put( *pNumItem ); } @@ -767,10 +767,10 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) SfxItemState _eItemState = rMyItemSet.GetItemState( _nWhich, false ); const SfxBoolItem* pBoolItem = (const SfxBoolItem*) GetItem( rMyItemSet, SID_ATTR_NUMBERFORMAT_SOURCE ); - sal_Bool bOld = (pBoolItem ? pBoolItem->GetValue() : sal_False); + bool bOld = pBoolItem && pBoolItem->GetValue(); rCoreAttrs.Put( SfxBoolItem( _nWhich, m_pCbSourceFormat->IsChecked() ) ); if ( !bDataChanged ) - bDataChanged = (bOld != (sal_Bool) m_pCbSourceFormat->IsChecked() || + bDataChanged = (bOld != m_pCbSourceFormat->IsChecked() || _eItemState != SFX_ITEM_SET); } @@ -878,7 +878,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt #* #************************************************************************/ -void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sal_False*/ ) +void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_False*/ ) { OUString theFormat = m_pEdFormat->GetText(); sal_Int32 nCurCategory = m_pLbCategory->GetSelectEntryPos(); @@ -897,7 +897,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa bThousand, bNegRed, nDecimals, nZeroes, nCategory ); - sal_Bool bDoIt=sal_False; + bool bDoIt=false; if(nCategory==CAT_CURRENCY) { sal_uInt16 nTstPos=pNumFmtShell->FindCurrencyFormat(theFormat); @@ -905,7 +905,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa { m_pLbCurrency->SelectEntryPos(nTstPos); pNumFmtShell->SetCurrencySymbol(nTstPos); - bDoIt=sal_True; + bDoIt=true; } } @@ -920,7 +920,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa else SetCategory(nCategory ); - UpdateFormatListBox_Impl( sal_True, sal_False ); + UpdateFormatListBox_Impl( sal_True, false ); } } else if ( m_pLbFormat->GetEntryCount() > 0 ) @@ -994,7 +994,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa void SvxNumberFormatTabPage::UpdateFormatListBox_Impl ( sal_uInt16 bCat, // Category or country/language ListBox? - sal_Bool bUpdateEdit + bool bUpdateEdit ) { std::vector<OUString> aEntryList; @@ -1200,7 +1200,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) if ( pNumFmtShell->FindEntry( aFormat) ) { m_pIbAdd->Enable(false ); - sal_Bool bIsUserDef=pNumFmtShell->IsUserDefined( aFormat ); + bool bIsUserDef=pNumFmtShell->IsUserDefined( aFormat ); m_pIbRemove->Enable(bIsUserDef); m_pIbInfo->Enable(bIsUserDef); @@ -1213,7 +1213,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) m_pFtComment->SetText(m_pEdComment->GetText()); } - UpdateOptions_Impl( sal_False ); + UpdateOptions_Impl( false ); return 0; } @@ -1222,9 +1222,9 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) // category-ListBox ------------------------------------------------- if (pLb == m_pLbCategory || pLb == m_pLbCurrency) { - UpdateFormatListBox_Impl( sal_True, sal_True ); + UpdateFormatListBox_Impl( sal_True, true ); EditHdl_Impl( NULL ); - UpdateOptions_Impl( sal_False ); + UpdateOptions_Impl( false ); return 0; } @@ -1233,7 +1233,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) // language/country-ListBox ---------------------------------------------- if (pLb == m_pLbLanguage) { - UpdateFormatListBox_Impl( sal_False, sal_True ); + UpdateFormatListBox_Impl( sal_False, true ); EditHdl_Impl(m_pEdFormat); return 0; @@ -1256,8 +1256,8 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, PushButton*, pIB) { - sal_Bool bAdded = sal_False; - sal_Bool bDeleted = sal_False; + bool bAdded = false; + bool bDeleted = false; sal_uLong nReturn = 0; const sal_uLong nReturnChanged = 0x1; // THE boolean return value const sal_uLong nReturnAdded = 0x2; // temp: format added @@ -1448,7 +1448,7 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) if ( pNumFmtShell->FindEntry( aFormat, &nCurKey ) ) { m_pIbAdd->Enable(false ); - sal_Bool bUserDef=pNumFmtShell->IsUserDefined( aFormat ); + bool bUserDef=pNumFmtShell->IsUserDefined( aFormat ); m_pIbRemove->Enable(bUserDef); m_pIbInfo->Enable(bUserDef); @@ -1480,7 +1480,7 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) if ( pEdFormat ) { pNumFmtShell->SetCurNumFmtKey( nCurKey ); - UpdateOptions_Impl( sal_True ); + UpdateOptions_Impl( true ); } return 0; @@ -1506,9 +1506,9 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) || (pOptCtrl == m_pBtnThousand) ) { OUString aFormat; - sal_Bool bThousand = m_pBtnThousand->IsEnabled() + bool bThousand = m_pBtnThousand->IsEnabled() && m_pBtnThousand->IsChecked(); - sal_Bool bNegRed = m_pBtnNegRed->IsEnabled() + bool bNegRed = m_pBtnNegRed->IsEnabled() && m_pBtnNegRed->IsChecked(); sal_uInt16 nPrecision = (m_pEdDecimals->IsEnabled()) ? (sal_uInt16)m_pEdDecimals->GetValue() @@ -1528,7 +1528,7 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) if ( pNumFmtShell->FindEntry( aFormat ) ) { m_pIbAdd->Enable(false ); - sal_Bool bUserDef=pNumFmtShell->IsUserDefined( aFormat ); + bool bUserDef=pNumFmtShell->IsUserDefined( aFormat ); m_pIbRemove->Enable(bUserDef); m_pIbInfo->Enable(bUserDef); EditHdl_Impl(m_pEdFormat); @@ -1711,7 +1711,7 @@ void SvxNumberFormatTabPage::SetCategory(sal_uInt16 nPos) which marks a certain language as automatically detected Additionally the "Default" language is removed */ -void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect) +void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect) { m_pLbLanguage->RemoveLanguage(LANGUAGE_SYSTEM); sal_uInt16 nPos = m_pLbLanguage->InsertEntry(sAutomaticEntry); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 2588b189d776..0ab58a61cc73 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -92,7 +92,7 @@ using namespace com::sun::star::style; #define MAX_BMP_WIDTH 16 #define MAX_BMP_HEIGHT 16 -static sal_Bool bLastRelative = sal_False; +static bool bLastRelative = false; static const sal_Char cNumberingType[] = "NumberingType"; static const sal_Char cParentNumbering[] = "ParentNumbering"; static const sal_Char cPrefix[] = "Prefix"; @@ -158,7 +158,7 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) static Font& lcl_GetDefaultBulletFont() { - static sal_Bool bInit = 0; + static bool bInit = false; static Font aDefBulletFont( OUString("StarSymbol"), OUString(), Size( 0, 14 ) ); if(!bInit) @@ -168,7 +168,7 @@ static Font& lcl_GetDefaultBulletFont() aDefBulletFont.SetPitch( PITCH_DONTKNOW ); aDefBulletFont.SetWeight( WEIGHT_DONTKNOW ); aDefBulletFont.SetTransparent( true ); - bInit = sal_True; + bInit = true; } return aDefBulletFont; } @@ -244,8 +244,8 @@ bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - bPreset = sal_False; - sal_Bool bIsPreset = sal_False; + bPreset = false; + bool bIsPreset = false; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -269,11 +269,11 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { m_pExamplesVS->SelectItem(1); NumSelectHdl_Impl(m_pExamplesVS); - bPreset = sal_True; + bPreset = true; } bPreset |= bIsPreset; - bModified = sal_False; + bModified = false; } int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) @@ -314,8 +314,8 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl) { if(pActNum) { - bPreset = sal_False; - bModified = sal_True; + bPreset = false; + bModified = true; sal_uInt16 nIdx = m_pExamplesVS->GetSelectItemId() - 1; DBG_ASSERT(aNumSettingsArr.size() > nIdx, "wrong index"); if(aNumSettingsArr.size() <= nIdx) @@ -404,8 +404,8 @@ bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - bPreset = sal_False; - sal_Bool bIsPreset = sal_False; + bPreset = false; + bool bIsPreset = false; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -429,10 +429,10 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) { m_pExamplesVS->SelectItem(1); NumSelectHdl_Impl(m_pExamplesVS); - bPreset = sal_True; + bPreset = true; } bPreset |= bIsPreset; - bModified = sal_False; + bModified = false; } int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) @@ -473,8 +473,8 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl) { if(pActNum) { - bPreset = sal_False; - bModified = sal_True; + bPreset = false; + bModified = true; sal_Unicode cChar = aBulletTypes[m_pExamplesVS->GetSelectItemId() - 1]; Font& rActBulletFont = lcl_GetDefaultBulletFont(); @@ -601,8 +601,8 @@ bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - bPreset = sal_False; - sal_Bool bIsPreset = sal_False; + bPreset = false; + bool bIsPreset = false; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -626,10 +626,10 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) { m_pExamplesVS->SelectItem(1); NumSelectHdl_Impl(m_pExamplesVS); - bPreset = sal_True; + bPreset = true; } bPreset |= bIsPreset; - bModified = sal_False; + bModified = false; } int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) @@ -672,8 +672,8 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl) { if(pActNum) { - bPreset = sal_False; - bModified = sal_True; + bPreset = false; + bModified = true; const FontList* pList = 0; @@ -831,8 +831,8 @@ SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - bPreset = sal_False; - sal_Bool bIsPreset = sal_False; + bPreset = false; + bool bIsPreset = false; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -857,10 +857,10 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) { m_pExamplesVS->SelectItem(1); NumSelectHdl_Impl(m_pExamplesVS); - bPreset = sal_True; + bPreset = true; } bPreset |= bIsPreset; - bModified = sal_False; + bModified = false; } int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) @@ -917,8 +917,8 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl) { if(pActNum) { - bPreset = sal_False; - bModified = sal_True; + bPreset = false; + bModified = true; sal_uInt16 nIdx = m_pExamplesVS->GetSelectItemId() - 1; sal_uInt16 nMask = 1; @@ -990,13 +990,13 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR sal_Int16 nCurrent = pTypes[nType]; if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N) { - sal_Bool bInsert = sal_True; + bool bInsert = true; for(sal_Int32 nEntry = 0; nEntry < rFmtLB.GetEntryCount(); nEntry++) { sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)rFmtLB.GetEntryData(nEntry); if(nEntryData == (sal_uInt16) nCurrent) { - bInsert = sal_False; + bInsert = false; aRemove[nEntry] = nDontRemove; break; } @@ -1026,12 +1026,12 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", rSet) , pActNum(0) , pSaveNum(0) - , bLastWidthModified(sal_False) - , bModified(sal_False) - , bPreset(sal_False) - , bAutomaticCharStyles(sal_True) - , bHTMLMode(sal_False) - , bMenuButtonInitialized(sal_False) + , bLastWidthModified(false) + , bModified(false) + , bPreset(false) + , bAutomaticCharStyles(true) + , bHTMLMode(false) + , bMenuButtonInitialized(false) , nBullet(0xff) , nActNumLvl(SAL_MAX_UINT16) , nNumItemId(SID_ATTR_NUMBERING_RULE) @@ -1303,13 +1303,13 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) bHTMLMode = 0 != (nHtmlMode&HTMLMODE_ON); } - sal_Bool bCharFmt = pActNum->IsFeatureSupported(NUM_CHAR_STYLE); + bool bCharFmt = pActNum->IsFeatureSupported(NUM_CHAR_STYLE); m_pCharFmtFT->Show(bCharFmt); m_pCharFmtLB->Show(bCharFmt); - sal_Bool bContinuous = pActNum->IsFeatureSupported(NUM_CONTINUOUS); + bool bContinuous = pActNum->IsFeatureSupported(NUM_CONTINUOUS); - sal_Bool bAllLevel = bContinuous && !bHTMLMode; + bool bAllLevel = bContinuous && !bHTMLMode; m_pAllLevelFT->Show(bAllLevel); m_pAllLevelNF->Show(bAllLevel); @@ -1370,7 +1370,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) } InitControls(); - bModified = sal_False; + bModified = false; } @@ -1399,8 +1399,8 @@ void SvxNumOptionsTabPage::InitControls() sal_uInt16 nHighestLevel = 0; OUString aEmptyStr; - sal_Bool bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR); - sal_Bool bBullRelSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE); + bool bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR); + bool bBullRelSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE); for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) @@ -1565,29 +1565,29 @@ void SvxNumOptionsTabPage::InitControls() } // 0 - Number; 1 - Bullet; 2 - Bitmap -void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool ) +void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, bool ) { if(nBullet == nType) return; nBullet = nType; - sal_Bool bBullet = (nType == SHOW_BULLET); - sal_Bool bBitmap = (nType == SHOW_BITMAP); - sal_Bool bEnableBitmap = (nType == SHOW_BITMAP); - sal_Bool bNumeric = !(bBitmap||bBullet); + bool bBullet = (nType == SHOW_BULLET); + bool bBitmap = (nType == SHOW_BITMAP); + bool bEnableBitmap = (nType == SHOW_BITMAP); + bool bNumeric = !(bBitmap||bBullet); m_pSeparatorFT->Show(bNumeric); m_pPrefixFT->Show(bNumeric); m_pPrefixED->Show(bNumeric); m_pSuffixFT->Show(bNumeric); m_pSuffixED->Show(bNumeric); - sal_Bool bCharFmt = pActNum->IsFeatureSupported(NUM_CHAR_STYLE); + bool bCharFmt = pActNum->IsFeatureSupported(NUM_CHAR_STYLE); m_pCharFmtFT->Show(!bBitmap && bCharFmt); m_pCharFmtLB->Show(!bBitmap && bCharFmt); // this is rather misusage, as there is no own flag // for complete numeration - sal_Bool bAllLevelFeature = pActNum->IsFeatureSupported(NUM_CONTINUOUS); - sal_Bool bAllLevel = bNumeric && bAllLevelFeature && !bHTMLMode; + bool bAllLevelFeature = pActNum->IsFeatureSupported(NUM_CONTINUOUS); + bool bAllLevel = bNumeric && bAllLevelFeature && !bHTMLMode; m_pAllLevelFT->Show(bAllLevel); m_pAllLevelNF->Show(bAllLevel); @@ -1596,10 +1596,10 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool ) m_pBulletFT->Show(bBullet); m_pBulletPB->Show(bBullet); - sal_Bool bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR); + bool bBullColor = pActNum->IsFeatureSupported(NUM_BULLET_COLOR); m_pBulColorFT->Show(!bBitmap && bBullColor); m_pBulColLB->Show(!bBitmap && bBullColor); - sal_Bool bBullResSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE); + bool bBullResSize = pActNum->IsFeatureSupported(NUM_BULLET_REL_SIZE); m_pBulRelSizeFT->Show(!bBitmap && bBullResSize); m_pBulRelSizeMF->Show(!bBitmap && bBullResSize); @@ -1695,7 +1695,7 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { OUString sSelectStyle; - sal_Bool bShowOrient = sal_False; + bool bShowOrient = false; bool bBmp = false; OUString aEmptyStr; sal_uInt16 nMask = 1; @@ -1718,7 +1718,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) aNumFmt.SetGraphic(aEmptyStr); pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BITMAP, bBmp ); - bShowOrient = sal_True; + bShowOrient = true; } else if( SVX_NUM_CHAR_SPECIAL == nNumberingType ) { @@ -1754,7 +1754,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) } nMask <<= 1; } - sal_Bool bAllLevelFeature = pActNum->IsFeatureSupported(NUM_CONTINUOUS); + bool bAllLevelFeature = pActNum->IsFeatureSupported(NUM_CONTINUOUS); if(bShowOrient && bAllLevelFeature) { m_pOrientFT->Show(); @@ -1770,15 +1770,15 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { m_pCharFmtLB->SelectEntry(sSelectStyle); CharFmtHdl_Impl(m_pCharFmtLB); - bAutomaticCharStyles = sal_True; + bAutomaticCharStyles = true; } return 0; } void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) { - sal_Bool bIsNull = m_pStartED->GetValue() == 0; - sal_Bool bNoZeroAllowed = nNumberingType < SVX_NUM_ARABIC || + bool bIsNull = m_pStartED->GetValue() == 0; + bool bNoZeroAllowed = nNumberingType < SVX_NUM_ARABIC || SVX_NUM_CHARS_UPPER_LETTER_N == nNumberingType || SVX_NUM_CHARS_LOWER_LETTER_N == nNumberingType; m_pStartED->SetMin(bNoZeroAllowed ? 1 : 0); @@ -1808,22 +1808,22 @@ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox ) } nMask <<= 1; } - SetModified(sal_False); + SetModified(false); return 0; } IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox ) { - sal_Bool bSet = pBox->IsChecked(); + bool bSet = pBox->IsChecked(); pActNum->SetContinuousNumbering(bSet); - sal_Bool bRepaint = sal_False; + bool bRepaint = false; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); if(aNumFmt.GetNumberingType() != SVX_NUM_NUMBER_NONE) { - bRepaint = sal_True; + bRepaint = true; break; } } @@ -1875,7 +1875,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) sal_uInt16 nItemId = pButton->GetCurItemId(); OUString aGrfName; Size aSize; - sal_Bool bSucc(sal_False); + bool bSucc(false); SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_SVXSTR_EDIT_GRAPHIC) ); if(MN_GALLERY_ENTRY <= nItemId ) @@ -1888,7 +1888,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, idx, &aGraphic)) { aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic); - bSucc = sal_True; + bSucc = true; } } } @@ -1905,7 +1905,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) if( !aGrfDlg.GetGraphic(aGraphic) ) { aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic); - bSucc = sal_True; + bSucc = true; } } } @@ -1953,7 +1953,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl) { if(!bMenuButtonInitialized) { - bMenuButtonInitialized = sal_True; + bMenuButtonInitialized = true; EnterWait(); PopupMenu* pMenu = m_pBitmapMB->GetPopupMenu(); PopupMenu* pPopup = pMenu->GetPopupMenu(m_nGalleryId); @@ -1980,7 +1980,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl) if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) { - sal_Bool bWidth = aSize.Width() > aSize.Height(); + bool bWidth = aSize.Width() > aSize.Height(); double nScale = bWidth ? (double)MAX_BMP_WIDTH / (double)aSize.Width(): (double)MAX_BMP_HEIGHT / (double)aSize.Height(); @@ -2006,13 +2006,13 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl) IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl) { - SvxCharacterMap* pMap = new SvxCharacterMap( this, sal_True ); + SvxCharacterMap* pMap = new SvxCharacterMap( this, true ); sal_uInt16 nMask = 1; const Font* pFmtFont = 0; - sal_Bool bSameBullet = sal_True; + bool bSameBullet = true; sal_Unicode cBullet = 0; - sal_Bool bFirst = sal_True; + bool bFirst = true; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) @@ -2024,12 +2024,12 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl) } else if(rCurFmt.GetBulletChar() != cBullet ) { - bSameBullet = sal_False; + bSameBullet = false; break; } if(!pFmtFont) pFmtFont = rCurFmt.GetBulletFont(); - bFirst = sal_False; + bFirst = false; } nMask <<= 1; @@ -2067,9 +2067,9 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl) IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) { - sal_Bool bWidth = pField == m_pWidthMF; + bool bWidth = pField == m_pWidthMF; bLastWidthModified = bWidth; - sal_Bool bRatio = m_pRatioCB->IsChecked(); + bool bRatio = m_pRatioCB->IsChecked(); long nWidthVal = static_cast<long>(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_100TH_MM))); long nHeightVal = static_cast<long>(m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_100TH_MM))); nWidthVal = OutputDevice::LogicToLogic( nWidthVal , @@ -2078,7 +2078,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) MAP_100TH_MM, (MapUnit)eCoreUnit); double fSizeRatio; - sal_Bool bRepaint = sal_False; + bool bRepaint = false; sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { @@ -2122,7 +2122,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) const SvxBrushItem* pBrushItem = aNumFmt.GetBrush(); sal_Int16 eOrient = aNumFmt.GetVertOrient(); if(aSize != aSaveSize) - bRepaint = sal_True; + bRepaint = true; aNumFmt.SetGraphicBrush( pBrushItem, &aSize, &eOrient ); pActNum->SetLevel(i, aNumFmt); } @@ -2147,7 +2147,7 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl) { - bAutomaticCharStyles = sal_False; + bAutomaticCharStyles = false; sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos(); OUString sEntry = m_pCharFmtLB->GetSelectEntry(); sal_uInt16 nMask = 1; @@ -2168,16 +2168,16 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl) } nMask <<= 1; } - SetModified(sal_False); + SetModified(false); return 0; }; IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit ) { - sal_Bool bPrefix = pEdit == m_pPrefixED; - sal_Bool bSuffix = pEdit == m_pSuffixED; - sal_Bool bStart = pEdit == m_pStartED; + bool bPrefix = pEdit == m_pPrefixED; + bool bSuffix = pEdit == m_pSuffixED; + bool bStart = pEdit == m_pStartED; sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { @@ -2713,7 +2713,7 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) void SvxNumPositionTabPage::InitControls() { - bInInintControl = sal_True; + bInInintControl = true; const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive && m_pRelativeCB->IsEnabled() && m_pRelativeCB->IsChecked(); const bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && @@ -2899,7 +2899,7 @@ void SvxNumPositionTabPage::InitControls() if ( bSetDistEmpty ) m_pDistBorderMF->SetText(aEmptyStr); - bInInintControl = sal_False; + bInInintControl = false; } void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) @@ -3039,7 +3039,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) ShowControlsDependingOnPosAndSpaceMode(); InitControls(); - bModified = sal_False; + bModified = false; } void SvxNumPositionTabPage::InitPosAndSpaceMode() @@ -3260,15 +3260,15 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) { - sal_Bool bOn = pBox->IsChecked(); - sal_Bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl; - sal_Bool bSetValue = sal_False; + bool bOn = pBox->IsChecked(); + bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl; + bool bSetValue = false; long nValue = 0; if(bOn || bSingleSelection) { sal_uInt16 nMask = 1; - sal_Bool bFirst = sal_True; - bSetValue = sal_True; + bool bFirst = true; + bSetValue = true; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { if(nActNumLvl & nMask) @@ -3284,7 +3284,7 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) bSetValue = nValue == (rNumFmt.GetAbsLSpace() + rNumFmt.GetFirstLineOffset()) - (pActNum->GetLevel(i - 1).GetAbsLSpace() + pActNum->GetLevel(i - 1).GetFirstLineOffset()); - bFirst = sal_False; + bFirst = false; } nMask <<= 1; } @@ -3474,9 +3474,9 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl) return 0; } -void SvxNumPositionTabPage::SetModified(sal_Bool bRepaint) +void SvxNumPositionTabPage::SetModified(bool bRepaint) { - bModified = sal_True; + bModified = true; if(bRepaint) { m_pPreviewWIN->SetLevel(nActNumLvl); @@ -3484,9 +3484,9 @@ void SvxNumPositionTabPage::SetModified(sal_Bool bRepaint) } } -void SvxNumOptionsTabPage::SetModified(sal_Bool bRepaint) +void SvxNumOptionsTabPage::SetModified(bool bRepaint) { - bModified = sal_True; + bModified = true; if(bRepaint) { m_pPreviewWIN->SetLevel(nActNumLvl); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 06b3e8b64367..24c2edc41c16 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -123,7 +123,7 @@ long ConvertLong_Impl( const long nIn, SfxMapUnit eUnit ) return OutputDevice::LogicToLogic( nIn, (MapUnit)eUnit, MAP_TWIP ); } -sal_Bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) +bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) { if ( pSize ) { @@ -133,7 +133,7 @@ sal_Bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) return ( nDiffW < 10 && nDiffH < 10 ); } else - return sal_False; + return false; } @@ -178,7 +178,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "PageFormatPage", "cui/ui/pageformatpage.ui", rAttr ), - bLandscape ( sal_False ), + bLandscape ( false ), eMode ( SVX_PAGE_MODE_STANDARD ), ePaperStart ( PAPER_A3 ), ePaperEnd ( PAPER_ENV_DL ), @@ -232,9 +232,9 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : SetExchangeSupport(); SvtLanguageOptions aLangOptions; - sal_Bool bCJK = aLangOptions.IsAsianTypographyEnabled(); - sal_Bool bCTL = aLangOptions.IsCTLFontEnabled(); - sal_Bool bWeb = sal_False; + bool bCJK = aLangOptions.IsAsianTypographyEnabled(); + bool bCTL = aLangOptions.IsCTLFontEnabled(); + bool bWeb = false; const SfxPoolItem* pItem; SfxObjectShell* pShell; @@ -495,7 +495,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) if ( !bOrientationSupport && aPaperSize.Width() > aPaperSize.Height() ) - bLandscape = sal_True; + bLandscape = true; m_pLandscapeBtn->Check( bLandscape ); m_pPortraitBtn->Check( !bLandscape ); @@ -663,7 +663,7 @@ void SvxPageDescPage::FillUserData() bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; const SfxItemSet& rOldSet = GetItemSet(); SfxItemPool* pPool = rOldSet.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -681,13 +681,13 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( m_pLeftMarginEdit->GetText() != m_pLeftMarginEdit->GetSavedValue() ) { aMargin.SetLeft( (sal_uInt16)GetCoreValue( *m_pLeftMarginEdit, eUnit ) ); - bModified |= sal_True; + bModified = true; } if ( m_pRightMarginEdit->GetText() != m_pRightMarginEdit->GetSavedValue() ) { aMargin.SetRight( (sal_uInt16)GetCoreValue( *m_pRightMarginEdit, eUnit ) ); - bModified |= sal_True; + bModified = true; } // set left and right margins @@ -698,21 +698,21 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) ) rSet.Put( aMargin ); else - bModified = sal_False; + bModified = false; } - sal_Bool bMod = sal_False; + bool bMod = false; if ( m_pTopMarginEdit->GetText() != m_pTopMarginEdit->GetSavedValue() ) { aTopMargin.SetUpper( (sal_uInt16)GetCoreValue( *m_pTopMarginEdit, eUnit ) ); - bMod |= sal_True; + bMod = true; } if ( m_pBottomMarginEdit->GetText() != m_pBottomMarginEdit->GetSavedValue() ) { aTopMargin.SetLower( (sal_uInt16)GetCoreValue( *m_pBottomMarginEdit, eUnit ) ); - bMod |= sal_True; + bMod = true; } // set top and bottom margins @@ -723,7 +723,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || !( *(const SvxULSpaceItem*)pOld == aTopMargin ) ) { - bModified |= sal_True; + bModified = true; rSet.Put( aTopMargin ); } } @@ -737,7 +737,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || ( (const SvxPaperBinItem*)pOld )->GetValue() != nBin ) { rSet.Put( SvxPaperBinItem( nWhich, (sal_uInt8)nBin ) ); - bModified |= sal_True; + bModified = true; } nPos = m_pPaperSizeBox->GetSelectEntryPos(); @@ -759,7 +759,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || ( (const SvxSizeItem*)pOld )->GetSize() != aSize ) { rSet.Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) ); - bModified |= sal_True; + bModified = true; } } } @@ -777,7 +777,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || ( (const SvxSizeItem*)pOld )->GetSize() != aSize ) { rSet.Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) ); - bModified |= sal_True; + bModified = true; } } } @@ -793,7 +793,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( bChecked != m_pLandscapeBtn->GetSavedValue() ) { aPage.SetLandscape(bChecked); - bMod |= sal_True; + bMod = true; } //Get the NumType value @@ -802,7 +802,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( nPos != m_pNumberFormatBox->GetSavedValue() ) { aPage.SetNumType( (SvxNumType)nEntryData ); - bMod |= sal_True; + bMod = true; } if ( bMod ) @@ -812,7 +812,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || !( *(const SvxPageItem*)pOld == aPage ) ) { rSet.Put( aPage ); - bModified |= sal_True; + bModified = true; } } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich ) ) @@ -831,7 +831,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) SfxBoolItem aHorz( GetWhich( SID_ATTR_PAGE_EXT1 ), m_pHorzBox->IsChecked() ); rSet.Put( aHorz ); - bModified |= sal_True; + bModified = true; } if ( TriState(m_pVertBox->IsChecked()) != m_pVertBox->GetSavedValue() ) @@ -839,7 +839,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) SfxBoolItem aVert( GetWhich( SID_ATTR_PAGE_EXT2 ), m_pVertBox->IsChecked() ); rSet.Put( aVert ); - bModified |= sal_True; + bModified = true; } break; } @@ -849,7 +849,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) // always put so that draw can evaluate this rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PAGE_EXT1 ), m_pAdaptBox->IsChecked() ) ); - bModified |= sal_True; + bModified = true; break; } default: ;//prevent warning @@ -861,13 +861,13 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { const SfxBoolItem& rRegItem = (const SfxBoolItem&)rOldSet.Get(SID_SWREGISTER_MODE); SfxBoolItem* pRegItem = (SfxBoolItem*)rRegItem.Clone(); - sal_Bool bCheck = m_pRegisterCB->IsChecked(); + bool bCheck = m_pRegisterCB->IsChecked(); pRegItem->SetValue(bCheck); rSet.Put(*pRegItem); - bModified |= sal_True; + bModified = true; if(bCheck) { - bModified |= sal_True; + bModified = true; rSet.Put(SfxStringItem(SID_SWREGISTER_COLLECTION, m_pRegisterLB->GetSelectEntry())); } @@ -878,7 +878,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if( m_pTextFlowBox->IsVisible() && (eDirection != m_pTextFlowBox->GetSavedValue()) ) { rSet.Put( SvxFrameDirectionItem( eDirection, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); - bModified = sal_True; + bModified = true; } return bModified; @@ -978,7 +978,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox ) { // Draw: if paper format the margin shall be 1 cm long nTmp = 0; - sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper)); + bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper)); if ( !bScreen ) // no margin if screen @@ -1580,10 +1580,10 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox ) { - sal_Bool bEnable = sal_False; + bool bEnable = false; if(pBox->IsChecked()) { - bEnable = sal_True; + bEnable = true; if(USHRT_MAX == m_pRegisterLB->GetSelectEntryPos()) m_pRegisterLB->SelectEntry(sStandardRegister); } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 6cb2a847213a..5439acf59113 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -205,7 +205,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SfxItemPool* pPool = rOutSet.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); - sal_Bool bModified = sal_False; + bool bModified = false; sal_uInt16 nWhich; sal_Int32 nPos = m_pLineDist->GetSelectEntryPos(); @@ -251,7 +251,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aSpacing ); - bModified = sal_True; + bModified = true; } } @@ -295,7 +295,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified = sal_True; + bModified = true; } } bool bNullTab = false; @@ -352,7 +352,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SFX_ITEM_DONTCARE == eState ) { rOutSet.Put( aMargin ); - bModified = sal_True; + bModified = true; } } @@ -391,7 +391,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { pRegItem->SetValue(!bSet); rOutSet.Put(*pRegItem); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, false ) ) rOutSet.ClearItem(_nWhich); @@ -604,7 +604,7 @@ void SvxStdParagraphTabPage::EnableRelativeMode() m_pRightIndent->EnableRelativeMode( 0, 999 ); m_pTopDist->EnableRelativeMode( 0, 999 ); m_pBottomDist->EnableRelativeMode( 0, 999 ); - bRelativeMode = sal_True; + bRelativeMode = true; } int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) @@ -623,8 +623,8 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemS nWidth ( 11905 /*567 * 50*/ ), nMinFixDist(0L), - bRelativeMode ( sal_False ), - bNegativeIndents(sal_False) + bRelativeMode ( false ), + bNegativeIndents(false) { get(m_pLeftIndent,"spinED_LEFTINDENT"); @@ -672,7 +672,7 @@ void SvxStdParagraphTabPage::EnableNegativeMode() m_pRightIndent->SetMin(-9999); m_pRightIndent->EnableNegativeMode(); m_pLeftIndent->EnableNegativeMode(); - bNegativeIndents = sal_True; + bNegativeIndents = true; } sal_uInt16* SvxStdParagraphTabPage::GetRanges() @@ -809,7 +809,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox ) } break; } - UpdateExample_Impl( sal_True ); + UpdateExample_Impl( true ); return 0; } @@ -847,7 +847,7 @@ void SvxStdParagraphTabPage::Init_Impl() m_pLineDistAtMetricBox->SetMax( m_pLineDistAtMetricBox->Normalize( nAbst ), eUnit ); } -void SvxStdParagraphTabPage::UpdateExample_Impl( sal_Bool bAll ) +void SvxStdParagraphTabPage::UpdateExample_Impl( bool bAll ) { m_pExampleWin->SetFirstLineOfst( (short)m_pFLineIndent->Denormalize( m_pFLineIndent->GetValue( FUNIT_TWIP ) ) ); m_pExampleWin->SetLeftMargin( static_cast<long>(m_pLeftIndent->Denormalize( m_pLeftIndent->GetValue( FUNIT_TWIP ) ) ) ); @@ -893,7 +893,7 @@ void SvxStdParagraphTabPage::EnableContextualMode() IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox ) { - sal_Bool bEnable = !pBox->IsChecked(); + bool bEnable = !pBox->IsChecked(); m_pFLineLabel->Enable(bEnable); m_pFLineIndent->Enable(bEnable); return 0; @@ -1056,7 +1056,7 @@ sal_uInt16* SvxParaAlignTabPage::GetRanges() bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; bool bAdj = false, bChecked = false; SvxAdjust eAdjust = SVX_ADJUST_LEFT; @@ -1112,7 +1112,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) pOld->GetLastBlock() != eLastBlock || ( bChecked && bNothingWasChecked ) ) { - bModified = sal_True; + bModified = true; SvxAdjustItem aAdj( (const SvxAdjustItem&)GetItemSet().Get( _nWhich ) ); aAdj.SetAdjust( eAdjust ); @@ -1124,12 +1124,12 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) if(TriState(m_pSnapToGridCB->IsChecked()) != m_pSnapToGridCB->GetSavedValue()) { rOutSet.Put(SvxParaGridItem(m_pSnapToGridCB->IsChecked(), GetWhich( SID_ATTR_PARA_SNAPTOGRID ))); - bModified = sal_True; + bModified = true; } if(m_pVertAlignLB->GetSavedValue() != m_pVertAlignLB->GetSelectEntryPos()) { rOutSet.Put(SvxParaVertAlignItem(m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN ))); - bModified = sal_True; + bModified = true; } if( m_pTextDirectionLB->IsVisible() ) @@ -1138,7 +1138,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) if( eDir != m_pTextDirectionLB->GetSavedValue() ) { rOutSet.Put( SvxFrameDirectionItem( eDir, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); - bModified = sal_True; + bModified = true; } } @@ -1166,7 +1166,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) case SVX_ADJUST_BLOCK: m_pJustify->Check(); break; default: ; //prevent warning } - sal_Bool bEnable = m_pJustify->IsChecked(); + bool bEnable = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bEnable); m_pLastLineLB->Enable(bEnable); m_pExpandCB->Enable(bEnable); @@ -1239,22 +1239,22 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) m_pLastLineLB->SaveValue(); m_pExpandCB->SaveValue(); - UpdateExample_Impl(sal_True); + UpdateExample_Impl(true); } IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) { - sal_Bool bJustify = m_pJustify->IsChecked(); + bool bJustify = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bJustify); m_pLastLineLB->Enable(bJustify); m_pExpandCB->Enable(bJustify); - UpdateExample_Impl(sal_False); + UpdateExample_Impl(false); return 0; } IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl) { - UpdateExample_Impl(sal_False); + UpdateExample_Impl(false); return 0; } @@ -1276,7 +1276,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl) return 0; } -void SvxParaAlignTabPage::UpdateExample_Impl( sal_Bool bAll ) +void SvxParaAlignTabPage::UpdateExample_Impl( bool bAll ) { if ( m_pLeft->IsChecked() ) m_pExampleWin->SetAdjust( SVX_ADJUST_LEFT ); @@ -1326,7 +1326,7 @@ SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE ); const TriState eHyphenState = m_pHyphenBox->GetState(); const SfxPoolItem* pOld = GetOldItem( rOutSet, SID_ATTR_PARA_HYPHENZONE ); @@ -1352,7 +1352,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) eHyphenState != m_pHyphenBox->GetSavedValue()) { rOutSet.Put( aHyphen ); - bModified = sal_True; + bModified = true; } } @@ -1366,7 +1366,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != aPageNum.GetValue() ) { rOutSet.Put( aPageNum ); - bModified = sal_True; + bModified = true; } } @@ -1391,7 +1391,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || ( (const SvxPageModelItem*)pOld )->GetValue() != sPage ) { rOutSet.Put( SvxPageModelItem( sPage, false, _nWhich ) ); - bModified = sal_True; + bModified = true; } else bIsPageModel = false; @@ -1424,7 +1424,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { case TRISTATE_TRUE: { - sal_Bool bBefore = m_pBreakPositionLB->GetSelectEntryPos() == 0; + bool bBefore = m_pBreakPositionLB->GetSelectEntryPos() == 0; if ( m_pBreakTypeLB->GetSelectEntryPos() == 0 ) { @@ -1453,7 +1453,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != m_pPageBreakBox->GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { - bModified = sal_True; + bModified = true; rOutSet.Put( aBreak ); } } @@ -1471,7 +1471,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) ( eState == TRISTATE_FALSE ) ) { rOutSet.Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) ); - bModified = sal_True; + bModified = true; } } @@ -1483,7 +1483,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { // if the status has changed, putting is necessary rOutSet.Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) ); - bModified = sal_True; + bModified = true; } // widows and orphans @@ -1500,7 +1500,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( eState != m_pWidowBox->GetSavedValue() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified = sal_True; + bModified = true; } } @@ -1519,7 +1519,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) !( *(const SvxOrphansItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); - bModified = sal_True; + bModified = true; } } @@ -1531,8 +1531,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE ); SfxItemState eItemState = rSet.GetItemState( _nWhich ); - sal_Bool bItemAvailable = eItemState >= SFX_ITEM_AVAILABLE; - sal_Bool bIsHyphen = sal_False; + bool bItemAvailable = eItemState >= SFX_ITEM_AVAILABLE; + bool bIsHyphen = false; if( !bHtmlMode && bItemAvailable ) { const SvxHyphenZoneItem& rHyphen = @@ -1550,7 +1550,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) { m_pHyphenBox->SetState( TRISTATE_INDET ); } - sal_Bool bEnable = bItemAvailable && bIsHyphen; + bool bEnable = bItemAvailable && bIsHyphen; m_pExtHyphenBeforeBox->Enable(bEnable); m_pExtHyphenAfterBox->Enable(bEnable); m_pBeforeText->Enable(bEnable); @@ -1571,7 +1571,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) { // first handle PageModel _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); - sal_Bool bIsPageModel = sal_False; + bool bIsPageModel = false; eItemState = rSet.GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_SET ) @@ -1587,7 +1587,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) { m_pApplyCollBox->SelectEntry( aStr ); m_pApplyCollBtn->SetState( TRISTATE_TRUE ); - bIsPageModel = sal_True; + bIsPageModel = true; m_pPageBreakBox->Enable(); m_pPageBreakBox->EnableTriState( false ); @@ -1646,7 +1646,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) m_pPageBreakBox->SetState( TRISTATE_TRUE ); - sal_Bool _bEnable = eBreak != SVX_BREAK_NONE && + bool _bEnable = eBreak != SVX_BREAK_NONE && eBreak != SVX_BREAK_COLUMN_BEFORE && eBreak != SVX_BREAK_COLUMN_AFTER; m_pApplyCollBtn->Enable(_bEnable); @@ -1742,7 +1742,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) m_pWidowBox->EnableTriState( false ); const sal_uInt16 nLines = rWidow.GetValue(); - sal_Bool _bEnable = nLines > 0; + bool _bEnable = nLines > 0; m_pWidowRowNo->SetValue( m_pWidowRowNo->Normalize( nLines ) ); m_pWidowBox->SetState( _bEnable ? TRISTATE_TRUE : TRISTATE_FALSE); m_pWidowRowNo->Enable(_bEnable); @@ -1765,7 +1765,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) const sal_uInt16 nLines = rOrphan.GetValue(); m_pOrphanBox->EnableTriState( false ); - sal_Bool _bEnable = nLines > 0; + bool _bEnable = nLines > 0; m_pOrphanBox->SetState( _bEnable ? TRISTATE_TRUE : TRISTATE_FALSE); m_pOrphanRowNo->SetValue( m_pOrphanRowNo->Normalize( nLines ) ); m_pOrphanRowNo->Enable(_bEnable); @@ -1813,7 +1813,7 @@ int SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxExtParagraphTabPage::DisablePageBreak() { - bPageBreak = sal_False; + bPageBreak = false; m_pPageBreakBox->Enable(false); m_pBreakTypeLB->RemoveEntry(0); m_pBreakPositionFT->Enable(false); @@ -1826,8 +1826,8 @@ void SvxExtParagraphTabPage::DisablePageBreak() SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "TextFlowPage","cui/ui/textflowpage.ui", rAttr ), - bPageBreak ( sal_True ), - bHtmlMode ( sal_False ), + bPageBreak ( true ), + bHtmlMode ( false ), nStdPos ( 0 ) { // Hyphenation @@ -1902,7 +1902,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe sal_uInt16 nHtmlMode = GetHtmlMode_Impl( rAttr ); if ( nHtmlMode & HTMLMODE_ON ) { - bHtmlMode = sal_True; + bHtmlMode = true; m_pHyphenBox ->Enable(false); m_pBeforeText ->Enable(false); m_pExtHyphenBeforeBox ->Enable(false); @@ -1941,7 +1941,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl) { m_pApplyCollBtn->Enable(); - sal_Bool bEnable = TRISTATE_TRUE == m_pApplyCollBtn->GetState() && + bool bEnable = TRISTATE_TRUE == m_pApplyCollBtn->GetState() && m_pApplyCollBox->GetEntryCount(); m_pApplyCollBox->Enable(bEnable); if(!bHtmlMode) @@ -1970,7 +1970,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl) IMPL_LINK_NOARG(SvxExtParagraphTabPage, KeepTogetherHdl_Impl) { - sal_Bool bEnable = m_pKeepTogetherBox->GetState() == TRISTATE_FALSE; + bool bEnable = m_pKeepTogetherBox->GetState() == TRISTATE_FALSE; m_pWidowBox->Enable(bEnable); m_pOrphanBox->Enable(bEnable); @@ -2026,7 +2026,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl) IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl) { - sal_Bool bEnable = m_pHyphenBox->GetState() == TRISTATE_TRUE; + bool bEnable = m_pHyphenBox->GetState() == TRISTATE_TRUE; m_pBeforeText->Enable(bEnable); m_pExtHyphenBeforeBox->Enable(bEnable); m_pAfterText->Enable(bEnable); @@ -2040,11 +2040,11 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl) IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl) { - sal_Bool bEnable = sal_False; + bool bEnable = false; if ( m_pApplyCollBtn->GetState() == TRISTATE_TRUE && m_pApplyCollBox->GetEntryCount() ) { - bEnable = sal_True; + bEnable = true; m_pApplyCollBox->SelectEntryPos( nStdPos ); } else @@ -2066,7 +2066,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox *, pListBox ) { m_pApplyCollBtn->Enable(); - sal_Bool bEnable = m_pApplyCollBtn->GetState() == TRISTATE_TRUE && + bool bEnable = m_pApplyCollBtn->GetState() == TRISTATE_TRUE && m_pApplyCollBox->GetEntryCount(); m_pApplyCollBox->Enable(bEnable); @@ -2149,7 +2149,7 @@ sal_uInt16* SvxAsianTabPage::GetRanges() bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bRet = sal_False; + bool bRet = false; SfxItemPool* pPool = rSet.GetPool(); if (m_pScriptSpaceCB->IsEnabled() && TriState(m_pScriptSpaceCB->IsChecked()) != m_pScriptSpaceCB->GetSavedValue()) { @@ -2158,7 +2158,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) pNewItem->SetValue(m_pScriptSpaceCB->IsChecked()); rSet.Put(*pNewItem); delete pNewItem; - bRet = sal_True; + bRet = true; } if (m_pHangingPunctCB->IsEnabled() && TriState(m_pHangingPunctCB->IsChecked()) != m_pHangingPunctCB->GetSavedValue()) { @@ -2167,7 +2167,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) pNewItem->SetValue(m_pHangingPunctCB->IsChecked()); rSet.Put(*pNewItem); delete pNewItem; - bRet = sal_True; + bRet = true; } if (m_pForbiddenRulesCB->IsEnabled() && TriState(m_pForbiddenRulesCB->IsChecked()) != m_pForbiddenRulesCB->GetSavedValue()) { @@ -2176,7 +2176,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) pNewItem->SetValue(m_pForbiddenRulesCB->IsChecked()); rSet.Put(*pNewItem); delete pNewItem; - bRet = sal_True; + bRet = true; } return bRet; } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index a18c90354e47..13dfcb196a6c 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -407,7 +407,7 @@ static std::size_t lcl_GetFrmMapCount(const FrmMap* pMap) } static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( - SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bRTL) + SvxSwFramePosString::StringId eStringId, bool bVertical, bool bRTL) { //special handling of STR_FROMLEFT if(SwFPos::FROMLEFT == eStringId) @@ -917,7 +917,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) pItem = GetItem( rSet, SID_ATTR_TRANSFORM_PROTECT_POS ); if ( pItem ) { - sal_Bool bProtected = ( ( const SfxBoolItem* )pItem )->GetValue(); + bool bProtected = ( ( const SfxBoolItem* )pItem )->GetValue(); m_pPositionCB->SetState( bProtected ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pPositionCB->EnableTriState( false ); m_pSizeCB->Enable( !bProtected ); @@ -1219,7 +1219,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl) IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) { - sal_Bool bHori = pLB == m_pHoriToLB; + bool bHori = pLB == m_pHoriToLB; UpdateExample(); @@ -1252,7 +1252,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) { - sal_Bool bHori = pLB == m_pHoriLB; + bool bHori = pLB == m_pHoriLB; ListBox *pRelLB = bHori ? m_pHoriToLB : m_pVertToLB; FixedText *pRelFT = bHori ? m_pHoriToFT : m_pVertToFT; FrmMap *pMap = bHori ? m_pHMap : m_pVMap; @@ -1263,13 +1263,13 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) if (bHori) { - sal_Bool bEnable = HoriOrientation::NONE == nAlign; + bool bEnable = HoriOrientation::NONE == nAlign; m_pHoriByMF->Enable( bEnable ); m_pHoriByFT->Enable( bEnable ); } else { - sal_Bool bEnable = VertOrientation::NONE == nAlign; + bool bEnable = VertOrientation::NONE == nAlign; m_pVertByMF->Enable( bEnable ); m_pVertByFT->Enable( bEnable ); } @@ -1298,7 +1298,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) // special treatment for HTML-Mode with horz-vert-dependencies if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) { - sal_Bool bSet = sal_False; + bool bSet = false; if(bHori) { // on the right only below is allowed - from the left only at the top @@ -1310,17 +1310,17 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) m_pVertLB->SelectEntryPos(1); else m_pVertLB->SelectEntryPos(0); - bSet = sal_True; + bSet = true; } else if(HoriOrientation::LEFT == nAlign && 1 == m_pVertLB->GetSelectEntryPos()) { m_pVertLB->SelectEntryPos(0); - bSet = sal_True; + bSet = true; } else if(HoriOrientation::NONE == nAlign && 1 == m_pVertLB->GetSelectEntryPos()) { m_pVertLB->SelectEntryPos(0); - bSet = sal_True; + bSet = true; } if(bSet) PosHdl(m_pVertLB); @@ -1332,7 +1332,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) if(1 == m_pHoriLB->GetSelectEntryPos()) { m_pHoriLB->SelectEntryPos(0); - bSet = sal_True; + bSet = true; } m_pHoriToLB->SelectEntryPos(1); } @@ -1341,7 +1341,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) if(2 == m_pHoriLB->GetSelectEntryPos()) { m_pHoriLB->SelectEntryPos(0); - bSet = sal_True; + bSet = true; } m_pHoriToLB->SelectEntryPos(0) ; } @@ -1489,7 +1489,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, m_nOldHRel = ((RelationMap *)m_pHoriToLB->GetEntryData(nPos))->nRelation; } - sal_Bool bEnable = sal_True; + bool bEnable = true; if( m_bIsMultiSelection ) { m_pVMap = aVMultiSelectionMap; @@ -1537,7 +1537,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, { m_pVMap = m_bHtmlMode ? aVAsCharHtmlMap : aVAsCharMap; m_pHMap = 0; - bEnable = sal_False; + bEnable = false; } m_pHoriLB->Enable( bEnable ); m_pHoriFT->Enable( bEnable ); diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index bee8f1bb27a4..cefd28b67d8e 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -70,7 +70,7 @@ SvxAreaTabDialog::SvxAreaTabDialog mnGradientListState ( CT_NONE ), mnHatchingListState ( CT_NONE ), mnPageType( PT_AREA ), - mbAreaTP( sal_False ) + mbAreaTP( false ) { m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, 0 ); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index d5ccddf8fcb8..133060adb061 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -40,7 +40,7 @@ SvxLineTabDialog::SvxLineTabDialog const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pSdrObj, - sal_Bool bHasObj + bool bHasObj ) : SfxTabDialog ( pParent @@ -67,7 +67,7 @@ SvxLineTabDialog::SvxLineTabDialog nPageType( 0 ), // We use it here primarily to get the right attributes with FillItemSet nPosDashLb( 0 ), nPosLineEndLb( 0 ), - mbAreaTP( sal_False ) + mbAreaTP( false ) { bool bLineOnly = false; if( pObj && pObj->GetObjInventor() == SdrInventor ) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index e1cebfdf46fb..fbe4bf733124 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -105,7 +105,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt aNewTabs ( 0, 0, SVX_TAB_ADJUST_LEFT, GetWhich( SID_ATTR_TABSTOP ) ), nDefDist ( 0 ), eDefUnit ( FUNIT_100TH_MM ), - bCheck ( sal_False ) + bCheck ( false ) { get(m_pTabBox,"ED_TABPOS"); @@ -203,7 +203,7 @@ sal_uInt16* SvxTabulatorTabPage::GetRanges() bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; // Put the controls' values in here if ( m_pNewBtn->IsEnabled() ) @@ -247,13 +247,13 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || !( *( (SvxTabStopItem*)pOld ) == aTmp ) ) { rSet.Put( aTmp ); - bModified = sal_True; + bModified = true; } } else if ( !pOld || !( *( (SvxTabStopItem*)pOld ) == aNewTabs ) ) { rSet.Put( aNewTabs ); - bModified = sal_True; + bModified = true; } return bModified; } @@ -523,7 +523,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) m_pTabBox->GrabFocus(); // If no RadioButton was clicked, we need to put anyway - bCheck |= sal_True; + bCheck = true; // Set the selection into the position Edit m_pTabBox->SetSelection(Selection(0, m_pTabBox->GetText().getLength())); return 0; @@ -568,7 +568,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) } // If no RadioButton was clicked, we need to put anyway - bCheck |= sal_True; + bCheck = true; return 0; } @@ -582,7 +582,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl) InitTabPos_Impl(); // So that we put in FillItemSet() - bCheck |= sal_True; + bCheck = true; } return 0; } @@ -591,7 +591,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl) IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) { - bCheck |= sal_True; + bCheck = true; SvxTabAdjust eAdj; m_pDezChar->Disable(); m_pDezCharLabel->Disable(); @@ -626,7 +626,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox ) { - bCheck |= sal_True; + bCheck = true; sal_uInt8 cFill = ' '; m_pFillChar->SetText( "" ); m_pFillChar->Disable(); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index accca2fe1b7b..588cd74713b0 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -185,7 +185,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) if( pItem ) { m_pTsbStartInside->EnableTriState( false ); - sal_Bool bValue = ( ( const SdrTextAniStartInsideItem* )pItem )->GetValue(); + bool bValue = ( ( const SdrTextAniStartInsideItem* )pItem )->GetValue(); if( bValue ) m_pTsbStartInside->SetState( TRISTATE_TRUE ); else @@ -202,7 +202,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) if( pItem ) { m_pTsbStopInside->EnableTriState( false ); - sal_Bool bValue = ( ( const SdrTextAniStopInsideItem* )pItem )->GetValue(); + bool bValue = ( ( const SdrTextAniStopInsideItem* )pItem )->GetValue(); if( bValue ) m_pTsbStopInside->SetState( TRISTATE_TRUE ); else @@ -334,7 +334,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { - sal_Bool bModified = sal_False; + bool bModified = false; sal_Int32 nPos; TriState eState; @@ -344,7 +344,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) nPos != m_pLbEffect->GetSavedValue() ) { rAttrs.Put( SdrTextAniKindItem( (SdrTextAniKind) nPos ) ); - bModified = sal_True; + bModified = true; } // animation direction @@ -355,23 +355,23 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { SdrTextAniDirection eValue = (SdrTextAniDirection) GetSelectedDirection(); rAttrs.Put( SdrTextAniDirectionItem( eValue ) ); - bModified = sal_True; + bModified = true; } // Start inside eState = m_pTsbStartInside->GetState(); if( eState != m_pTsbStartInside->GetSavedValue() ) { - rAttrs.Put( SdrTextAniStartInsideItem( (sal_Bool) TRISTATE_TRUE == eState ) ); - bModified = sal_True; + rAttrs.Put( SdrTextAniStartInsideItem( TRISTATE_TRUE == eState ) ); + bModified = true; } // Stop inside eState = m_pTsbStopInside->GetState(); if( eState != m_pTsbStopInside->GetSavedValue() ) { - rAttrs.Put( SdrTextAniStopInsideItem( (sal_Bool) TRISTATE_TRUE == eState ) ); - bModified = sal_True; + rAttrs.Put( SdrTextAniStopInsideItem( TRISTATE_TRUE == eState ) ); + bModified = true; } // quantity @@ -382,13 +382,13 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Int64 nValue = 0; if( eState == TRISTATE_TRUE /*#89844#*/ && m_pTsbEndless->IsEnabled()) - bModified = sal_True; + bModified = true; else { if( aStr != m_pNumFldCount->GetSavedValue() ) { nValue = m_pNumFldCount->GetValue(); - bModified = sal_True; + bModified = true; } } if( bModified ) @@ -403,13 +403,13 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Int64 nValue = 0; if( eState == TRISTATE_TRUE ) - bModified = sal_True; + bModified = true; else { if( aStr != m_pMtrFldDelay->GetSavedValue() ) { nValue = m_pMtrFldDelay->GetValue(); - bModified = sal_True; + bModified = true; } } if( bModified ) @@ -434,7 +434,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) } rAttrs.Put( SdrTextAniAmountItem( (sal_Int16) nValue ) ); - bModified = sal_True; + bModified = true; } return( bModified ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 84c4f2fbbdcd..29a483337fc1 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -266,7 +266,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) } // See if we have to check the "full width" check button. - sal_Bool bLeftToRight(IsTextDirectionLeftToRight()); + bool bLeftToRight(IsTextDirectionLeftToRight()); if((bLeftToRight && (SDRTEXTHORZADJUST_BLOCK == eTHA)) || (!bLeftToRight && (SDRTEXTVERTADJUST_BLOCK == eTVA))) { @@ -303,7 +303,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) if( rAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE ) { - sal_Bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue(); + bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue(); m_pTsbContour->SetState( bContour ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbContour->EnableTriState( false ); } @@ -356,31 +356,31 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) eState = m_pTsbAutoGrowHeight->GetState(); if( eState != m_pTsbAutoGrowHeight->GetSavedValue() ) { - rAttrs.Put( SdrTextAutoGrowHeightItem( (sal_Bool) TRISTATE_TRUE == eState ) ); + rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbAutoGrowWidth->GetState(); if( eState != m_pTsbAutoGrowWidth->GetSavedValue() ) { - rAttrs.Put( SdrTextAutoGrowWidthItem( (sal_Bool) TRISTATE_TRUE == eState ) ); + rAttrs.Put( SdrTextAutoGrowWidthItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbAutoGrowSize->GetState(); if( eState != m_pTsbAutoGrowSize->GetSavedValue() ) { - rAttrs.Put( SdrTextAutoGrowHeightItem( (sal_Bool) TRISTATE_TRUE == eState ) ); + rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbWordWrapText->GetState(); if( eState != m_pTsbWordWrapText->GetSavedValue() ) { - rAttrs.Put( SdrTextWordWrapItem( (sal_Bool) TRISTATE_TRUE == eState ) ); + rAttrs.Put( SdrTextWordWrapItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbContour->GetState(); if( eState != m_pTsbContour->GetSavedValue() ) { - rAttrs.Put( SdrTextContourFrameItem( (sal_Bool) TRISTATE_TRUE == eState ) ); + rAttrs.Put( SdrTextContourFrameItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbFitToSize->GetState(); @@ -427,7 +427,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) } // #103516# Do not change values if adjust controls were disabled. - sal_Bool bIsDisabled(m_pCtlPosition->IsCompletelyDisabled()); + bool bIsDisabled(m_pCtlPosition->IsCompletelyDisabled()); if(!bIsDisabled) { @@ -467,8 +467,8 @@ void SvxTextAttrPage::Construct() { DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" ); - bFitToSizeEnabled = bContourEnabled = sal_True; - bWordWrapTextEnabled = bAutoGrowSizeEnabled = bAutoGrowWidthEnabled = bAutoGrowHeightEnabled = sal_False; + bFitToSizeEnabled = bContourEnabled = true; + bWordWrapTextEnabled = bAutoGrowSizeEnabled = bAutoGrowWidthEnabled = bAutoGrowHeightEnabled = false; const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 ) @@ -487,18 +487,18 @@ void SvxTextAttrPage::Construct() if(pObj->HasText()) { // contour NOT possible for pure text objects - bContourEnabled = sal_False; + bContourEnabled = false; // adjusting width and height is ONLY possible for pure text objects - bAutoGrowWidthEnabled = bAutoGrowHeightEnabled = sal_True; + bAutoGrowWidthEnabled = bAutoGrowHeightEnabled = true; } } break; case OBJ_CUSTOMSHAPE : { - bFitToSizeEnabled = bContourEnabled = sal_False; - bAutoGrowSizeEnabled = sal_True; - bWordWrapTextEnabled = sal_True; + bFitToSizeEnabled = bContourEnabled = false; + bAutoGrowSizeEnabled = true; + bWordWrapTextEnabled = true; } break; default: ;//prevent warning @@ -637,10 +637,10 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl) IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) { - sal_Bool bAutoGrowWidth = m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE; - sal_Bool bAutoGrowHeight = m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE; - sal_Bool bFitToSize = m_pTsbFitToSize->GetState() == TRISTATE_TRUE; - sal_Bool bContour = m_pTsbContour->GetState() == TRISTATE_TRUE; + bool bAutoGrowWidth = m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE; + bool bAutoGrowHeight = m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE; + bool bFitToSize = m_pTsbFitToSize->GetState() == TRISTATE_TRUE; + bool bContour = m_pTsbContour->GetState() == TRISTATE_TRUE; m_pTsbContour->Enable( !bFitToSize && !( ( bAutoGrowWidth && bAutoGrowWidthEnabled ) || ( bAutoGrowHeight && bAutoGrowHeightEnabled ) ) && @@ -672,7 +672,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) // #103516# Do the setup based on states of hor/ver adjust SfxItemState eVState = rOutAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST ); SfxItemState eHState = rOutAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST ); - sal_Bool bHorAndVer(SFX_ITEM_DONTCARE == eVState || SFX_ITEM_DONTCARE == eHState); + bool bHorAndVer(SFX_ITEM_DONTCARE == eVState || SFX_ITEM_DONTCARE == eHState); // #83698# enable/disable text anchoring dependent of contour m_pFlPosition->Enable(!bContour && !bHorAndVer); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 85ae669cf2de..06e781adea08 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -76,8 +76,8 @@ static sal_uInt16 pTransparenceRanges[] = IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) { // disable all other controls - ActivateLinear(sal_False); - ActivateGradient(sal_False); + ActivateLinear(false); + ActivateGradient(false); // Preview rXFSet.ClearItem (XATTR_FILLTRANSPARENCE); @@ -85,7 +85,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) m_pCtlXRectPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() ); - InvalidatePreview( sal_False ); + InvalidatePreview( false ); return( 0L ); } @@ -93,8 +93,8 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) { // enable linear, disable other - ActivateLinear(sal_True); - ActivateGradient(sal_False); + ActivateLinear(true); + ActivateGradient(false); // preview rXFSet.ClearItem (XATTR_FILLFLOATTRANSPARENCE); @@ -106,8 +106,8 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) { // enable gradient, disable other - ActivateLinear(sal_False); - ActivateGradient(sal_True); + ActivateLinear(false); + ActivateGradient(true); // preview rXFSet.ClearItem (XATTR_FILLTRANSPARENCE); @@ -116,7 +116,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) return( 0L ); } -void SvxTransparenceTabPage::ActivateLinear(sal_Bool bActivate) +void SvxTransparenceTabPage::ActivateLinear(bool bActivate) { m_pMtrTransparent->Enable(bActivate); } @@ -162,7 +162,7 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl, void *, pControl) return( 0L ); } -void SvxTransparenceTabPage::ActivateGradient(sal_Bool bActivate) +void SvxTransparenceTabPage::ActivateGradient(bool bActivate) { m_pGridGradient->Enable(bActivate); @@ -231,7 +231,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet eRP ( RP_LT ), nPageType (0), nDlgType (0), - bBitmap ( sal_False ), + bBitmap ( false ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) @@ -303,16 +303,16 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) const SfxPoolItem* pLinearItem = NULL; SfxItemState eStateGradient(rOutAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); SfxItemState eStateLinear(rOutAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); - sal_Bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()); - sal_Bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0); + bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()); + bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0); // #103765# - sal_Bool bGradUsed = (eStateGradient == SFX_ITEM_DONTCARE); - sal_Bool bLinearUsed = (eStateLinear == SFX_ITEM_DONTCARE); + bool bGradUsed = (eStateGradient == SFX_ITEM_DONTCARE); + bool bLinearUsed = (eStateLinear == SFX_ITEM_DONTCARE); - sal_Bool bModified(sal_False); - sal_Bool bSwitchOffLinear(sal_False); - sal_Bool bSwitchOffGradient(sal_False); + bool bModified(false); + bool bSwitchOffLinear(false); + bool bSwitchOffGradient(false); if(m_pMtrTransparent->IsEnabled()) { @@ -327,8 +327,8 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) { rAttrs.Put(aItem); rAttrs.Put(aShadowItem); - bModified = sal_True; - bSwitchOffGradient = sal_True; + bModified = true; + bSwitchOffGradient = true; } } } @@ -362,16 +362,16 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) if(!pOld || !(*(const XFillFloatTransparenceItem*)pOld == aItem) || !bGradActive) { rAttrs.Put(aItem); - bModified = sal_True; - bSwitchOffLinear = sal_True; + bModified = true; + bSwitchOffLinear = true; } } } else { // no transparence - bSwitchOffGradient = sal_True; - bSwitchOffLinear = sal_True; + bSwitchOffGradient = true; + bSwitchOffLinear = true; } // disable unused XFillFloatTransparenceItem @@ -384,7 +384,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aGrad); aItem.SetEnabled(false); rAttrs.Put(aItem); - bModified = sal_True; + bModified = true; } // disable unused XFillFloatTransparenceItem @@ -394,7 +394,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) SdrShadowTransparenceItem aShadowItem(0); rAttrs.Put(aItem); rAttrs.Put(aShadowItem); - bModified = sal_True; + bModified = true; } rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); return bModified; @@ -406,13 +406,13 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) SfxItemState eStateGradient(rAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); if(!pGradientItem) pGradientItem = &rAttrs.Get(XATTR_FILLFLOATTRANSPARENCE); - sal_Bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()); + bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()); const SfxPoolItem* pLinearItem = NULL; SfxItemState eStateLinear(rAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); if(!pLinearItem) pLinearItem = &rAttrs.Get(XATTR_FILLTRANSPARENCE); - sal_Bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0); + bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0); // transparence gradient const XGradient& rGradient = ((XFillFloatTransparenceItem*)pGradientItem)->GetGradientValue(); @@ -461,7 +461,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrTrgrStartValue->SaveValue(); m_pMtrTrgrEndValue->SaveValue(); - sal_Bool bActive = InitPreview ( rAttrs ); + bool bActive = InitPreview ( rAttrs ); InvalidatePreview ( bActive ); } @@ -492,7 +492,7 @@ void SvxTransparenceTabPage::PointChanged(Window* , RECT_POINT eRcPt) // Preview-Methods -sal_Bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet ) +bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet ) { // set transparencetyp for preview if ( m_pRbtTransOff->IsChecked() ) @@ -534,7 +534,7 @@ sal_Bool SvxTransparenceTabPage::InitPreview ( const SfxItemSet& rSet ) return !m_pRbtTransOff->IsChecked(); } -void SvxTransparenceTabPage::InvalidatePreview (sal_Bool bEnable) +void SvxTransparenceTabPage::InvalidatePreview (bool bEnable) { if ( bBitmap ) { @@ -799,7 +799,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) SetPos(pPosItem->GetValue()); if( nDlgType == 0 ) // area dialog { - *pbAreaTP = sal_True; + *pbAreaTP = true; if( pColorList.is() ) { @@ -990,7 +990,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { sal_Int32 _nPos; - sal_Bool bModified = sal_False; + bool bModified = false; if( nDlgType != 0 || *pbAreaTP ) { @@ -1008,7 +1008,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { rAttrs.Put( aStyleItem ); - bModified = sal_True; + bModified = true; } } } @@ -1025,7 +1025,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillColorItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } // NEW @@ -1038,7 +1038,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { rAttrs.Put( aStyleItem ); - bModified = sal_True; + bModified = true; } } } @@ -1056,7 +1056,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillGradientItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } // NEW @@ -1069,7 +1069,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { rAttrs.Put( aStyleItem ); - bModified = sal_True; + bModified = true; } } } @@ -1087,7 +1087,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillHatchItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } XFillBackgroundItem aItem ( m_pCbxHatchBckgrd->IsChecked() ); @@ -1102,7 +1102,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillColorItem*)pOld == aFillColorItem ) ) { rAttrs.Put( aFillColorItem ); - bModified = sal_True; + bModified = true; } } // NEW @@ -1115,7 +1115,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { rAttrs.Put( aStyleItem ); - bModified = sal_True; + bModified = true; } } } @@ -1128,7 +1128,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic); rAttrs.Put(XFillStyleItem(XFILL_BITMAP)); rAttrs.Put(aXBmpItem); - bModified = sal_True; + bModified = true; } else { @@ -1143,7 +1143,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBitmapItem*)pOld == aFillBitmapItem ) ) { rAttrs.Put( aFillBitmapItem ); - bModified = sal_True; + bModified = true; } } // NEW @@ -1156,7 +1156,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { rAttrs.Put( aStyleItem ); - bModified = sal_True; + bModified = true; } } } @@ -1168,12 +1168,12 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pTsbStepCount->IsEnabled() ) { sal_uInt16 nValue = 0; - sal_Bool bValueModified = sal_False; + bool bValueModified = false; TriState eState = m_pTsbStepCount->GetState(); if( eState == TRISTATE_TRUE ) { if( eState != m_pTsbStepCount->GetSavedValue() ) - bValueModified = sal_True; + bValueModified = true; } else { @@ -1182,7 +1182,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { nValue = (sal_uInt16) m_pNumFldStepCount->GetValue(); if( nValue != (sal_uInt16) m_pNumFldStepCount->GetSavedValue().toInt32() ) - bValueModified = sal_True; + bValueModified = true; } } if( bValueModified ) @@ -1192,7 +1192,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XGradientStepCountItem*)pOld == aFillBitmapItem ) ) { rAttrs.Put( aFillBitmapItem ); - bModified = sal_True; + bModified = true; } } } @@ -1208,7 +1208,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpTileItem*)pOld == aFillBmpTileItem ) ) { rAttrs.Put( aFillBmpTileItem ); - bModified = sal_True; + bModified = true; } } } @@ -1224,7 +1224,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpStretchItem*)pOld == aFillBmpStretchItem ) ) { rAttrs.Put( aFillBmpStretchItem ); - bModified = sal_True; + bModified = true; } } } @@ -1252,7 +1252,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpSizeLogItem*)pOld == *pItem ) ) { rAttrs.Put( *pItem ); - bModified = sal_True; + bModified = true; } delete pItem; } @@ -1288,7 +1288,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpSizeXItem*)pOld == *pItem ) ) { rAttrs.Put( *pItem ); - bModified = sal_True; + bModified = true; } delete pItem; } @@ -1325,7 +1325,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpSizeYItem*)pOld == *pItem ) ) { rAttrs.Put( *pItem ); - bModified = sal_True; + bModified = true; } delete pItem; } @@ -1350,7 +1350,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { rAttrs.Put( aFillBmpTileOffsetXItem ); rAttrs.Put( XFillBmpTileOffsetYItem( 0 ) ); - bModified = sal_True; + bModified = true; } } else if( m_pRbtColumn->IsChecked() ) @@ -1361,7 +1361,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { rAttrs.Put( aFillBmpTileOffsetYItem ); rAttrs.Put( XFillBmpTileOffsetXItem( 0 ) ); - bModified = sal_True; + bModified = true; } } } @@ -1370,16 +1370,16 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) //aCtlPosition if( m_pCtlPosition->IsEnabled() ) { - sal_Bool bPut = sal_False; + bool bPut = false; RECT_POINT _eRP = m_pCtlPosition->GetActualRP(); if( SFX_ITEM_DONTCARE == rOutAttrs.GetItemState( XATTR_FILLBMP_POS ) ) - bPut = sal_True; + bPut = true; else { RECT_POINT eValue = ( ( const XFillBmpPosItem& ) rOutAttrs.Get( XATTR_FILLBMP_POS ) ).GetValue(); if( eValue != _eRP ) - bPut = sal_True; + bPut = true; } if( bPut ) { @@ -1388,7 +1388,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpPosItem*)pOld == aFillBmpPosItem ) ) { rAttrs.Put( aFillBmpPosItem ); - bModified = sal_True; + bModified = true; } } } @@ -1405,7 +1405,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpPosOffsetXItem*)pOld == aFillBmpPosOffsetXItem ) ) { rAttrs.Put( aFillBmpPosOffsetXItem ); - bModified = sal_True; + bModified = true; } } } @@ -1422,7 +1422,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XFillBmpPosOffsetYItem*)pOld == aFillBmpPosOffsetYItem ) ) { rAttrs.Put( aFillBmpPosOffsetYItem ); - bModified = sal_True; + bModified = true; } } } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 8853bc957c54..c0b95d0c7de2 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -141,7 +141,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) if( nDlgType == 0 ) // area dialog { - *pbAreaTP = sal_False; + *pbAreaTP = false; if( pColorList.is() ) { @@ -227,7 +227,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) { - if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog + if( nDlgType == 0 && *pbAreaTP == false ) // area dialog { if(PT_BITMAP == *pPageType) { @@ -408,7 +408,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); - bBmpChanged = sal_False; + bBmpChanged = false; delete pGraphicObject; } @@ -474,18 +474,18 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) long nCount = pBitmapList->Count(); long j = 1; - sal_Bool bDifferent = sal_False; + bool bDifferent = false; while( !bDifferent ) { aName = aNewName; aName += " "; aName += OUString::number( j++ ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pBitmapList->GetBitmap( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -499,11 +499,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pBitmapList->GetBitmap( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; if( bDifferent ) { nError = 0; @@ -607,12 +607,12 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) { pDlg->GetName( aName ); - sal_Bool bDifferent = sal_True; + bool bDifferent = true; long nCount = pBitmapList->Count(); for( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pBitmapList->GetBitmap( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; if( bDifferent ) { nError = 0; @@ -676,25 +676,25 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pBitmapList->Count(); - sal_Bool bDifferent = sal_False; - sal_Bool bLoop = sal_True; + bool bDifferent = false; + bool bLoop = true; const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pBitmapList->GetBitmap( i )->GetName() && aName != aOldName ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) { - bLoop = sal_False; + bLoop = false; const BitmapEx aBitmapEx(m_pBitmapCtl->GetBitmapEx()); @@ -707,7 +707,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) *pnBitmapListState |= CT_MODIFIED; - bBmpChanged = sal_False; + bBmpChanged = false; } else { @@ -922,7 +922,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangePixelColorHdl_Impl) m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); - bBmpChanged = sal_True; + bBmpChanged = true; return 0L; } @@ -941,7 +941,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl) m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); - bBmpChanged = sal_True; + bBmpChanged = true; return 0L; } @@ -959,7 +959,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); - bBmpChanged = sal_True; + bBmpChanged = true; } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 5e28dbbedb40..c20bb39c9218 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -285,12 +285,12 @@ struct SvxColorTabPageShadow { sal_uInt16 nUnknownType; sal_Int32 nUnknownPos; - sal_Bool bIsAreaTP; + bool bIsAreaTP; sal_uInt16 nChangeType; SvxColorTabPageShadow() : nUnknownType( COLORPAGE_UNKNOWN ) , nUnknownPos( LISTBOX_ENTRY_NOTFOUND ) - , bIsAreaTP( sal_False ) + , bIsAreaTP( false ) , nChangeType( 0 ) { } @@ -427,7 +427,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) { if( nDlgType == 0 ) // area dialog { - *pbAreaTP = sal_False; + *pbAreaTP = false; if( pColorList.is() ) { @@ -559,7 +559,7 @@ long SvxColorTabPage::CheckChanges_Impl() bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) { if( ( nDlgType != 0 ) || - ( *pPageType == PT_COLOR && *pbAreaTP == sal_False ) ) + ( *pPageType == PT_COLOR && *pbAreaTP == false ) ) { OUString aString; Color aColor; @@ -669,12 +669,12 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) OUString aName( m_pEdtName->GetText() ); XColorEntry* pEntry; long nCount = pColorList->Count(); - sal_Bool bDifferent = sal_True; + bool bDifferent = true; // check if name is already existing for ( long i = 0; i < nCount && bDifferent; i++ ) if ( aName == pColorList->GetColor( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; // if yes, it is repeated and a new name is demanded if ( !bDifferent ) @@ -686,21 +686,21 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ); - sal_Bool bLoop = sal_True; + bool bLoop = true; while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pColorList->GetColor( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) - bLoop = sal_False; + bLoop = false; else aWarningBox.Execute(); } @@ -741,12 +741,12 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) OUString aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) ); OUString aName( m_pEdtName->GetText() ); long nCount = pColorList->Count(); - sal_Bool bDifferent = sal_True; + bool bDifferent = true; // check if name is already existing for ( long i = 0; i < nCount && bDifferent; i++ ) if ( aName == pColorList->GetColor( i )->GetName() && nPos != i ) - bDifferent = sal_False; + bDifferent = false; // if yes, it is repeated and a new name is demanded if ( !bDifferent ) @@ -758,19 +758,19 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ); - sal_Bool bLoop = sal_True; + bool bLoop = true; while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for ( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pColorList->GetColor( i )->GetName() && nPos != i ) - bDifferent = sal_False; + bDifferent = false; if( bDifferent ) - bLoop = sal_False; + bLoop = false; else aWarningBox.Execute(); } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 18b8ccec7f3c..8a0e37906c92 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -156,7 +156,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) if( nDlgType == 0 ) // area dialog { - *pbAreaTP = sal_False; + *pbAreaTP = false; if( pColorList.is() ) { @@ -308,7 +308,7 @@ long SvxGradientTabPage::CheckChanges_Impl() bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) { - if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False ) + if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == false ) { // CheckChanges(); <-- duplicate inquiry ? @@ -412,18 +412,18 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) long nCount = pGradientList->Count(); long j = 1; - sal_Bool bDifferent = sal_False; + bool bDifferent = false; while( !bDifferent ) { aName = aNewName; aName += " "; aName += OUString::number( j++ ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pGradientList->GetGradient( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -437,11 +437,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pGradientList->GetGradient( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; if( bDifferent ) { @@ -523,24 +523,24 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pGradientList->Count(); - sal_Bool bDifferent = sal_False; - sal_Bool bLoop = sal_True; + bool bDifferent = false; + bool bLoop = true; while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pGradientList->GetGradient( i )->GetName() && aName != aOldName ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) { - bLoop = sal_False; + bLoop = false; XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(), m_pLbColorTo->GetSelectEntryColor(), (XGradientStyle) m_pLbGradientType->GetSelectEntryPos(), diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index e79b839e1580..4925d61142ed 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -152,7 +152,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) if( nDlgType == 0 ) // area dialog { - *pbAreaTP = sal_False; + *pbAreaTP = false; if( pColorList.is() ) { @@ -280,7 +280,7 @@ long SvxHatchTabPage::CheckChanges_Impl() bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) { - if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog + if( nDlgType == 0 && *pbAreaTP == false ) // area dialog { if( *pPageType == PT_HATCH ) { @@ -462,18 +462,18 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) long nCount = pHatchingList->Count(); long j = 1; - sal_Bool bDifferent = sal_False; + bool bDifferent = false; while( !bDifferent ) { aName = aNewName; aName += " "; aName += OUString::number( j++ ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pHatchingList->GetHatch( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -487,11 +487,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) if( aName == pHatchingList->GetHatch( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; if( bDifferent ) { nError = 0; @@ -567,23 +567,23 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pHatchingList->Count(); - sal_Bool bDifferent = sal_False; - sal_Bool bLoop = sal_True; + bool bDifferent = false; + bool bLoop = true; while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pHatchingList->GetHatch( i )->GetName() && aName != aOldName ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) { - bLoop = sal_False; + bLoop = false; XHatch aXHatch( m_pLbLineColor->GetSelectEntryColor(), (XHatchStyle) m_pLbLineType->GetSelectEntryPos(), GetCoreValue( *m_pMtrDistance, ePoolUnit ), diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index ca5f3e5115fe..317f6c0cebc8 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -90,12 +90,12 @@ SvxLineTabPage::SvxLineTabPage nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), // unknown respectively unchanged pSymbolAttr(NULL), - bLastWidthModified(sal_False), + bLastWidthModified(false), aSymbolLastSize(Size(0,0)), - bSymbols(sal_False), + bSymbols(false), rOutAttrs ( rInAttrs ), - bObjSelected( sal_False ), + bObjSelected( false ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), aXLStyle ( XLINE_DASH ), @@ -208,12 +208,12 @@ SvxLineTabPage::SvxLineTabPage m_pSymbolRatioCB->SetClickHdl(LINK(this, SvxLineTabPage, RatioHdl_Impl)); m_pSymbolRatioCB->Check(true); - ShowSymbolControls(sal_False); + ShowSymbolControls(false); nActLineWidth = -1; } -void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn) +void SvxLineTabPage::ShowSymbolControls(bool bOn) { // Symbols on a line (e.g. StarCharts), symbol-enable controls @@ -290,7 +290,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) Size aSize(aBitmap.GetSizePixel()); if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) { - sal_Bool bWidth = aSize.Width() > aSize.Height(); + bool bWidth = aSize.Width() > aSize.Height(); double nScale = bWidth ? (double)MAX_BMP_WIDTH / (double)aSize.Width(): (double)MAX_BMP_HEIGHT / (double)aSize.Height(); @@ -376,7 +376,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) Size aSize(aBitmapEx.GetSizePixel()); if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) { - sal_Bool bWidth = aSize.Width() > aSize.Height(); + bool bWidth = aSize.Width() > aSize.Height(); double nScale = bWidth ? (double)MAX_BMP_WIDTH / (double)aSize.Width(): (double)MAX_BMP_HEIGHT / (double)aSize.Height(); @@ -672,7 +672,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; sal_Int32 nPos; - sal_Bool bModified = sal_False; + bool bModified = false; // To prevent modifications to the list, we do not set other page's items. if( nDlgType != 0 || nPageType != 2 ) @@ -700,7 +700,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineDashItem*)pOld == aDashItem ) ) { rAttrs.Put( aDashItem ); - bModified = sal_True; + bModified = true; } } } @@ -708,7 +708,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineStyleItem*)pOld == *pStyleItem ) ) { rAttrs.Put( *pStyleItem ); - bModified = sal_True; + bModified = true; } delete pStyleItem; } @@ -722,7 +722,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineWidthItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } // Width line start @@ -733,7 +733,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } // Width line end @@ -744,7 +744,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } @@ -756,7 +756,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineColorItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } @@ -775,7 +775,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( pItem && ( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) ) { rAttrs.Put( *pItem ); - bModified = sal_True; + bModified = true; } delete pItem; } @@ -793,7 +793,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) ( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) ) { rAttrs.Put( *pItem ); - bModified = sal_True; + bModified = true; } delete pItem; } @@ -808,7 +808,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineStartCenterItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } eState = m_pTsbCenterEnd->GetState(); @@ -819,7 +819,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineEndCenterItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } @@ -832,7 +832,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const XLineTransparenceItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } @@ -873,7 +873,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(!pOld || !(*(const XLineJointItem*)pOld == *pNew)) { rAttrs.Put( *pNew ); - bModified = sal_True; + bModified = true; } delete pNew; @@ -912,7 +912,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(!pOld || !(*(const XLineCapItem*)pOld == *pNew)) { rAttrs.Put( *pNew ); - bModified = sal_True; + bModified = true; } delete pNew; @@ -928,7 +928,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(bNewSize) { rAttrs.Put(aSItem); - bModified=sal_True; + bModified=true; } SfxInt32Item aTItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),nSymbolType); @@ -939,7 +939,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(bNewType) { rAttrs.Put(aTItem); - bModified=sal_True; + bModified=true; } if(nSymbolType!=SVX_SYMBOLTYPE_NONE) @@ -951,7 +951,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(bNewBrush) { rAttrs.Put(aBItem); - bModified=sal_True; + bModified=true; } } } @@ -961,7 +961,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) -sal_Bool SvxLineTabPage::FillXLSet_Impl() +bool SvxLineTabPage::FillXLSet_Impl() { sal_Int32 nPos; @@ -1081,7 +1081,7 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl() // #116827# m_pCtlPreview->SetLineAttributes(aXLineAttr.GetItemSet()); - return( sal_True ); + return true; } @@ -1093,10 +1093,10 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) // Line style const SfxPoolItem *pPoolItem; long nSymType=SVX_SYMBOLTYPE_UNKNOWN; - sal_Bool bPrevSym=sal_False; - sal_Bool bEnable=sal_True; - sal_Bool bIgnoreGraphic=sal_False; - sal_Bool bIgnoreSize=sal_False; + bool bPrevSym=false; + bool bEnable=true; + bool bIgnoreGraphic=false; + bool bIgnoreSize=false; if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),true,&pPoolItem) == SFX_ITEM_SET) { nSymType=((const SfxInt32Item *)pPoolItem)->GetValue(); @@ -1106,13 +1106,13 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) { aSymbolGraphic=aAutoSymbolGraphic; aSymbolSize=aSymbolLastSize=aAutoSymbolGraphic.GetPrefSize(); - bPrevSym=sal_True; + bPrevSym=true; } else if(nSymType == SVX_SYMBOLTYPE_NONE) { - bEnable=sal_False; - bIgnoreGraphic=sal_True; - bIgnoreSize=sal_True; + bEnable=false; + bIgnoreGraphic=true; + bIgnoreSize=true; } else if(nSymType >= 0) { @@ -1164,9 +1164,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) aSymbolSize=pObj->GetSnapRect().GetSize(); aSymbolGraphic.SetPrefSize(pInvisibleSquare->GetSnapRect().GetSize()); aSymbolGraphic.SetPrefMapMode(MAP_100TH_MM); - bPrevSym=sal_True; - bEnable=sal_True; - bIgnoreGraphic=sal_True; + bPrevSym=true; + bEnable=true; + bIgnoreGraphic=true; pView->UnmarkAll(); pInvisibleSquare=pPage->RemoveObject(1); @@ -1194,7 +1194,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) pGraphic->GetPrefMapMode(), MAP_100TH_MM ); } - bPrevSym=sal_True; + bPrevSym=true; } } @@ -1270,7 +1270,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) else if( rAttrs.GetItemState( XATTR_LINESTART ) != SFX_ITEM_DONTCARE ) { // #86265# select entry using list and polygon, not string - sal_Bool bSelected(sal_False); + bool bSelected(false); const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineStartItem&)rAttrs.Get(XATTR_LINESTART)).GetLineStartValue(); for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++) @@ -1282,7 +1282,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) { // select this entry m_pLbStartStyle->SelectEntryPos(a + 1); - bSelected = sal_True; + bSelected = true; } } @@ -1302,7 +1302,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) else if( rAttrs.GetItemState( XATTR_LINEEND ) != SFX_ITEM_DONTCARE ) { // #86265# select entry using list and polygon, not string - sal_Bool bSelected(sal_False); + bool bSelected(false); const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineEndItem&)rAttrs.Get(XATTR_LINEEND)).GetLineEndValue(); for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++) @@ -1314,7 +1314,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) { // select this entry m_pLbEndStyle->SelectEntryPos(a + 1); - bSelected = sal_True; + bSelected = true; } } @@ -1416,7 +1416,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) // Synchronize // We get the value from the INI file now OUString aStr = GetUserData(); - m_pCbxSynchronize->Check( (sal_Bool)aStr.toInt32() ); + m_pCbxSynchronize->Check( aStr.toInt32() != 0 ); // #116827# if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINEJOINT)) @@ -1729,7 +1729,7 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem) Size aSize(aBitmap.GetSizePixel()); if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) { - sal_Bool bWidth = aSize.Width() > aSize.Height(); + bool bWidth = aSize.Width() > aSize.Height(); double nScale = bWidth ? (double)MAX_BMP_WIDTH / (double)aSize.Width(): (double)MAX_BMP_HEIGHT / (double)aSize.Height(); @@ -1752,16 +1752,16 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton ) } IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) { - bNewSize=true; - sal_Bool bWidth = (sal_Bool)(pField == m_pSymbolWidthMF); + bNewSize = true; + bool bWidth = pField == m_pSymbolWidthMF; bLastWidthModified = bWidth; - sal_Bool bRatio = m_pSymbolRatioCB->IsChecked(); + bool bRatio = m_pSymbolRatioCB->IsChecked(); long nWidthVal = static_cast<long>(m_pSymbolWidthMF->Denormalize(m_pSymbolWidthMF->GetValue(FUNIT_100TH_MM))); long nHeightVal= static_cast<long>(m_pSymbolHeightMF->Denormalize(m_pSymbolHeightMF->GetValue(FUNIT_100TH_MM))); nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MAP_100TH_MM,(MapUnit)ePoolUnit ); nHeightVal = OutputDevice::LogicToLogic(nHeightVal,MAP_100TH_MM,(MapUnit)ePoolUnit); - aSymbolSize=Size(nWidthVal,nHeightVal); - double fSizeRatio = (double)1; + aSymbolSize = Size(nWidthVal,nHeightVal); + double fSizeRatio = (double)1; if(bRatio) { @@ -1845,7 +1845,7 @@ void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) if(pSdrObjListItem) //symbols { - ShowSymbolControls(sal_True); + ShowSymbolControls(true); pSymbolList = static_cast<SdrObjList*>(pSdrObjListItem->GetValue()); if (pSymbolAttrItem) pSymbolAttr = new SfxItemSet(pSymbolAttrItem->GetItemSet()); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 7be9c1bcc07b..fc2768aa536a 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -529,40 +529,40 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) long nCount = pDashList->Count(); long j = 1; - sal_Bool bDifferent = sal_False; + bool bDifferent = false; while ( !bDifferent ) { aName = aNewName; aName += " "; aName += OUString::number( j++ ); - bDifferent = sal_True; + bDifferent = true; for ( long i = 0; i < nCount && bDifferent; i++ ) if ( aName == pDashList->GetDash( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - sal_Bool bLoop = sal_True; + bool bLoop = true; while ( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pDashList->GetDash( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) { - bLoop = sal_False; + bLoop = false; FillDash_Impl(); pEntry = new XDashEntry( aDash, aName ); @@ -627,24 +627,24 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pDashList->Count(); - sal_Bool bDifferent = sal_False; - sal_Bool bLoop = sal_True; + bool bDifferent = false; + bool bLoop = true; while ( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pDashList->GetDash( i )->GetName() && aName != aOldName ) - bDifferent = sal_False; + bDifferent = false; } if ( bDifferent ) { - bLoop = sal_False; + bLoop = false; FillDash_Impl(); XDashEntry* pEntry = new XDashEntry( aDash, aName ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index cad882b53a98..41f3917b1757 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -316,12 +316,12 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) ); OUString aName( m_pEdtName->GetText() ); long nCount = pLineEndList->Count(); - sal_Bool bDifferent = sal_True; + bool bDifferent = true; // check whether the name is existing already for ( long i = 0; i < nCount && bDifferent; i++ ) if ( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; // if yes, repeat and demand a new name if ( !bDifferent ) @@ -335,21 +335,21 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - sal_Bool bLoop = sal_True; + bool bLoop = true; while( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) - bLoop = sal_False; + bLoop = false; else aWarningBox.Execute(); } @@ -432,40 +432,40 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) long nCount = pLineEndList->Count(); long j = 1; - sal_Bool bDifferent = sal_False; + bool bDifferent = false; while ( !bDifferent ) { aName = aNewName; aName += " "; aName += OUString::number( j++ ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) if ( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - sal_Bool bLoop = sal_True; + bool bLoop = true; while ( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) { - bLoop = sal_False; + bLoop = false; pEntry = new XLineEndEntry( aNewPolyPolygon, aName ); long nLineEndCount = pLineEndList->Count(); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 77ca6c1c9fd5..da9bd8850f5d 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -55,7 +55,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs nPageType ( 0 ), nDlgType ( 0 ), pbAreaTP ( 0 ), - bDisable ( sal_False ), + bDisable ( false ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) @@ -247,7 +247,7 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; - sal_Bool bModified = sal_False; + bool bModified = false; if( !bDisable ) { @@ -259,7 +259,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const SdrShadowItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } @@ -306,7 +306,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) ( !pOld || !( *(const SdrShadowXDistItem*)pOld == aXItem ) ) ) { rAttrs.Put( aXItem ); - bModified = sal_True; + bModified = true; } SdrShadowYDistItem aYItem( nY ); pOld = GetOldItem( rAttrs, SDRATTR_SHADOWYDIST ); @@ -314,7 +314,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) ( !pOld || !( *(const SdrShadowYDistItem*)pOld == aYItem ) ) ) { rAttrs.Put( aYItem ); - bModified = sal_True; + bModified = true; } } @@ -328,7 +328,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const SdrShadowColorItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } @@ -341,7 +341,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) if ( !pOld || !( *(const SdrShadowTransparenceItem*)pOld == aItem ) ) { rAttrs.Put( aItem ); - bModified = sal_True; + bModified = true; } } } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 8a3450699726..c7ade67de393 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -275,7 +275,7 @@ void SvxAngleTabPage::Construct() bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) { - sal_Bool bModified = sal_False; + bool bModified = false; if(m_pCtlAngle->IsValueModified() || m_pMtrPosX->IsValueModified() || m_pMtrPosY->IsValueModified()) { @@ -287,7 +287,7 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), basegfx::fround(fTmpX))); rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), basegfx::fround(fTmpY))); - bModified = sal_True; + bModified = true; } return bModified; @@ -478,7 +478,7 @@ void SvxSlantTabPage::Construct() bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { - sal_Bool bModified = sal_False; + bool bModified = false; OUString aStr = m_pMtrRadius->GetText(); if( aStr != m_pMtrRadius->GetSavedValue() ) @@ -488,7 +488,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) nTmp = Fraction( nTmp ) * aUIScale; rAttrs.Put( SdrEckenradiusItem( nTmp ) ); - bModified = sal_True; + bModified = true; } aStr = m_pMtrAngle->GetText(); @@ -497,7 +497,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { sal_Int32 nValue = static_cast<sal_Int32>(m_pMtrAngle->GetValue()); rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); - bModified = sal_True; + bModified = true; } if( bModified ) @@ -784,7 +784,7 @@ void SvxPositionSizeTabPage::Construct() bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { - sal_Bool bModified(sal_False); + bool bModified(false); if ( m_pMtrWidth->HasFocus() ) { @@ -816,7 +816,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) rOutAttrs.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_X), basegfx::fround(fX))); rOutAttrs.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_Y), basegfx::fround(fY))); - bModified |= sal_True; + bModified = true; } if ( m_pTsbPosProtect->GetState() != m_pTsbPosProtect->GetSavedValue() ) @@ -832,7 +832,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); } - bModified |= sal_True; + bModified = true; } } @@ -858,7 +858,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), (sal_uInt32) lWidth ) ); rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), (sal_uInt32) lHeight ) ); rOutAttrs.Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), sal::static_int_cast< sal_uInt16 >( meRP ) ) ); - bModified |= sal_True; + bModified = true; } if ( m_pTsbSizeProtect->GetState() != m_pTsbSizeProtect->GetSavedValue() ) @@ -869,7 +869,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) rOutAttrs.Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); - bModified |= sal_True; + bModified = true; } if ( m_pTsbAutoGrowWidth->GetState() != m_pTsbAutoGrowWidth->GetSavedValue() ) @@ -883,7 +883,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOWIDTH ), m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); } - bModified |= sal_True; + bModified = true; } if ( m_pTsbAutoGrowHeight->GetState() != m_pTsbAutoGrowHeight->GetSavedValue() ) @@ -897,7 +897,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOHEIGHT ), m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); } - bModified |= sal_True; + bModified = true; } @@ -930,7 +930,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet& ) pItem = GetItem( mrOutAttrs, SID_ATTR_TRANSFORM_PROTECT_POS ); if ( pItem ) { - sal_Bool bProtected = ( ( const SfxBoolItem* )pItem )->GetValue(); + bool bProtected = ( ( const SfxBoolItem* )pItem )->GetValue(); m_pTsbPosProtect->SetState( bProtected ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbPosProtect->EnableTriState( false ); } @@ -1000,7 +1000,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet& ) // Is matching set? OUString aStr = GetUserData(); - m_pCbxScale->Check( (sal_Bool)aStr.toInt32() ); + m_pCbxScale->Check( aStr.toInt32() != 0 ); m_pTsbSizeProtect->SaveValue(); m_pTsbAutoGrowWidth->SaveValue(); |