diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-16 11:39:08 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-16 11:51:51 +0200 |
commit | 5b1b1e55ce492ceb1a907833f7073b46451760c6 (patch) | |
tree | 6f1ff57b2cb011702eb79c41d180063ab16d9463 /cui/source/customize | |
parent | 199d333f131474729a105afa5a3da61205f61df2 (diff) |
cui: sal_Bool->bool
Change-Id: Ib7dd1f27d4909d30ee794936364a472a9755c609
Diffstat (limited to 'cui/source/customize')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 8 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 16 | ||||
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 32 | ||||
-rw-r--r-- | cui/source/customize/eventdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/eventdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/customize/macropg.cxx | 8 | ||||
-rw-r--r-- | cui/source/customize/macropg_impl.hxx | 4 | ||||
-rw-r--r-- | cui/source/customize/selector.cxx | 22 |
8 files changed, 47 insertions, 47 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 ); } |