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 | |
| parent | 199d333f131474729a105afa5a3da61205f61df2 (diff) | |
cui: sal_Bool->bool
Change-Id: Ib7dd1f27d4909d30ee794936364a472a9755c609
140 files changed, 1510 insertions, 1512 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 398fe7fc4aa0..40ad739fe2ae 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -733,7 +733,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt , aLoadAccelConfigStr(CUI_RES(RID_SVXSTR_LOADACCELCONFIG)) , aSaveAccelConfigStr(CUI_RES(RID_SVXSTR_SAVEACCELCONFIG)) , aFilterCfgStr(CUI_RES(RID_SVXSTR_FILTERNAME_CFG)) - , m_bStylesInfoInitialized(sal_False) + , m_bStylesInfoInitialized(false) , m_xGlobal() , m_xModule() , m_xAct() @@ -914,7 +914,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler m_aStylesInfo.setModel(xModel); m_pFunctionBox->SetStylesInfo(&m_aStylesInfo); m_pGroupLBox->SetStylesInfo(&m_aStylesInfo); - m_bStylesInfoInitialized = sal_True; + m_bStylesInfoInitialized = true; } // Insert all editable accelerators into list box. It is possible @@ -956,7 +956,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos); TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData(); - pEntry->m_bIsConfigurable = sal_True; + pEntry->m_bIsConfigurable = true; pEntry->m_sCommand = sCommand; CreateCustomItems(pLBEntry, m_pEntriesBox->GetEntryText(pLBEntry, 0), sLabel); } @@ -976,7 +976,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos); TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData(); - pEntry->m_bIsConfigurable = sal_False; + pEntry->m_bIsConfigurable = false; CreateCustomItems(pLBEntry, m_pEntriesBox->GetEntryText(pLBEntry, 0), OUString()); } } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 91a4c30eab01..81356106c39e 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -527,7 +527,7 @@ bool GetToolbarItemData( OUString& rCommandURL, OUString& rLabel, sal_uInt16& rType, - sal_Bool& rIsVisible, + bool& rIsVisible, sal_Int32& rStyle, uno::Reference< container::XIndexAccess >& rSubMenu ) { @@ -603,7 +603,7 @@ ConvertSvxConfigEntry( aPropSeq[2].Name = aDescriptorLabel; if ( !pEntry->HasChangedName() && !pEntry->GetCommand().isEmpty() ) { - sal_Bool isDefaultName = sal_False; + bool isDefaultName = false; try { uno::Any a( xCommandToLabelMap->getByName( pEntry->GetCommand() ) ); @@ -619,7 +619,7 @@ ConvertSvxConfigEntry( if ( tmpLabel.equals( pEntry->GetName() ) ) { - isDefaultName = sal_True; + isDefaultName = true; } break; @@ -681,7 +681,7 @@ ConvertToolbarEntry( aPropSeq[2].Name = aDescriptorLabel; if ( !pEntry->HasChangedName() && !pEntry->GetCommand().isEmpty() ) { - sal_Bool isDefaultName = sal_False; + bool isDefaultName = false; try { uno::Any a( xCommandToLabelMap->getByName( pEntry->GetCommand() ) ); @@ -697,7 +697,7 @@ ConvertToolbarEntry( if ( tmpLabel.equals( pEntry->GetName() ) ) { - isDefaultName = sal_True; + isDefaultName = true; } break; @@ -2552,7 +2552,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton ) if ( m_pSelectorDlg == NULL ) { // Create Script Selector which also shows builtin commands - m_pSelectorDlg = new SvxScriptSelectorDialog( this, sal_True, m_xFrame ); + m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame ); m_pSelectorDlg->SetAddHdl( LINK( this, SvxMenuConfigPage, AddFunctionHdl ) ); @@ -4189,7 +4189,7 @@ bool ToolbarSaveInData::LoadToolbar( OUString aCommandURL; OUString aLabel; bool bIsUserDefined = true; - sal_Bool bIsVisible; + bool bIsVisible; sal_Int32 nStyle; sal_uInt16 nType( css::ui::ItemType::DEFAULT ); @@ -4475,7 +4475,7 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton ) if ( m_pSelectorDlg == NULL ) { // Create Script Selector which shows slot commands - m_pSelectorDlg = new SvxScriptSelectorDialog( this, sal_True, m_xFrame ); + m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame ); // Position the Script Selector over the Add button so it is // beside the menu contents list and does not obscure it diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index f1ffaa1ef67a..40b88bb386e0 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -94,14 +94,14 @@ OUString SfxStylesInfo_Impl::generateCommand(const OUString& sFamily, const OUSt return sCommand.makeStringAndClear(); } -sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle) +bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle) { static sal_Int32 LEN_STYLEPROT = CMDURL_STYLEPROT_ONLY.getLength(); static sal_Int32 LEN_SPART = CMDURL_SPART_ONLY.getLength(); static sal_Int32 LEN_FPART = CMDURL_FPART_ONLY.getLength(); if (!aStyle.sCommand.startsWith(CMDURL_STYLEPROT_ONLY)) - return sal_False; + return false; aStyle.sFamily = OUString(); aStyle.sStyle = OUString(); @@ -110,7 +110,7 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle) OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT); sal_Int32 i = sCmdArgs.indexOf('&'); if (i<0) - return sal_False; + return false; OUString sArg = sCmdArgs.copy(0, i); if (sArg.startsWith(CMDURL_SPART_ONLY)) @@ -125,9 +125,9 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle) aStyle.sFamily = sArg.copy(LEN_FPART, sArg.getLength()-LEN_FPART); if (!(aStyle.sFamily.isEmpty() || aStyle.sStyle.isEmpty())) - return sal_True; + return true; - return sal_False; + return false; } void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) @@ -627,13 +627,13 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent { Sequence< Reference< browse::XBrowseNode > > children = rootNode->getChildNodes(); - sal_Bool bIsRootNode = sal_False; + bool bIsRootNode = false; OUString user("user"); OUString share("share"); if ( rootNode->getName() == "Root" ) { - bIsRootNode = sal_True; + bIsRootNode = true; } //To mimic current starbasic behaviour we @@ -652,14 +652,14 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent for ( sal_Int32 n = 0; n < children.getLength(); ++n ) { Reference< browse::XBrowseNode >& theChild = children[n]; - sal_Bool bDisplay = sal_True; + bool bDisplay = true; OUString uiName = theChild->getName(); if ( bIsRootNode ) { if ( ! ((theChild->getName().equals( user ) || theChild->getName().equals( share ) || theChild->getName().equals( currentDocTitle ) ) ) ) { - bDisplay=sal_False; + bDisplay=false; } else { @@ -983,9 +983,9 @@ void SfxConfigGroupListBox::GroupSelected() pFunctionListBox->SetUpdateMode(true); } -sal_Bool SfxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) +bool SfxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) { - sal_Bool bRet = SvTreeListBox::Expand( pParent ); + bool bRet = SvTreeListBox::Expand( pParent ); if ( bRet ) { sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight(); @@ -1020,7 +1020,7 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) */ { SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData(); - pInfo->bWasOpened = sal_True; + pInfo->bWasOpened = true; switch ( pInfo->nKind ) { case SFX_CFGGROUP_SCRIPTCONTAINER: @@ -1035,13 +1035,13 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) { Sequence< Reference< browse::XBrowseNode > > children = rootNode->getChildNodes(); - sal_Bool bIsRootNode = sal_False; + bool bIsRootNode = false; OUString user("user"); OUString share("share" ); if ( rootNode->getName() == "Root" ) { - bIsRootNode = sal_True; + bIsRootNode = true; } /* To mimic current starbasic behaviour we @@ -1062,11 +1062,11 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) { Reference< browse::XBrowseNode >& theChild = children[n]; OUString aName( theChild->getName() ); - sal_Bool bDisplay = sal_True; + bool bDisplay = true; if ( bIsRootNode ) { if ( !( (aName.equals(user) || aName.equals(share) || aName.equals(currentDocTitle) ) ) ) - bDisplay=sal_False; + bDisplay=false; } if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay ) { diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index f3bea629f91f..9f2a5cf09e88 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -172,7 +172,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) bAppConfig = *bApp; if ( *bApp ) { - SetReadOnly( sal_False ); + SetReadOnly( false ); _SvxMacroTabPage::DisplayAppEvents( true ); } else diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 24321a149431..dd14a12c30c3 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -35,7 +35,7 @@ class SvxEventConfigPage : public _SvxMacroTabPage ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocumentEvents; ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xDocumentModifiable; - sal_Bool bAppConfig; + bool bAppConfig; DECL_LINK( SelectHdl_Impl, ListBox* ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 00a48e6111b0..881f5a5e5c83 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -183,7 +183,7 @@ void MacroEventListBox::ConnectElements( void ) maListBox.InitHeaderBar( &maHeaderBar ); } -void MacroEventListBox::Show( sal_Bool bVisible, sal_uInt16 nFlags ) +void MacroEventListBox::Show( bool bVisible, sal_uInt16 nFlags ) { maListBox.Show( bVisible, nFlags ); maHeaderBar.Show( bVisible, nFlags ); @@ -412,7 +412,7 @@ void _SvxMacroTabPage::Reset( const SfxItemSet& ) DisplayAppEvents(bAppEvents); } -void _SvxMacroTabPage::SetReadOnly( sal_Bool bSet ) +void _SvxMacroTabPage::SetReadOnly( bool bSet ) { mpImpl->bReadOnly = bSet; } @@ -600,7 +600,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* return 0; } - const sal_Bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled(); + const bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled(); OUString* pEventName = (OUString*)pE->GetUserData(); @@ -658,7 +658,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* else if( bAssEnabled ) { // assign pressed - SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog( pThis, sal_False, pThis->GetFrame() ); + SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog( pThis, false, pThis->GetFrame() ); if( pDlg ) { short ret = pDlg->Execute(); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 1a2d87c4d17f..907bdfdf06af 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -33,8 +33,8 @@ public: OUString sStrEvent; OUString sAssignedMacro; MacroEventListBox* pEventLB; - sal_Bool bReadOnly; - sal_Bool bIDEDialogMode; + bool bReadOnly; + bool bIDEDialogMode; }; class AssignComponentDialog : public ModalDialog diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 35380540a864..4dbbac23a3cb 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -303,7 +303,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode Sequence< Reference< browse::XBrowseNode > > children = _rxRootNode->getChildNodes(); - sal_Bool bIsRootNode = _rxRootNode->getName() == "Root"; + bool bIsRootNode = _rxRootNode->getName() == "Root"; /* To mimic current starbasic behaviour we need to make sure that only the current document @@ -325,7 +325,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode if ( !theChild.is() ) continue; OUString sUIName = theChild->getName(); - sal_Bool bDisplay = sal_True; + bool bDisplay = true; if ( bIsRootNode || ( m_bShowSlots && _pParentEntry && ( GetModel()->GetDepth( _pParentEntry ) == 0 ) ) @@ -336,16 +336,16 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode if ( sUIName == "user" ) { sUIName = m_sMyMacros; - bIsRootNode = sal_True; + bIsRootNode = true; } else if ( sUIName == "share" ) { sUIName = m_sProdMacros; - bIsRootNode = sal_True; + bIsRootNode = true; } else if ( !sUIName.equals( sCurrentDocTitle ) ) { - bDisplay = sal_False; + bDisplay = false; } } @@ -797,9 +797,9 @@ void SvxConfigGroupListBox::GroupSelected() pFunctionListBox->SetUpdateMode(true); } -sal_Bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) +bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) { - sal_Bool bRet = SvTreeListBox::Expand( pParent ); + bool bRet = SvTreeListBox::Expand( pParent ); if ( bRet ) { sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight(); @@ -831,7 +831,7 @@ sal_Bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) { SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData(); - pInfo->bWasOpened = sal_True; + pInfo->bWasOpened = true; switch ( pInfo->nKind ) { case SVX_CFGGROUP_SCRIPTCONTAINER: @@ -858,7 +858,7 @@ void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) */ SvxScriptSelectorDialog::SvxScriptSelectorDialog( - Window* pParent, sal_Bool bShowSlots, const Reference< frame::XFrame >& xFrame) + Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame) : ModelessDialog(pParent, "MacroSelectorDialog", "cui/ui/macroselectordialog.ui") , m_bShowSlots(bShowSlots) { @@ -959,7 +959,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton ) { // If we are displaying Slot API commands then the dialog is being // run from Tools/Configure and we should not close it, just hide it - if ( m_bShowSlots == sal_False ) + if ( m_bShowSlots == false ) { EndDialog( RET_CANCEL ); } @@ -974,7 +974,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton ) // If we are displaying Slot API commands then this the dialog is being // run from Tools/Configure and we should not close it - if ( m_bShowSlots == sal_False ) + if ( m_bShowSlots == false ) { EndDialog( RET_OK ); } diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 659cb10d1ac1..0bf1dfff78e6 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1940,7 +1940,7 @@ void SentenceEditWindow_Impl::ResetUndo() } -void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg ) +void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, bool bTryMerg ) { ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); rUndoMgr.AddUndoAction(pAction, bTryMerg); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0985a26e07e0..ff619623c1f8 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -175,7 +175,7 @@ void AboutDialog::SetLogo() // fdo#67401 set AntiAliasing for SVG logo SvtOptionsDrawinglayer aDrawOpt; - sal_Bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing(); + bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing(); aDrawOpt.SetAntiAliasing(true); // load svg logo, specify desired width, scale height isotrophically diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index d2b9cacb402b..48aae6864a99 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -125,7 +125,7 @@ void SvxCommonLinguisticControl::SetButtonHandler( ButtonType _eType, const Link } -void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEnable ) +void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, bool _bEnable ) { Button* pButton = GetButton( _eType ); if ( pButton ) diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 5ad64b05b200..b5598b7cd425 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -104,7 +104,7 @@ public: inline const Link& GetResetWordHdl() const { return aAktWord.GetActivateHdl(); } void SetButtonHandler( ButtonType _eType, const Link& _rHandler ); - void EnableButton( ButtonType _eType, sal_Bool _bEnable ); + void EnableButton( ButtonType _eType, bool _bEnable ); inline PushButton* GetButton( ButtonType _eType ) { return implGetButton( _eType ); } inline const PushButton* GetButton( ButtonType _eType ) const { return implGetButton( _eType ); } diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 207bef33cb98..eaa041eca53e 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -44,7 +44,7 @@ // class SvxCharacterMap ================================================= -SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const SfxItemSet* pSet ) +SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet* pSet ) : SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui") , bOne( bOne_ ) , pSubsetMap( NULL ) @@ -171,7 +171,7 @@ short SvxCharacterMap::Execute() // class SvxShowText ===================================================== -SvxShowText::SvxShowText(Window* pParent, sal_Bool bCenter) +SvxShowText::SvxShowText(Window* pParent, bool bCenter) : Control(pParent) , mnY(0) , mbCenter(bCenter) @@ -455,7 +455,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) pSubsetMap = NULL; m_pSubsetLB->Clear(); - sal_Bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); + bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); if( bNeedSubset ) { FontCharMap aFontCharMap; @@ -476,7 +476,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) bFirst = false; } if( m_pSubsetLB->GetEntryCount() <= 1 ) - bNeedSubset = sal_False; + bNeedSubset = false; } m_pSubsetText->Enable(bNeedSubset); @@ -541,7 +541,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) { OUString aText; sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); - sal_Bool bSelect = (cChar > 0); + bool bSelect = (cChar > 0); // show char sample if ( bSelect ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 017dff1dc44c..ecbf3ffd4029 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -237,7 +237,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni // initial m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint)); m_aDelayedPaint.SetTimeout(500); - EnableSearchUI(sal_True); + EnableSearchUI(true); if ( m_prbSearchForText->IsChecked() ) m_pcmbSearchText->GrabFocus(); @@ -259,7 +259,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) { if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull)) { - EnableSearchForDependees(sal_True); + EnableSearchForDependees(true); } else // en- or disable field list box accordingly @@ -297,7 +297,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) if (m_pcbStartOver->IsChecked()) { m_pcbStartOver->Check(false); - EnableSearchUI(sal_False); + EnableSearchUI(false); if (m_prbSearchForText->IsChecked()) m_pSearchEngine->StartOver(strThisRoundText); else @@ -305,7 +305,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) } else { - EnableSearchUI(sal_False); + EnableSearchUI(false); if (m_prbSearchForText->IsChecked()) m_pSearchEngine->SearchNext(strThisRoundText); else @@ -410,7 +410,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox) IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) { - sal_Bool bChecked = pBox->IsChecked(); + bool bChecked = pBox->IsChecked(); // formatter or case -> pass on to the engine if (pBox == m_pcbUseFormat) @@ -478,7 +478,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) m_pSoundsLikeCJKSettings->Enable(bChecked); // two other buttons which depend on this one - sal_Bool bEnable = ( m_prbSearchForText->IsChecked() + bool bEnable = ( m_prbSearchForText->IsChecked() && !m_pSoundsLikeCJK->IsChecked() ) || !SvtCJKOptions().IsJapaneseFindEnabled(); @@ -544,11 +544,11 @@ IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox*, pBox) return 0L; } -void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) +void FmSearchDialog::EnableSearchUI(bool bEnable) { // when the controls shall be disabled their paint is turned off and then turned on again after a delay if (!bEnable) - EnableControlPaint(sal_False); + EnableControlPaint(false); else { if (m_aDelayedPaint.IsActive()) @@ -597,7 +597,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if (!bEnable) m_aDelayedPaint.Start(); else - EnableControlPaint(sal_True); + EnableControlPaint(true); if ( bEnable ) { // restore focus @@ -615,14 +615,14 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) } -void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable) +void FmSearchDialog::EnableSearchForDependees(bool bEnable) { - sal_Bool bSearchingForText = m_prbSearchForText->IsChecked(); + bool bSearchingForText = m_prbSearchForText->IsChecked(); m_pbSearchAgain->Enable(bEnable && (!bSearchingForText || (!m_pcmbSearchText->GetText().isEmpty()))); bEnable = bEnable && bSearchingForText; - sal_Bool bEnableRedundants = !m_pSoundsLikeCJK->IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled(); + bool bEnableRedundants = !m_pSoundsLikeCJK->IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled(); m_pcmbSearchText->Enable (bEnable); m_pftPosition->Enable (bEnable && !m_pcbWildCard->IsChecked()); @@ -638,7 +638,7 @@ void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable) m_pcbCase->Enable (bEnable && bEnableRedundants); } -void FmSearchDialog::EnableControlPaint(sal_Bool bEnable) +void FmSearchDialog::EnableControlPaint(bool bEnable) { Control* pAffectedControls[] = { m_prbSearchForText, m_pcmbSearchText, m_prbSearchForNull, m_prbSearchForNotNull, m_prbSearchForText, m_prbAllFields, m_prbSingleField, m_plbField, m_pftPosition, m_plbPosition, @@ -661,7 +661,7 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable) IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint) { - EnableControlPaint(sal_True); + EnableControlPaint(true); return 0L; } @@ -713,7 +713,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) case FmSearchProgress::STATE_SUCCESSFULL: OnFound(pProgress->aBookmark, (sal_Int16)pProgress->nFieldIndex); - EnableSearchUI(sal_True); + EnableSearchUI(true); break; case FmSearchProgress::STATE_ERROR: @@ -726,7 +726,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) } // NO break ! case FmSearchProgress::STATE_CANCELED: - EnableSearchUI(sal_True); + EnableSearchUI(true); if (m_lnkCanceledNotFoundHdl.IsSet()) { FmFoundRecordInformation friInfo; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 4a802e9c8943..f5f3924d8970 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -118,7 +118,7 @@ void SearchThread::execute() void SearchThread::ImplSearch( const INetURLObject& rStartURL, const ::std::vector< OUString >& rFormats, - sal_Bool bRecursive ) + bool bRecursive ) { { SolarMutexGuard aGuard; @@ -148,17 +148,17 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, INetURLObject aFoundURL( xContentAccess->queryContentIdentifierString() ); DBG_ASSERT( aFoundURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - sal_Bool bFolder = xRow->getBoolean( 1 ); // property "IsFolder" + bool bFolder = xRow->getBoolean( 1 ); // property "IsFolder" if ( xRow->wasNull() ) - bFolder = sal_False; + bFolder = false; if( bRecursive && bFolder ) - ImplSearch( aFoundURL, rFormats, sal_True ); + ImplSearch( aFoundURL, rFormats, true ); else { - sal_Bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument" + bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument" if ( xRow->wasNull() ) - bDocument = sal_False; + bDocument = false; if( bDocument ) { @@ -543,7 +543,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) { Gallery* pGal = pThm->GetParent(); const sal_uLong nId = GetId(); - sal_Bool bDifferentThemeExists = sal_False; + bool bDifferentThemeExists = false; for( sal_uLong i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ ) { @@ -560,7 +560,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) InfoBox aBox( this, aStr ); aBox.Execute(); m_pLbResName->GrabFocus(); - bDifferentThemeExists = sal_True; + bDifferentThemeExists = true; } } @@ -630,7 +630,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) OUString aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); OUString aAccess; OUString aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); - sal_Bool bReadOnly = pThm->IsReadOnly(); + bool bReadOnly = pThm->IsReadOnly(); m_pEdtMSName->SetText( pThm->GetName() ); m_pEdtMSName->SetReadOnly( bReadOnly ); @@ -750,7 +750,7 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh if ( RET_OK == _nDlgResult ) { aURL = INetURLObject( _rFolderURL ); - bSearchRecursive = sal_True; // UI choice no longer possible, windows file picker allows no user controls + bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls SearchFiles(); } @@ -805,7 +805,7 @@ void TPGalleryThemeProperties::FillFilterList() FilterEntry* pFilterEntry; FilterEntry* pTestEntry; sal_uInt16 i, nKeyCount; - sal_Bool bInList; + bool bInList; // graphic filters for( i = 0, nKeyCount = rFilter.GetImportFormatCount(); i < nKeyCount; i++ ) @@ -814,7 +814,7 @@ void TPGalleryThemeProperties::FillFilterList() aName = rFilter.GetImportFormatName( i ); size_t entryIndex = 0; pTestEntry = aFilterEntryList.empty() ? NULL : aFilterEntryList[ entryIndex ]; - bInList = sal_False; + bInList = false; OUString aExtensions; int j = 0; @@ -837,7 +837,7 @@ void TPGalleryThemeProperties::FillFilterList() { if ( pTestEntry->aFilterName == aExt ) { - bInList = sal_True; + bInList = true; break; } pTestEntry = ( ++entryIndex < aFilterEntryList.size() ) @@ -995,7 +995,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) if( xFolderPicker->execute() == RET_OK ) { aURL = INetURLObject( xFolderPicker->getDirectory() ); - bSearchRecursive = sal_True; // UI choice no longer possible, windows file picker allows no user controls + bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls SearchFiles(); } @@ -1057,7 +1057,7 @@ void TPGalleryThemeProperties::DoPreview() if( aString != aPreviewString ) { INetURLObject _aURL( aFoundList[ m_pLbxFound->GetEntryPos( aString ) ] ); - bInputAllowed = sal_False; + bInputAllowed = false; if ( !m_pWndPreview->SetGraphic( _aURL ) ) { @@ -1072,7 +1072,7 @@ void TPGalleryThemeProperties::DoPreview() xMediaPlayer->start(); } - bInputAllowed = sal_True; + bInputAllowed = true; aPreviewString = aString; } } @@ -1096,7 +1096,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl) } else { - bTakeAll = sal_False; + bTakeAll = false; TakeFiles(); } } @@ -1111,7 +1111,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl) if( bInputAllowed ) { aPreviewTimer.Stop(); - bTakeAll = sal_True; + bTakeAll = true; TakeFiles(); } @@ -1124,7 +1124,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl) { if( bInputAllowed ) { - sal_Bool bPreviewPossible = sal_False; + bool bPreviewPossible = false; aPreviewTimer.Stop(); @@ -1133,7 +1133,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl) if( m_pLbxFound->GetSelectEntryCount() == 1 ) { m_pCbxPreview->Enable(); - bPreviewPossible = sal_True; + bPreviewPossible = true; } else m_pCbxPreview->Disable(); @@ -1184,14 +1184,14 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl) m_pLbxFound->SelectEntryPos( 0 ); m_pBtnTakeAll->Enable(); m_pCbxPreview->Enable(); - bEntriesFound = sal_True; + bEntriesFound = true; } else { m_pLbxFound->InsertEntry( OUString( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) ); m_pBtnTakeAll->Disable(); m_pCbxPreview->Disable(); - bEntriesFound = sal_False; + bEntriesFound = false; } return 0L; } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index ae2ada60750b..53da9daf4a12 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -183,7 +183,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, - sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges ) : GraphicFilterDialog(pParent, "MosaicDialog", "cui/ui/mosaicdialog.ui", rGraphic) { @@ -292,7 +292,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, - sal_uInt8 cGreyThreshold, sal_Bool bInvert ) + sal_uInt8 cGreyThreshold, bool bInvert ) : GraphicFilterDialog(pParent, "SolarizeDialog", "cui/ui/solarizedialog.ui", rGraphic) { diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 1c7bccbef05e..8d33cc6ce6d5 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -86,11 +86,11 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) : IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ), maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), mpBindings ( pBindings ), - mbReadOnly ( sal_False ), - mbIsHTMLDoc ( sal_False ) + mbReadOnly ( false ), + mbIsHTMLDoc ( false ) { SetUniqueId( HID_HYPERLINK_DIALOG ); - mbGrabFocus = sal_True; + mbGrabFocus = true; // insert pages Image aImage; OUString aStrTitle; @@ -123,7 +123,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) SetInputSet (mpItemSet); // Init Dialog - Start (sal_False); + Start (false); pBindings->Update( SID_READONLY_MODE ); @@ -182,13 +182,13 @@ void SvxHpLinkDlg::Move() // Size of Extrawindow Size aExtraWndSize( pCurrentPage->GetSizeExtraWnd() ); - sal_Bool bDoInvalid ; + bool bDoInvalid ; if( aDlgPos.X()+(1.02*aDlgSize.Width())+aExtraWndSize.Width() > aWindowSize.Width() ) { if( aDlgPos.X() - ( 0.02*aDlgSize.Width() ) - aExtraWndSize.Width() < 0 ) { // Pos Extrawindow anywhere - bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), sal_True ); + bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), true ); } else { @@ -308,7 +308,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) if ( mbGrabFocus ) { pCurrentPage->SetInitFocus(); // #92535# grab the focus only once at initialization - mbGrabFocus = sal_False; + mbGrabFocus = false; } return nPageId; } @@ -319,7 +319,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) |* |************************************************************************/ -void SvxHpLinkDlg::SetReadOnlyMode( sal_Bool bRdOnly ) +void SvxHpLinkDlg::SetReadOnlyMode( bool bRdOnly ) { mbReadOnly = bRdOnly; if ( bRdOnly ) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index c49446480782..03aedf3d7631 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -420,7 +420,7 @@ namespace svx if( m_bDisplayListBox != bDisplayListBox ) { Control& rOldControl = implGetCurrentControl(); - sal_Bool bHasFocus = rOldControl.HasFocus(); + bool bHasFocus = rOldControl.HasFocus(); m_bDisplayListBox = bDisplayListBox; @@ -729,7 +729,7 @@ namespace svx pOtherBox = &m_aHangulOnly; if (pBox && pOtherBox) { - sal_Bool bBoxChecked = pBox->IsChecked(); + bool bBoxChecked = pBox->IsChecked(); if (bBoxChecked) pOtherBox->Check( false ); pOtherBox->Enable( !bBoxChecked ); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 28577d74ea3e..c04c81c1ba55 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -60,9 +60,9 @@ struct DocumentTypeData {} }; -sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const +bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const { - sal_Bool bIsValidURL = !rPath.isEmpty(); + bool bIsValidURL = !rPath.isEmpty(); if ( bIsValidURL ) { aURLObject.SetURL( rPath ); @@ -80,7 +80,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OU { OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, false ) ); if ( aBase.isEmpty() || ( aBase[0] == '.' ) ) - bIsValidURL = sal_False; + bIsValidURL = false; } if ( bIsValidURL ) { @@ -261,10 +261,10 @@ void SvxHyperlinkNewDocTp::SetInitFocus() |* \************************************************************************/ -sal_Bool SvxHyperlinkNewDocTp::AskApply() +bool SvxHyperlinkNewDocTp::AskApply() { INetURLObject aINetURLObject; - sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject ); + bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject ); if ( !bRet ) { WarningBox aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ); @@ -310,7 +310,7 @@ void SvxHyperlinkNewDocTp::DoApply () com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler > xHandler; SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, xHandler ); - sal_Bool bOk = pIStm && ( pIStm->GetError() == 0); + bool bOk = pIStm && ( pIStm->GetError() == 0); if( pIStm ) delete pIStm; @@ -407,19 +407,19 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL ); OUString aStrPath = aStrURL; - sal_Bool bZeroPath = aStrPath.isEmpty(); - sal_Bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled + bool bZeroPath = aStrPath.isEmpty(); + bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled // as file name, otherwise we do not yet know if( bZeroPath ) aStrPath = SvtPathOptions().GetWorkPath(); else if( !::utl::UCBContentHelper::IsFolder( aStrURL ) ) - bHandleFileName = sal_True; + bHandleFileName = true; xFolderPicker->setDisplayDirectory( aStrPath ); - DisableClose( sal_True ); + DisableClose( true ); sal_Int16 nResult = xFolderPicker->execute(); - DisableClose( sal_False ); + DisableClose( false ); if( ExecutableDialogResults::OK == nResult ) { sal_Char const sSlash[] = "/"; diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index f91f89c29581..f6682485f1bb 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -47,7 +47,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maFtURL ( this, CUI_RES (FT_URL) ), maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), - mbMarkWndOpen ( sal_False ) + mbMarkWndOpen ( false ) { // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (false); @@ -201,9 +201,9 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) aDlg.SetDisplayDirectory( aOldURL ); } - DisableClose( sal_True ); + DisableClose( true ); ErrCode nError = aDlg.Execute(); - DisableClose( sal_False ); + DisableClose( false ); if ( ERRCODE_NONE == nError ) { diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index d20f4c4891b3..6ef153622e78 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -50,7 +50,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maFtPassword ( this, CUI_RES (FT_PASSWD) ), maEdPassword ( this, CUI_RES (ED_PASSWD) ), maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), - mbMarkWndOpen ( sal_False ) + mbMarkWndOpen ( false ) { // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (false); @@ -271,8 +271,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme) { //if rScheme is empty or unknown the default beaviour is like it where HTTP - sal_Bool bFTP = rScheme.startsWith(sFTPScheme); - sal_Bool bInternet = !(bFTP); + bool bFTP = rScheme.startsWith(sFTPScheme); + bool bInternet = !(bFTP); //update protocol button selection: maRbtLinktypFTP.Check(bFTP); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index eb7ffba103b5..2e15476f9c64 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -124,7 +124,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) maBtApply( this, CUI_RES (BT_APPLY) ), maBtClose( this, CUI_RES (BT_CLOSE) ), maLbTree ( this, CUI_RES (TLB_MARK) ), - mbUserMoved ( sal_False ), + mbUserMoved ( false ), mpParent ( pParent ), mnError ( LERR_NOERROR ) { @@ -172,11 +172,11 @@ sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError) |* |************************************************************************/ -sal_Bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) +bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) { if ( !mbUserMoved ) { - sal_Bool bOldStatus = mbUserMoved; + bool bOldStatus = mbUserMoved; SetPosPixel ( aNewPos ); mbUserMoved = bOldStatus; } @@ -189,12 +189,12 @@ void SvxHlinkDlgMarkWnd::Move () Window::Move(); if ( IsReallyVisible() ) - mbUserMoved = sal_True; + mbUserMoved = true; } -sal_Bool SvxHlinkDlgMarkWnd::ConnectToDialog( sal_Bool bDoit ) +bool SvxHlinkDlgMarkWnd::ConnectToDialog( bool bDoit ) { - sal_Bool bOldStatus = mbUserMoved; + bool bOldStatus = mbUserMoved; mbUserMoved = !bDoit; @@ -307,7 +307,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& aStrURL) |* |************************************************************************/ -sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) +bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) { mnError = LERR_NOERROR; @@ -324,7 +324,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) { uno::Sequence< beans::PropertyValue > aArg(1); aArg.getArray()[0].Name = "Hidden"; - aArg.getArray()[0].Value <<= (sal_Bool) sal_True; + aArg.getArray()[0].Value <<= true; xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg ); } catch( const io::IOException& ) @@ -387,7 +387,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink uno::Any aAny; OUString aLink( *pNames++ ); - sal_Bool bError = sal_False; + bool bError = false; try { aAny = xLinks->getByName( aLink ); @@ -396,7 +396,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink { // if the name of the target was invalid (like empty headings) // no object can be provided - bError = sal_True; + bError = true; } if(bError) continue; @@ -415,7 +415,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // is it a target ? uno::Reference< lang::XServiceInfo > xSI( xTarget, uno::UNO_QUERY ); - sal_Bool bIsTarget = xSI->supportsService( aProp_LinkTarget ); + bool bIsTarget = xSI->supportsService( aProp_LinkTarget ); // create userdata TargetData *pData = new TargetData ( aLink, bIsTarget ); @@ -499,14 +499,14 @@ void SvxHlinkDlgMarkWnd::ClearTree() SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (const OUString& aStrName) { - sal_Bool bFound=sal_False; + bool bFound=false; SvTreeListEntry* pEntry = maLbTree.First(); while ( pEntry && !bFound ) { TargetData* pUserData = ( TargetData * ) pEntry->GetUserData (); if (aStrName == pUserData->aUStrLinkname) - bFound = sal_True; + bFound = true; else pEntry = maLbTree.Next( pEntry ); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 9d17318b8ec1..f31c0568db27 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -129,9 +129,9 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, mpFtText ( NULL ), mpEdText ( NULL ), mpBtScript ( NULL ), - mbIsCloseDisabled ( sal_False ), + mbIsCloseDisabled ( false ), mpDialog ( pParent ), - mbStdControlsInit ( sal_False ), + mbStdControlsInit ( false ), aEmptyStr() { // create bookmark-window @@ -169,7 +169,7 @@ void SvxHyperlinkTabPageBase::DeactivatePage() TabPage::DeactivatePage(); } -sal_Bool SvxHyperlinkTabPageBase::QueryClose() +bool SvxHyperlinkTabPageBase::QueryClose() { return !mbIsCloseDisabled; } @@ -196,16 +196,16 @@ void SvxHyperlinkTabPageBase::InitStdControls () mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm ); } - mbStdControlsInit = sal_True; + mbStdControlsInit = true; } // Move Extra-Window -sal_Bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, sal_Bool bDisConnectDlg ) +bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, bool bDisConnectDlg ) { - sal_Bool bReturn = mpMarkWnd->MoveTo ( aNewPos ); + bool bReturn = mpMarkWnd->MoveTo ( aNewPos ); if( bDisConnectDlg ) - mpMarkWnd->ConnectToDialog( sal_False ); + mpMarkWnd->ConnectToDialog( false ); return ( !bReturn && IsMarkWndVisible() ); } @@ -233,7 +233,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd () { // Pos Extrawindow anywhere MoveToExtraWnd( Point(10,10) ); // very unlikely - mpMarkWnd->ConnectToDialog( sal_False ); + mpMarkWnd->ConnectToDialog( false ); } else { @@ -297,10 +297,10 @@ void SvxHyperlinkTabPageBase::DoApply () } // Ask page whether an insert is possible -sal_Bool SvxHyperlinkTabPageBase::AskApply () +bool SvxHyperlinkTabPageBase::AskApply () { // default-implementation - return sal_True; + return true; } // This method would be called from bookmark-window to set new mark-string @@ -316,7 +316,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus() } // Ask dialog whether the curretn doc is a HTML-doc -sal_Bool SvxHyperlinkTabPageBase::IsHTMLDoc() const +bool SvxHyperlinkTabPageBase::IsHTMLDoc() const { return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc(); } @@ -351,7 +351,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) because if no JAVA is installed an error box occurs and then it is possible to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF */ - sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled(); + bool bIsInputEnabled = GetParent()->IsInputEnabled(); if ( bIsInputEnabled ) GetParent()->EnableInput( false ); SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet ); @@ -372,9 +372,9 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) if ( bIsInputEnabled ) GetParent()->EnableInput( true ); // execute dlg - DisableClose( sal_True ); + DisableClose( true ); short nRet = aDlg.Execute(); - DisableClose( sal_False ); + DisableClose( false ); if ( RET_OK == nRet ) { const SfxItemSet* pOutSet = aDlg.GetOutputItemSet(); @@ -574,9 +574,9 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) return( LEAVE_PAGE ); } -sal_Bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() +bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() { - return sal_False; + return false; } void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(sal_Bool) diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index b2d822460ab7..edf181b6a335 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -349,9 +349,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl( /*nHyphPos*/nOldPos ); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -367,9 +367,9 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButt xProp->setIsHyphAuto( sal_True ); - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl( /*nHyphPos*/nOldPos ); - bBusy = sal_False; + bBusy = false; xProp->setIsHyphAuto( sal_False ); } @@ -387,9 +387,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl(); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -399,9 +399,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl( CONTINUE_HYPH ); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -411,10 +411,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; pHyphWrapper->SpellEnd(); EndDialog( RET_CANCEL ); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -424,9 +424,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; SelLeft(); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -436,9 +436,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; SelRight(); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -467,7 +467,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( , nHyphPos(0) , nOldPos(0) , nHyphenationPositionsOffset(0) - , bBusy(sal_False) + , bBusy(false) { get(m_pWordEdit, "worded"); get(m_pLeftBtn, "left"); diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 4bdd7216539a..3c5f7946c9d6 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -70,7 +70,7 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId, const SfxItemSet &rAttrSet ) : TabPage ( pParent, rResId ), pSet ( &rAttrSet ), - bHasExchangeSupport ( sal_False ), + bHasExchangeSupport ( false ), pDialog ( NULL ) { SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE ); @@ -111,16 +111,16 @@ void IconChoicePage::FillUserData() -sal_Bool IconChoicePage::IsReadOnly() const +bool IconChoicePage::IsReadOnly() const { - return sal_False; + return false; } -sal_Bool IconChoicePage::QueryClose() +bool IconChoicePage::QueryClose() { - return sal_True; + return true; } /********************************************************************** @@ -211,11 +211,11 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, pRanges ( NULL ), nResId ( rResId.GetId() ), - bHideResetBtn ( sal_False ), - bModal ( sal_False ), - bInOK ( sal_False ), - bModified ( sal_False ), - bItemsReset ( sal_False ) + bHideResetBtn ( false ), + bModal ( false ), + bInOK ( false ), + bModified ( false ), + bItemsReset ( false ) { maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); @@ -245,7 +245,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, aHelpBtn.Show(); aResetBtn.Show(); - SetPosSizeCtrls ( sal_True ); + SetPosSizeCtrls ( true ); } @@ -307,7 +307,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( const Image& rChoiceIcon, CreatePage pCreateFunc /* != 0 */, GetPageRanges pRangesFunc /* darf 0 sein */, - sal_Bool bItemsOnDemand, + bool bItemsOnDemand, sal_uLong /*nPos*/ ) { @@ -439,7 +439,7 @@ void IconChoiceDialog::Resize() } } -void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit ) +void IconChoiceDialog::SetPosSizeCtrls ( bool bInit ) { const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) ); Size aOutSize ( GetOutputSizePixel() ); @@ -665,7 +665,7 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) IMPL_LINK_NOARG(IconChoiceDialog, OkHdl) { - bInOK = sal_True; + bInOK = true; if ( OK_Impl() ) { @@ -758,7 +758,7 @@ void IconChoiceDialog::ActivatePageImpl () pData->pPage->Reset( *pSet ); } - pData->bRefresh = sal_False; + pData->bRefresh = false; if ( pExampleSet ) pData->pPage->ActivatePage( *pExampleSet ); @@ -776,7 +776,7 @@ void IconChoiceDialog::ActivatePageImpl () -sal_Bool IconChoiceDialog::DeActivatePageImpl () +bool IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData *pData = GetPageData ( mnCurrentPageId ); @@ -828,17 +828,17 @@ sal_Bool IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData* pObj = maPageList[ i ]; if ( pObj->pPage != pPage ) - pObj->bRefresh = sal_True; + pObj->bRefresh = true; else - pObj->bRefresh = sal_False; + pObj->bRefresh = false; } } } if ( nRet & IconChoicePage::LEAVE_PAGE ) - return sal_True; + return true; else - return sal_False; + return false; } @@ -961,11 +961,11 @@ short IconChoiceDialog::Execute() -void IconChoiceDialog::Start( sal_Bool bShow ) +void IconChoiceDialog::Start( bool bShow ) { aCancelBtn.SetClickHdl( LINK( this, IconChoiceDialog, CancelHdl ) ); - bModal = sal_False; + bModal = false; Start_Impl(); @@ -976,15 +976,15 @@ void IconChoiceDialog::Start( sal_Bool bShow ) -sal_Bool IconChoiceDialog::QueryClose() +bool IconChoiceDialog::QueryClose() { - sal_Bool bRet = sal_True; + bool bRet = true; for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { IconChoicePageData* pData = maPageList[i ]; if ( pData->pPage && !pData->pPage->QueryClose() ) { - bRet = sal_False; + bRet = false; break; } } @@ -1064,7 +1064,7 @@ IconChoicePageData* IconChoiceDialog::GetPageData ( sal_uInt16 nId ) | \**********************************************************************/ -sal_Bool IconChoiceDialog::OK_Impl() +bool IconChoiceDialog::OK_Impl() { IconChoicePage* pPage = GetPageData ( mnCurrentPageId )->pPage; @@ -1075,7 +1075,7 @@ sal_Bool IconChoiceDialog::OK_Impl() if ( pSet ) { SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); - sal_Bool bRet = sal_False; + bool bRet = false; if ( pPage->HasExchangeSupport() ) nRet = pPage->DeactivatePage( &aTmp ); @@ -1087,7 +1087,7 @@ sal_Bool IconChoiceDialog::OK_Impl() pOutSet->Put( aTmp ); } else if ( bRet ) - bModified |= sal_True; + bModified |= true; } else nRet = pPage->DeactivatePage( NULL ); @@ -1101,7 +1101,7 @@ sal_Bool IconChoiceDialog::OK_Impl() short IconChoiceDialog::Ok() { - bInOK = sal_True; + bInOK = true; if ( !pOutSet ) { diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index ac0645ec8134..fe7dfea399cf 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -82,9 +82,9 @@ static OUString impl_getSvtResString( sal_uInt32 nId ) return aRet; } -sal_Bool InsertObjectDialog_Impl::IsCreateNew() const +bool InsertObjectDialog_Impl::IsCreateNew() const { - return sal_False; + return false; } uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( OUString* /*pGraphicMediaType*/ ) @@ -216,8 +216,8 @@ short SvInsertOleDlg::Execute() if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK ) { OUString aFileName; - sal_Bool bLink = sal_False; - sal_Bool bCreateNew = IsCreateNew(); + bool bLink = false; + bool bCreateNew = IsCreateNew(); if ( bCreateNew ) { // create and insert new embedded object @@ -523,7 +523,7 @@ void SfxInsertFloatingFrameDialog::Init() short SfxInsertFloatingFrameDialog::Execute() { short nRet = RET_OK; - sal_Bool bOK = sal_False; + bool bOK = false; uno::Reference < beans::XPropertySet > xSet; if ( m_xObj.is() ) { @@ -567,11 +567,11 @@ short SfxInsertFloatingFrameDialog::Execute() else m_pNMMarginHeight->SetText( OUString::number( nSize ) ); - sal_Bool bScrollOn = sal_False; - sal_Bool bScrollOff = sal_False; - sal_Bool bScrollAuto = sal_False; + bool bScrollOn = false; + bool bScrollOff = false; + bool bScrollAuto = false; - sal_Bool bSet = sal_False; + bool bSet = false; aAny = xSet->getPropertyValue( "FrameIsAutoScroll" ); aAny >>= bSet; if ( !bSet ) @@ -582,13 +582,13 @@ short SfxInsertFloatingFrameDialog::Execute() bScrollOff = !bSet; } else - bScrollAuto = sal_True; + bScrollAuto = true; m_pRBScrollingOn->Check( bScrollOn ); m_pRBScrollingOff->Check( bScrollOff ); m_pRBScrollingAuto->Check( bScrollAuto ); - bSet = sal_False; + bSet = false; aAny = xSet->getPropertyValue( "FrameIsAutoBorder" ); aAny >>= bSet; if ( !bSet ) @@ -600,7 +600,7 @@ short SfxInsertFloatingFrameDialog::Execute() } SetUpdateMode( true ); - bOK = sal_True; + bOK = true; } catch ( uno::Exception& ) { @@ -640,7 +640,7 @@ short SfxInsertFloatingFrameDialog::Execute() { try { - sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; + bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; if ( bIPActive ) m_xObj->changeState( embed::EmbedStates::RUNNING ); @@ -653,7 +653,7 @@ short SfxInsertFloatingFrameDialog::Execute() if ( m_pRBScrollingAuto->IsChecked() ) eScroll = ScrollingAuto; - sal_Bool bHasBorder = m_pRBFrameBorderOn->IsChecked(); + bool bHasBorder = m_pRBFrameBorderOn->IsChecked(); long lMarginWidth; if ( !m_pCBMarginWidthDefault->IsChecked() ) @@ -671,9 +671,9 @@ short SfxInsertFloatingFrameDialog::Execute() xSet->setPropertyValue( "FrameName", makeAny( aName ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( "FrameIsAutoScroll", makeAny( sal_True ) ); + xSet->setPropertyValue( "FrameIsAutoScroll", makeAny( true ) ); else - xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); + xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( eScroll == ScrollingYes ) ); xSet->setPropertyValue( "FrameIsBorder", makeAny( bHasBorder ) ); xSet->setPropertyValue( "FrameMarginWidth", makeAny( sal_Int32( lMarginWidth ) ) ); diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 74ac8ecc56eb..043de0334822 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -77,7 +77,7 @@ static long nTabs[] = }; -SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bHtml ) +SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml ) : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ), aFtFiles( this, CUI_RES( FT_FILES ) ), aFtLinks( this, CUI_RES( FT_LINKS ) ), @@ -419,7 +419,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) { (void)pPushButton; - sal_Bool bModified = sal_False; + bool bModified = false; if(Links().GetSelectionCount() <= 1) { sal_uLong nPos; @@ -434,7 +434,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) Links().GetModel()->Remove( Links().GetEntry( nPos ) ); // close object, if it's still existing - sal_Bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType(); + bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType(); // tell the link that it will be resolved! xLink->Closed(); @@ -453,7 +453,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) if( pEntry ) Links().SetCurEntry( pEntry ); } - bModified = sal_True; + bModified = true; } } else @@ -481,7 +481,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) // if somebody has forgotten to deregister himself pLinkMgr->Remove( &xLink ); - bModified = sal_True; + bModified = true; } // then remove all selected entries } @@ -538,11 +538,11 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) // So search for the link in the manager; if it does not exist // anymore, fill the list completely new. Otherwise only the // edited link needs to be refreshed. - sal_Bool bLinkFnd = sal_False; + bool bLinkFnd = false; for( size_t n = pLinkMgr->GetLinks().size(); n; ) if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) ) { - bLinkFnd = sal_True; + bLinkFnd = true; break; } @@ -551,7 +551,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) Links().SetUpdateMode(false); Links().GetModel()->Remove( Links().GetEntry( nPos ) ); SvTreeListEntry* pToUnselect = Links().FirstSelected(); - InsertEntry( *_pLink, nPos, sal_True ); + InsertEntry( *_pLink, nPos, true ); if(pToUnselect) Links().Select(pToUnselect, false); Links().SetUpdateMode(true); @@ -627,7 +627,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) } -void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, sal_Bool bSelect ) +void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool bSelect ) { OUString aEntry, sFileNm, sLinkNm, sTypeNm, sFilter; diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index eee728bb1cb3..b353e2dfe747 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -290,7 +290,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath ) { OUString sPath = rPath.getToken( i, cDelim ); OUString sSystemPath; - sal_Bool bIsSystemPath = + bool bIsSystemPath = ::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath ); OUString sEntry( '\t' ); @@ -322,7 +322,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath) { OUString sPath = rPath.getToken( i, cDelim ); OUString sSystemPath; - sal_Bool bIsSystemPath = + bool bIsSystemPath = ::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath ); if ( bIsSystemPath ) diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index d430bdb75c45..0b14ca606a92 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -62,7 +62,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, aFont.SetWeight( WEIGHT_LIGHT ); m_pEditED->SetFont( aFont ); - sal_Bool bNew = sal_True; + bool bNew = true; sal_uInt16 nWhich = 0; if ( !bPrevNext ) @@ -76,7 +76,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { - bNew = sal_False; + bNew = false; const SvxPostItAuthorItem& rAuthor = (const SvxPostItAuthorItem&)rSet.Get( nWhich ); aAuthorStr = rAuthor.GetValue(); @@ -154,7 +154,7 @@ sal_uInt16* SvxPostItDialog::GetRanges() -void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev) +void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) { m_pPrevBtn->Enable(bPrev); m_pNextBtn->Enable(bNext); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 9de4ce59be6b..7e7349755e9d 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -839,7 +839,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } //do we need L10N for this? ie something like: //String aNewStdName( ResId( STR_STDMODULENAME ) ); - sal_Bool bValid = sal_False; + bool bValid = false; sal_Int32 i = 1; Sequence< Reference< browse::XBrowseNode > > childNodes; @@ -849,7 +849,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) if( node->hasChildNodes() == sal_False ) { aNewName = aNewStdName + OUString::number(i); - bValid = sal_True; + bValid = true; } else { @@ -865,7 +865,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) while ( !bValid ) { aNewName = aNewStdName + OUString::number(i); - sal_Bool bFound = sal_False; + bool bFound = false; if(childNodes.getLength() > 0 ) { OUString nodeName = childNodes[0]->getName(); @@ -877,7 +877,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) { if (aNewName+extn == childNodes[index]->getName()) { - bFound = sal_True; + bFound = true; break; } } @@ -887,7 +887,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } else { - bValid = sal_True; + bValid = true; } } @@ -899,12 +899,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) if ( xNewDlg->Execute() && !xNewDlg->GetObjectName().isEmpty() ) { OUString aUserSuppliedName = xNewDlg->GetObjectName(); - bValid = sal_True; + bValid = true; for( sal_Int32 index = 0; index < childNodes.getLength(); index++ ) { if (aUserSuppliedName+extn == childNodes[index]->getName()) { - bValid = sal_False; + bValid = false; OUString aError( m_createErrStr ); aError += m_createDupStr; ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError ); @@ -1022,13 +1022,13 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); xNewDlg->SetObjectName( aNewName ); - sal_Bool bValid; + bool bValid; do { if ( xNewDlg->Execute() && !xNewDlg->GetObjectName().isEmpty() ) { OUString aUserSuppliedName = xNewDlg->GetObjectName(); - bValid = sal_True; + bValid = true; if( bValid ) aNewName = aUserSuppliedName; } @@ -1077,7 +1077,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) } void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) { - sal_Bool result = sal_False; + bool result = false; Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); // ISSUE L10N string & can we centre list? OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 ); @@ -1108,7 +1108,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) } } - if ( result == sal_True ) + if ( result ) { m_pScriptsBox->deleteTree( pEntry ); m_pScriptsBox->GetModel()->Remove( pEntry ); @@ -1123,15 +1123,13 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) } -sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps, +bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps, OUString& propName ) { - sal_Bool result = false; + bool result = false; try { - sal_Bool bTemp = sal_False; - xProps->getPropertyValue( propName ) >>= bTemp; - result = ( bTemp == sal_True ); + xProps->getPropertyValue( propName ) >>= result; } catch ( Exception& ) { diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 73b781b87c1f..d0a79b74c153 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -84,7 +84,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: { sCurName = ""; xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY); - sal_Bool bIsHidden = sal_False; + bool bIsHidden = false; try { ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index d13ce270845e..cdaf0090595c 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -106,7 +106,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) } else if (nId == m_nBackPageId) { - ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(sal_True); + ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(true); } } @@ -139,14 +139,14 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent, sal_uInt16 nSlot = rPool.GetSlotId( nWhich ); if ( nSlot >= SID_SVX_START ) { - sal_Bool bChecked = sal_False, bFound = sal_False; + bool bChecked = false, bFound = false; for ( sal_uInt16 i = 0; !bFound && i < rList.Count(); ++i ) { if ( nSlot == rList[i].nSlot ) { - bFound = sal_True; + bFound = true; if ( IsInvalidItem( rList[i].pItem ) ) - bChecked = sal_True; + bChecked = true; } } @@ -181,7 +181,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) for ( sal_uInt16 i = 0; i < m_pAttrLB->GetEntryCount(); ++i ) { sal_uInt16 nSlot = (sal_uInt16)(sal_uLong)m_pAttrLB->GetEntryData(i); - sal_Bool bChecked = m_pAttrLB->IsChecked(i); + bool bChecked = m_pAttrLB->IsChecked(i); sal_uInt16 j; for ( j = rList.Count(); j; ) @@ -223,7 +223,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) SvxSearchSimilarityDialog::SvxSearchSimilarityDialog ( Window* pParent, - sal_Bool bRelax, + bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index e369d03ef2fa..28eb9a07ad86 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -297,7 +297,7 @@ SvxZoomDialog::~SvxZoomDialog() IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) { - bModified |= sal_True; + bModified = true; if (pBtn == m_pUserBtn) { @@ -315,7 +315,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) { if ( !m_pUserBtn->IsChecked() ) return 0; - bModified |= sal_True; + bModified = true; return 0; } @@ -323,7 +323,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) { - bModified |= sal_True; + bModified = true; if (pBtn == m_pAutomaticBtn) { @@ -366,7 +366,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt ) m_pBookModeChk->Disable(); } - bModified |= sal_True; + bModified = true; return 0; } @@ -378,7 +378,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk ) if (pChk == m_pBookModeChk && !m_pColumnsBtn->IsChecked()) return 0; - bModified |= sal_True; + bModified = true; return 0; } diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index b358e5c9fb1b..01490ba0fc82 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1278,7 +1278,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& , const SfxItemSet* pAttrSet ) { - SfxModalDialog* pDlg = new SvxCharacterMap( pParent, sal_True, pAttrSet ); + SfxModalDialog* pDlg = new SvxCharacterMap( pParent, true, pAttrSet ); return new CuiAbstractSfxDialog_Impl( pDlg ); } @@ -1543,7 +1543,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, pDlg = new SfxMacroAssignDlg( pParent, _rxDocumentFrame, rAttr ); break; case RID_SVXDLG_CHARMAP : - pDlg = new SvxCharacterMap( pParent, sal_True, &rAttr ); + pDlg = new SvxCharacterMap( pParent, true, &rAttr ); break; default: break; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index f340cfd8f150..cd0179b88b79 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -105,7 +105,7 @@ public: void ResetUndo(); void Undo(); - void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ); + void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); sal_uInt16 GetUndoActionCount(); void UndoActionStart( sal_uInt16 nId ); void UndoActionEnd(); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 2998db5fbdc1..825f79bc7052 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -86,20 +86,20 @@ struct TAccInfo const KeyCode& aKey ) : m_nKeyPos (nKeyPos ) , m_nListPos (nListPos ) - , m_bIsConfigurable(sal_True ) /**< its important to set sal_True as default - + , m_bIsConfigurable(true ) /**< its important to set sal_True as default - because only fix entries will be disabled later ... */ , m_sCommand ( ) , m_aKey (aKey ) {} - sal_Bool isConfigured() const + bool isConfigured() const { return (m_nKeyPos>-1 && m_nListPos>-1 && !m_sCommand.isEmpty()); } sal_Int32 m_nKeyPos; sal_Int32 m_nListPos; - sal_Bool m_bIsConfigurable; + bool m_bIsConfigurable; OUString m_sCommand; KeyCode m_aKey; }; @@ -134,7 +134,7 @@ private: OUString aFilterAllStr; OUString aFilterCfgStr; SfxStylesInfo_Impl m_aStylesInfo; - sal_Bool m_bStylesInfoInitialized; + bool m_bStylesInfoInitialized; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobal; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index e6748d0df116..644a8c7e84b5 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -80,8 +80,8 @@ class OfaACorrCheckListBox : public SvSimpleTable inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } - sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); - void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); + bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); + void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); }; @@ -182,18 +182,18 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage class AutoCorrEdit : public Edit { Link aActionLink; - sal_Bool bSpaces; + bool bSpaces; public: AutoCorrEdit(Window* pParent, const ResId& rResId) : - Edit(pParent, rResId), bSpaces(sal_False){} + Edit(pParent, rResId), bSpaces(false){} AutoCorrEdit(Window* pParent) : - Edit(pParent), bSpaces(sal_False){} + Edit(pParent), bSpaces(false){} void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(sal_Bool bSet) + void SetSpaces(bool bSet) {bSpaces = bSet;} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; @@ -245,16 +245,16 @@ private: CharClass* pCharClass; LanguageType eLang; - sal_Bool bHasSelectionText; - sal_Bool bFirstSelect:1; - sal_Bool bReplaceEditChanged:1; - sal_Bool bSWriter:1; + bool bHasSelectionText; + bool bFirstSelect:1; + bool bReplaceEditChanged:1; + bool bSWriter:1; DECL_LINK(SelectHdl, SvTabListBox*); DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); - void RefillReplaceBox( sal_Bool bFromReset, + void RefillReplaceBox( bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage); @@ -314,7 +314,7 @@ private: DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); /// Box filled with new language - void RefillReplaceBoxes(sal_Bool bFromReset, + void RefillReplaceBoxes(bool bFromReset, LanguageType eOldLanguage, LanguageType eNewLanguage); public: diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 23293c544453..b8c77fd37ac6 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -59,9 +59,9 @@ public: /// for the Writer (cells/rows/tables) void ShowTblControl(); /// for the Writer (paragraph/characters) - void ShowParaControl(sal_Bool bCharOnly = sal_False); + void ShowParaControl(bool bCharOnly = false); - void EnableTransparency(sal_Bool bColor, sal_Bool bGraphic); + void EnableTransparency(bool bColor, bool bGraphic); virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -108,11 +108,11 @@ private: Color aBgdColor; sal_uInt16 nHtmlMode; - sal_Bool bAllowShowSelector : 1; - sal_Bool bIsGraphicValid : 1; - sal_Bool bLinkOnly : 1; - sal_Bool bColTransparency : 1; - sal_Bool bGraphTransparency : 1; + bool bAllowShowSelector : 1; + bool bIsGraphicValid : 1; + bool bLinkOnly : 1; + bool bColTransparency : 1; + bool bGraphTransparency : 1; Graphic aBgdGraphic; OUString aBgdGraphicPath; OUString aBgdGraphicFilter; @@ -128,7 +128,7 @@ private: void HideColorUI_Impl(); void ShowBitmapUI_Impl(); void HideBitmapUI_Impl(); - sal_Bool LoadLinkedGraphic_Impl(); + bool LoadLinkedGraphic_Impl(); void RaiseLoadError_Impl(); void SetGraphicPosition_Impl( SvxGraphicPosition ePos ); SvxGraphicPosition GetGraphicPosition_Impl(); diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 60010ffcd993..7a8865a11e90 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -65,7 +65,7 @@ struct SfxStylesInfo_Impl SfxStylesInfo_Impl(); void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); - sal_Bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); + bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); void getLabel4Style(SfxStyleInfo_Impl& aStyle); ::std::vector< SfxStyleInfo_Impl > getStyleFamilies(); @@ -85,12 +85,12 @@ struct SfxGroupInfo_Impl sal_uInt16 nKind; sal_uInt16 nUniqueID; void* pObject; - sal_Bool bWasOpened; + bool bWasOpened; OUString sCommand; OUString sLabel; SfxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, void* pObj = 0 ) : - nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(sal_False) {} + nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(false) {} }; struct CuiMacroInfo @@ -160,7 +160,7 @@ class SfxConfigGroupListBox : public SvTreeListBox protected: virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; - virtual sal_Bool Expand( SvTreeListEntry* pParent ); + virtual bool Expand( SvTreeListEntry* pParent ); public: SfxConfigGroupListBox(Window* pParent, WinBits nStyle); @@ -173,7 +173,7 @@ public: bool bEventMode); void SetFunctionListBox( SfxConfigFunctionListBox *pBox ) { pFunctionListBox = pBox; } - void Open( SvTreeListEntry*, sal_Bool ); + void Open( SvTreeListEntry*, bool ); void GroupSelected(); void SelectMacro( const SfxMacroInfoItem* ); void SelectMacro( const OUString&, const OUString& ); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index cc2c6a880433..c582d98302d5 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -49,7 +49,7 @@ class SvxCharBasePage : public SfxTabPage protected: SvxFontPrevWindow* m_pPreviewWin; - sal_Bool m_bPreviewBackgroundToCharacter; + bool m_bPreviewBackgroundToCharacter; SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); @@ -217,7 +217,7 @@ private: void UpdatePreview_Impl(); void SetCaseMap_Impl( SvxCaseMap eCaseMap ); void ResetColor_Impl( const SfxItemSet& rSet ); - sal_Bool FillItemSetColor_Impl( SfxItemSet& rSet ); + bool FillItemSetColor_Impl( SfxItemSet& rSet ); DECL_LINK( SelectHdl_Impl, ListBox* ); DECL_LINK(CbClickHdl_Impl, void *); @@ -340,7 +340,7 @@ private: void UpdatePreview_Impl(); void Initialize(); void SelectCharacter( ListBox* pBox ); - void SetBracket( sal_Unicode cBracket, sal_Bool bStart ); + void SetBracket( sal_Unicode cBracket, bool bStart ); DECL_LINK(TwoLinesHdl_Impl, void *); DECL_LINK( CharacterMapHdl_Impl, ListBox* ); diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 79ee29252c66..09211e8b4db3 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -40,7 +40,7 @@ class SvxShowText : public Control { public: SvxShowText( Window* pParent, - sal_Bool bCenter = sal_False ); + bool bCenter = false ); virtual ~SvxShowText(); void SetFont( const Font& rFont ); @@ -56,7 +56,7 @@ protected: private: long mnY; - sal_Bool mbCenter; + bool mbCenter; }; @@ -81,7 +81,7 @@ private: SvxShowText* m_pShowChar; FixedText* m_pCharCodeText; Font aFont; - sal_Bool bOne; + bool bOne; const SubsetMap* pSubsetMap; DECL_LINK(OKHdl, void *); @@ -97,7 +97,7 @@ private: void fillAllSubsets(ListBox &rListBox); public: - SvxCharacterMap( Window* pParent, sal_Bool bOne=sal_True, const SfxItemSet* pSet=0 ); + SvxCharacterMap( Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); virtual ~SvxCharacterMap(); void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 909e2f1516f2..84fabd0d5eeb 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -143,11 +143,11 @@ protected: painting is turned on immediately. As a consequence for this intricateness there is no flickering when turning off and on quickly. */ - void EnableSearchUI(sal_Bool bEnable); + void EnableSearchUI(bool bEnable); - void EnableSearchForDependees(sal_Bool bEnable); + void EnableSearchForDependees(bool bEnable); - void EnableControlPaint(sal_Bool bEnable); + void EnableControlPaint(bool bEnable); void InitContext(sal_Int16 nContext); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6c3b1eacc30a..3458d5d361eb 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -65,7 +65,7 @@ private: void ImplSearch( const INetURLObject& rStartURL, const ::std::vector< OUString >& rFormats, - sal_Bool bRecursive ); + bool bRecursive ); virtual ~SearchThread(); virtual void execute() SAL_OVERRIDE; @@ -253,10 +253,10 @@ class TPGalleryThemeProperties : public SfxTabPage INetURLObject aURL; sal_uInt16 nCurFilterPos; sal_uInt16 nFirstExtFilterPos; - sal_Bool bEntriesFound; - sal_Bool bInputAllowed; - sal_Bool bTakeAll; - sal_Bool bSearchRecursive; + bool bEntriesFound; + bool bInputAllowed; + bool bTakeAll; + bool bSearchRecursive; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 05ed2b5ef57f..f501472c7560 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -121,12 +121,12 @@ private: public: GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic, - sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges); + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; long GetTileWidth() const { return static_cast<long>(mpMtrWidth->GetValue()); } long GetTileHeight() const { return static_cast<long>(mpMtrHeight->GetValue()); } - sal_Bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); } + bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); } }; @@ -142,11 +142,11 @@ private: public: GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, - sal_uInt8 nGreyThreshold, sal_Bool bInvert ); + sal_uInt8 nGreyThreshold, bool bInvert ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( mpMtrThreshold->GetValue() * 2.55 ) ); } - sal_Bool IsInvert() const { return mpCbxInvert->IsChecked(); } + bool IsInvert() const { return mpCbxInvert->IsChecked(); } }; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 0f0a512d28c6..d6ca568ea174 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -64,9 +64,9 @@ private: SfxBindings* mpBindings; SfxItemSet* mpItemSet; - sal_Bool mbGrabFocus : 1; - sal_Bool mbReadOnly : 1; - sal_Bool mbIsHTMLDoc : 1; + bool mbGrabFocus : 1; + bool mbReadOnly : 1; + bool mbIsHTMLDoc : 1; DECL_LINK (ClickApplyHdl_Impl, void * ); DECL_LINK (ClickCloseHdl_Impl, void * ); @@ -82,8 +82,8 @@ public: virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; sal_uInt16 SetPage( SvxHyperlinkItem* pItem ); - void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); - inline sal_Bool IsHTMLDoc() const { return mbIsHTMLDoc; } + void SetReadOnlyMode( bool bReadOnly = false ); + inline bool IsHTMLDoc() const { return mbIsHTMLDoc; } inline SfxBindings* GetBindings() const { return mpBindings; }; inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 417b89a0d96f..5f58c56aaad9 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -65,7 +65,7 @@ private: sal_uInt16 mnPageType; sal_Int32 mnPos; - sal_Bool mbAreaTP; + bool mbAreaTP; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; @@ -138,7 +138,7 @@ class SvxTransparenceTabPage : public SvxTabPage // preview SvxXRectPreview* m_pCtlBitmapPreview; SvxXRectPreview* m_pCtlXRectPreview; - sal_Bool bBitmap; + bool bBitmap; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -151,12 +151,12 @@ class SvxTransparenceTabPage : public SvxTabPage DECL_LINK(ChangeTrgrTypeHdl_Impl, void*); DECL_LINK(ModifiedTrgrHdl_Impl, void*); - void ActivateLinear(sal_Bool bActivate); - void ActivateGradient(sal_Bool bActivate); + void ActivateLinear(bool bActivate); + void ActivateGradient(bool bActivate); void SetControlState_Impl(XGradientStyle eXGS); - sal_Bool InitPreview ( const SfxItemSet& rSet ); - void InvalidatePreview (sal_Bool bEnable = sal_True ); + bool InitPreview ( const SfxItemSet& rSet ); + void InvalidatePreview (bool bEnable = true ); public: SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs); @@ -240,7 +240,7 @@ private: // SvxAreaTabDialog has to call the setter methods (e.g. SetColorChgd). // Without that the pages used in SvxAreaTabDialog are not usable ChangeType maFixed_ChangeType; - sal_Bool maFixed_sal_Bool; + bool maFixed_sal_Bool; ChangeType* pnColorListState; ChangeType* pnBitmapListState; @@ -251,7 +251,7 @@ private: sal_uInt16 nDlgType; sal_Int32 nPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -311,7 +311,7 @@ public: void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } @@ -337,13 +337,13 @@ private: const SfxItemSet& rOutAttrs; RECT_POINT eRP; - XColorListRef pColorList; + XColorListRef pColorList; ChangeType* pnColorListState; - sal_uInt16 nPageType; - sal_uInt16 nDlgType; - sal_Bool* pbAreaTP; + sal_uInt16 nPageType; + sal_uInt16 nDlgType; + bool* pbAreaTP; - sal_Bool bDisable; + bool bDisable; XOutdevItemPool* pXPool; XFillAttrSetItem aXFillAttr; @@ -369,10 +369,10 @@ public: void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; - void DisablePage( sal_Bool bIn ) { bDisable = bIn; } + void DisablePage( bool bIn ) { bDisable = bIn; } }; /************************************************************************/ @@ -413,7 +413,7 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XOutdevItemPool* pXPool; XFillStyleItem aXFStyleItem; @@ -451,7 +451,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } @@ -488,7 +488,7 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XOutdevItemPool* pXPool; XFillStyleItem aXFStyleItem; @@ -529,7 +529,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } @@ -571,9 +571,9 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; - sal_Bool bBmpChanged; + bool bBmpChanged; XOutdevItemPool* pXPool; XFillStyleItem aXFStyleItem; @@ -614,7 +614,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } @@ -694,7 +694,7 @@ private: sal_uInt16* pPageType; sal_uInt16 nDlgType; sal_Int32* pPos; - sal_Bool* pbAreaTP; + bool* pbAreaTP; XFillStyleItem aXFStyleItem; XFillColorItem aXFillColorItem; @@ -752,7 +752,7 @@ public: void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } void SetPos( sal_Int32* pInPos ) { pPos = pInPos; } - void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; } + void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; } void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index c7f626ac4977..9de7879b9df2 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -42,7 +42,7 @@ private: XDashListRef pNewDashList; XLineEndListRef pLineEndList; XLineEndListRef pNewLineEndList; - sal_Bool bObjSelected; + bool bObjSelected; ChangeType nLineEndListState; ChangeType nDashListState; @@ -51,7 +51,7 @@ private: sal_uInt16 nPageType; sal_Int32 nPosDashLb; sal_Int32 nPosLineEndLb; - sal_Bool mbAreaTP; + bool mbAreaTP; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; @@ -63,7 +63,7 @@ protected: public: SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, - sal_Bool bHasObj = sal_True ); + bool bHasObj = true ); virtual ~SvxLineTabDialog(); void SetNewDashList( XDashListRef pInLst) @@ -139,15 +139,15 @@ private: CheckBox* m_pSymbolRatioCB; std::vector<OUString> aGrfNames; SvxBmpItemInfoList aGrfBrushItems; - sal_Bool bLastWidthModified; + bool bLastWidthModified; Size aSymbolLastSize; Graphic aSymbolGraphic; Size aSymbolSize; - sal_Bool bSymbols; + bool bSymbols; const SfxItemSet& rOutAttrs; RECT_POINT eRP; - sal_Bool bObjSelected; + bool bObjSelected; XOutdevItemPool* pXPool; XLineStyleItem aXLStyle; @@ -193,14 +193,14 @@ private: // LineCaps DECL_LINK ( ChangeCapStyleHdl_Impl, void * ); - sal_Bool FillXLSet_Impl(); + bool FillXLSet_Impl(); void InitSymbols(MenuButton* pButton); void SymbolSelected(MenuButton* pButton); void FillListboxes(); public: - void ShowSymbolControls(sal_Bool bOn); + void ShowSymbolControls(bool bOn); SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineTabPage(); @@ -223,7 +223,7 @@ public: void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } void SetLineEndList( XLineEndListRef pLneEndLst) { pLineEndList = pLneEndLst; } - void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } + void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } @@ -263,7 +263,7 @@ private: const SfxItemSet& rOutAttrs; XDash aDash; - sal_Bool bObjSelected; + bool bObjSelected; XOutdevItemPool* pXPool; XLineStyleItem aXLStyle; @@ -313,7 +313,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } - void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } + void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } @@ -343,7 +343,7 @@ private: const SfxItemSet& rOutAttrs; const SdrObject* pPolyObj; - sal_Bool bObjSelected; + bool bObjSelected; XOutdevItemPool* pXPool; XLineStyleItem aXLStyle; @@ -384,7 +384,7 @@ public: void SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; } void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; } - void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; } + void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; } void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 07649510a3f2..755232f436a0 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -54,7 +54,7 @@ namespace svx ::svx::OptHeaderTabListBox* pPathBox; SvTreeListEntry* m_pCurEntry; sal_uLong m_nOldCount; - sal_Bool m_bModified; + bool m_bModified; #ifdef INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX DECL_LINK( NewHdl, void * ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 7d06e1476552..d5301414641e 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -88,9 +88,9 @@ class SvxGrfCropPage : public SfxTabPage const MetricField* pLastCropField; long nOldWidth; long nOldHeight; - sal_Bool bReset; - sal_Bool bInitialized; - sal_Bool bSetOrigSize; + bool bReset; + bool bInitialized; + bool bSetOrigSize; SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet ); @@ -106,7 +106,7 @@ class SvxGrfCropPage : public SfxTabPage void CalcZoom(); void CalcMinMaxBorder(); - void GraphicHasChanged(sal_Bool bFound); + void GraphicHasChanged(bool bFound); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; Size GetGrfOrigSize( const Graphic& ) const; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index f4658b3eeda0..18b22a252c18 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -50,7 +50,7 @@ public: void ConnectElements( void );/**< should be called after all manipulations on elements are done calcs real sizes depending on sizes of this */ - void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ); ///< same meaning as Windows::Show() + void Show( bool bVisible = true, sal_uInt16 nFlags = 0 ); ///< same meaning as Windows::Show() void Enable( bool bEnable = true, bool bChild = true ); ///< same meaning as Windows::Enable() }; diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 4a69291715a2..db5296c6c796 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -39,7 +39,7 @@ private: FixedText maFtDocTypes; ListBox maLbDocTypes; - sal_Bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; + bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); DECL_LINK (ClickNewHdl_Impl , void * ); @@ -58,7 +58,7 @@ public: static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet ); - virtual sal_Bool AskApply () SAL_OVERRIDE; + virtual bool AskApply () SAL_OVERRIDE; virtual void DoApply () SAL_OVERRIDE; virtual void SetInitFocus() SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index f580818f339b..5003f80055d9 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -44,7 +44,7 @@ private: OUString maStrURL; - sal_Bool mbMarkWndOpen; + bool mbMarkWndOpen; DECL_LINK (ClickFileopenHdl_Impl , void * ); DECL_LINK (ClickTargetHdl_Impl , void * ); @@ -66,7 +66,7 @@ protected: void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ) SAL_OVERRIDE; - virtual sal_Bool ShouldOpenMarkWnd () SAL_OVERRIDE {return mbMarkWndOpen;} + virtual bool ShouldOpenMarkWnd () SAL_OVERRIDE {return mbMarkWndOpen;} virtual void SetMarkWndShouldOpen (sal_Bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} OUString GetCurrentURL (); diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 153f83e21508..4bd07e6c36e8 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -47,7 +47,7 @@ private: OUString maStrOldUser; OUString maStrOldPassword; - sal_Bool mbMarkWndOpen; + bool mbMarkWndOpen; DECL_LINK (Click_SmartProtocol_Impl , void * ); ///< Radiobutton clicked: Type HTTP or FTP DECL_LINK (ClickAnonymousHdl_Impl , void * ); ///< Checkbox : Anonymous User @@ -75,7 +75,7 @@ protected: virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName, OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ) SAL_OVERRIDE; - virtual sal_Bool ShouldOpenMarkWnd () SAL_OVERRIDE {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} + virtual bool ShouldOpenMarkWnd () SAL_OVERRIDE {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );} virtual void SetMarkWndShouldOpen (sal_Bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} public: diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index a560585ada0c..15633c3817b9 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -62,7 +62,7 @@ private: PushButton maBtClose; SvxHlmarkTreeLBox maLbTree; - sal_Bool mbUserMoved; + bool mbUserMoved; SvxHyperlinkTabPageBase* mpParent; @@ -71,7 +71,7 @@ private: sal_uInt16 mnError; protected: - sal_Bool RefreshFromDoc( const OUString& aURL ); + bool RefreshFromDoc( const OUString& aURL ); void RestoreLastSelection(); SvTreeListEntry* FindEntry(const OUString& aStrName); @@ -87,11 +87,11 @@ public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); virtual ~SvxHlinkDlgMarkWnd(); - sal_Bool MoveTo ( Point aNewPos ); + bool MoveTo ( Point aNewPos ); void RefreshTree(const OUString& aStrURL); bool SelectEntry(const OUString& aStrMark); - sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True ); + bool ConnectToDialog( bool bDoit = true ); sal_uInt16 SetError( sal_uInt16 nError); }; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 2b0f8823f76c..dad7e1fb1fc1 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -86,7 +86,7 @@ private: Edit *mpEdText; ImageButton *mpBtScript; - sal_Bool mbIsCloseDisabled; + bool mbIsCloseDisabled; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxDocumentFrame; @@ -94,7 +94,7 @@ private: protected: Window* mpDialog; - sal_Bool mbStdControlsInit; + bool mbStdControlsInit; OUString maStrInitURL; @@ -120,7 +120,7 @@ protected: static OUString GetSchemeFromURL( const OUString& rStrURL ); - inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; } + inline void DisableClose( bool _bDisable ) { mbIsCloseDisabled = _bDisable; } public: SvxHyperlinkTabPageBase ( @@ -136,7 +136,7 @@ public: mxDocumentFrame = rxDocumentFrame; } - virtual sal_Bool AskApply (); + virtual bool AskApply (); virtual void DoApply (); virtual void SetInitFocus(); virtual void SetMarkStr ( const OUString& aStrMark ); @@ -145,16 +145,16 @@ public: virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - sal_Bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } + bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } - sal_Bool MoveToExtraWnd ( Point aNewPos, sal_Bool bDisConnectDlg = sal_False ); + bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; - virtual sal_Bool QueryClose() SAL_OVERRIDE; + virtual bool QueryClose() SAL_OVERRIDE; protected: - virtual sal_Bool ShouldOpenMarkWnd(); + virtual bool ShouldOpenMarkWnd(); virtual void SetMarkWndShouldOpen(sal_Bool bOpen); void ShowMarkWnd (); @@ -166,7 +166,7 @@ protected: sal_uInt16 GetMacroEvents(); SvxMacroTableDtor* GetMacroTable(); - sal_Bool IsHTMLDoc() const; + bool IsHTMLDoc() const; }; #endif // INCLUDED_CUI_SOURCE_INC_HLTPBASE_HXX diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 1a41b0bcc7a7..f4e4293ad958 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -61,7 +61,7 @@ class SvxHyphenWordDialog : public SfxModalDialog sal_uInt16 nHyphPos; sal_uInt16 nOldPos; sal_Int32 nHyphenationPositionsOffset; - sal_Bool bBusy; + bool bBusy; void EnableLRBtn_Impl(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 729acf4c4502..689938c3bf05 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -53,17 +53,17 @@ struct IconChoicePageData CreatePage fnCreatePage; ///< pointer to the factory GetPageRanges fnGetRanges; ///< pointer to the ranges-function IconChoicePage* pPage; ///< the TabPage itself - sal_Bool bOnDemand; ///< Flag: ItemSet onDemand - sal_Bool bRefresh; ///< Flag: page has to be newly initialized + bool bOnDemand; ///< Flag: ItemSet onDemand + bool bRefresh; ///< Flag: page has to be newly initialized // constructor - IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, sal_Bool bDemand ) + IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, bool bDemand ) : nId ( Id ), fnCreatePage ( fnPage ), fnGetRanges ( fnRanges ), pPage ( NULL ), bOnDemand ( bDemand ), - bRefresh ( sal_False ) + bRefresh ( false ) {} }; @@ -75,7 +75,7 @@ class IconChoicePage : public TabPage private : const SfxItemSet* pSet; OUString aUserString; - sal_Bool bHasExchangeSupport; + bool bHasExchangeSupport; IconChoiceDialog* pDialog; void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; } @@ -99,8 +99,8 @@ public : virtual bool FillItemSet( SfxItemSet& ) = 0; virtual void Reset( const SfxItemSet& ) = 0; - sal_Bool HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( sal_Bool bNew = sal_True ) { bHasExchangeSupport = bNew; } + bool HasExchangeSupport() const { return bHasExchangeSupport; } + void SetExchangeSupport( bool bNew = true ) { bHasExchangeSupport = bNew; } enum { KEEP_PAGE = 0x0000, ///< error handling @@ -116,8 +116,8 @@ public : void SetUserData(const OUString& rString) { aUserString = rString; } OUString GetUserData() { return aUserString; } virtual void FillUserData(); - virtual sal_Bool IsReadOnly() const; - virtual sal_Bool QueryClose(); + virtual bool IsReadOnly() const; + virtual bool QueryClose(); void StateChanged( StateChangedType nType ) SAL_OVERRIDE; void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -148,11 +148,11 @@ private : sal_uInt32 nResId; - sal_Bool bHideResetBtn; - sal_Bool bModal; - sal_Bool bInOK; - sal_Bool bModified; - sal_Bool bItemsReset; + bool bHideResetBtn; + bool bModal; + bool bInOK; + bool bModified; + bool bItemsReset; DECL_LINK ( ChosePageHdl_Impl, void * ); DECL_LINK(OkHdl, void *); @@ -161,9 +161,9 @@ private : IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); - sal_Bool OK_Impl(); + bool OK_Impl(); - void SetPosSizeCtrls ( sal_Bool bInit = sal_False ); + void SetPosSizeCtrls ( bool bInit = false ); void SetPosSizePages ( sal_uInt16 nId ); void FocusOnIcon ( sal_uInt16 nId ); @@ -180,7 +180,7 @@ protected : const SfxItemSet* GetRefreshedSet(); void ActivatePageImpl (); - sal_Bool DeActivatePageImpl (); + bool DeActivatePageImpl (); void ResetPageImpl (); short Ok(); @@ -199,7 +199,7 @@ public : SvxIconChoiceCtrlEntry* AddTabPage( sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon, CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/, - sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = TREELIST_APPEND ); + bool bItemsOnDemand = false, sal_uLong nPos = TREELIST_APPEND ); void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } sal_uInt16 GetCurPageId() const { return mnCurrentPageId; } @@ -218,8 +218,8 @@ public : HelpButton& GetHelpButton() { return aHelpBtn; } short Execute() SAL_OVERRIDE; - void Start( sal_Bool bShow = sal_True ); - sal_Bool QueryClose(); + void Start( bool bShow = true ); + bool QueryClose(); const SfxItemSet* GetExampleSet() const { return pExampleSet; } diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index a612bbc80f5c..bd793a7b0ece 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -51,7 +51,7 @@ public: com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() { return m_xObj; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); - virtual sal_Bool IsCreateNew() const; + virtual bool IsCreateNew() const; }; class SvInsertOleDlg : public InsertObjectDialog_Impl @@ -77,9 +77,9 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return *m_pLbObjecttype; } OUString GetFilePath() const { return m_pEdFilepath->GetText(); } - sal_Bool IsLinked() const + bool IsLinked() const { return m_pCbFilelink->IsChecked(); } - sal_Bool IsCreateNew() const SAL_OVERRIDE + bool IsCreateNew() const SAL_OVERRIDE { return m_pRbNewObject->IsChecked(); } public: diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 2dc5c13447bb..9c85d7ba00bf 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -53,11 +53,11 @@ private: short nCaptionType; sal_Int32 nGap; short nEscDir; - sal_Bool bEscRel; + bool bEscRel; sal_Int32 nEscAbs; sal_Int32 nEscRel; sal_Int32 nLineLen; - sal_Bool bFitLineLen; + bool bFitLineLen; sal_uInt16 nAnsatzRelPos; sal_uInt16 nAnsatzTypePos; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 538a00793ffb..467ecba7ee61 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -70,7 +70,7 @@ class SvBaseLinksDlg : public ModalDialog OUString aStrCloselinkmsgMulti; OUString aStrWaitinglink; sfx2::LinkManager* pLinkMgr; - sal_Bool bHtmlMode; + bool bHtmlMode; Timer aUpdateTimer; DECL_LINK( LinksSelectHdl, SvTabListBox * ); @@ -86,7 +86,7 @@ class SvBaseLinksDlg : public ModalDialog sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); OUString ImplGetStateStr( const sfx2::SvBaseLink& ); void SetType( sfx2::SvBaseLink& rLink, sal_uLong nPos, sal_uInt16 nType ); - void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uLong nPos = TREELIST_APPEND, sal_Bool bSelect = sal_False); + void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uLong nPos = TREELIST_APPEND, bool bSelect = false); void StartUpdateTimer() { aUpdateTimer.Start(); } @@ -112,7 +112,7 @@ class SvBaseLinksDlg : public ModalDialog void SetManager( sfx2::LinkManager* ); public: - SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, sal_Bool bHtml = sal_False ); + SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, bool bHtml = false ); virtual ~SvBaseLinksDlg(); void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index cdb5ab8e5be8..e8848a59acdf 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -89,7 +89,7 @@ public: virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void DisplayAppEvents( bool appEvents); - void SetReadOnly( sal_Bool bSet ); + void SetReadOnly( bool bSet ); bool IsReadOnly() const SAL_OVERRIDE; }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 7aea469a2fe7..8ce7f1bf0727 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -55,7 +55,7 @@ private: const SdrView* pView; SfxMapUnit eUnit; - sal_Bool bPositionModified; + bool bPositionModified; void FillUnitLB(); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 5955bb4bc074..5ff2baee62be 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -48,7 +48,7 @@ private: Color aPrevCol; sal_Int32 mnPos; sal_Unicode mnChar; - void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); + void InitSettings( bool bForeground, bool bBackground ); protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -83,7 +83,7 @@ public: { SetInfoItem( rItem ); } void SetOkHdl( const Link& rOkHandler ); - void HideLanguage(sal_Bool nFlag=sal_True); + void HideLanguage(bool nFlag=true); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE; private: @@ -122,8 +122,8 @@ private: sal_uLong nInitFormat; Link fnOkHdl; - sal_Bool bNumItemFlag; ///< for handling with DocShell - sal_Bool bOneAreaFlag; + bool bNumItemFlag; ///< for handling with DocShell + bool bOneAreaFlag; short nFixedCategory; OUString sAutomaticEntry; @@ -133,15 +133,15 @@ private: void Init_Impl(); void FillCurrencyBox(); void FillFormatListBox_Impl( std::vector<OUString>& rEntries ); - void UpdateOptions_Impl( sal_Bool bCheckCatChange ); - void UpdateFormatListBox_Impl( sal_uInt16 bCat, sal_Bool bUpdateEdit ); + void UpdateOptions_Impl( bool bCheckCatChange ); + void UpdateFormatListBox_Impl( sal_uInt16 bCat, bool bUpdateEdit ); void Obstructing(); void EnableBySourceFormat_Impl(); void SetCategory( sal_uInt16 nPos ); OUString GetExpColorString( Color*& rpPreviewColor, const OUString& aFormatStr, short nTmpCatPos ); void MakePreviewText( const OUString& rFormat ); void ChangePreviewText( sal_uInt16 nPos ); - void AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect); + void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); // Handler DECL_LINK( LostFocusHdl_Impl, Edit* pEd ); DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index b3124adad1c4..b4714a566e56 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -44,7 +44,7 @@ class SvxNumberingPreview : public Window Font aStdFont; long nPageWidth; const OUString* pOutlineNames; - sal_Bool bPosition; + bool bPosition; sal_uInt16 nActLevel; protected: @@ -60,7 +60,7 @@ class SvxNumberingPreview : public Window void SetOutlineNames(const OUString* pNames) {pOutlineNames = pNames;} void SetPositionMode() - { bPosition = sal_True;} + { bPosition = true;} void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} }; @@ -95,8 +95,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage SvxNumRule* pActNum; SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; OUString sNumCharFmtName; sal_uInt16 nNumItemId; @@ -133,8 +133,8 @@ class SvxBulletPickTabPage : public SfxTabPage SvxNumRule* pActNum; SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; sal_uInt16 nNumItemId; OUString sBulletCharFmtName; @@ -176,8 +176,8 @@ class SvxNumPickTabPage : public SfxTabPage SvxNumRule* pSaveNum; sal_uInt16 nActNumLvl; sal_uInt16 nNumItemId; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; protected: @@ -221,8 +221,8 @@ class SvxBitmapPickTabPage : public SfxTabPage sal_uInt16 nActNumLvl; sal_uInt16 nNumItemId; SfxMapUnit eCoreUnit; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; + bool bModified : 1; + bool bPreset : 1; protected: DECL_LINK(NumSelectHdl_Impl, void *); @@ -300,12 +300,12 @@ class SvxNumOptionsTabPage : public SfxTabPage Size aInitSize[SVX_MAX_NUM]; - sal_Bool bLastWidthModified : 1; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; - sal_Bool bAutomaticCharStyles: 1; - sal_Bool bHTMLMode : 1; - sal_Bool bMenuButtonInitialized : 1; + bool bLastWidthModified : 1; + bool bModified : 1; + bool bPreset : 1; + bool bAutomaticCharStyles: 1; + bool bHTMLMode : 1; + bool bMenuButtonInitialized : 1; std::vector<OUString> aGrfNames; Font aActBulletFont; @@ -320,7 +320,7 @@ class SvxNumOptionsTabPage : public SfxTabPage 0 - Number; 1 - Bullet; 2 - Bitmap; */ - void SwitchNumberType( sal_uInt8 nType, sal_Bool bBmp = sal_False ); + void SwitchNumberType( sal_uInt8 nType, bool bBmp = false ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * ); @@ -362,7 +362,7 @@ class SvxNumOptionsTabPage : public SfxTabPage void SetMetric(FieldUnit eSet); ListBox& GetCharFmtListBox() {return *m_pCharFmtLB;} - void SetModified(sal_Bool bRepaint = sal_True); + void SetModified(bool bRepaint = true); virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; /** Get the numberings provided by the i18n framework (CTL, Asian, ...) and @@ -423,9 +423,9 @@ class SvxNumPositionTabPage : public SfxTabPage sal_uInt16 nNumItemId; SfxMapUnit eCoreUnit; - sal_Bool bModified : 1; - sal_Bool bPreset : 1; - sal_Bool bInInintControl : 1; // workaround for Modify-error, is said to be corrected from 391 on + bool bModified : 1; + bool bPreset : 1; + bool bInInintControl : 1; // workaround for Modify-error, is said to be corrected from 391 on bool bLabelAlignmentPosAndSpaceModeActive; void InitControls(); @@ -458,7 +458,7 @@ public: const SfxItemSet& rAttrSet); void SetMetric(FieldUnit eSet); - void SetModified(sal_Bool bRepaint = sal_True); + void SetModified(bool bRepaint = true); virtual void PageCreated(SfxAllItemSet aSet) SAL_OVERRIDE; }; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 24b8c896e060..4e0a5779b2da 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -77,18 +77,18 @@ public: class SvxDictEdit : public Edit { Link aActionLink; - sal_Bool bSpaces; + bool bSpaces; public: SvxDictEdit(Window* pParent, const ResId& rResId) : - Edit(pParent, rResId), bSpaces(sal_False){} + Edit(pParent, rResId), bSpaces(false){} SvxDictEdit(Window* pParent, WinBits aWB) : - Edit(pParent, aWB), bSpaces(sal_False){} + Edit(pParent, aWB), bSpaces(false){} void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} - void SetSpaces(sal_Bool bSet) + void SetSpaces(bool bSet) {bSpaces = bSet;} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; @@ -123,9 +123,9 @@ private: short nOld; long nWidth; - sal_Bool bFirstSelect; - sal_Bool bDoNothing; - sal_Bool bDicIsReadonly; + bool bFirstSelect; + bool bDoNothing; + bool bDicIsReadonly; DECL_LINK(SelectBookHdl_Impl, void *); DECL_LINK(SelectLangHdl_Impl, void *); @@ -136,7 +136,7 @@ private: void ShowWords_Impl( sal_uInt16 nId ); void SetLanguage_Impl( ::com::sun::star::util::Language nLanguage ); - sal_Bool IsDicReadonly_Impl() const { return bDicIsReadonly; } + bool IsDicReadonly_Impl() const { return bDicIsReadonly; } void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &xDic ); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 15f276eca52a..5e1556cffc2a 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -64,7 +64,7 @@ private: DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); void GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, - OUString& _rUserPath, OUString& _rWritablePath, sal_Bool& _rReadOnly ); + OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ); void SetPathList( sal_uInt16 _nPathHandle, const OUString& _rUserPath, const OUString& _rWritablePath ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 29bf0b3fe6ab..a5881b996557 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -131,7 +131,7 @@ class SvxPageDescPage : public SfxTabPage long nLastBottomMargin; Size aMaxSize; - sal_Bool bLandscape; + bool bLandscape; bool bBorderModified; SvxModeType eMode; Paper ePaperStart; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index ca4c06e87a7d..7b74fcf632b1 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -81,12 +81,12 @@ private: long nAbst; long nWidth; long nMinFixDist; - sal_Bool bRelativeMode; - sal_Bool bNegativeIndents; + bool bRelativeMode; + bool bNegativeIndents; void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); void Init_Impl(); - void UpdateExample_Impl( sal_Bool bAll = sal_False ); + void UpdateExample_Impl( bool bAll = false ); DECL_LINK( LineDistHdl_Impl, ListBox* ); DECL_LINK(ModifyHdl_Impl, void *); @@ -151,7 +151,7 @@ class SvxParaAlignTabPage : public SfxTabPage DECL_LINK(LastLineHdl_Impl, void *); DECL_LINK(TextDirectionHdl_Impl, void *); - void UpdateExample_Impl( sal_Bool bAll = sal_False ); + void UpdateExample_Impl( bool bAll = false ); SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxParaAlignTabPage(); @@ -239,8 +239,8 @@ private: NumericField* m_pWidowRowNo; FixedText* m_pWidowRowLabel; - sal_Bool bPageBreak; - sal_Bool bHtmlMode; + bool bPageBreak; + bool bHtmlMode; sal_uInt16 nStdPos; DECL_LINK(PageBreakHdl_Impl, void *); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 046beac90282..8a25529541f8 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -57,7 +57,7 @@ public: void SetNextHdl( const Link& rLink ) { aNextHdlLink = rLink; } - void EnableTravel(sal_Bool bNext, sal_Bool bPrev); + void EnableTravel(bool bNext, bool bPrev); OUString GetNote() { return m_pEditED->GetText(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 8e46d945ced0..f51c2f6dd365 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -160,7 +160,7 @@ protected: DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); + bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index c2ba86fb2ddd..8a8a9de478d6 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -45,7 +45,7 @@ struct SvxGroupInfo_Impl xBrowseNode; OUString sURL; OUString sHelpText; - sal_Bool bWasOpened; + bool bWasOpened; SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr ) :nKind( n ) @@ -53,7 +53,7 @@ struct SvxGroupInfo_Impl ,xBrowseNode() ,sURL() ,sHelpText() - ,bWasOpened(sal_False) + ,bWasOpened(false) { } @@ -63,7 +63,7 @@ struct SvxGroupInfo_Impl ,xBrowseNode( _rxNode ) ,sURL() ,sHelpText() - ,bWasOpened(sal_False) + ,bWasOpened(false) { } @@ -73,7 +73,7 @@ struct SvxGroupInfo_Impl ,xBrowseNode() ,sURL( _rURL ) ,sHelpText( _rHelpText ) - ,bWasOpened(sal_False) + ,bWasOpened(false) { } }; @@ -157,7 +157,7 @@ private: protected: virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE; - virtual sal_Bool Expand( SvTreeListEntry* pParent ); + virtual bool Expand( SvTreeListEntry* pParent ); public: SvxConfigGroupListBox(Window* pParent, WinBits nStyle); @@ -166,7 +166,7 @@ public: void Init(bool bShowSlots, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame); - void Open( SvTreeListEntry*, sal_Bool ); + void Open( SvTreeListEntry*, bool ); void ClearAll(); void GroupSelected(); @@ -186,7 +186,7 @@ class SvxScriptSelectorDialog : public ModelessDialog PushButton* m_pCancelButton; VclMultiLineEdit* m_pDescriptionText; OUString m_sDefaultDesc; - sal_Bool m_bShowSlots; + bool m_bShowSlots; Link m_aAddHdl; DECL_LINK( ClickHdl, Button * ); @@ -199,7 +199,7 @@ public: SvxScriptSelectorDialog ( Window* pParent = NULL, - sal_Bool bShowSlots = sal_False, + bool bShowSlots = false, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 0d1f4c141f6c..c81a79d86003 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -72,7 +72,7 @@ private: public: SvxSearchSimilarityDialog( Window* pParent, - sal_Bool bRelax, + bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ); @@ -80,7 +80,7 @@ public: sal_uInt16 GetOther() { return (sal_uInt16)m_pOtherFld->GetValue(); } sal_uInt16 GetShorter() { return (sal_uInt16)m_pShorterFld->GetValue(); } sal_uInt16 GetLonger() { return (sal_uInt16)m_pLongerFld->GetValue(); } - sal_Bool IsRelaxed() { return m_pRelaxBox->IsChecked(); } + bool IsRelaxed() { return m_pRelaxBox->IsChecked(); } }; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 9493c5be4697..b4fd273fe4fd 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -99,7 +99,7 @@ private: SvxTabStopItem aNewTabs; long nDefDist; FieldUnit eDefUnit; - sal_Bool bCheck; + bool bCheck; void InitTabPos_Impl( sal_uInt16 nPos = 0 ); void SetFillAndTabType_Impl(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 8381c93f8179..fe40f007123a 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -57,12 +57,12 @@ private: const SfxItemSet& rOutAttrs; const SdrView* pView; - sal_Bool bAutoGrowSizeEnabled; - sal_Bool bContourEnabled; - sal_Bool bAutoGrowWidthEnabled; - sal_Bool bAutoGrowHeightEnabled; - sal_Bool bWordWrapTextEnabled; - sal_Bool bFitToSizeEnabled; + bool bAutoGrowSizeEnabled; + bool bContourEnabled; + bool bAutoGrowWidthEnabled; + bool bAutoGrowHeightEnabled; + bool bWordWrapTextEnabled; + bool bFitToSizeEnabled; DECL_LINK( ClickFullWidthHdl_Impl, void * ); DECL_LINK( ClickHdl_Impl, void * ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index f5c57ead5f90..e698653efa56 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -28,7 +28,7 @@ class SfxShell; // static ---------------------------------------------------------------- -sal_Bool EnableSSO(); +bool EnableSSO(); CreateTabPage GetSSOCreator( void ); // struct OrderedEntry --------------------------------------------------- @@ -164,8 +164,8 @@ private: SfxItemSet* pColorPageItemSet; SvxColorTabPage *mpColorPage; - sal_Bool bForgetSelection; - sal_Bool bExternBrowserActive; + bool bForgetSelection; + bool bExternBrowserActive; bool bIsFromExtensionManager; // check "for the current document only" and set focus to "Western" languages box @@ -276,7 +276,7 @@ private: bool m_bIsWindowHidden; void CreateDialogWithHandler(); - sal_Bool DispatchAction( const OUString& rAction ); + bool DispatchAction( const OUString& rAction ); public: ExtensionsTabPage( diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 2942c0797daa..64c46b53ac42 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -45,7 +45,7 @@ private: const SfxItemSet& rSet; SfxItemSet* pOutSet; - sal_Bool bModified; + bool bModified; DECL_LINK( UserHdl, RadioButton* ); DECL_LINK(SpinHdl, void *); diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index fe2fbd04c9b4..8e755a47737b 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -177,7 +177,7 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const SvxChartOptions::SvxChartOptions() : ::utl::ConfigItem( OUString("Office.Chart") ), - mbIsInitialized( sal_False ) + mbIsInitialized( false ) { maPropertyNames.realloc( 1 ); maPropertyNames[ 0 ] = "DefaultColor/Series"; @@ -200,7 +200,7 @@ void SvxChartOptions::SetDefaultColors( const SvxChartColorTable& aCol ) SetModified(); } -sal_Bool SvxChartOptions::RetrieveOptions() +bool SvxChartOptions::RetrieveOptions() { // get sequence containing all properties @@ -240,9 +240,9 @@ sal_Bool SvxChartOptions::RetrieveOptions() maDefColors.append( XColorEntry( aCol, aName )); } - return sal_True; + return true; } - return sal_False; + return false; } void SvxChartOptions::Commit() diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 836b2f61389f..134661abc4bd 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -67,14 +67,14 @@ class SvxChartOptions : public ::utl::ConfigItem { private: SvxChartColorTable maDefColors; - sal_Bool mbIsInitialized; + bool mbIsInitialized; ::com::sun::star::uno::Sequence< OUString > maPropertyNames; inline ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const { return maPropertyNames; } - sal_Bool RetrieveOptions(); + bool RetrieveOptions(); public: SvxChartOptions(); diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index f9b9fc17c52f..621f699379a3 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -90,7 +90,7 @@ namespace offapp // the global "enabled" flag Any aEnabled = aConnectionPoolRoot.getNodeValue(getEnablePoolingNodeName()); - sal_Bool bEnabled = sal_True; + bool bEnabled = true; aEnabled >>= bEnabled; _rFillItems.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, bEnabled)); @@ -103,7 +103,7 @@ namespace offapp ++aLoopDrivers ) { - aSettings.push_back(DriverPooling(*aLoopDrivers, sal_False, 120)); + aSettings.push_back(DriverPooling(*aLoopDrivers, false, 120)); } // then look for which of them settings are stored in the configuration @@ -131,7 +131,7 @@ namespace offapp if (aLookup == aSettings.end()) { // do not know the driver - add it - aSettings.push_back(DriverPooling(sThisDriverName, sal_False, 120)); + aSettings.push_back(DriverPooling(sThisDriverName, false, 120)); // and the position of the new entry aLookup = aSettings.end(); @@ -157,7 +157,7 @@ namespace offapp // already asserted by the OConfigurationTreeRoot return; - sal_Bool bNeedCommit = sal_False; + bool bNeedCommit = false; // the global "enabled" flag SFX_ITEMSET_GET( _rSourceItems, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true ); @@ -165,7 +165,7 @@ namespace offapp { sal_Bool bEnabled = pEnabled->GetValue(); aConnectionPoolRoot.setNodeValue(getEnablePoolingNodeName(), Any(&bEnabled, ::getBooleanCppuType())); - bNeedCommit = sal_True; + bNeedCommit = true; } // the settings for the single drivers @@ -199,7 +199,7 @@ namespace offapp aThisDriverSettings.setNodeValue(getEnableNodeName(), Any(&aLoop->bEnabled, ::getBooleanCppuType())); aThisDriverSettings.setNodeValue(getTimeoutNodeName(), makeAny(aLoop->nTimeoutSeconds)); } - bNeedCommit = sal_True; + bNeedCommit = true; } if (bNeedCommit) aConnectionPoolRoot.commit(); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 6dff2f00340c..6cc3fe62d911 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -61,7 +61,7 @@ namespace offapp const DriverPoolingSettings& getSettings() const { return m_aSettings; } void saveValue() { m_aSavedSettings = m_aSettings; } - sal_Bool isModified() const; + bool isModified() const; protected: virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; @@ -111,10 +111,10 @@ namespace offapp } - sal_Bool DriverListControl::isModified() const + bool DriverListControl::isModified() const { if (m_aSettings.size() != m_aSavedSettings.size()) - return sal_True; + return true; DriverPoolingSettings::const_iterator aCurrent = m_aSettings.begin(); DriverPoolingSettings::const_iterator aCurrentEnd = m_aSettings.end(); @@ -122,10 +122,10 @@ namespace offapp for (;aCurrent != aCurrentEnd; ++aCurrent, ++aSaved) { if (*aCurrent != *aSaved) - return sal_True; + return true; } - return sal_False; + return false; } @@ -332,7 +332,7 @@ namespace offapp } - void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bFromReset*/) + void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, bool /*_bFromReset*/) { // the enabled flag SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true ); @@ -393,19 +393,19 @@ namespace offapp void ConnectionPoolOptionsPage::ActivatePage( const SfxItemSet& _rSet) { SfxTabPage::ActivatePage(_rSet); - implInitControls(_rSet, sal_False); + implInitControls(_rSet, false); } void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet) { - implInitControls(_rSet, sal_True); + implInitControls(_rSet, true); } IMPL_LINK( ConnectionPoolOptionsPage, OnDriverRowChanged, const void*, _pRowIterator ) { - sal_Bool bValidRow = (NULL != _pRowIterator); + bool bValidRow = (NULL != _pRowIterator); m_pDriverPoolingEnabled->Enable(bValidRow && m_pEnablePooling->IsChecked()); m_pTimeoutLabel->Enable(bValidRow); m_pTimeout->Enable(bValidRow); @@ -441,8 +441,8 @@ namespace offapp IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, const CheckBox*, _pCheckBox ) { - sal_Bool bGloballyEnabled = m_pEnablePooling->IsChecked(); - sal_Bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox; + bool bGloballyEnabled = m_pEnablePooling->IsChecked(); + bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox; if (m_pEnablePooling == _pCheckBox) { diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 10f0003b3421..cd80ccfc578c 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -64,7 +64,7 @@ namespace offapp DECL_LINK( OnEnabledDisabled, const CheckBox* ); DECL_LINK( OnDriverRowChanged, const void* ); - void implInitControls(const SfxItemSet& _rSet, sal_Bool _bFromReset); + void implInitControls(const SfxItemSet& _rSet, bool _bFromReset); void commitTimeoutField(); }; diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 623906daf4f4..639ee0e804b8 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -28,7 +28,7 @@ namespace offapp //= DriverPooling - DriverPooling::DriverPooling( const OUString& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ) + DriverPooling::DriverPooling( const OUString& _rName, bool _bEnabled, const sal_Int32 _nTimeout ) :sName(_rName) ,bEnabled(_bEnabled) ,nTimeoutSeconds(_nTimeout) @@ -36,7 +36,7 @@ namespace offapp } - sal_Bool DriverPooling::operator == (const DriverPooling& _rR) const + bool DriverPooling::operator == (const DriverPooling& _rR) const { return (sName == _rR.sName) && (bEnabled == _rR.bEnabled) diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 59a4a8d6e47b..1cb0205683b6 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -38,13 +38,13 @@ namespace offapp struct DriverPooling { OUString sName; - sal_Bool bEnabled; + bool bEnabled; sal_Int32 nTimeoutSeconds; - DriverPooling( const OUString& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout ); + DriverPooling( const OUString& _rName, bool _bEnabled, const sal_Int32 _nTimeout ); - sal_Bool operator == (const DriverPooling& _rR) const; - sal_Bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); } + bool operator == (const DriverPooling& _rR) const; + bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); } }; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index d71d7927054f..7af151db533d 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -110,7 +110,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox ( NULL ), m_pCurEntry ( NULL ), m_nOldCount ( 0 ), - m_bModified ( sal_False ) + m_bModified ( false ) { get(m_pPathCtrl, "pathctrl"); Size aControlSize(248, 147); @@ -238,7 +238,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) rBar.SetItemSize( ITEMID_TYPE, aUserData.getToken(0, ';').toInt32() ); HeaderEndDrag_Impl( &rBar ); // restore sort direction - sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.getToken(1, ';').toInt32(); + bool bUp = aUserData.getToken(1, ';').toInt32() != 0; HeaderBarItemBits nBits = rBar.GetItemBits(ITEMID_TYPE); if ( bUp ) @@ -264,7 +264,7 @@ void DbRegistrationOptionsPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += (bUp ? OUString("1") : OUString("0")); SetUserData( aUserData ); } @@ -319,7 +319,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) @@ -430,7 +430,7 @@ void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const O pPathBox->GetModel()->Remove( _pEntry ); } insertNewEntry( sNewName, sNewLocation, false ); - m_bModified = sal_True; + m_bModified = true; } } } diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 687b87a6695c..2fdc4436b714 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -42,7 +42,7 @@ namespace svx { } - DatabaseRegistration( const OUString& _rLocation, const sal_Bool _bReadOnly ) + DatabaseRegistration( const OUString& _rLocation, const bool _bReadOnly ) :sLocation( _rLocation ) ,bReadOnly( _bReadOnly ) { diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index d6fb3e528e45..7c8c2e0eeb40 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -43,7 +43,7 @@ namespace svx //= ODocumentLinkDialog - ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ) + ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ) : ModalDialog(_pParent, "DatabaseLinkDialog", "cui/ui/databaselinkdialog.ui") ,m_bCreatingNew(_bCreateNew) @@ -101,12 +101,12 @@ namespace svx sURL = aTransformer.get(OFileNotation::N_URL); // check for the existence of the selected file - sal_Bool bFileExists = sal_False; + bool bFileExists = false; try { ::ucbhelper::Content aFile(sURL, Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext()); if (aFile.isDocument()) - bFileExists = sal_True; + bFileExists = true; } catch(Exception&) { diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 8113da3347a3..d14566902e3c 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -45,12 +45,12 @@ namespace svx Edit* m_pName; OKButton* m_pOK; - sal_Bool m_bCreatingNew; + bool m_bCreatingNew; Link m_aNameValidator; public: - ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ); + ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ); // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 86fe6b513ae3..b169718e3b12 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -319,7 +319,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) { OUString sFontName = m_pFontNameLB->GetSelectEntry(); - sal_Bool bNonPropOnly = pBox->IsChecked(); + bool bNonPropOnly = pBox->IsChecked(); m_pFontNameLB->Clear(); FontList aFntLst( Application::GetDefaultDevice() ); m_pFontNameLB->InsertEntry(m_sAutomatic); @@ -336,11 +336,11 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) void SvxFontSubstTabPage::CheckEnable() { - sal_Bool bEnableAll = m_pUseTableCB->IsChecked(); + bool bEnableAll = m_pUseTableCB->IsChecked(); m_pReplacements->Enable(bEnableAll); if (bEnableAll) { - sal_Bool bApply, bDelete; + bool bApply, bDelete; SvTreeListEntry* pEntry = m_pCheckLB->FirstSelected(); @@ -350,15 +350,15 @@ void SvxFontSubstTabPage::CheckEnable() // because of OS/2 optimization error (Bug #56267) a bit more intricate: if (m_pFont1CB->GetText().isEmpty() || m_pFont2CB->GetText().isEmpty()) - bApply = sal_False; + bApply = false; else if(m_pFont1CB->GetText() == m_pFont2CB->GetText()) - bApply = sal_False; + bApply = false; else if(m_pCheckLB->GetEntryPos(sEntry) != 0xffffffff) - bApply = sal_False; + bApply = false; else if(pEntry != 0 && m_pCheckLB->NextSelected(pEntry) != 0) - bApply = sal_False; + bApply = false; else - bApply = sal_True; + bApply = true; bDelete = pEntry != 0; @@ -454,7 +454,7 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvSimpleTable::KeyInput(rKEvt); } -void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) +void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -464,7 +464,7 @@ void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sa SvButtonState( SV_BUTTON_UNCHECKED ) ); } -void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) +void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, bool bChecked) { if ( pEntry ) SetCheckButtonState( @@ -474,12 +474,12 @@ void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nC SvButtonState( SV_BUTTON_UNCHECKED ) ); } -sal_Bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) +bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) { return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } -sal_Bool SvxFontSubstCheckListBox::IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol) +bool SvxFontSubstCheckListBox::IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol) { return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED; } diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index c111689a01e9..415f59c83317 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -49,10 +49,10 @@ class SvxFontSubstCheckListBox : public SvSimpleTable inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); } inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } - sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); - sal_Bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0); - void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); - void CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked); + bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); + bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0); + void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); + void CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, bool bChecked); SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 0ac465444a23..de0b47778da0 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -182,7 +182,7 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ ) m_pPrefBox->GetModel()->SetSortMode( SortNone ); m_pPrefBox->SetUpdateMode(false); - Reference< XNameAccess > xConfigAccess = getConfigAccess( "/", sal_False ); + Reference< XNameAccess > xConfigAccess = getConfigAccess( "/", false ); FillItems( xConfigAccess ); m_pPrefBox->SetUpdateMode(true); } @@ -194,7 +194,7 @@ bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter; for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter ) { - Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , sal_True ); + Reference< XNameAccess > xUpdateAccess = getConfigAccess( (*pIter)->Name , true ); Reference< XNameReplace > xNameReplace( xUpdateAccess, UNO_QUERY_THROW ); xNameReplace->replaceByName( (*pIter)->Property, (*pIter)->Value ); @@ -381,7 +381,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces } } -Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate ) +Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& sNodePath, bool bUpdate ) { uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 55c614e628e0..6761e3c1ddfb 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -62,7 +62,7 @@ public: void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue); void Reset(/* const SfxItemSet&*/ ); void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess); - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate ); + com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, bool bUpdate ); virtual bool FillItemSet( /* SfxItemSet& rSet*/ ); virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 88c2a2aea1cd..d8f062de37ee 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -115,12 +115,12 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) IMPL_LINK(SvxAccessibilityOptionsTabPage, TipHelpHdl, CheckBox*, pBox) { - sal_Bool bChecked = pBox->IsChecked(); + bool bChecked = pBox->IsChecked(); m_pTipHelpNF->Enable(bChecked); return 0; } -void SvxAccessibilityOptionsTabPage::EnableTipHelp(sal_Bool bCheck) +void SvxAccessibilityOptionsTabPage::EnableTipHelp(bool bCheck) { m_pTipHelpCB->Check(bCheck); m_pTipHelpNF->Enable(bCheck); diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 1cdc671a053f..97bd44e21dd4 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -36,7 +36,7 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage CheckBox* m_pPagePreviews; DECL_LINK(TipHelpHdl, CheckBox*); - void EnableTipHelp(sal_Bool bCheck); + void EnableTipHelp(bool bCheck); SvxAccessibilityOptionsTabPage_Impl* m_pImpl; diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 953e742629a8..5316e0a61a3e 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -50,7 +50,7 @@ struct SvxForbiddenChars_Impl { ~SvxForbiddenChars_Impl(); - sal_Bool bRemoved; + bool bRemoved; ForbiddenCharacters* pCharacters; }; @@ -73,7 +73,7 @@ struct SvxAsianLayoutPage_Impl Reference< XPropertySetInfo > xPrSetInfo; SvxForbiddenCharacterMap_Impl aChangedLanguagesMap; - sal_Bool hasForbiddenCharacters(LanguageType eLang); + bool hasForbiddenCharacters(LanguageType eLang); SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang); void addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden); }; @@ -87,7 +87,7 @@ SvxAsianLayoutPage_Impl::~SvxAsianLayoutPage_Impl() } } -sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) +bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang) { return aChangedLanguagesMap.count( eLang ); } @@ -231,7 +231,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) if( pImpl->xPrSet.is() ) pImpl->xPrSetInfo = pImpl->xPrSet->getPropertySetInfo(); OUString sForbidden("ForbiddenCharacters"); - sal_Bool bKernWesternText = pImpl->aConfig.IsKerningWesternTextOnly(); + bool bKernWesternText = pImpl->aConfig.IsKerningWesternTextOnly(); sal_Int16 nCompress = pImpl->aConfig.GetCharDistanceCompression(); if(pImpl->xPrSetInfo.is()) { @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) Locale aLocale( aLanguageTag.getLocale()); OUString sStart, sEnd; - sal_Bool bAvail; + bool bAvail; if(pImpl->xForbidden.is()) { bAvail = pImpl->hasForbiddenCharacters(eSelectLanguage); @@ -311,7 +311,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) SvxForbiddenChars_Impl* pElement = pImpl->getForbiddenCharacters(eSelectLanguage); if(pElement->bRemoved || !pElement->pCharacters) { - bAvail = sal_False; + bAvail = false; } else { @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox) { - sal_Bool bCheck = pBox->IsChecked(); + bool bCheck = pBox->IsChecked(); m_pStartED->Enable(!bCheck); m_pEndED->Enable(!bCheck); m_pStartFT->Enable(!bCheck); @@ -377,7 +377,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage )); OUString sStart = m_pStartED->GetText(); OUString sEnd = m_pEndED->GetText(); - sal_Bool bEnable = pEdit->IsEnabled(); + bool bEnable = pEdit->IsEnabled(); if(pImpl->xForbidden.is()) { try diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 051d7c2932b5..435c54e25903 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1081,7 +1081,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) { - bFillItemSetCalled = sal_True; + bFillItemSetCalled = true; if(m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos()) { pColorConfig->SetModified(); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 7d062095fd7c..b3033bade873 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -36,7 +36,7 @@ class SvxColorOptionsTabPage : public SfxTabPage PushButton* m_pDeleteSchemePB; ColorConfigCtrl_Impl* m_pColorConfigCT; - sal_Bool bFillItemSetCalled; + bool bFillItemSetCalled; svtools::EditableColorConfig* pColorConfig; svtools::EditableExtendedColorConfig* pExtColorConfig; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 96e95a53d554..d743800f615a 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -26,7 +26,7 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl) { - sal_Bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); + bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); m_pRestrictedCB->Enable( bIsSequenceChecking ); m_pTypeReplaceCB->Enable( bIsSequenceChecking ); // #i48117#: by default restricted and type&replace have to be switched on @@ -72,21 +72,21 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) SvtCTLOptions aCTLOptions; // Sequence checking - sal_Bool bChecked = m_pSequenceCheckingCB->IsChecked(); - if ( bChecked != m_pSequenceCheckingCB->GetSavedValue() ) + bool bChecked = m_pSequenceCheckingCB->IsChecked(); + if ( (bChecked ? 1 : 0) != m_pSequenceCheckingCB->GetSavedValue() ) { aCTLOptions.SetCTLSequenceChecking( bChecked ); bModified = true; } bChecked = m_pRestrictedCB->IsChecked(); - if( bChecked != m_pRestrictedCB->GetSavedValue() ) + if( (bChecked ? 1 : 0) != m_pRestrictedCB->GetSavedValue() ) { aCTLOptions.SetCTLSequenceCheckingRestricted( bChecked ); bModified = true; } bChecked = m_pTypeReplaceCB->IsChecked(); - if( bChecked != m_pTypeReplaceCB->GetSavedValue()) + if( (bChecked ? 1 : 0) != m_pTypeReplaceCB->GetSavedValue()) { aCTLOptions.SetCTLSequenceCheckingTypeAndReplace(bChecked); bModified = true; @@ -147,7 +147,7 @@ void SvxCTLOptionsPage::Reset( const SfxItemSet& ) m_pMovementVisualRB->SaveValue(); m_pNumeralsLB->SaveValue(); - sal_Bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); + bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); m_pRestrictedCB->Enable( bIsSequenceChecking ); m_pTypeReplaceCB->Enable( bIsSequenceChecking ); } diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 189a5114c02e..e0f46bdce70f 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -59,16 +59,16 @@ static OUString getNormDicEntry_Impl(const OUString &rText) if (aTmp.indexOf('[') > -1) { OUStringBuffer aTmp2 ( aTmp.getLength() ); - sal_Bool bSkip = sal_False; + bool bSkip = false; for (sal_Int32 i = 0; i < aTmp.getLength(); i++) { sal_Unicode cTmp = aTmp[i]; if (cTmp == '[') - bSkip = sal_True; + bSkip = true; else if (!bSkip) aTmp2.append( cTmp ); else if (cTmp == ']') - bSkip = sal_False; + bSkip = false; } aTmp = aTmp2.makeStringAndClear(); } @@ -133,11 +133,11 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) const Reference< XDictionary > *pDic = aDics.getConstArray(); sal_Int32 nCount = aDics.getLength(); - sal_Bool bFound = sal_False; + bool bFound = false; sal_Int32 i; for (i = 0; !bFound && i < nCount; ++i ) if ( sDict.equalsIgnoreAsciiCase( pDic[i]->getName()) ) - bFound = sal_True; + bFound = true; if ( bFound ) { @@ -227,8 +227,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( aDecoView ( this), xSpell ( xSpl ), nOld ( NOACTDICT ), - bFirstSelect (sal_True), - bDoNothing (sal_False) + bFirstSelect (true), + bDoNothing (false) { get(pAllDictsLB,"book"); @@ -294,8 +294,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( pLangLB->SetLanguageList( LANG_LIST_ALL, true, true ); - pReplaceED->SetSpaces(sal_True); - pWordED->SetSpaces(sal_True); + pReplaceED->SetSpaces(true); + pWordED->SetSpaces(true); if ( nCount > 0 ) { @@ -315,7 +315,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( // check if dictionary is read-only SetDicReadonly_Impl(xDic); - sal_Bool bEnable = !IsDicReadonly_Impl(); + bool bEnable = !IsDicReadonly_Impl(); pNewReplacePB->Enable( false ); pDeletePB->Enable( false ); pLangFT->Enable( bEnable ); @@ -354,7 +354,7 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( Reference< XDictionary > &xDic ) { // enable or disable new and delete button according to file attributes - bDicIsReadonly = sal_True; + bDicIsReadonly = true; if (xDic.is()) { Reference< frame::XStorable > xStor( xDic, UNO_QUERY ); @@ -362,7 +362,7 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( || !xStor->hasLocation() // not yet persistent || !xStor->isReadonly() ) { - bDicIsReadonly = sal_False; + bDicIsReadonly = false; } } } @@ -432,7 +432,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl) SetLanguage_Impl( LanguageTag( xDic->getLocale() ).getLanguageType() ); SetDicReadonly_Impl(xDic); - sal_Bool bEnable = !IsDicReadonly_Impl(); + bool bEnable = !IsDicReadonly_Impl(); pLangFT->Enable( bEnable ); pLangLB->Enable( bEnable ); } @@ -563,7 +563,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) pReplaceED->SetText(pBox->GetEntryText(pEntry, 1)); } else - bFirstSelect = sal_False; + bFirstSelect = false; // entries in the list box should exactly correspond to those from the // dictionary. Thus: @@ -609,7 +609,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) //! ...IsVisible should reflect whether the dictionary is a negativ //! or not (hopefully...) - sal_Bool bIsNegEntry = pReplaceFT->IsVisible(); + bool bIsNegEntry = pReplaceFT->IsVisible(); OUString aRplcText; if(bIsNegEntry) aRplcText = aReplaceStr; @@ -681,16 +681,16 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) sal_Int32 nWordLen = rEntry.getLength(); const OUString& rRepString = pReplaceED->GetText(); - sal_Bool bEnableNewReplace = sal_False; - sal_Bool bEnableDelete = sal_False; + bool bEnableNewReplace = false; + bool bEnableDelete = false; OUString aNewReplaceText = sNew; if(pEdt == pWordED) { if(nWordLen>0) { - sal_Bool bFound = sal_False; - sal_Bool bTmpSelEntry=sal_False; + bool bFound = false; + bool bTmpSelEntry=false; CDE_RESULT eCmpRes = CDE_DIFFERENT; for(sal_uLong i = 0; i < pWordsLB->GetEntryCount(); i++) @@ -701,32 +701,32 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) if(CDE_DIFFERENT != eCmpRes) { if(!rRepString.isEmpty()) - bFirstSelect = sal_True; - bDoNothing=sal_True; + bFirstSelect = true; + bDoNothing=true; pWordsLB->SetCurEntry(pEntry); - bDoNothing=sal_False; + bDoNothing=false; pFirstSel = pEntry; pReplaceED->SetText(pWordsLB->GetEntryText(pEntry, 1)); if (CDE_SIMILAR == eCmpRes) { aNewReplaceText = sModify; - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } - bFound= sal_True; + bFound= true; break; } else if(getNormDicEntry_Impl(aTestStr).indexOf( getNormDicEntry_Impl( rEntry ) ) == 0 && !bTmpSelEntry) { - bDoNothing=sal_True; + bDoNothing=true; pWordsLB->MakeVisible(pEntry); - bDoNothing=sal_False; - bTmpSelEntry=sal_True; + bDoNothing=false; + bTmpSelEntry=true; aNewReplaceText = sNew; - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } } @@ -736,16 +736,16 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) pFirstSel = 0; aNewReplaceText = sNew; - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } bEnableDelete = CDE_DIFFERENT != eCmpRes; } else if(pWordsLB->GetEntryCount()>0) { SvTreeListEntry* pEntry = pWordsLB->GetEntry( 0 ); - bDoNothing=sal_True; + bDoNothing=true; pWordsLB->MakeVisible(pEntry); - bDoNothing=sal_False; + bDoNothing=false; } } else if(pEdt == pReplaceED) @@ -758,13 +758,13 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) aReplaceText = pWordsLB->GetEntryText( pFirstSel, 1 ); aNewReplaceText = sModify; - bEnableDelete = sal_True; + bEnableDelete = true; } - sal_Bool bIsChange = + bool bIsChange = CDE_EQUAL != cmpDicEntry_Impl(pWordED->GetText(), aWordText) || CDE_EQUAL != cmpDicEntry_Impl(pReplaceED->GetText(), aReplaceText); if (!pWordED->GetText().isEmpty() && bIsChange) - bEnableNewReplace = sal_True; + bEnableNewReplace = true; } pNewReplacePB->SetText( aNewReplaceText ); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index f0f58ea1e90a..d732661dbdf2 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -80,24 +80,24 @@ bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); - sal_Bool bFlag; - if( aWBasicCodeCB->GetSavedValue() != (bFlag = aWBasicCodeCB->IsChecked())) + bool bFlag; + if( (aWBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicCodeCB->IsChecked())) rOpt.SetLoadWordBasicCode( bFlag ); - if( aWBasicWbctblCB->GetSavedValue() != (bFlag = aWBasicWbctblCB->IsChecked())) + if( (aWBasicWbctblCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicWbctblCB->IsChecked())) rOpt.SetLoadWordBasicExecutable( bFlag ); - if( aWBasicStgCB->GetSavedValue() != (bFlag = aWBasicStgCB->IsChecked())) + if( (aWBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicStgCB->IsChecked())) rOpt.SetLoadWordBasicStorage( bFlag ); - if( aEBasicCodeCB->GetSavedValue() != (bFlag = aEBasicCodeCB->IsChecked())) + if( (aEBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicCodeCB->IsChecked())) rOpt.SetLoadExcelBasicCode( bFlag ); - if( aEBasicExectblCB->GetSavedValue() != (bFlag = aEBasicExectblCB->IsChecked())) + if( (aEBasicExectblCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicExectblCB->IsChecked())) rOpt.SetLoadExcelBasicExecutable( bFlag ); - if( aEBasicStgCB->GetSavedValue() != (bFlag = aEBasicStgCB->IsChecked())) + if( (aEBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicStgCB->IsChecked())) rOpt.SetLoadExcelBasicStorage( bFlag ); - if( aPBasicCodeCB->GetSavedValue() != (bFlag = aPBasicCodeCB->IsChecked())) + if( (aPBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aPBasicCodeCB->IsChecked())) rOpt.SetLoadPPointBasicCode( bFlag ); - if( aPBasicStgCB->GetSavedValue() != (bFlag = aPBasicStgCB->IsChecked())) + if( (aPBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aPBasicStgCB->IsChecked())) rOpt.SetLoadPPointBasicStorage( bFlag ); return false; @@ -260,7 +260,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) { InvalidCBEntry, NULL } }; - sal_Bool bFirst = sal_True; + bool bFirst = true; for( const ChkCBoxEntries* pArr = aChkArr; InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst ) { @@ -288,7 +288,7 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType } void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, - sal_Bool loadEnabled, sal_Bool saveEnabled ) + bool loadEnabled, bool saveEnabled ) { SvTreeListEntry* pEntry = new SvTreeListEntry; @@ -386,7 +386,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( return eState; } -void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) +void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -406,7 +406,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) if ( nCol < 2 ) { SvTreeListEntry* pEntry = GetEntry( nSelPos ); - sal_Bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED ); + bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED ); CheckEntryPos( nSelPos, nCol, !bIsChecked ); CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, (void*)pEntry ); } diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index fe01a122a480..30b58f011a94 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -58,7 +58,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage using SvTreeListBox::SetCheckButtonState; using SvSimpleTable::SetTabs; - void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); + void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); protected: @@ -88,7 +88,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType ); void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, - sal_Bool loadEnabled, sal_Bool saveEnabled ); + bool loadEnabled, bool saveEnabled ); SvTreeListEntry* GetEntry4Type( sal_IntPtr _nType ) const; public: diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 08586e846141..7ae17fd96049 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -244,42 +244,42 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; SvtHelpOptions aHelpOptions; - sal_Bool bChecked = m_pToolTipsCB->IsChecked(); - if ( bChecked != m_pToolTipsCB->GetSavedValue() ) + bool bChecked = m_pToolTipsCB->IsChecked(); + if ( bChecked != (m_pToolTipsCB->GetSavedValue() == TRISTATE_TRUE) ) aHelpOptions.SetHelpTips( bChecked ); bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() ); - if ( bChecked != m_pExtHelpCB->GetSavedValue() ) + if ( bChecked != (m_pExtHelpCB->GetSavedValue() == TRISTATE_TRUE) ) aHelpOptions.SetExtendedHelp( bChecked ); if ( TriState(m_pFileDlgCB->IsChecked()) != m_pFileDlgCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetUseSystemFileDialog( !m_pFileDlgCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if ( TriState(m_pPrintDlgCB->IsChecked()) != m_pPrintDlgCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetUseSystemPrintDialog( !m_pPrintDlgCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if ( TriState(m_pDocStatusCB->IsChecked()) != m_pDocStatusCB->GetSavedValue() ) { SvtPrintWarningOptions aPrintOptions; aPrintOptions.SetModifyDocumentOnPrintingAllowed( m_pDocStatusCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if ( TriState(m_pSaveAlwaysCB->IsChecked()) != m_pSaveAlwaysCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetSaveAlwaysAllowed( m_pSaveAlwaysCB->IsChecked() ); - bModified = sal_True; + bModified = true; } const SfxUInt16Item* pUInt16Item = @@ -287,7 +287,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32(); if ( pUInt16Item && pUInt16Item->GetValue() != nNum ) { - bModified = sal_True; + bModified = true; rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) ); } @@ -380,24 +380,24 @@ class CanvasSettings public: CanvasSettings(); - sal_Bool IsHardwareAccelerationEnabled() const; - sal_Bool IsHardwareAccelerationAvailable() const; - void EnabledHardwareAcceleration( sal_Bool _bEnabled ) const; + bool IsHardwareAccelerationEnabled() const; + bool IsHardwareAccelerationAvailable() const; + void EnabledHardwareAcceleration( bool _bEnabled ) const; private: typedef std::vector< std::pair<OUString,Sequence<OUString> > > ServiceVector; Reference<XNameAccess> mxForceFlagNameAccess; ServiceVector maAvailableImplementations; - mutable sal_Bool mbHWAccelAvailable; - mutable sal_Bool mbHWAccelChecked; + mutable bool mbHWAccelAvailable; + mutable bool mbHWAccelChecked; }; CanvasSettings::CanvasSettings() : mxForceFlagNameAccess(), - mbHWAccelAvailable(sal_False), - mbHWAccelChecked(sal_False) + mbHWAccelAvailable(false), + mbHWAccelChecked(false) { try { @@ -453,7 +453,7 @@ CanvasSettings::CanvasSettings() : } -sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const +bool CanvasSettings::IsHardwareAccelerationAvailable() const { if( !mbHWAccelChecked ) { @@ -500,7 +500,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const } -sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const +bool CanvasSettings::IsHardwareAccelerationEnabled() const { bool bForceLastEntry(false); if( !mxForceFlagNameAccess.is() ) @@ -513,7 +513,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const } -void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const +void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const { Reference< XNameReplace > xNameReplace( mxForceFlagNameAccess, UNO_QUERY ); @@ -629,7 +629,7 @@ IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN ) { (void)NOTINTERESTEDIN; - sal_Bool bAAEnabled = m_pFontAntiAliasing->IsChecked(); + bool bAAEnabled = m_pFontAntiAliasing->IsChecked(); m_pAAPointLimitLabel->Enable( bAAEnabled ); m_pAAPointLimit->Enable( bAAEnabled ); @@ -657,8 +657,8 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) SvtFontOptions aFontOpt; SvtMenuOptions aMenuOpt; - sal_Bool bModified = sal_False; - sal_Bool bMenuOptModified = sal_False; + bool bModified = false; + bool bMenuOptModified = false; bool bRepaintWindows(false); SvtMiscOptions aMiscOptions; @@ -693,7 +693,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) nStyleLB_InitialSelection = nStyleLB_NewSelection; } - sal_Bool bAppearanceChanged = sal_False; + bool bAppearanceChanged = false; // Screen Scaling @@ -703,7 +703,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if ( nNewScale != nOldScale ) { pAppearanceCfg->SetScaleFactor(nNewScale); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } // Mouse Snap Mode @@ -715,7 +715,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if ( eNewSnap != eOldSnap ) { pAppearanceCfg->SetSnapMode(eNewSnap ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } // Middle Mouse Button @@ -727,27 +727,27 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if ( eNewMiddleMouse != eOldMiddleMouse ) { pAppearanceCfg->SetMiddleMouseButton( eNewMiddleMouse ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } #if defined( UNX ) if ( TriState(m_pFontAntiAliasing->IsChecked()) != m_pFontAntiAliasing->GetSavedValue() ) { pAppearanceCfg->SetFontAntiAliasing( m_pFontAntiAliasing->IsChecked() ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } if ( m_pAAPointLimit->GetValue() != m_pAAPointLimit->GetSavedValue().toInt32() ) { pAppearanceCfg->SetFontAntialiasingMinPixelHeight( m_pAAPointLimit->GetValue() ); - bAppearanceChanged = sal_True; + bAppearanceChanged = true; } #endif if ( TriState(m_pFontShowCB->IsChecked()) != m_pFontShowCB->GetSavedValue() ) { aFontOpt.EnableFontWYSIWYG( m_pFontShowCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if(m_pMenuIconsLB->GetSelectEntryPos() != m_pMenuIconsLB->GetSavedValue()) @@ -755,15 +755,15 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectEntryPos() == 0 ? TRISTATE_INDET : static_cast<TriState>(m_pMenuIconsLB->GetSelectEntryPos() - 1)); - bModified = sal_True; - bMenuOptModified = sal_True; - bAppearanceChanged = sal_True; + bModified = true; + bMenuOptModified = true; + bAppearanceChanged = true; } if ( TriState(m_pFontHistoryCB->IsChecked()) != m_pFontHistoryCB->GetSavedValue() ) { aFontOpt.EnableFontHistory( m_pFontHistoryCB->IsChecked() ); - bModified = sal_True; + bModified = true; } // #i95644# if disabled, do not use value, see in ::Reset() @@ -772,7 +772,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(TriState(m_pUseHardwareAccell->IsChecked()) != m_pUseHardwareAccell->GetSavedValue()) { pCanvasSettings->EnabledHardwareAcceleration(m_pUseHardwareAccell->IsChecked()); - bModified = sal_True; + bModified = true; } } @@ -782,7 +782,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(m_pUseAntiAliase->IsChecked() != mpDrawinglayerOpt->IsAntiAliasing()) { mpDrawinglayerOpt->SetAntiAliasing(m_pUseAntiAliase->IsChecked()); - bModified = sal_True; + bModified = true; bRepaintWindows = true; } } @@ -796,7 +796,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(bNewSelection != (bool)mpDrawinglayerOpt->IsTransparentSelection()) { mpDrawinglayerOpt->SetTransparentSelection(m_pSelectionCB->IsChecked()); - bModified = sal_True; + bModified = true; bRepaintWindows = true; } @@ -805,7 +805,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) if(nNewTransparence != mpDrawinglayerOpt->GetTransparentSelectionPercent()) { mpDrawinglayerOpt->SetTransparentSelectionPercent(nNewTransparence); - bModified = sal_True; + bModified = true; bRepaintWindows = true; } } @@ -815,8 +815,8 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& ) m_pSystemFont->IsEnabled() ) { aAccessibilityOptions.SetIsSystemFont( m_pSystemFont->IsChecked() ); - bModified = sal_True; - bMenuOptModified = sal_True; + bModified = true; + bMenuOptModified = true; } if( bMenuOptModified ) @@ -970,7 +970,7 @@ struct LanguageConfig_Impl SvtLinguConfig aLinguConfig; }; -static sal_Bool bLanguageCurrentDoc_Impl = sal_False; +static bool bLanguageCurrentDoc_Impl = false; // some things we'll need... static const OUString sAccessSrvc("com.sun.star.configuration.ConfigurationAccess"); @@ -1132,7 +1132,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe m_bOldAsian = pLangConfig->aLanguageOptions.IsAnyEnabled(); m_pAsianSupportCB->Check(m_bOldAsian); m_pAsianSupportCB->SaveValue(); - sal_Bool bReadonly = pLangConfig->aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_ALLCJK); + bool bReadonly = pLangConfig->aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_ALLCJK); m_pAsianSupportCB->Enable(!bReadonly); SupportHdl( m_pAsianSupportCB ); @@ -1201,7 +1201,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { //sequence checking has to be switched on depending on the selected CTL language LanguageType eCTLLang = m_pComplexLanguageLB->GetSelectLanguage(); - sal_Bool bOn = MsLangId::needsSequenceChecking( eCTLLang); + bool bOn = MsLangId::needsSequenceChecking( eCTLLang); pLangConfig->aLanguageOptions.SetCTLSequenceCheckingRestricted(bOn); pLangConfig->aLanguageOptions.SetCTLSequenceChecking(bOn); pLangConfig->aLanguageOptions.SetCTLSequenceCheckingTypeAndReplace(bOn); @@ -1305,12 +1305,12 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); Reference< css::linguistic2::XLinguProperties > xLinguProp = LinguMgr::GetLinguPropertySet(); - sal_Bool bCurrentDocCBChecked = m_pCurrentDocCB->IsChecked(); + bool bCurrentDocCBChecked = m_pCurrentDocCB->IsChecked(); if(m_pCurrentDocCB->IsEnabled()) bLanguageCurrentDoc_Impl = bCurrentDocCBChecked; - sal_Bool bCurrentDocCBChanged = bCurrentDocCBChecked != m_pCurrentDocCB->GetSavedValue(); + bool bCurrentDocCBChanged = bCurrentDocCBChecked != (m_pCurrentDocCB->GetSavedValue() == TRISTATE_TRUE); - sal_Bool bValChanged = m_pWesternLanguageLB->GetSavedValue() != m_pWesternLanguageLB->GetSelectEntryPos(); + bool bValChanged = m_pWesternLanguageLB->GetSavedValue() != m_pWesternLanguageLB->GetSelectEntryPos(); if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged) { LanguageType eSelectLang = m_pWesternLanguageLB->GetSelectLanguage(); @@ -1373,7 +1373,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) if(m_pAsianSupportCB->GetSavedValue() != TriState(m_pAsianSupportCB->IsChecked()) ) { - sal_Bool bChecked = m_pAsianSupportCB->IsChecked(); + bool bChecked = m_pAsianSupportCB->IsChecked(); pLangConfig->aLanguageOptions.SetAll(bChecked); //iterate over all bindings to invalidate vertical text direction @@ -1425,7 +1425,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pLocaleSettingLB->SelectLanguage(LanguageTag::convertToLanguageTypeWithFallback(sLang)); else m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG ); - sal_Bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); + bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE); m_pLocaleSettingLB->Enable(!bReadonly); m_pLocaleSettingFT->Enable(!bReadonly); @@ -1551,7 +1551,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pIgnoreLanguageChangeCB->SaveValue(); m_pCurrentDocCB->SaveValue(); - sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale" ); + bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale" ); m_pWesternLanguageFT->Enable( bEnable ); m_pWesternLanguageLB->Enable( bEnable ); @@ -1580,10 +1580,10 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) { DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); - sal_Bool bCheck = pBox->IsChecked(); + bool bCheck = pBox->IsChecked(); if ( m_pAsianSupportCB == pBox ) { - sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CJK"); + bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CJK"); bCheck = ( bCheck && !bReadonly ); m_pAsianLanguageLB->Enable( bCheck ); if( pBox->IsEnabled() ) @@ -1591,7 +1591,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) } else if ( m_pCTLSupportCB == pBox ) { - sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CTL"); + bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly("DefaultLocale_CTL"); bCheck = ( bCheck && !bReadonly ); m_pComplexLanguageLB->Enable( bCheck ); if( pBox->IsEnabled() ) @@ -1605,7 +1605,7 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) namespace { - void lcl_checkLanguageCheckBox(CheckBox* _rCB,sal_Bool _bNewValue,sal_Bool _bOldValue) + void lcl_checkLanguageCheckBox(CheckBox* _rCB,bool _bNewValue,bool _bOldValue) { if ( _bNewValue ) _rCB->Check(true); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 44130a772a1d..e015f4c4728e 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -150,8 +150,8 @@ class OfaLanguagesTabPage : public SfxTabPage CheckBox* m_pCTLSupportCB; CheckBox* m_pIgnoreLanguageChangeCB; - sal_Bool m_bOldAsian; - sal_Bool m_bOldCtl; + bool m_bOldAsian; + bool m_bOldCtl; LanguageConfig_Impl* pLangConfig; OUString m_sUserLocaleValue; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index bd37cc5c6aee..653c6038586a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -483,7 +483,7 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) return bModified; } -void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable) +void SvxProxyTabPage::EnableControls_Impl(bool bEnable) { m_pHttpProxyFT->Enable(bEnable); m_pHttpProxyED->Enable(bEnable); @@ -643,7 +643,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) if ( m_pSavePasswordsCB->IsChecked() ) { - sal_Bool bOldValue = xMasterPasswd->allowPersistentStoring( sal_True ); + bool bOldValue = xMasterPasswd->allowPersistentStoring( sal_True ); xMasterPasswd->removeMasterPassword(); if ( xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { @@ -933,8 +933,8 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent, bool MozPluginTabPage::FillItemSet( SfxItemSet& ) { - sal_Bool hasInstall = isInstalled(); - sal_Bool hasChecked = m_pWBasicCodeCB->IsChecked(); + bool hasInstall = isInstalled(); + bool hasChecked = m_pWBasicCodeCB->IsChecked(); if(hasInstall && (!hasChecked)){ //try to uninstall uninstallPlugin(); @@ -978,7 +978,7 @@ inline bool getDllURL(OString * path) return true; } -sal_Bool MozPluginTabPage::isInstalled() +bool MozPluginTabPage::isInstalled() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1027,7 +1027,7 @@ sal_Bool MozPluginTabPage::isInstalled() #endif } -sal_Bool MozPluginTabPage::installPlugin() +bool MozPluginTabPage::installPlugin() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1074,7 +1074,7 @@ sal_Bool MozPluginTabPage::installPlugin() #endif } -sal_Bool MozPluginTabPage::uninstallPlugin() +bool MozPluginTabPage::uninstallPlugin() { #ifdef UNIX // get the real file referred by .so lnk file @@ -1107,7 +1107,7 @@ class MailerProgramCfg_Impl : public utl::ConfigItem // variables OUString sProgram; // readonly states - sal_Bool bROProgram; + bool bROProgram; const Sequence<OUString> GetPropertyNames(); public: @@ -1122,7 +1122,7 @@ public: MailerProgramCfg_Impl::MailerProgramCfg_Impl() : utl::ConfigItem("Office.Common/ExternalMailer"), - bROProgram(sal_False) + bROProgram(false) { const Sequence< OUString > aNames = GetPropertyNames(); const Sequence< Any > aValues = GetProperties(aNames); @@ -1236,11 +1236,11 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) { - sal_Bool bMailModified = sal_False; + bool bMailModified = false; if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->GetSavedValue() != m_pMailerURLED->GetText()) { pImpl->aMailConfig.sProgram = m_pMailerURLED->GetText(); - bMailModified = sal_True; + bMailModified = true; } if ( bMailModified ) pImpl->aMailConfig.Commit(); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 2d42cbf50d01..c76a8eb97a92 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -92,7 +92,7 @@ private: uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess; - void EnableControls_Impl(sal_Bool bEnable); + void EnableControls_Impl(bool bEnable); void ReadConfigData_Impl(); void ReadConfigDefaults_Impl(); void RestoreConfigDefaults_Impl(); @@ -183,9 +183,9 @@ class MozPluginTabPage : public SfxTabPage { CheckBox* m_pWBasicCodeCB; - sal_Bool isInstalled(void); - sal_Bool installPlugin(void); - sal_Bool uninstallPlugin(void); + bool isInstalled(void); + bool installPlugin(void); + bool uninstallPlugin(void); MozPluginTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~MozPluginTabPage(); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 41a82f6f436f..cda9b33696eb 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -221,7 +221,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) { - sal_Bool bEnable = m_pJavaEnableCB->IsChecked(); + bool bEnable = m_pJavaEnableCB->IsChecked(); m_pJavaBox->Enable(bEnable); bEnable ? m_pJavaList->EnableTable() : m_pJavaList->DisableTable(); return 0; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 10bb9e68a474..54482d40048f 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -52,7 +52,7 @@ SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& get( m_pIgnoreWhitespace, "ignorewhitespace"); get( m_pIgnoreMiddleDot, "ignoremiddledot"); - bSaveOptions = sal_True; + bSaveOptions = true; nTransliterationFlags = 0x00000000; } @@ -70,7 +70,7 @@ SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet& r void SvxJSearchOptionsPage::SetTransliterationFlags( sal_Int32 nSettings ) { - sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); + bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); m_pMatchCase ->Check( bVal ); //! treat as equal uppercase/lowercase bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH); m_pMatchFullHalfWidth ->Check( bVal ); @@ -222,136 +222,136 @@ bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) bModified = false; SvtSearchOptions aOpt; - sal_Bool bNewVal, bChanged; + bool bNewVal, bChanged; bNewVal = m_pMatchCase->IsChecked(); //! treat as equal uppercase/lowercase - bChanged = bNewVal != m_pMatchCase->GetSavedValue(); + bChanged = bNewVal != (m_pMatchCase->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchCase(!bNewVal ); bModified = true; } bNewVal = m_pMatchFullHalfWidth->IsChecked(); - bChanged = bNewVal != m_pMatchFullHalfWidth->GetSavedValue(); + bChanged = bNewVal != (m_pMatchFullHalfWidth->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchFullHalfWidthForms( bNewVal ); bModified = true; } bNewVal = m_pMatchHiraganaKatakana->IsChecked(); - bChanged = bNewVal != m_pMatchHiraganaKatakana->GetSavedValue(); + bChanged = bNewVal != (m_pMatchHiraganaKatakana->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchHiraganaKatakana( bNewVal ); bModified = true; } bNewVal = m_pMatchContractions->IsChecked(); - bChanged = bNewVal != m_pMatchContractions->GetSavedValue(); + bChanged = bNewVal != (m_pMatchContractions->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchContractions( bNewVal ); bModified = true; } bNewVal = m_pMatchMinusDashChoon->IsChecked(); - bChanged = bNewVal != m_pMatchMinusDashChoon->GetSavedValue(); + bChanged = bNewVal != (m_pMatchMinusDashChoon->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchMinusDashChoon( bNewVal ); bModified = true; } bNewVal = m_pMatchRepeatCharMarks->IsChecked(); - bChanged = bNewVal != m_pMatchRepeatCharMarks->GetSavedValue(); + bChanged = bNewVal != (m_pMatchRepeatCharMarks->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchRepeatCharMarks( bNewVal ); bModified = true; } bNewVal = m_pMatchVariantFormKanji->IsChecked(); - bChanged = bNewVal != m_pMatchVariantFormKanji->GetSavedValue(); + bChanged = bNewVal != (m_pMatchVariantFormKanji->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchVariantFormKanji( bNewVal ); bModified = true; } bNewVal = m_pMatchOldKanaForms->IsChecked(); - bChanged = bNewVal != m_pMatchOldKanaForms->GetSavedValue(); + bChanged = bNewVal != (m_pMatchOldKanaForms->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchOldKanaForms( bNewVal ); bModified = true; } bNewVal = m_pMatchDiziDuzu->IsChecked(); - bChanged = bNewVal != m_pMatchDiziDuzu->GetSavedValue(); + bChanged = bNewVal != (m_pMatchDiziDuzu->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchDiziDuzu( bNewVal ); bModified = true; } bNewVal = m_pMatchBavaHafa->IsChecked(); - bChanged = bNewVal != m_pMatchBavaHafa->GetSavedValue(); + bChanged = bNewVal != (m_pMatchBavaHafa->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchBavaHafa( bNewVal ); bModified = true; } bNewVal = m_pMatchTsithichiDhizi->IsChecked(); - bChanged = bNewVal != m_pMatchTsithichiDhizi->GetSavedValue(); + bChanged = bNewVal != (m_pMatchTsithichiDhizi->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchTsithichiDhizi( bNewVal ); bModified = true; } bNewVal = m_pMatchHyuiyuByuvyu->IsChecked(); - bChanged = bNewVal != m_pMatchHyuiyuByuvyu->GetSavedValue(); + bChanged = bNewVal != (m_pMatchHyuiyuByuvyu->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchHyuiyuByuvyu( bNewVal ); bModified = true; } bNewVal = m_pMatchSesheZeje->IsChecked(); - bChanged = bNewVal != m_pMatchSesheZeje->GetSavedValue(); + bChanged = bNewVal != (m_pMatchSesheZeje->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchSesheZeje( bNewVal ); bModified = true; } bNewVal = m_pMatchIaiya->IsChecked(); - bChanged = bNewVal != m_pMatchIaiya->GetSavedValue(); + bChanged = bNewVal != (m_pMatchIaiya->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchIaiya( bNewVal ); bModified = true; } bNewVal = m_pMatchKiku->IsChecked(); - bChanged = bNewVal != m_pMatchKiku->GetSavedValue(); + bChanged = bNewVal != (m_pMatchKiku->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetMatchKiku( bNewVal ); bModified = true; } bNewVal = m_pIgnorePunctuation->IsChecked(); - bChanged = bNewVal != m_pIgnorePunctuation->GetSavedValue(); + bChanged = bNewVal != (m_pIgnorePunctuation->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnorePunctuation( bNewVal ); bModified = true; } bNewVal = m_pIgnoreWhitespace->IsChecked(); - bChanged = bNewVal != m_pIgnoreWhitespace->GetSavedValue(); + bChanged = bNewVal != (m_pIgnoreWhitespace->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnoreWhitespace( bNewVal ); bModified = true; } bNewVal = m_pMatchProlongedSoundMark->IsChecked(); - bChanged = bNewVal != m_pMatchProlongedSoundMark->GetSavedValue(); + bChanged = bNewVal != (m_pMatchProlongedSoundMark->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnoreProlongedSoundMark( bNewVal ); bModified = true; } bNewVal = m_pIgnoreMiddleDot->IsChecked(); - bChanged = bNewVal != m_pIgnoreMiddleDot->GetSavedValue(); + bChanged = bNewVal != (m_pIgnoreMiddleDot->GetSavedValue() == TRISTATE_TRUE); if (bChanged) { aOpt.SetIgnoreMiddleDot( bNewVal ); diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 6445b39bc55e..4c20a5c178a5 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -54,7 +54,7 @@ private: CheckBox* m_pIgnoreMiddleDot; sal_Int32 nTransliterationFlags; - sal_Bool bSaveOptions; + bool bSaveOptions; sal_Int32 GetTransliterationFlags_Impl(); @@ -69,8 +69,8 @@ public: virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; - sal_Bool IsSaveOptions() const { return bSaveOptions; } - void EnableSaveOptions( sal_Bool bVal ) { bSaveOptions = bVal; } + bool IsSaveOptions() const { return bSaveOptions; } + void EnableSaveOptions( bool bVal ) { bSaveOptions = bVal; } sal_Int32 GetTransliterationFlags() const { return nTransliterationFlags; } void SetTransliterationFlags( sal_Int32 nSettings ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index c2c4b110823d..6a279b8e64d2 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -159,23 +159,23 @@ static sal_uInt16 pRanges[] = 0 }; -sal_Bool KillFile_Impl( const OUString& rURL ) +bool KillFile_Impl( const OUString& rURL ) { - sal_Bool bRet = sal_True; + bool bRet = true; try { Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete"), makeAny( true ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { SAL_WARN( "cui.options", "KillFile: CommandAbortedException" ); - bRet = sal_False; + bRet = false; } catch( ... ) { SAL_WARN( "cui.options", "KillFile: Any other exception" ); - bRet = sal_False; + bRet = false; } return bRet; @@ -194,14 +194,14 @@ sal_Bool KillFile_Impl( const OUString& rURL ) class ModuleUserData_Impl { - sal_Bool bParent; - sal_Bool bIsChecked; + bool bParent; + bool bIsChecked; sal_uInt8 nType; sal_uInt8 nIndex; OUString sImplName; public: - ModuleUserData_Impl( const OUString& sImpName, sal_Bool bIsParent, sal_Bool bChecked, sal_uInt8 nSetType, sal_uInt8 nSetIndex ) : + ModuleUserData_Impl( const OUString& sImpName, bool bIsParent, bool bChecked, sal_uInt8 nSetType, sal_uInt8 nSetIndex ) : bParent(bIsParent), bIsChecked(bChecked), nType(nSetType), @@ -209,9 +209,9 @@ public: sImplName(sImpName) { } - sal_Bool IsParent() const {return bParent;} + bool IsParent() const {return bParent;} sal_uInt8 GetType() const {return nType;} - sal_Bool IsChecked() const {return bIsChecked;} + bool IsChecked() const {return bIsChecked;} sal_uInt8 GetIndex() const {return nIndex;} const OUString& GetImplName() const {return sImplName;} @@ -227,18 +227,18 @@ class DicUserData public: DicUserData( sal_uLong nUserData ) : nVal( nUserData ) {} DicUserData( sal_uInt16 nEID, - sal_Bool bChecked, sal_Bool bEditable, sal_Bool bDeletable ); + bool bChecked, bool bEditable, bool bDeletable ); sal_uLong GetUserData() const { return nVal; } sal_uInt16 GetEntryId() const { return (sal_uInt16)(nVal >> 16); } - sal_Bool IsChecked() const { return (sal_Bool)(nVal >> 8) & 0x01; } - sal_Bool IsDeletable() const { return (sal_Bool)(nVal >> 10) & 0x01; } + bool IsChecked() const { return (bool)((nVal >> 8) & 0x01); } + bool IsDeletable() const { return (bool)((nVal >> 10) & 0x01); } }; DicUserData::DicUserData( sal_uInt16 nEID, - sal_Bool bChecked, sal_Bool bEditable, sal_Bool bDeletable ) + bool bChecked, bool bEditable, bool bDeletable ) { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); nVal = ((sal_uLong)(0xFFFF & nEID) << 16) | @@ -250,7 +250,7 @@ DicUserData::DicUserData( // class BrwString_Impl ------------------------------------------------- -static void lcl_SetCheckButton( SvTreeListEntry* pEntry, sal_Bool bCheck ) +static void lcl_SetCheckButton( SvTreeListEntry* pEntry, bool bCheck ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); @@ -390,22 +390,22 @@ class OptionsUserData public: OptionsUserData( sal_uLong nUserData ) : nVal( nUserData ) {} OptionsUserData( sal_uInt16 nEID, - sal_Bool bHasNV, sal_uInt16 nNumVal, - sal_Bool bCheckable, sal_Bool bChecked ); + bool bHasNV, sal_uInt16 nNumVal, + bool bCheckable, bool bChecked ); sal_uLong GetUserData() const { return nVal; } sal_uInt16 GetEntryId() const { return (sal_uInt16)(nVal >> 16); } - sal_Bool HasNumericValue() const { return (sal_Bool)(nVal >> 10) & 0x01; } + bool HasNumericValue() const { return (bool)((nVal >> 10) & 0x01); } sal_uInt16 GetNumericValue() const { return (sal_uInt16)(nVal & 0xFF); } - sal_Bool IsCheckable() const { return (sal_Bool)(nVal >> 9) & 0x01; } - sal_Bool IsModified() const { return (sal_Bool)(nVal >> 11) & 0x01; } + bool IsCheckable() const { return (bool)((nVal >> 9) & 0x01); } + bool IsModified() const { return (bool)((nVal >> 11) & 0x01); } - void SetNumericValue( sal_uInt8 nNumVal ); + void SetNumericValue( sal_uInt8 nNumVal ); }; OptionsUserData::OptionsUserData( sal_uInt16 nEID, - sal_Bool bHasNV, sal_uInt16 nNumVal, - sal_Bool bCheckable, sal_Bool bChecked ) + bool bHasNV, sal_uInt16 nNumVal, + bool bCheckable, bool bChecked ) { DBG_ASSERT( nEID < 65000, "Entry Id out of range" ); DBG_ASSERT( nNumVal < 256, "value out of range" ); @@ -486,9 +486,9 @@ struct ServiceInfo_Impl uno::Reference< XHyphenator > xHyph; uno::Reference< XThesaurus > xThes; uno::Reference< XProofreader > xGrammar; - sal_Bool bConfigured; + bool bConfigured; - ServiceInfo_Impl() : bConfigured(sal_False) {} + ServiceInfo_Impl() : bConfigured(false) {} }; typedef std::vector< ServiceInfo_Impl > ServiceInfoArr; @@ -511,8 +511,8 @@ class SvxLinguData_Impl uno::Reference< XLinguServiceManager2 > xLinguSrvcMgr; - sal_Bool AddRemove( Sequence< OUString > &rConfigured, - const OUString &rImplName, sal_Bool bAdd ); + bool AddRemove( Sequence< OUString > &rConfigured, + const OUString &rImplName, bool bAdd ); public: SvxLinguData_Impl(); @@ -524,7 +524,7 @@ public: uno::Reference<XLinguServiceManager2> & GetManager() { return xLinguSrvcMgr; } void SetChecked( const Sequence< OUString > &rConfiguredServices ); - void Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ); + void Reconfigure( const OUString &rDisplayName, bool bEnable ); const Sequence<Locale> & GetAllSupportedLocales() const { return aAllServiceLocales; } @@ -644,7 +644,7 @@ static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Lo sal_Int32 i; for(i = 0; i < rAdd.getLength(); i++) { - sal_Bool bFound = sal_False; + bool bFound = false; for(sal_Int32 j = 0; j < aAllLocales.getLength() && !bFound; j++) { bFound = pAdd[i].Language == pAllLocales[j].Language && @@ -901,7 +901,7 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices pEntry->sHyphImplName == rSrvcImplName || pEntry->sThesImplName == rSrvcImplName)) { - pEntry->bConfigured = sal_True; + pEntry->bConfigured = true; break; } } @@ -909,11 +909,11 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices } } -sal_Bool SvxLinguData_Impl::AddRemove( +bool SvxLinguData_Impl::AddRemove( Sequence< OUString > &rConfigured, - const OUString &rImplName, sal_Bool bAdd ) + const OUString &rImplName, bool bAdd ) { - sal_Bool bRet = sal_False; // modified? + bool bRet = false; // modified? sal_Int32 nEntries = rConfigured.getLength(); sal_Int32 nPos = lcl_SeqGetEntryPos(rConfigured, rImplName); @@ -922,7 +922,7 @@ sal_Bool SvxLinguData_Impl::AddRemove( rConfigured.realloc( ++nEntries ); OUString *pConfigured = rConfigured.getArray(); pConfigured[nEntries - 1] = rImplName; - bRet = sal_True; + bRet = true; } else if (!bAdd && nPos >= 0) // remove existing entry { @@ -930,14 +930,14 @@ sal_Bool SvxLinguData_Impl::AddRemove( for (sal_Int32 i = nPos; i < nEntries - 1; ++i) pConfigured[i] = pConfigured[i + 1]; rConfigured.realloc(--nEntries); - bRet = sal_True; + bRet = true; } return bRet; } -void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, sal_Bool bEnable ) +void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable ) { DBG_ASSERT( !rDisplayName.isEmpty(), "empty DisplayName" ); @@ -1237,12 +1237,12 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) DicUserData aData( (sal_uLong)pEntry->GetUserData() ); if (aData.GetEntryId() < nDics) { - sal_Bool bChecked = m_pLinguDicsCLB->IsChecked( i ); + bool bChecked = m_pLinguDicsCLB->IsChecked( i ); uno::Reference< XDictionary > xDic( aDics.getConstArray()[ i ] ); if (xDic.is()) { if (SvxGetIgnoreAllList() == xDic) - bChecked = sal_True; + bChecked = true; xDic->setActive( bChecked ); if (bChecked) @@ -1273,7 +1273,7 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) Any aAny; if (aData.IsCheckable()) { - sal_Bool bChecked = m_pLinguOptionsCLB->IsChecked( j ); + bool bChecked = m_pLinguOptionsCLB->IsChecked( j ); aAny <<= bChecked; } else if (aData.HasNumericValue()) @@ -1328,9 +1328,9 @@ sal_uLong SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > & { uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY ); - sal_Bool bChecked = rxDic->isActive(); - sal_Bool bEditable = !xStor.is() || !xStor->isReadonly(); - sal_Bool bDeletable = bEditable; + bool bChecked = rxDic->isActive(); + bool bEditable = !xStor.is() || !xStor->isReadonly(); + bool bDeletable = bEditable; nRes = DicUserData( nIdx, bChecked, bEditable, bDeletable ).GetUserData(); @@ -1429,7 +1429,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) SvTreeListEntry* pEntry = NULL; sal_Int16 nVal = 0; - sal_Bool bVal = sal_False; + bool bVal = false; sal_uLong nUserData = 0; pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); @@ -1437,42 +1437,42 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); if (pItem) bVal = ((SfxBoolItem *) pItem)->GetValue(); - nUserData = OptionsUserData( EID_SPELL_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_SPELL_AUTO, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_GRAMMAR_AUTO ) >>= bVal; - nUserData = OptionsUserData( EID_GRAMMAR_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_GRAMMAR_AUTO, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sCapitalWords, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_UPPER_CASE ) >>= bVal; - nUserData = OptionsUserData( EID_CAPITAL_WORDS, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_CAPITAL_WORDS, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sWordsWithDigits, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_WITH_DIGITS ) >>= bVal; - nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_WORDS_WITH_DIGITS, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sSpellSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_SPECIAL ) >>= bVal; - nUserData = OptionsUserData( EID_SPELL_SPECIAL, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_SPELL_SPECIAL, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sNumMinWordlen, CBCOL_SECOND ); aLngCfg.GetProperty( UPN_HYPH_MIN_WORD_LENGTH ) >>= nVal; - nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); + nUserData = OptionsUserData( EID_NUM_MIN_WORDLEN, true, (sal_uInt16)nVal, false, false).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1485,7 +1485,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) aLngCfg.GetProperty( UPN_HYPH_MIN_LEADING ) >>= nVal; if (pHyp) nVal = (sal_Int16) pHyp->GetMinLead(); - nUserData = OptionsUserData( EID_NUM_PRE_BREAK, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); + nUserData = OptionsUserData( EID_NUM_PRE_BREAK, true, (sal_uInt16)nVal, false, false).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); @@ -1493,20 +1493,20 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) aLngCfg.GetProperty( UPN_HYPH_MIN_TRAILING ) >>= nVal; if (pHyp) nVal = (sal_Int16) pHyp->GetMinTrail(); - nUserData = OptionsUserData( EID_NUM_POST_BREAK, sal_True, (sal_uInt16)nVal, sal_False, sal_False).GetUserData(); + nUserData = OptionsUserData( EID_NUM_POST_BREAK, true, (sal_uInt16)nVal, false, false).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); pEntry = CreateEntry( sHyphAuto, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_HYPH_AUTO ) >>= bVal; - nUserData = OptionsUserData( EID_HYPH_AUTO, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_HYPH_AUTO, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); pEntry = CreateEntry( sHyphSpecial, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_HYPH_SPECIAL ) >>= bVal; - nUserData = OptionsUserData( EID_HYPH_SPECIAL, sal_False, 0, sal_True, bVal).GetUserData(); + nUserData = OptionsUserData( EID_HYPH_SPECIAL, false, 0, true, bVal).GetUserData(); pEntry->SetUserData( (void *)nUserData ); pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); @@ -1574,7 +1574,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { SvTreeListEntry* pEntry = m_pLinguDicsCLB->GetEntry( nPos ); if (pEntry) - lcl_SetCheckButton( pEntry, sal_True ); + lcl_SetCheckButton( pEntry, true ); } } } @@ -1598,7 +1598,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) // evaluate new status of 'bConfigured' flag sal_uLong nLen = pLinguData->GetDisplayServiceCount(); for (sal_uLong i = 0; i < nLen; ++i) - pLinguData->GetDisplayServiceArray()[i].bConfigured = sal_False; + pLinguData->GetDisplayServiceArray()[i].bConfigured = false; const Locale* pAllLocales = pLinguData->GetAllSupportedLocales().getConstArray(); sal_Int32 nLocales = pLinguData->GetAllSupportedLocales().getLength(); for (sal_Int32 k = 0; k < nLocales; ++k) @@ -1943,8 +1943,8 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) { if (m_pModulesCLB == pBox) { - sal_Bool bDisableUp = sal_True; - sal_Bool bDisableDown = sal_True; + bool bDisableUp = true; + bool bDisableDown = true; SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { @@ -1995,7 +1995,7 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) pData->GetType() == TYPE_HYPH && pEntry != pCurEntry) { - lcl_SetCheckButton( pEntry, sal_False ); + lcl_SetCheckButton( pEntry, false ); pBox->InvalidateEntry( pEntry ); } pEntry = pBox->Next( pEntry ); @@ -2054,7 +2054,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) OUString* pChange = aChange.getArray(); pChange[nStart] = pData->GetImplName(); bChanged |= pData->GetIndex() != nLocalIndex || - pData->IsChecked() != (m_pModulesCLB->IsChecked(i) ? 1 : 0); + pData->IsChecked() != m_pModulesCLB->IsChecked(i); if(m_pModulesCLB->IsChecked(i)) nStart++; ++nLocalIndex; @@ -2084,7 +2084,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) SvTreeListEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); ModuleUserData_Impl* pUserData = new ModuleUserData_Impl( - OUString(), sal_True, sal_False, TYPE_SPELL, 0 ); + OUString(), true, false, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2095,7 +2095,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2117,7 +2117,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_SPELL, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2128,7 +2128,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // grammar checker entries pEntry = CreateEntry( sGrammar, CBCOL_SECOND ); - pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_GRAMMAR, 0 ); + pUserData = new ModuleUserData_Impl( OUString(), true, false, TYPE_GRAMMAR, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2139,7 +2139,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2161,7 +2161,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_GRAMMAR, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2172,7 +2172,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // hyphenator entries pEntry = CreateEntry( sHyph, CBCOL_SECOND ); - pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_HYPH, 0 ); + pUserData = new ModuleUserData_Impl( OUString(), true, false, TYPE_HYPH, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2183,7 +2183,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2205,7 +2205,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_HYPH, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2216,7 +2216,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // thesaurus entries pEntry = CreateEntry( sThes, CBCOL_SECOND ); - pUserData = new ModuleUserData_Impl( OUString(), sal_True, sal_False, TYPE_THES, 0 ); + pUserData = new ModuleUserData_Impl( OUString(), true, false, TYPE_THES, 0 ); pEntry->SetUserData( (void *)pUserData ); pModel->Insert( pEntry ); @@ -2227,7 +2227,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) for (n = 0; n < nNames; ++n) { OUString aImplName; - sal_Bool bIsSuppLang = sal_False; + bool bIsSuppLang = false; pInfo = rLinguData.GetInfoByImplName( pName[n] ); if (pInfo) @@ -2249,7 +2249,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); - pUserData = new ModuleUserData_Impl( aImplName, sal_False, + pUserData = new ModuleUserData_Impl( aImplName, false, bCheck, TYPE_THES, (sal_uInt8)nLocalIndex++ ); pNewEntry->SetUserData( (void *)pUserData ); pModel->Insert( pNewEntry ); @@ -2262,7 +2262,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { - sal_Bool bUp = m_pPrioUpPB == pBtn; + bool bUp = m_pPrioUpPB == pBtn; sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos(); SvTreeListEntry* pEntry; if (nCurPos != TREELIST_ENTRY_NOTFOUND && @@ -2275,7 +2275,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) OUString aStr(m_pModulesCLB->GetEntryText(pEntry)); SvTreeListEntry* pToInsert = CreateEntry( aStr, CBCOL_FIRST ); pToInsert->SetUserData( (void *)pData); - sal_Bool bIsChecked = m_pModulesCLB->IsChecked(nCurPos); + bool bIsChecked = m_pModulesCLB->IsChecked(nCurPos); pModel->Remove(pEntry); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 9d6f538701cf..1b065062d555 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -175,7 +175,7 @@ bool SvxControlFocusHelper::Notify( NotifyEvent& rNEvt ) // functions ------------------------------------------------------------- -sal_Bool IsMultiPath_Impl( const sal_uInt16 nIndex ) +bool IsMultiPath_Impl( const sal_uInt16 nIndex ) { #if OSL_DEBUG_LEVEL > 1 return ( SvtPathOptions::PATH_AUTOCORRECT == nIndex || @@ -312,7 +312,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); aStr += "\t"; OUString sInternal, sUser, sWritable; - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( i, sInternal, sUser, sWritable, bReadOnly ); OUString sTmpPath = sUser; if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() ) @@ -378,7 +378,7 @@ void SvxPathTabPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); aUserData += bUp ? OUString("1") : OUString("0"); SetUserData( aUserData ); } @@ -394,7 +394,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) Image aEntryImage; if(pEntry) aEntryImage = pPathBox->GetCollapsedEntryBmp( pEntry ); - sal_Bool bEnable = !aEntryImage; + bool bEnable = !aEntryImage; while ( pEntry && ( nSelCount < 2 ) ) { nSelCount++; @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) if ( !aOldPath.isEmpty() ) { OUString sInternal, sUser, sWritable, sTemp; - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sal_uInt16 i; @@ -475,7 +475,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) OUString sInternal, sUser, sWritable; PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sUser = pPathImpl->sUserPath; sWritable = pPathImpl->sWritablePath; @@ -537,7 +537,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) if ( pEntry ) { PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); sUser = pPathImpl->sUserPath; sWritable = pPathImpl->sWritablePath; @@ -641,7 +641,7 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) @@ -711,7 +711,7 @@ IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt ) void SvxPathTabPage::GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, - OUString& _rUserPath, OUString& _rWritablePath, sal_Bool& _rReadOnly ) + OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ) { OUString sCfgName = getCfgName_Impl( _nPathHandle ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 21a4474618be..5dd08661a907 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -65,13 +65,13 @@ struct SvxSaveTabPage_Impl Sequence< OUString > aUIFilterArr[APP_COUNT]; OUString aDefaultArr[APP_COUNT]; sal_Bool aDefaultReadonlyArr[APP_COUNT]; - sal_Bool bInitialized; + bool bInitialized; SvxSaveTabPage_Impl(); ~SvxSaveTabPage_Impl(); }; -SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( sal_False ) +SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( false ) { } @@ -345,7 +345,7 @@ bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) -sal_Bool isODFFormat( const OUString& sFilter ) +bool isODFFormat( const OUString& sFilter ) { static const char* aODFFormats[] = { @@ -365,13 +365,13 @@ sal_Bool isODFFormat( const OUString& sFilter ) NULL }; - sal_Bool bRet = sal_False; + bool bRet = false; int i = 0; while ( aODFFormats[i] != NULL ) { if ( sFilter.equalsAscii( aODFFormats[i++] ) ) { - bRet = sal_True; + bRet = true; break; } } @@ -457,13 +457,13 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) getStr()); } - pImpl->bInitialized = sal_True; + pImpl->bInitialized = true; } aDocInfoCB->Check(aSaveOpt.IsDocInfoSave()); aBackupCB->Check(aSaveOpt.IsBackup()); - sal_Bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); + bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP); aBackupCB->Enable(!bBackupRO); aAutoSaveCB->Check(aSaveOpt.IsAutoSave()); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 788ef9399322..014076cb03f8 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -65,7 +65,7 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet m_xUpdateAccess = setup::UpdateCheckConfig::create( xContext ); - sal_Bool bDownloadSupported = sal_False; + bool bDownloadSupported = false; m_xUpdateAccess->getByName( "DownloadSupported" ) >>= bDownloadSupported; WinBits nStyle = m_pDestPath->GetStyle(); @@ -161,7 +161,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) { bool bModified = false; - sal_Bool bValue; + bool bValue; sal_Int64 nValue; if( m_pAutoCheckCheckBox->GetSavedValue() != TriState(m_pAutoCheckCheckBox->IsChecked()) ) @@ -222,7 +222,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) { - sal_Bool bValue = sal_Bool(); + bool bValue = false; m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue; m_pAutoCheckCheckBox->Check(bValue); @@ -270,7 +270,7 @@ void SvxOnlineUpdateTabPage::FillUserData() IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox ) { - sal_Bool bEnabled = pBox->IsChecked(); + bool bEnabled = pBox->IsChecked(); m_pEveryDayButton->Enable(bEnabled); m_pEveryWeekButton->Enable(bEnabled); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index e5b1bf37d82d..14dcccb8704d 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -250,7 +250,7 @@ class MailMergeCfg_Impl : public utl::ConfigItem { friend class SvxEMailTabPage; // variables - sal_Bool bIsEmailSupported; + bool bIsEmailSupported; public: MailMergeCfg_Impl(); @@ -259,13 +259,13 @@ public: virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; - sal_Bool IsEmailSupported() const {return bIsEmailSupported;} + bool IsEmailSupported() const {return bIsEmailSupported;} }; MailMergeCfg_Impl::MailMergeCfg_Impl() : utl::ConfigItem("Office.Writer/MailMergeWizard"), - bIsEmailSupported(sal_False) + bIsEmailSupported(false) { Sequence<OUString> aNames(1); aNames.getArray()[0] = "EMailSupported"; @@ -424,16 +424,16 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { NULL, NULL, 0 } }; -static sal_Bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName ) +static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nIdx = 0; while ( OptionsMap_Impl[nIdx].m_pGroupName != NULL ) { if ( _nPageId == OptionsMap_Impl[nIdx].m_nPageId ) { - bRet = sal_True; + bRet = true; _rGroupName = OUString::createFromAscii( OptionsMap_Impl[nIdx].m_pGroupName ); if ( OptionsMap_Impl[nIdx].m_pPageName != NULL ) _rPageName = OUString::createFromAscii( OptionsMap_Impl[nIdx].m_pPageName ); @@ -445,9 +445,9 @@ static sal_Bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, return bRet; } -static sal_Bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogOptions& _rOptOptions ) +static bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogOptions& _rOptOptions ) { - sal_Bool bIsHidden = sal_False; + bool bIsHidden = false; OUString sGroupName, sPageName; if ( lcl_getStringFromID( _nPageId, sGroupName, sPageName ) ) { @@ -477,13 +477,13 @@ struct OptionsGroupInfo SfxShell* m_pShell; // used to create the page SfxModule* m_pModule; // used to create the ItemSet sal_uInt16 m_nDialogId; // Id of the former dialog - sal_Bool m_bLoadError; // load fails? + bool m_bLoadError; // load fails? OUString m_sPageURL; ExtensionsTabPage* m_pExtPage; OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) : m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ), - m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( sal_False ), + m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( false ), m_sPageURL( OUString() ), m_pExtPage( NULL ) {} ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; } }; @@ -502,7 +502,7 @@ struct OptionsGroupInfo sNotLoadedError ( CUI_RES( ST_LOAD_ERROR ) ),\ pColorPageItemSet ( NULL ),\ mpColorPage ( NULL ),\ - bForgetSelection ( sal_False ),\ + bForgetSelection ( false ),\ bIsFromExtensionManager( false ), \ bIsForSetDocumentLanguage( false ) @@ -798,7 +798,7 @@ void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId ) DBG_ASSERT( !bIsFromExtensionManager, "OfaTreeOptionsDialog::ActivatePage(): call from extension manager" ); if ( !pLastPageSaver ) pLastPageSaver = new LastPageSaver; - bForgetSelection = sal_True; + bForgetSelection = true; sal_uInt16 nTemp = pLastPageSaver->m_nLastPageId; pLastPageSaver->m_nLastPageId = nResId; ActivateLastSelection(); @@ -810,7 +810,7 @@ void OfaTreeOptionsDialog::ActivatePage( const OUString& rPageURL ) DBG_ASSERT( !bIsFromExtensionManager, "OfaTreeOptionsDialog::ActivatePage(): call from extension manager" ); if ( !pLastPageSaver ) pLastPageSaver = new LastPageSaver; - bForgetSelection = sal_True; + bForgetSelection = true; pLastPageSaver->m_nLastPageId = 0; pLastPageSaver->m_sLastPageURL_Tools = rPageURL; ActivateLastSelection(); @@ -1051,13 +1051,13 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() if(pGroupInfo->m_pModule /*&& !pGroupInfo->pModule->IsLoaded()*/) { SfxModule* pOldModule = pGroupInfo->m_pModule; - sal_Bool bIdentical = pGroupInfo->m_pModule == pGroupInfo->m_pShell; + bool bIdentical = pGroupInfo->m_pModule == pGroupInfo->m_pShell; WaitObject aWait(this); //pGroupInfo->pModule = pGroupInfo->pModule->Load(); if(!pGroupInfo->m_pModule) { - pGroupInfo->m_bLoadError = sal_True; + pGroupInfo->m_bLoadError = true; InfoBox(pBox, sNotLoadedError).Execute(); return; } @@ -1304,7 +1304,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) } else { - sal_Bool bVal = sal_False; + bool bVal = false; if (xProp.is()) { bVal = xProp->getIsSpellAuto(); @@ -1438,7 +1438,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet } void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) { - sal_Bool bSaveSpellCheck = sal_False; + bool bSaveSpellCheck = false; const SfxPoolItem* pItem; if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem ) ) @@ -1453,7 +1453,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) xProp->setHyphMinLeading( (sal_Int16) pHyphenItem->GetMinLead() ); xProp->setHyphMinTrailing( (sal_Int16) pHyphenItem->GetMinTrail() ); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } SfxViewFrame *pViewFrame = SfxViewFrame::Current(); @@ -1464,22 +1464,22 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet) if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem )) { pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, false, &pItem )) { pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, false, &pItem )) { pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L); - bSaveSpellCheck = sal_True; + bSaveSpellCheck = true; } if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false, &pItem )) { - sal_Bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue(); + bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue(); pDispatch->Execute(SID_AUTOSPELL_CHECK, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, pItem, 0L); @@ -2363,9 +2363,9 @@ void ExtensionsTabPage::CreateDialogWithHandler() -sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) +bool ExtensionsTabPage::DispatchAction( const OUString& rAction ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( m_xEventHdl.is() ) { try diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index b09a1ec302cc..427145a9e659 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -55,7 +55,7 @@ void PasswordTable::Resort( bool bForced ) if ( 0 == nColumn || bForced ) // only the first column is sorted { HeaderBarItemBits nBits = GetTheHeaderBar().GetItemBits(1); - sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) 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(); |