diff options
53 files changed, 503 insertions, 503 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 489aace5638e..d15fd53cb65b 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1086,13 +1086,13 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData(); OUString sPossibleNewCommand = pFunctionBox->GetCurCommand(); - aRemoveButton.Enable( sal_False ); - aChangeButton.Enable( sal_False ); + aRemoveButton.Enable( false ); + aChangeButton.Enable( false ); if (pEntry->m_bIsConfigurable) { if (pEntry->isConfigured()) - aRemoveButton.Enable( sal_True ); + aRemoveButton.Enable( true ); aChangeButton.Enable( pEntry->m_sCommand != sPossibleNewCommand ); } } @@ -1100,12 +1100,12 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) { pGroupLBox->GroupSelected(); if ( !pFunctionBox->FirstSelected() ) - aChangeButton.Enable( sal_False ); + aChangeButton.Enable( false ); } else if ( pListBox == pFunctionBox ) { - aRemoveButton.Enable( sal_False ); - aChangeButton.Enable( sal_False ); + aRemoveButton.Enable( false ); + aChangeButton.Enable( false ); // #i36994 First selected can return zero! SvTreeListEntry* pLBEntry = aEntriesBox.FirstSelected(); @@ -1118,7 +1118,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) if (pEntry->m_bIsConfigurable) { if (pEntry->isConfigured()) - aRemoveButton.Enable( sal_True ); + aRemoveButton.Enable( true ); aChangeButton.Enable( pEntry->m_sCommand != sPossibleNewCommand ); } @@ -1133,7 +1133,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey); SvTreeListEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND ); pE1->SetUserData(pU1); - pE1->EnableChildrenOnDemand( sal_False ); + pE1->EnableChildrenOnDemand( false ); } pIt = aEntriesBox.Next(pIt); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 3f89c709e932..f55addcb8c11 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -404,9 +404,9 @@ SvxConfigPage::CanConfig( const OUString& aModuleId ) if ( aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography" ) { - return sal_False; + return false; } - return sal_True; + return true; } OUString GetModuleName( const OUString& aModuleId ) @@ -510,14 +510,14 @@ bool GetMenuItemData( } } - return sal_True; + return true; } } catch ( ::com::sun::star::lang::IndexOutOfBoundsException& ) { } - return sal_False; + return false; } bool GetToolbarItemData( @@ -563,14 +563,14 @@ bool GetToolbarItemData( } } - return sal_True; + return true; } } catch ( ::com::sun::star::lang::IndexOutOfBoundsException& ) { } - return sal_False; + return false; } uno::Sequence< beans::PropertyValue > @@ -848,9 +848,9 @@ SaveInData::SaveInData( const OUString& aModuleId, bool isDocConfig ) : - bModified( sal_False ), + bModified( false ), bDocConfig( isDocConfig ), - bReadOnly( sal_False ), + bReadOnly( false ), m_xCfgMgr( xCfgMgr ), m_xParentCfgMgr( xParentCfgMgr ) { @@ -959,7 +959,7 @@ Image SaveInData::GetImage( const OUString& rCommandURL ) bool SaveInData::PersistChanges( const uno::Reference< uno::XInterface >& xManager ) { - bool result = sal_True; + bool result = true; try { @@ -976,7 +976,7 @@ bool SaveInData::PersistChanges( } catch ( com::sun::star::io::IOException& ) { - result = sal_False; + result = false; } return result; @@ -1040,7 +1040,7 @@ MenuSaveInData::GetEntries() { pRootEntry = new SvxConfigEntry( OUString("MainMenus"), - OUString(), sal_True); + OUString(), true); if ( m_xMenuSettings.is() ) { @@ -1085,7 +1085,7 @@ bool MenuSaveInData::LoadSubMenus( uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; OUString aLabel; - bool bIsUserDefined = sal_True; + bool bIsUserDefined = true; sal_uInt16 nType( css::ui::ItemType::DEFAULT ); @@ -1100,11 +1100,11 @@ bool MenuSaveInData::LoadSubMenus( try { a = m_xCommandToLabelMap->getByName( aCommandURL ); - bIsUserDefined = sal_False; + bIsUserDefined = false; } catch ( container::NoSuchElementException& ) { - bIsUserDefined = sal_True; + bIsUserDefined = true; } // If custom label not set retrieve it from the command @@ -1129,7 +1129,7 @@ bool MenuSaveInData::LoadSubMenus( { // popup menu SvxConfigEntry* pEntry = new SvxConfigEntry( - aLabel, aCommandURL, sal_True ); + aLabel, aCommandURL, true ); pEntry->SetUserDefined( bIsUserDefined ); @@ -1143,7 +1143,7 @@ bool MenuSaveInData::LoadSubMenus( } else { - pEntry->SetMain( sal_True ); + pEntry->SetMain( true ); } subMenuTitle += stripHotKey( aLabel ); @@ -1153,7 +1153,7 @@ bool MenuSaveInData::LoadSubMenus( else { SvxConfigEntry* pEntry = new SvxConfigEntry( - aLabel, aCommandURL, sal_False ); + aLabel, aCommandURL, false ); pEntry->SetUserDefined( bIsUserDefined ); pEntries->push_back( pEntry ); } @@ -1171,7 +1171,7 @@ bool MenuSaveInData::LoadSubMenus( bool MenuSaveInData::Apply() { - bool result = sal_False; + bool result = false; if ( IsModified() ) { @@ -1213,7 +1213,7 @@ bool MenuSaveInData::Apply() OSL_TRACE("caught some other exception saving settings"); } - SetModified( sal_False ); + SetModified( false ); result = PersistChanges( GetConfigManager() ); } @@ -1387,7 +1387,7 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox( Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ) , pPage( (SvxMenuConfigPage*) pParent ) - , m_bIsInternalDrag( sal_False ) + , m_bIsInternalDrag( false ) { SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HIDESELECTION ); @@ -1416,14 +1416,14 @@ DragDropMode SvxMenuEntriesListBox::NotifyStartDrag( (void)aTransferDataContainer; (void)pEntry; - m_bIsInternalDrag = sal_True; + m_bIsInternalDrag = true; return GetDragDropMode(); } void SvxMenuEntriesListBox::DragFinished( sal_Int8 nDropAction ) { (void)nDropAction; - m_bIsInternalDrag = sal_False; + m_bIsInternalDrag = false; } sal_Int8 SvxMenuEntriesListBox::AcceptDrop( const AcceptDropEvent& rEvt ) @@ -1506,11 +1506,11 @@ void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent ) // support CTRL+UP and CTRL+DOWN for moving selected entries else if ( keycode.GetCode() == KEY_UP && keycode.IsMod1() ) { - pPage->MoveEntry( sal_True ); + pPage->MoveEntry( true ); } else if ( keycode.GetCode() == KEY_DOWN && keycode.IsMod1() ) { - pPage->MoveEntry( sal_False ); + pPage->MoveEntry( false ); } else { @@ -1568,7 +1568,7 @@ SvxConfigPage::SvxConfigPage( Window *pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ), - bInitialised( sal_False ), + bInitialised( false ), pCurrentSaveInData( 0 ), aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ), aTopLevelLabel( this, CUI_RES( FT_MENUS ) ), @@ -1654,7 +1654,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) pModuleData = CreateSaveInData( xCfgMgr, uno::Reference< css::ui::XUIConfigurationManager >(), aModuleId, - sal_False ); + false ); } catch ( container::NoSuchElementException& ) { @@ -1691,7 +1691,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) SaveInData* pDocData = NULL; if ( xDocCfgMgr.is() ) { - pDocData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, sal_True ); + pDocData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, true ); if ( !pDocData->IsReadOnly() ) { @@ -1702,20 +1702,20 @@ void SvxConfigPage::Reset( const SfxItemSet& ) // if an item to select has been passed in (eg. the ResourceURL for a // toolbar) then try to select the SaveInData entry that has that item - bool bURLToSelectFound = sal_False; + bool bURLToSelectFound = false; if ( !m_aURLToSelect.isEmpty() ) { if ( pDocData != NULL && pDocData->HasURL( m_aURLToSelect ) ) { aSaveInListBox.SelectEntryPos( nPos, sal_True ); pCurrentSaveInData = pDocData; - bURLToSelectFound = sal_True; + bURLToSelectFound = true; } else if ( pModuleData->HasURL( m_aURLToSelect ) ) { aSaveInListBox.SelectEntryPos( 0, sal_True ); pCurrentSaveInData = pModuleData; - bURLToSelectFound = sal_True; + bURLToSelectFound = true; } } @@ -1802,7 +1802,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) if ( xDocCfgMgr.is() ) { - SaveInData* pData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, sal_True ); + SaveInData* pData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, true ); if ( pData && !pData->IsReadOnly() ) { @@ -1818,7 +1818,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) aSaveInListBox.SetSelectHdl( LINK( this, SvxConfigPage, SelectSaveInLocation ) ); - bInitialised = sal_True; + bInitialised = true; Init(); } @@ -1884,7 +1884,7 @@ OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::X sal_Bool SvxConfigPage::FillItemSet( SfxItemSet& ) { - bool result = sal_False; + bool result = false; for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); ++i ) { @@ -2038,8 +2038,8 @@ SvTreeListEntry* SvxConfigPage::AddFunction( } SvxConfigEntry* pNewEntryData = - new SvxConfigEntry( aDisplayName, aURL, sal_False ); - pNewEntryData->SetUserDefined( sal_True ); + new SvxConfigEntry( aDisplayName, aURL, false ); + pNewEntryData->SetUserDefined( true ); // check that this function is not already in the menu SvxConfigEntry* pParent = GetTopLevelSelection(); @@ -2119,7 +2119,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntry( aContentsListBox->Select( pNewEntry ); aContentsListBox->MakeVisible( pNewEntry ); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); } return pNewEntry; @@ -2224,7 +2224,7 @@ bool SvxConfigPage::MoveEntryData( //modified by shizhoubo for issue53677 if ( NULL == pSourceEntry || NULL == pTargetEntry ) { - return sal_False; + return false; } // Grab the entries list for the currently selected menu @@ -2239,9 +2239,9 @@ bool SvxConfigPage::MoveEntryData( pEntries->insert( pEntries->begin(), pSourceData ); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); - return sal_True; + return true; } else { @@ -2262,13 +2262,13 @@ bool SvxConfigPage::MoveEntryData( // insert the source entry at the position after the target pEntries->insert( ++iter, pSourceData ); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); - return sal_True; + return true; } } - return sal_False; + return false; } SvxMenuConfigPage::SvxMenuConfigPage( @@ -2363,8 +2363,8 @@ void SvxMenuConfigPage::UpdateButtonStates() if ( aContentsListBox->GetEntryCount() == 0 || selection == NULL ) { - aMoveUpButton.Enable( sal_False ); - aMoveDownButton.Enable( sal_False ); + aMoveUpButton.Enable( false ); + aMoveDownButton.Enable( false ); pPopup->EnableItem( ID_BEGIN_GROUP, sal_True ); pPopup->EnableItem( ID_RENAME, sal_False ); @@ -2414,7 +2414,7 @@ void SvxMenuConfigPage::DeleteSelectedTopLevel() ReloadTopLevelListBox(); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); } bool SvxMenuConfigPage::DeleteSelectedContent() @@ -2445,11 +2445,11 @@ bool SvxMenuConfigPage::DeleteSelectedContent() // delete data for menu entry delete pMenuEntry; - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); - return sal_True; + return true; } - return sal_False; + return false; } short SvxMenuConfigPage::QueryReset() @@ -2522,7 +2522,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) ReloadTopLevelListBox(); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); } // #i68101# Memory leak (!) @@ -2544,7 +2544,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) ReloadTopLevelListBox( pDialog->GetSelectedEntry() ); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); } delete pDialog; @@ -2574,14 +2574,14 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) pNameDialog->GetName(aNewName); SvxConfigEntry* pNewEntryData = - new SvxConfigEntry( aNewName, aNewName, sal_True ); - pNewEntryData->SetUserDefined( sal_True ); + new SvxConfigEntry( aNewName, aNewName, true ); + pNewEntryData->SetUserDefined( true ); InsertEntry( pNewEntryData ); ReloadTopLevelListBox(); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); } delete pNameDialog; @@ -2591,7 +2591,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) case ID_BEGIN_GROUP: { SvxConfigEntry* pNewEntryData = new SvxConfigEntry; - pNewEntryData->SetUserDefined( sal_True ); + pNewEntryData->SetUserDefined( true ); InsertEntry( pNewEntryData ); break; @@ -2620,7 +2620,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) pEntry->SetName( aNewName ); aContentsListBox->SetEntryText( pActEntry, aNewName ); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); } delete pNameDialog; @@ -2657,13 +2657,13 @@ IMPL_LINK( SvxMenuConfigPage, NewMenuHdl, Button *, pButton ) SvxMainMenuOrganizerDialog* pDialog = new SvxMainMenuOrganizerDialog( 0, - GetSaveInData()->GetEntries(), NULL, sal_True ); + GetSaveInData()->GetEntries(), NULL, true ); if ( pDialog->Execute() == RET_OK ) { GetSaveInData()->SetEntries( pDialog->GetEntries() ); ReloadTopLevelListBox( pDialog->GetSelectedEntry() ); - GetSaveInData()->SetModified( sal_True ); + GetSaveInData()->SetModified( true ); } delete pDialog; @@ -2754,9 +2754,9 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( OUString newurl = generateCustomMenuURL( pEntries ); SvxConfigEntry* pNewEntryData = - new SvxConfigEntry( newname, newurl, sal_True ); - pNewEntryData->SetUserDefined( sal_True ); - pNewEntryData->SetMain( sal_True ); + new SvxConfigEntry( newname, newurl, true ); + pNewEntryData->SetUserDefined( true ); + pNewEntryData->SetMain( true ); pNewMenuEntry = m_pMenuListBox->InsertEntry( stripHotKey( pNewEntryData->GetName() ) ); @@ -2872,7 +2872,7 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) m_pMenuListBox->GetModel()->Move( pSourceEntry, pTargetEntry ); m_pMenuListBox->MakeVisible( pSourceEntry ); - bModified = sal_True; + bModified = true; } } @@ -2914,11 +2914,11 @@ SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName, , aLabel(rDisplayName) , aCommand(rCommandURL) , bPopUp(bPopup) - , bStrEdited( sal_False ) - , bIsUserDefined( sal_False ) - , bIsMain( sal_False ) + , bStrEdited( false ) + , bIsUserDefined( false ) + , bIsMain( false ) , bIsParentData( bParentData ) - , bIsVisible( sal_True ) + , bIsVisible( true ) , nStyle( 0 ) , pEntries( 0 ) { @@ -2946,27 +2946,27 @@ bool SvxConfigEntry::IsMovable() { if ( IsPopup() && !IsMain() ) { - return sal_False; + return false; } - return sal_True; + return true; } bool SvxConfigEntry::IsDeletable() { if ( IsMain() && !IsUserDefined() ) { - return sal_False; + return false; } - return sal_True; + return true; } bool SvxConfigEntry::IsRenamable() { if ( IsMain() && !IsUserDefined() ) { - return sal_False; + return false; } - return sal_True; + return true; } SvxToolbarConfigPage::SvxToolbarConfigPage( @@ -3011,8 +3011,8 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( aMoveDownButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl) ); // Always enable Up and Down buttons // added for issue i53677 by shizhoubo - aMoveDownButton.Enable( sal_True ); - aMoveUpButton.Enable( sal_True ); + aMoveDownButton.Enable( true ); + aMoveUpButton.Enable( true ); PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_TOOLBAR ) ); pMenu->SetMenuFlags( @@ -3152,10 +3152,10 @@ bool SvxToolbarConfigPage::DeleteSelectedContent() } } - return sal_True; + return true; } - return sal_False; + return false; } IMPL_LINK( SvxToolbarConfigPage, MoveHdl, Button *, pButton ) @@ -3274,7 +3274,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) { - bool bNeedsApply = sal_False; + bool bNeedsApply = false; // get currently selected toolbar SvxConfigEntry* pToolbar = GetTopLevelSelection(); @@ -3300,7 +3300,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) pEntry->SetName( aNewName ); aContentsListBox->SetEntryText( pActEntry, aNewName ); - bNeedsApply = sal_True; + bNeedsApply = true; } delete pNameDialog; @@ -3335,7 +3335,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) pEntry->SetName( aSystemName ); aContentsListBox->SetEntryText( pActEntry, stripHotKey( aSystemName ) ); - bNeedsApply = sal_True; + bNeedsApply = true; } uno::Sequence< OUString > aURLSeq( 1 ); @@ -3365,7 +3365,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) aContentsListBox->Select( pNewLBEntry ); aContentsListBox->MakeVisible( pNewLBEntry ); - bNeedsApply = sal_True; + bNeedsApply = true; } catch ( uno::Exception& ) { @@ -3376,7 +3376,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) case ID_BEGIN_GROUP: { SvxConfigEntry* pNewEntryData = new SvxConfigEntry; - pNewEntryData->SetUserDefined( sal_True ); + pNewEntryData->SetUserDefined( true ); SvTreeListEntry* pNewLBEntry = InsertEntry( pNewEntryData ); @@ -3384,7 +3384,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) aContentsListBox->SetCheckButtonState( pNewLBEntry, SV_BUTTON_TRISTATE ); - bNeedsApply = sal_True; + bNeedsApply = true; break; } case ID_DELETE: @@ -3829,7 +3829,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() pRootEntry = new SvxConfigEntry( OUString("MainToolbars"), - OUString(), sal_True); + OUString(), true); uno::Sequence< uno::Sequence < beans::PropertyValue > > info = GetConfigManager()->getUIElementsInfo( @@ -3873,9 +3873,9 @@ SvxEntries* ToolbarSaveInData::GetEntries() } SvxConfigEntry* pEntry = new SvxConfigEntry( - uiname, url, sal_True ); + uiname, url, true ); - pEntry->SetMain( sal_True ); + pEntry->SetMain( true ); pEntry->SetStyle( GetSystemStyle( url ) ); @@ -3885,11 +3885,11 @@ SvxEntries* ToolbarSaveInData::GetEntries() OUString custom(CUSTOM_TOOLBAR_STR); if ( systemname.startsWith( custom ) ) { - pEntry->SetUserDefined( sal_True ); + pEntry->SetUserDefined( true ); } else { - pEntry->SetUserDefined( sal_False ); + pEntry->SetUserDefined( false ); } pRootEntry->GetEntries()->push_back( pEntry ); @@ -3961,18 +3961,18 @@ SvxEntries* ToolbarSaveInData::GetEntries() } SvxConfigEntry* pEntry = new SvxConfigEntry( - uiname, url, sal_True, sal_True ); + uiname, url, true, true ); - pEntry->SetMain( sal_True ); + pEntry->SetMain( true ); pEntry->SetStyle( GetSystemStyle( url ) ); if ( systemname.startsWith( custom ) ) { - pEntry->SetUserDefined( sal_True ); + pEntry->SetUserDefined( true ); } else { - pEntry->SetUserDefined( sal_False ); + pEntry->SetUserDefined( false ); } pRootEntry->GetEntries()->push_back( pEntry ); @@ -4019,14 +4019,14 @@ ToolbarSaveInData::HasURL( const OUString& rURL ) if ( pEntry->GetCommand().equals( rURL ) ) { if ( pEntry->IsParentData() ) - return sal_False; + return false; else - return sal_True; + return true; } ++iter; } - return sal_False; + return false; } bool ToolbarSaveInData::HasSettings() @@ -4034,9 +4034,9 @@ bool ToolbarSaveInData::HasSettings() // return true if there is at least one toolbar entry if ( GetEntries()->size() > 0 ) { - return sal_True; + return true; } - return sal_False; + return false; } void ToolbarSaveInData::Reset() @@ -4084,7 +4084,7 @@ void ToolbarSaveInData::Reset() bool ToolbarSaveInData::Apply() { // toolbar changes are instantly applied - return sal_False; + return false; } void ToolbarSaveInData::ApplyToolbar( @@ -4331,7 +4331,7 @@ bool ToolbarSaveInData::LoadToolbar( uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; OUString aLabel; - bool bIsUserDefined = sal_True; + bool bIsUserDefined = true; sal_Bool bIsVisible; sal_Int32 nStyle; @@ -4348,11 +4348,11 @@ bool ToolbarSaveInData::LoadToolbar( try { a = m_xCommandToLabelMap->getByName( aCommandURL ); - bIsUserDefined = sal_False; + bIsUserDefined = false; } catch ( container::NoSuchElementException& ) { - bIsUserDefined = sal_True; + bIsUserDefined = true; } // If custom label not set retrieve it from the command @@ -4376,7 +4376,7 @@ bool ToolbarSaveInData::LoadToolbar( if ( xSubMenu.is() ) { SvxConfigEntry* pEntry = new SvxConfigEntry( - aLabel, aCommandURL, sal_True ); + aLabel, aCommandURL, true ); pEntry->SetUserDefined( bIsUserDefined ); pEntry->SetVisible( bIsVisible ); @@ -4388,7 +4388,7 @@ bool ToolbarSaveInData::LoadToolbar( else { SvxConfigEntry* pEntry = new SvxConfigEntry( - aLabel, aCommandURL, sal_False ); + aLabel, aCommandURL, false ); pEntry->SetUserDefined( bIsUserDefined ); pEntry->SetVisible( bIsVisible ); pEntry->SetStyle( nStyle ); @@ -4481,16 +4481,16 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox ) SvxConfigEntry* pToolbar = GetTopLevelSelection(); if ( pToolbar == NULL ) { - aModifyTopLevelButton.Enable( sal_False ); - aModifyCommandButton.Enable( sal_False ); - aAddCommandsButton.Enable( sal_False ); + aModifyTopLevelButton.Enable( false ); + aModifyCommandButton.Enable( false ); + aAddCommandsButton.Enable( false ); return 0; } - aModifyTopLevelButton.Enable( sal_True ); - aModifyCommandButton.Enable( sal_True ); - aAddCommandsButton.Enable( sal_True ); + aModifyTopLevelButton.Enable( true ); + aModifyCommandButton.Enable( true ); + aAddCommandsButton.Enable( true ); PopupMenu* pPopup = aModifyTopLevelButton.GetPopupMenu(); @@ -4591,10 +4591,10 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) } SvxConfigEntry* pToolbar = - new SvxConfigEntry( aNewName, aNewURL, sal_True ); + new SvxConfigEntry( aNewName, aNewURL, true ); - pToolbar->SetUserDefined( sal_True ); - pToolbar->SetMain( sal_True ); + pToolbar->SetUserDefined( true ); + pToolbar->SetMain( true ); pData->CreateToolbar( pToolbar ); @@ -4603,7 +4603,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) aTopLevelListBox.SelectEntryPos( nInsertPos, sal_True ); aTopLevelListBox.GetSelectHdl().Call(this); - pData->SetModified( sal_True ); + pData->SetModified( true ); } delete pNameDialog; @@ -4655,7 +4655,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction( if ( pEntry->IsBinding() ) { - pEntry->SetVisible( sal_True ); + pEntry->SetVisible( true ); aContentsListBox->SetCheckButtonState( pNewLBEntry, SV_BUTTON_CHECKED ); } @@ -4952,7 +4952,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, } else { - aBtnImport.Enable( sal_False ); + aBtnImport.Enable( false ); } aDirectory += "soffice.cfg/import"; @@ -5068,7 +5068,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, ++pConstIter; } - aBtnDelete.Enable( sal_False ); + aBtnDelete.Enable( false ); aTbSymbol.SetSelectHdl( LINK(this, SvxIconSelectorDialog, SelectHdl) ); aBtnImport.SetClickHdl( LINK(this, SvxIconSelectorDialog, ImportHdl) ); aBtnDelete.SetClickHdl( LINK(this, SvxIconSelectorDialog, DeleteHdl) ); @@ -5135,11 +5135,11 @@ IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox ) OUString aSelImageText = aTbSymbol.GetItemText( nId ); if ( m_xImportedImageManager->hasImage( GetImageType(), aSelImageText ) ) { - aBtnDelete.Enable( sal_True ); + aBtnDelete.Enable( true ); } else { - aBtnDelete.Enable( sal_False ); + aBtnDelete.Enable( false ); } return 0; @@ -5222,7 +5222,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( aMediaProps[0].Value <<= aURL; com::sun::star::awt::Size aSize; - bool bOK = sal_False; + bool bOK = false; try { xGraphic = m_xGraphProvider->queryGraphic( aMediaProps ); @@ -5233,9 +5233,9 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( OUString("SizePixel") ); a >>= aSize; if (0 == aSize.Width || 0 == aSize.Height) - return sal_False; + return false; else - bOK = sal_True; + bOK = true; } catch ( uno::Exception& ) { @@ -5333,7 +5333,7 @@ void SvxIconSelectorDialog::ImportGraphics( { aIndex = rPaths[i].lastIndexOf( '/' ); aIconName = rPaths[i].copy( aIndex+1 ); - ret = SvxIconReplacementDialog( this, aIconName, sal_True ).ShowDialog(); + ret = SvxIconReplacementDialog( this, aIconName, true ).ShowDialog(); if ( ret == 2 ) { ReplaceGraphicItem( aPath ); @@ -5390,7 +5390,7 @@ void SvxIconSelectorDialog::ImportGraphics( bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) { - bool result = sal_False; + bool result = false; sal_uInt16 nId = m_nNextId; ++m_nNextId; @@ -5400,7 +5400,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) uno::Reference< graphic::XGraphic > xGraphic; com::sun::star::awt::Size aSize; - bool bOK = sal_True; + bool bOK = true; aMediaProps[0].Value <<= aURL; try { @@ -5415,7 +5415,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) { a >>= aSize; if ( 0 == aSize.Width || 0 == aSize.Height ) - bOK = sal_False; + bOK = false; Image aImage( xGraphic ); @@ -5447,7 +5447,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) xConfigPersistence->store(); } - result = sal_True; + result = true; } else { diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 4a93a6fd82b1..a6e468e532f3 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -637,7 +637,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent OUString aTitle(pImp->m_sDlgMacros); SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL ); pNewEntry->SetUserData( pInfo ); - pNewEntry->EnableChildrenOnDemand( sal_True ); + pNewEntry->EnableChildrenOnDemand( true ); aArr.push_back( pInfo ); } else @@ -723,7 +723,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent { if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER ) { - pNewEntry->EnableChildrenOnDemand( sal_True ); + pNewEntry->EnableChildrenOnDemand( true ); m = grandchildren.getLength(); } } @@ -746,7 +746,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data aArr.push_back( pInfo ); pEntry->SetUserData( pInfo ); - pEntry->EnableChildrenOnDemand( sal_True ); + pEntry->EnableChildrenOnDemand( true ); } MakeVisible( GetEntry( 0,0 ) ); @@ -948,7 +948,7 @@ void SfxConfigGroupListBox::GroupSelected() OUString* pScriptURI = new OUString( uri ); SfxGroupInfo_Impl* pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGFUNCTION_SCRIPT, 0, pScriptURI ); - Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False ); + Image aImage = GetImage( children[n], Reference< XComponentContext >(), false ); SvTreeListEntry* pNewEntry = pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); @@ -1102,7 +1102,7 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) new SfxGroupInfo_Impl(SFX_CFGGROUP_SCRIPTCONTAINER, 0, static_cast<void *>( theChild.get())); - Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False ); + Image aImage = GetImage( theChild, Reference< XComponentContext >(), false ); SvTreeListEntry* pNewEntry = InsertEntry( theChild->getName(), pEntry ); SetExpandedEntryBmp( pNewEntry, aImage ); @@ -1120,7 +1120,7 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) { if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER ) { - pNewEntry->EnableChildrenOnDemand( sal_True ); + pNewEntry->EnableChildrenOnDemand( true ); m = grandchildren.getLength(); } } @@ -1151,7 +1151,7 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, pFamily ); aArr.push_back( pGrpInfo ); pStyleEntry->SetUserData( pGrpInfo ); - pStyleEntry->EnableChildrenOnDemand( sal_False ); + pStyleEntry->EnableChildrenOnDemand( false ); } } break; diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index faacfdcea42d..02888d3f505d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -180,7 +180,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) } else { - bool isReadonly = sal_False; + bool isReadonly = false; uno::Reference< frame::XDesktop2 > xFramesSupplier = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 80d1337311af..99b962fd0db1 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -767,7 +767,7 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA mpImpl->pEventLB->GetListBox().SetEntryHeight( sal::static_int_cast< short >(nMinLineHeight) ); - mpImpl->pEventLB->Enable( sal_True ); + mpImpl->pEventLB->Enable( true ); if(!m_xAppEvents.is()) { diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 4db4c2707e2e..46565fc5f6a7 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -372,7 +372,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode * way to determine if a basic lib had children * without having to ask for them (which forces * the library to be loaded */ - pNewEntry->EnableChildrenOnDemand( sal_True ); + pNewEntry->EnableChildrenOnDemand( true ); } else { @@ -385,7 +385,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode { if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER ) { - pNewEntry->EnableChildrenOnDemand( sal_True ); + pNewEntry->EnableChildrenOnDemand( true ); break; } } @@ -518,7 +518,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL ); pNewEntry->SetUserData( pInfo ); - pNewEntry->EnableChildrenOnDemand( sal_True ); + pNewEntry->EnableChildrenOnDemand( true ); aArr.push_back( pInfo ); } else @@ -764,7 +764,7 @@ void SvxConfigGroupListBox::GroupSelected() new SvxGroupInfo_Impl( SVX_CFGFUNCTION_SCRIPT, 123, uri, description ); - Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False ); + Image aImage = GetImage( children[n], Reference< XComponentContext >(), false ); SvTreeListEntry* pNewEntry = pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); @@ -944,12 +944,12 @@ SvxScriptSelectorDialog::UpdateUI() m_pCommands->GetHelpText(m_pCommands->FirstSelected()); m_pDescriptionText->SetText(sMessage.isEmpty() ? m_sDefaultDesc : sMessage); - m_pOKButton->Enable( sal_True ); + m_pOKButton->Enable( true ); } else { m_pDescriptionText->SetText(m_sDefaultDesc); - m_pOKButton->Enable( sal_False ); + m_pOKButton->Enable( false ); } } diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 323c0b7b33ff..5637894a37c6 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -403,7 +403,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent sal_Int32 nIdx = 0; do { - aControls[nIdx]->Enable(sal_True); + aControls[nIdx]->Enable(true); } while(aControls[++nIdx]); @@ -412,7 +412,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent { //remove undo if a new sentence is active m_pSentenceED->ResetUndo(); - m_pUndoPB->Enable(sal_False); + m_pUndoPB->Enable(false); } } } @@ -426,7 +426,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) pThis->m_pAutoCorrPB->Show(pThis->rParent.HasAutoCorrection()); pThis->SpellContinue_Impl(); pThis->m_pSentenceED->ResetUndo(); - pThis->m_pUndoPB->Enable(sal_False); + pThis->m_pUndoPB->Enable(false); // get current language pThis->UpdateBoxes_Impl(); @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SpellDialog, UndoHdl) { m_pSentenceED->Undo(); if(!m_pSentenceED->GetUndoActionCount()) - m_pUndoPB->Enable(sal_False); + m_pUndoPB->Enable(false); return 0; } @@ -669,9 +669,9 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) case SPELLUNDO_CHANGE_TEXTENGINE: { if(pAction->IsEnableChangePB()) - m_pChangePB->Enable(sal_False); + m_pChangePB->Enable(false); if(pAction->IsEnableChangeAllPB()) - m_pChangeAllPB->Enable(sal_False); + m_pChangeAllPB->Enable(false); } break; case SPELLUNDO_CHANGE_NEXTERROR: @@ -857,7 +857,7 @@ int SpellDialog::InitUserDicts() && (!xStor.is() || !xStor->isReadonly()) ) { pMenu->InsertItem( nItemId, xDicTmp->getName() ); - bEnable = sal_True; + bEnable = true; uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY ); if (xSvcInfo.is()) @@ -1036,7 +1036,7 @@ void SpellDialog::InvalidateDialog() sal_Int16 i = 0; while(aDisableArr[i]) { - aDisableArr[i]->Enable(sal_False); + aDisableArr[i]->Enable(false); i++; } SfxModelessDialog::Deactivate(); @@ -1142,7 +1142,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) if(!bHasReplaced) m_pSentenceED->ClearModifyFlag(); m_pSentenceED->ResetUndo(); - m_pUndoPB->Enable(sal_False); + m_pUndoPB->Enable(false); bRet = nStartPosition > 0; } return bRet; @@ -2005,7 +2005,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) sal_Int32 nIdx = 0; do { - aControls[nIdx]->Enable(sal_False); + aControls[nIdx]->Enable(false); } while(aControls[++nIdx]); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 1b90b53d9689..782421f95aa9 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -70,22 +70,22 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const SfxItem //lock the size request of this widget to double the height of the label m_pShowText->set_height_request(m_pSymbolText->get_preferred_size().Height() * 3); - SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, sal_False ); + SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, false ); if ( pItem ) bOne = pItem->GetValue(); init(); - SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, sal_False ); + SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, false ); if ( pCharItem ) SetChar( pCharItem->GetValue() ); - SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, sal_False ); + SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, false ); if ( pDisableItem && pDisableItem->GetValue() ) DisableFontSelection(); - SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); - SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, sal_False ); + SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, false ); if ( pFontItem ) { Font aTmpFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() ); @@ -351,7 +351,7 @@ void SvxCharacterMap::init() if ( m_pFontLB->GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND ) { aDefStr = aToken; - bFound = sal_True; + bFound = true; break; } } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index e9ac03d1bb5b..5893b9f68725 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -641,7 +641,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) { // this means we're preparing for starting a search // In this case, EnableSearchForDependees disabled the search button // But as we're about to use it for cancelling the search, we really need to enable it, again - m_pbSearchAgain.Enable( sal_True ); + m_pbSearchAgain.Enable( true ); } } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 2dfba19c33fa..e8e019b6bf07 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -841,9 +841,9 @@ namespace svx { // default state: try both direction m_aHangulOnly.Check( sal_False ); - m_aHangulOnly.Enable( sal_True ); + m_aHangulOnly.Enable( true ); m_aHanjaOnly.Check( sal_False ); - m_aHanjaOnly.Enable( sal_True ); + m_aHanjaOnly.Enable( true ); if (!_bTryBothDirections) { diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index c5ac9ff1640a..c9a377d144c3 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -78,7 +78,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OU bIsValidURL = aURLObject.GetProtocol() != INET_PROT_NOT_VALID; if ( bIsValidURL ) { - OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, sal_False ) ); + OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, false ) ); if ( aBase.isEmpty() || ( aBase[0] == '.' ) ) bIsValidURL = sal_False; } diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index ddaf9865cf98..35cf1ca3b069 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -69,12 +69,12 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, /////////////////////////////////////// // set defaults maRbtLinktypInternet.Check (); - maFtLogin.Show( sal_False ); - maFtPassword.Show( sal_False ); - maEdLogin.Show( sal_False ); - maEdPassword.Show( sal_False ); - maCbAnonymous.Show( sal_False ); - maBtBrowse.Enable( sal_True ); + maFtLogin.Show( false ); + maFtPassword.Show( false ); + maEdLogin.Show( false ); + maEdPassword.Show( false ); + maCbAnonymous.Show( false ); + maBtBrowse.Enable( true ); /////////////////////////////////////// // overload handlers @@ -407,11 +407,11 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) SfxStringItem aName( SID_FILE_NAME, OUString("http://") ); SfxStringItem aRefererItem( SID_REFERER, OUString("private:user") ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); - SfxBoolItem aSilent( SID_SILENT, sal_True ); - SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, true ); + SfxBoolItem aSilent( SID_SILENT, true ); + SfxBoolItem aReadOnly( SID_DOC_READONLY, true ); - SfxBoolItem aBrowse( SID_BROWSE, sal_True ); + SfxBoolItem aBrowse( SID_BROWSE, true ); const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; (((SvxHpLinkDlg*)mpDialog)->GetBindings())->Execute( SID_OPENDOC, ppItems, 0, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 29774ddacb60..5cd21e4c2f6b 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -353,7 +353,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) */ sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled(); if ( bIsInputEnabled ) - GetParent()->EnableInput( sal_False ); + GetParent()->EnableInput( false ); SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet ); // add events @@ -370,7 +370,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) SFX_EVENT_MOUSEOUT_OBJECT); if ( bIsInputEnabled ) - GetParent()->EnableInput( sal_True ); + GetParent()->EnableInput( true ); // execute dlg DisableClose( sal_True ); short nRet = aDlg.Execute(); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index ed436b6cf0dd..c051582387ad 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -376,7 +376,7 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButt catch (uno::Exception &e) { (void) e; - DBG_ASSERT( 0, "Hyphenate All failed" ); + DBG_ASSERT( false, "Hyphenate All failed" ); } } return 0; @@ -510,7 +510,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( // disable controls if service is not available if (!xHyphenator.is()) - Enable( sal_False ); + Enable( false ); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 1be69603b484..7319f4a64ede 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -126,7 +126,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) } catch( const IllegalArgumentException& ) { - DBG_ASSERT( 0, "caught IllegalArgumentException when registering filter\n" ); + DBG_ASSERT( false, "caught IllegalArgumentException when registering filter\n" ); } if( xFilePicker->execute() == ExecutableDialogResults::OK ) @@ -368,7 +368,7 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) } catch( IllegalArgumentException& ) { - DBG_ASSERT( 0, "caught IllegalArgumentException when registering filter\n" ); + DBG_ASSERT( false, "caught IllegalArgumentException when registering filter\n" ); } if( xFilePicker->execute() == ExecutableDialogResults::OK ) @@ -547,8 +547,8 @@ short SfxInsertFloatingFrameDialog::Execute() { m_pCBMarginWidthDefault->Check( sal_True ); m_pNMMarginWidth->SetText( OUString::number(DEFAULT_MARGIN_WIDTH) ); - m_pFTMarginWidth->Enable( sal_False ); - m_pNMMarginWidth->Enable( sal_False ); + m_pFTMarginWidth->Enable( false ); + m_pNMMarginWidth->Enable( false ); } else m_pNMMarginWidth->SetText( OUString::number( nSize ) ); @@ -560,8 +560,8 @@ short SfxInsertFloatingFrameDialog::Execute() { m_pCBMarginHeightDefault->Check( sal_True ); m_pNMMarginHeight->SetText( OUString::number(DEFAULT_MARGIN_HEIGHT) ); - m_pFTMarginHeight->Enable( sal_False ); - m_pNMMarginHeight->Enable( sal_False ); + m_pFTMarginHeight->Enable( false ); + m_pNMMarginHeight->Enable( false ); } else m_pNMMarginHeight->SetText( OUString::number( nSize ) ); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 978f06b0735f..8c809e93d3bd 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -39,7 +39,7 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, m_pVertBox->SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); if( mnMaxVertical < 2 ) - m_pVertBox->Enable(sal_False); + m_pVertBox->Enable(false); //exchange the meaning of horizontal and vertical for vertical text if(bIsTableVertical) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0aecd5210397..354eec47add1 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -220,7 +220,7 @@ SvTreeListEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const OUS } pEntry->AddItem( new SvLBoxString( pEntry, 0, OUString() ) ); // add empty column aText += rText; - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false ) ); // otherwise crash pEntry->AddItem( new AlternativesString( *this, pEntry, 0, aText ) ); SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); @@ -482,7 +482,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( LookUp( aTmp2 ); m_pAlternativesCT->GrabFocus(); - m_pLeftBtn->Enable( sal_False ); + m_pLeftBtn->Enable( false ); // fill language menu button list SvtLanguageTable aLangTab; @@ -513,7 +513,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( // disable controls if service is missing if (!xThesaurus.is()) - Enable( sal_False ); + Enable( false ); } IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ ) diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index d0c1a33b9822..8ab1fad446cc 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -110,7 +110,7 @@ public: const com::sun::star::uno::Reference < com::sun::star::uno::XInterface >& xManager ); - void SetModified( bool bValue = sal_True ) { bModified = bValue; } + void SetModified( bool bValue = true ) { bModified = bValue; } bool IsModified( ) { return bModified; } bool IsReadOnly( ) { return bReadOnly; } @@ -203,7 +203,7 @@ public: /// methods inherited from SaveInData SvxEntries* GetEntries(); void SetEntries( SvxEntries* ); - bool HasURL( const OUString& URL ) { (void)URL; return sal_False; } + bool HasURL( const OUString& URL ) { (void)URL; return false; } bool HasSettings() { return m_xMenuSettings.is(); } void Reset(); bool Apply(); @@ -239,18 +239,18 @@ public: SvxConfigEntry( const OUString& rDisplayName, const OUString& rCommandURL, - bool bPopup = sal_False, - bool bParentData = sal_False ); + bool bPopup = false, + bool bParentData = false ); SvxConfigEntry() : nId( 0 ), - bPopUp( sal_False ), - bStrEdited( sal_False ), - bIsUserDefined( sal_False ), - bIsMain( sal_False ), - bIsParentData( sal_False ), - bIsVisible( sal_True ), + bPopUp( false ), + bStrEdited( false ), + bIsUserDefined( false ), + bIsMain( false ), + bIsParentData( false ), + bIsVisible( true ), nStyle( 0 ), pEntries( 0 ) {} @@ -261,7 +261,7 @@ public: void SetCommand( const OUString& rCmd ) { aCommand = rCmd; } const OUString& GetName() const { return aLabel; } - void SetName( const OUString& rStr ) { aLabel = rStr; bStrEdited = sal_True; } + void SetName( const OUString& rStr ) { aLabel = rStr; bStrEdited = true; } bool HasChangedName() const { return bStrEdited; } const OUString& GetHelpText() ; @@ -270,10 +270,10 @@ public: const OUString& GetHelpURL() const { return aHelpURL; } void SetHelpURL( const OUString& rStr ) { aHelpURL = rStr; } - void SetPopup( bool bOn = sal_True ) { bPopUp = bOn; } + void SetPopup( bool bOn = true ) { bPopUp = bOn; } bool IsPopup() const { return bPopUp; } - void SetUserDefined( bool bOn = sal_True ) { bIsUserDefined = bOn; } + void SetUserDefined( bool bOn = true ) { bIsUserDefined = bOn; } bool IsUserDefined() const { return bIsUserDefined; } bool IsBinding() const { return !bPopUp; } @@ -283,10 +283,10 @@ public: void SetEntries( SvxEntries* entries ) { pEntries = entries; } bool HasEntries() const { return pEntries != NULL; } - void SetMain( bool bValue = sal_True ) { bIsMain = bValue; } + void SetMain( bool bValue = true ) { bIsMain = bValue; } bool IsMain() { return bIsMain; } - void SetParentData( bool bValue = sal_True ) { bIsParentData = bValue; } + void SetParentData( bool bValue = true ) { bIsParentData = bValue; } bool IsParentData() { return bIsParentData; } bool IsMovable(); @@ -425,7 +425,7 @@ protected: SvTreeListEntry* InsertEntry( SvxConfigEntry* pNewEntryData, SvTreeListEntry* pTarget = NULL, - bool bFront = sal_False ); + bool bFront = false ); void AddSubMenusToUI( const OUString& rBaseTitle, SvxConfigEntry* pParentData ); @@ -445,8 +445,8 @@ public: SaveInData* GetSaveInData() { return pCurrentSaveInData; } SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, - bool bFront = sal_False, - bool bAllowDuplicates = sal_False ); + bool bFront = false, + bool bAllowDuplicates = false ); virtual void MoveEntry( bool bMoveUp ); @@ -531,7 +531,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog public: SvxMainMenuOrganizerDialog ( Window*, SvxEntries*, - SvxConfigEntry*, bool bCreateMenu = sal_False ); + SvxConfigEntry*, bool bCreateMenu = false ); ~SvxMainMenuOrganizerDialog (); @@ -605,8 +605,8 @@ public: ~SvxToolbarConfigPage(); SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, - bool bFront = sal_False, - bool bAllowDuplicates = sal_True ); + bool bFront = false, + bool bAllowDuplicates = true ); void MoveEntry( bool bMoveUp ); diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 5a3606468014..71e289380c0b 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -300,7 +300,7 @@ bool SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const return (this->m_aColorTable == rCTItem->GetColorList()); } - return 0; + return false; } void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 12d8fadffdd1..63a75b2f4f26 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -67,10 +67,10 @@ namespace offapp { const DriverPoolingSettingsItem* pItem = PTR_CAST(DriverPoolingSettingsItem, &_rCompare); if (!pItem) - return sal_False; + return false; if (m_aSettings.size() != pItem->m_aSettings.size()) - return sal_False; + return false; DriverPoolingSettings::const_iterator aOwn = m_aSettings.begin(); DriverPoolingSettings::const_iterator aOwnEnd = m_aSettings.end(); @@ -78,13 +78,13 @@ namespace offapp while (aOwn < aOwnEnd) { if (*aOwn != *aForeign) - return sal_False; + return false; ++aForeign; ++aOwn; } - return sal_True; + return true; } //-------------------------------------------------------------------- diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index a3f993ed5011..6dac6e67c836 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -42,10 +42,10 @@ namespace svx { const DatabaseMapItem* pItem = PTR_CAST(DatabaseMapItem, &_rCompare); if ( !pItem ) - return sal_False; + return false; if ( m_aRegistrations.size() != pItem->m_aRegistrations.size() ) - return sal_False; + return false; return m_aRegistrations == pItem->m_aRegistrations; } diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 06afeb592f8d..b44a347a64f4 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -122,7 +122,7 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( m_pCheckLB ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); // Sonst Puff! pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 3d0919ec3db6..18981dd62b60 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -111,10 +111,10 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& rKeyEvent ) //Select all, Copy, Paste, Cut, Undo Keys if ( !bValid && ( rKeyCode.IsMod1() && ( KEY_A == nKey || KEY_C == nKey || KEY_V == nKey || KEY_X == nKey || KEY_Z == nKey ) ) ) - bValid = sal_True; + bValid = true; } else - bValid = sal_True; + bValid = true; if( bValid ) Edit::KeyInput( rKeyEvent ); } @@ -165,7 +165,7 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString& r { SvTreeListEntry* pEntry = new SvTreeListEntry; - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); //It is needed, otherwise causes crash + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); //It is needed, otherwise causes crash pEntry->AddItem( new SvLBoxString( pEntry, 0, rProp)); pEntry->AddItem( new SvLBoxString( pEntry, 0, rStatus)); pEntry->AddItem( new SvLBoxString( pEntry, 0, rType)); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 2c86765bb31d..988527052a36 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -254,14 +254,14 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) } else { - m_pLanguageFT->Enable(sal_False); - m_pLanguageLB->Enable(sal_False); - m_pStandardCB->Enable(sal_False); - m_pStartFT->Enable(sal_False); - m_pStartED->Enable(sal_False); - m_pEndFT->Enable(sal_False); - m_pEndED->Enable(sal_False); - m_pHintFT->Enable(sal_False); + m_pLanguageFT->Enable(false); + m_pLanguageLB->Enable(false); + m_pStandardCB->Enable(false); + m_pStartFT->Enable(false); + m_pStartED->Enable(false); + m_pEndFT->Enable(false); + m_pEndED->Enable(false); + m_pHintFT->Enable(false); } if(bKernWesternText) m_pCharKerningRB->Check(sal_True); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 35f2e267ab09..313c7e135b22 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -176,7 +176,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults) m_pLbChartColors->GetFocus(); m_pLbChartColors->SelectEntryPos( 0 ); - m_pPBRemove->Enable( sal_True ); + m_pPBRemove->Enable( true ); } return 0L; @@ -197,7 +197,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor) m_pLbChartColors->GetFocus(); m_pLbChartColors->SelectEntryPos( pColorConfig->GetColorList().size() - 1 ); - m_pPBRemove->Enable( sal_True ); + m_pPBRemove->Enable( true ); } return 0L; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index bde7de1589e2..ba626c4958ab 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -300,8 +300,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( // check if dictionary is read-only SetDicReadonly_Impl(xDic); sal_Bool bEnable = !IsDicReadonly_Impl(); - pNewReplacePB->Enable( sal_False ); - pDeletePB->Enable( sal_False ); + pNewReplacePB->Enable( false ); + pDeletePB->Enable( false ); pLangFT->Enable( bEnable ); pLangLB->Enable( bEnable ); ShowWords_Impl( nPos ); @@ -406,8 +406,8 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl) if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { - pNewReplacePB->Enable( sal_False ); - pDeletePB->Enable( sal_False ); + pNewReplacePB->Enable( false ); + pDeletePB->Enable( false ); // display dictionary ShowWords_Impl( nPos ); // enable or disable new and delete button according to file attributes @@ -551,8 +551,8 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) // entries in the list box should exactly correspond to those from the // dictionary. Thus: - pNewReplacePB->Enable(sal_False); - pDeletePB->Enable( sal_True && !IsDicReadonly_Impl() ); + pNewReplacePB->Enable(false); + pDeletePB->Enable( true && !IsDicReadonly_Impl() ); } return 0; }; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 30409b4e8007..3b78b3bc3cf2 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -295,7 +295,7 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( m_pCheckLB ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); pEntry->AddItem( new SvLBoxButton( pEntry, loadEnabled? SvLBoxButtonKind_enabledCheckbox : SvLBoxButtonKind_disabledCheckbox, 0, pCheckButtonData ) ); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 4862ef06361c..2aedac056ade 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -323,7 +323,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) } else { - m_pYearFrame->Enable(sal_False); + m_pYearFrame->Enable(false); } } @@ -1191,9 +1191,9 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { // lock configuration broadcasters so that we can coordinate the notifications - pLangConfig->aSysLocaleOptions.BlockBroadcasts( sal_True ); - pLangConfig->aLanguageOptions.BlockBroadcasts( sal_True ); - pLangConfig->aLinguConfig.BlockBroadcasts( sal_True ); + pLangConfig->aSysLocaleOptions.BlockBroadcasts( true ); + pLangConfig->aLanguageOptions.BlockBroadcasts( true ); + pLangConfig->aLinguConfig.BlockBroadcasts( true ); /* * Sequence checking only matters when CTL support is enabled. @@ -1281,7 +1281,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // this will happen after releasing the lock on the ConfigurationBroadcaster at // the end of this method pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang ); - rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, sal_True ) ); + rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) ); sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale ); bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0; @@ -1389,8 +1389,8 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) const sal_uInt16 STATE_COUNT = 2; SfxBoolItem* pBoolItems[STATE_COUNT]; - pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, sal_False); - pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, sal_False); + pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, false); + pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, false); SfxVoidItem* pInvalidItems[STATE_COUNT]; pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE); @@ -1407,7 +1407,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) const sal_uInt16 STATE_COUNT = 1; SfxBoolItem* pBoolItems[STATE_COUNT]; - pBoolItems[0] = new SfxBoolItem(SID_CTLFONT_STATE, sal_False); + pBoolItems[0] = new SfxBoolItem(SID_CTLFONT_STATE, false); SfxVoidItem* pInvalidItems[STATE_COUNT]; pInvalidItems[0] = new SfxVoidItem(SID_CTLFONT_STATE); lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT); @@ -1419,9 +1419,9 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // first release the lock on the ConfigurationBroadcaster for Locale changes // it seems that our code relies on the fact that before other changes like e.g. currency // are broadcasted locale changes have been done - pLangConfig->aSysLocaleOptions.BlockBroadcasts( sal_False ); - pLangConfig->aLanguageOptions.BlockBroadcasts( sal_False ); - pLangConfig->aLinguConfig.BlockBroadcasts( sal_False ); + pLangConfig->aSysLocaleOptions.BlockBroadcasts( false ); + pLangConfig->aLanguageOptions.BlockBroadcasts( false ); + pLangConfig->aLinguConfig.BlockBroadcasts( false ); return sal_False; } @@ -1485,7 +1485,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) LanguageType eCurLangCTL = LANGUAGE_NONE; SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); //collect the configuration values first - m_pCurrentDocCB->Enable(sal_False); + m_pCurrentDocCB->Enable(false); // Any aWestLang; Any aCJKLang; @@ -1514,7 +1514,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) //overwrite them by the values provided by the DocShell if(pCurrentDocShell) { - m_pCurrentDocCB->Enable(sal_True); + m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl); const SfxPoolItem* pLang; if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, sal_False, &pLang)) @@ -1579,7 +1579,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) { m_pWesternLanguageLB->GrabFocus(); - m_pCurrentDocCB->Enable(sal_True); + m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(sal_True); } } diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 753f2a0b457c..1e0957fb9b35 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -199,9 +199,9 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox) case HTML_CFG_MSIE: case HTML_CFG_NS40 : case HTML_CFG_WRITER : - aPrintExtensionCB->Enable(sal_True); + aPrintExtensionCB->Enable(true); break; - default: aPrintExtensionCB->Enable(sal_False); + default: aPrintExtensionCB->Enable(false); } return 0; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index f3486ac66124..fe2d6b0423bb 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -116,7 +116,7 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) if ( !bValid && ( rKeyCode.IsMod1() && ( KEY_A == nKey || KEY_C == nKey || KEY_V == nKey || KEY_X == nKey || KEY_Z == nKey ) ) ) // Erase, Copy, Paste, Select All und Undo soll funktionieren - bValid = sal_True; + bValid = true; } if (bValid) Edit::KeyInput(rKEvent); @@ -647,11 +647,11 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) xMasterPasswd->removeMasterPassword(); if ( xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { - m_pMasterPasswordPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordCB->Enable( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordCB->Enable( true ); + m_pMasterPasswordFT->Enable( true ); + m_pShowConnectionsPB->Enable( true ); } else { @@ -668,16 +668,16 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) { xMasterPasswd->allowPersistentStoring( sal_False ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordPB->Enable( sal_False ); - m_pMasterPasswordCB->Enable( sal_False ); - m_pMasterPasswordFT->Enable( sal_False ); - m_pShowConnectionsPB->Enable( sal_False ); + m_pMasterPasswordPB->Enable( false ); + m_pMasterPasswordCB->Enable( false ); + m_pMasterPasswordFT->Enable( false ); + m_pShowConnectionsPB->Enable( false ); } else { m_pSavePasswordsCB->Check( sal_True ); - m_pMasterPasswordPB->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pShowConnectionsPB->Enable( true ); } } } @@ -716,28 +716,28 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl) { if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { - m_pMasterPasswordPB->Enable( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pMasterPasswordFT->Enable( true ); } else { m_pMasterPasswordCB->Check( sal_False ); - m_pMasterPasswordPB->Enable( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pMasterPasswordFT->Enable( true ); } } else { if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->useDefaultMasterPassword( Reference< task::XInteractionHandler >() ) ) { - m_pMasterPasswordPB->Enable( sal_False ); - m_pMasterPasswordFT->Enable( sal_False ); + m_pMasterPasswordPB->Enable( false ); + m_pMasterPasswordFT->Enable( false ); } else { m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordPB->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pShowConnectionsPB->Enable( true ); } } } @@ -821,11 +821,11 @@ void SvxSecurityTabPage::InitControls() m_pCertFrame->Hide(); #endif - m_pMasterPasswordPB->Enable( sal_False ); - m_pMasterPasswordCB->Enable( sal_False ); + m_pMasterPasswordPB->Enable( false ); + m_pMasterPasswordCB->Enable( false ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordFT->Enable( sal_False ); - m_pShowConnectionsPB->Enable( sal_False ); + m_pMasterPasswordFT->Enable( false ); + m_pShowConnectionsPB->Enable( false ); // initialize the password saving checkbox try @@ -835,23 +835,23 @@ void SvxSecurityTabPage::InitControls() if ( xMasterPasswd->isPersistentStoringAllowed() ) { - m_pMasterPasswordCB->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordCB->Enable( true ); + m_pShowConnectionsPB->Enable( true ); m_pSavePasswordsCB->Check( sal_True ); if ( xMasterPasswd->isDefaultMasterPasswordUsed() ) m_pMasterPasswordCB->Check( sal_False ); else { - m_pMasterPasswordPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); + m_pMasterPasswordFT->Enable( true ); } } } catch (const Exception&) { - m_pSavePasswordsCB->Enable( sal_False ); + m_pSavePasswordsCB->Enable( false ); } } @@ -1256,8 +1256,8 @@ sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) void SvxEMailTabPage::Reset( const SfxItemSet& ) { - m_pMailerURLED->Enable(sal_True ); - m_pMailerURLPB->Enable(sal_True ); + m_pMailerURLED->Enable(true ); + m_pMailerURLPB->Enable(true ); if (pImpl->aMailConfig.bROProgram) m_pMailerURLFI->Show(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 4d1be954f1f4..20c79749a762 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1852,7 +1852,7 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // empty column - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); pEntry->AddItem( new BrwString_Impl( pEntry, 0, rTxt ) ); return pEntry; @@ -1911,8 +1911,8 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) aPrioDownPB.SetClickHdl( LINK( this, SvxEditModulesDlg, UpDownHdl_Impl )); aBackPB .SetClickHdl( LINK( this, SvxEditModulesDlg, BackHdl_Impl )); // in case of not installed language modules - aPrioUpPB .Enable( sal_False ); - aPrioDownPB.Enable( sal_False ); + aPrioUpPB .Enable( false ); + aPrioDownPB.Enable( false ); if ( SvtExtendedSecurityOptions().GetOpenHyperlinkMode() != SvtExtendedSecurityOptions::OPEN_NEVER ) @@ -1978,7 +1978,7 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // empty column - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); pEntry->AddItem( new BrwStringDic_Impl( pEntry, 0, rTxt ) ); return pEntry; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index d9e72472401b..a6a9eec5bbe6 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -246,9 +246,9 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) m_xUpdateAccess->getByName( "AutoDownloadEnabled" ) >>= bValue; m_pAutoDownloadCheckBox->Check(bValue); - m_pDestPathLabel->Enable(sal_True); - m_pDestPath->Enable(sal_True); - m_pChangePathButton->Enable(sal_True); + m_pDestPathLabel->Enable(true); + m_pDestPath->Enable(true); + m_pChangePathButton->Enable(true); OUString sValue, aPath; m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 03a7a79fe6b0..27b4cc9acac0 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -134,8 +134,8 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent) m_pChangeBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, ChangePasswordHdl ) ); m_pPasswordsLB->SetSelectHdl( LINK( this, WebConnectionInfoDialog, EntrySelectedHdl ) ); - m_pRemoveBtn->Enable( sal_False ); - m_pChangeBtn->Enable( sal_False ); + m_pRemoveBtn->Enable( false ); + m_pChangeBtn->Enable( false ); HeaderBarClickedHdl( NULL ); } @@ -301,12 +301,12 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( !pEntry ) { - m_pRemoveBtn->Enable( sal_False ); - m_pChangeBtn->Enable( sal_False ); + m_pRemoveBtn->Enable( false ); + m_pChangeBtn->Enable( false ); } else { - m_pRemoveBtn->Enable( sal_True ); + m_pRemoveBtn->Enable( true ); // url container entries (-> use system credentials) have // no password diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 3a4acaf4b3bf..9394bbe26227 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -71,11 +71,11 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) if ( _pSet ) { - SFX_ITEMSET_ARG( _pSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, sal_False ); + SFX_ITEMSET_ARG( _pSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, false ); if ( pItem && pItem->GetValue() ) bShowSWOptions = sal_True; - SFX_ITEMSET_ARG( _pSet, pItem2, SfxBoolItem, SID_OPEN_SMARTTAGOPTIONS, sal_False ); + SFX_ITEMSET_ARG( _pSet, pItem2, SfxBoolItem, SID_OPEN_SMARTTAGOPTIONS, false ); if ( pItem2 && pItem2->GetValue() ) bOpenSmartTagOptions = sal_True; } @@ -223,7 +223,7 @@ sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) { - ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); + ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) @@ -448,7 +448,7 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(OUString& rTxt, sal_uInt16 m_pCheckLB->SetCheckButtonData( pCheckButtonData ); } - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); OUString sEmpty; if (nCol == CBCOL_SECOND) @@ -598,7 +598,7 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) { - ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); + ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) @@ -912,7 +912,7 @@ void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); - ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_True); + ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(true); } int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) @@ -1052,8 +1052,8 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, aFormatText.insert(pWordPtr->GetShort()); } } - m_pNewReplacePB->Enable(sal_False); - m_pDeleteReplacePB->Enable(sal_False); + m_pNewReplacePB->Enable(false); + m_pDeleteReplacePB->Enable(false); m_pReplaceTLB->SetUpdateMode(sal_True); } @@ -1068,7 +1068,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, } else { - m_pTextOnlyCB->Enable( sal_False ); + m_pTextOnlyCB->Enable( false ); } } @@ -1124,7 +1124,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) bFirstSelect = sal_False; } - m_pNewReplacePB->Enable(sal_False); + m_pNewReplacePB->Enable(false); m_pDeleteReplacePB->Enable(); return 0; }; @@ -1305,7 +1305,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) pFirstSel = 0; m_pNewReplacePB->SetText( sNew ); if( bReplaceEditChanged ) - m_pTextOnlyCB->Enable(sal_False); + m_pTextOnlyCB->Enable(false); } m_pDeleteReplacePB->Enable( bFound ); } @@ -1413,7 +1413,7 @@ void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) { if(eLang != eLastDialogLanguage) SetLanguage(eLastDialogLanguage); - ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_True); + ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(true); } int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) @@ -1648,13 +1648,13 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox) if (pBox == m_pAbbrevLB) { m_pAbbrevED->SetText(pBox->GetSelectEntry()); - m_pNewAbbrevPB->Enable(sal_False); + m_pNewAbbrevPB->Enable(false); m_pDelAbbrevPB->Enable(); } else { m_pDoubleCapsED->SetText(pBox->GetSelectEntry()); - m_pNewDoublePB->Enable(sal_False); + m_pNewDoublePB->Enable(false); m_pDelDoublePB->Enable(); } return 0; @@ -1721,7 +1721,7 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol) m_pSwCheckLB->SetCheckButtonData(pCheckButtonData); } - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); OUString sEmpty; if (nCol == CBCOL_SECOND) @@ -1776,7 +1776,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) sal_Bool bShowSWOptions = sal_False; - SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, sal_False ); + SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, false ); if ( pItem && pItem->GetValue() ) bShowSWOptions = sal_True; @@ -1893,7 +1893,7 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) void OfaQuoteTabPage::ActivatePage( const SfxItemSet& ) { - ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(sal_False); + ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } void OfaQuoteTabPage::Reset( const SfxItemSet& ) @@ -2241,7 +2241,7 @@ void OfaAutoCompleteTabPage::Reset( const SfxItemSet& ) void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& ) { - ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage( sal_False ); + ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage( false ); } IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl) @@ -2487,9 +2487,9 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) const lang::Locale aLocale( LanguageTag::convertToLocale( eLastDialogLanguage ) ); if ( xRec->hasPropertyPage( nSmartTagIdx, aLocale ) ) - m_aPropertiesPB.Enable( sal_True ); + m_aPropertiesPB.Enable( true ); else - m_aPropertiesPB.Enable( sal_False ); + m_aPropertiesPB.Enable( false ); return 0; } @@ -2557,7 +2557,7 @@ void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet& ) void OfaSmartTagOptionsTabPage::ActivatePage( const SfxItemSet& ) { - ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage( sal_False ); + ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage( false ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index c8abe6327650..8a204798623a 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -698,7 +698,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet ) // We now have always a link to the background bLinkOnly = sal_True; m_pBtnLink->Check( sal_True ); - m_pBtnLink->Show( sal_False ); + m_pBtnLink->Show( false ); delete pTemp; } @@ -1132,7 +1132,7 @@ void SvxBackgroundTabPage::ShowSelector() if(nHtmlMode & HTMLMODE_ON) { - m_pBtnArea->Enable(sal_False); + m_pBtnArea->Enable(false); } } } @@ -1254,8 +1254,8 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl() m_pBtnPreview->Show(); m_pGraphTransFrame->Show(bGraphTransparency); - m_pColTransFT->Show(sal_False); - m_pColTransMF->Show(sal_False); + m_pColTransFT->Show(false); + m_pColTransMF->Show(false); } } @@ -1400,7 +1400,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl) else if ( XFILL_BITMAP == lcl_getFillStyle(m_pLbSelect) ) { ShowBitmapUI_Impl(); - m_pParaLBox->Enable(sal_False); // drawing background can't be a bitmap + m_pParaLBox->Enable(false); // drawing background can't be a bitmap } else { @@ -1767,7 +1767,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox ) case PARA_DEST_CHAR: { pActItem = pParaBck_Impl->pCharBrush; - m_pLbSelect->Enable(sal_False); + m_pLbSelect->Enable(false); } break; } @@ -1929,8 +1929,8 @@ void SvxBackgroundTabPage::EnableTransparency(sal_Bool bColor, sal_Bool bGraphic void SvxBackgroundTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,sal_False); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,false); if (pFlagItem) { diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 0247ca8f077b..4696e3256493 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -695,7 +695,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) // // Put or Clear of the border? // - bPut = sal_True; + bPut = true; if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxWhich, sal_False )) { @@ -1183,8 +1183,8 @@ void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pSWModeItem,SfxUInt16Item,SID_SWMODE_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pSWModeItem,SfxUInt16Item,SID_SWMODE_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); if (pSWModeItem) { nSWMode = pSWModeItem->GetValue(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 3e6807c22070..110e0b17982a 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -921,7 +921,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan rSet.ClearItem( nWhich ); - bChanged = sal_True; + bChanged = true; switch ( eLangGrp ) { case Western : nSlot = SID_ATTR_CHAR_WEIGHT; break; @@ -1267,9 +1267,9 @@ void SvxCharNamePage::SetPreviewBackgroundToCharacter() // ----------------------------------------------------------------------- void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pDisalbeItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False); + SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,false); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pDisalbeItem,SfxUInt16Item,SID_DISABLE_CTL,false); if (pFontListItem) SetFontList(*pFontListItem); @@ -2520,8 +2520,8 @@ void SvxCharEffectsPage::SetPreviewBackgroundToCharacter() // ----------------------------------------------------------------------- void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,sal_False); - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,false); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); if (pDisableCtlItem) DisableControls(pDisableCtlItem->GetValue()); @@ -3271,7 +3271,7 @@ void SvxCharPositionPage::SetPreviewBackgroundToCharacter() // ----------------------------------------------------------------------- void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); if (pFlagItem) { sal_uInt32 nFlags=pFlagItem->GetValue(); @@ -3515,7 +3515,7 @@ void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter() // ----------------------------------------------------------------------- void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); if (pFlagItem) { sal_uInt32 nFlags=pFlagItem->GetValue(); diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 602e9232f552..fc33e7984d3a 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -270,20 +270,20 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) sal_uInt16 nValue = ( ( const SdrEdgeLineDeltaAnzItem* )pItem )->GetValue(); if( nValue <= 2 ) { - m_pFtLine3->Enable( sal_False ); - m_pMtrFldLine3->Enable( sal_False ); + m_pFtLine3->Enable( false ); + m_pMtrFldLine3->Enable( false ); m_pMtrFldLine3->SetEmptyFieldValue(); } if( nValue <= 1 ) { - m_pFtLine2->Enable( sal_False ); - m_pMtrFldLine2->Enable( sal_False ); + m_pFtLine2->Enable( false ); + m_pMtrFldLine2->Enable( false ); m_pMtrFldLine2->SetEmptyFieldValue(); } if( nValue == 0 ) { - m_pFtLine1->Enable( sal_False ); - m_pMtrFldLine1->Enable( sal_False ); + m_pFtLine1->Enable( false ); + m_pMtrFldLine1->Enable( false ); m_pMtrFldLine1->SetEmptyFieldValue(); } } @@ -511,7 +511,7 @@ void SvxConnectionPage::FillTypeLB() } void SvxConnectionPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); + SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,false); if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue()) ); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index b55e6c7fff27..e1057ca111f1 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -132,7 +132,7 @@ void _SfxMacroTabPage::EnableButtons() mpImpl->pAssignPB->Enable( !mpImpl->bReadOnly && !sScriptURI.equalsIgnoreAsciiCase( sEventMacro ) ); } else - mpImpl->pAssignPB->Enable( sal_False ); + mpImpl->pAssignPB->Enable( false ); } _SfxMacroTabPage::_SfxMacroTabPage(Window* pParent, const SfxItemSet& rAttrSet) @@ -350,12 +350,12 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer*, EMPTYARG ) if ( pTabDlg ) { pTabDlg->EnterWait(); - pTabDlg->EnableInput( sal_False ); + pTabDlg->EnableInput( false ); } pThis->FillMacroList(); if ( pTabDlg ) { - pTabDlg->EnableInput( sal_True ); + pTabDlg->EnableInput( true ); pTabDlg->LeaveWait(); } return 0; @@ -386,9 +386,9 @@ void _SfxMacroTabPage::InitAndSetHandler() mpImpl->pEventLB->Show(); mpImpl->pEventLB->ConnectElements(); - mpImpl->pEventLB->Enable( sal_True ); - mpImpl->pGroupLB->Enable( sal_True ); - mpImpl->pMacroLB->Enable( sal_True ); + mpImpl->pEventLB->Enable( true ); + mpImpl->pGroupLB->Enable( true ); + mpImpl->pMacroLB->Enable( true ); mpImpl->pGroupLB->SetFunctionListBox( mpImpl->pMacroLB ); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index c07e37873ebe..28fe6fc91900 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -808,7 +808,7 @@ void SvxMeasurePage::FillUnitLB() } void SvxMeasurePage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); + SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,false); if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue())); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index c0247fe84c21..64db77063e01 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -276,9 +276,9 @@ void SvxNumberFormatTabPage::Init_Impl() bNumItemFlag=sal_True; bOneAreaFlag=sal_False; - m_pIbAdd->Enable(sal_False ); - m_pIbRemove->Enable(sal_False ); - m_pIbInfo->Enable(sal_False ); + m_pIbAdd->Enable(false ); + m_pIbRemove->Enable(false ); + m_pIbInfo->Enable(false ); m_pEdComment->SetText(m_pLbCategory->GetEntry(1)); // string for user defined @@ -600,9 +600,9 @@ void SvxNumberFormatTabPage::Obstructing() m_pFtLanguage->Disable(); m_pLbLanguage->Disable(); - m_pIbAdd->Enable(sal_False ); - m_pIbRemove->Enable(sal_False ); - m_pIbInfo->Enable(sal_False ); + m_pIbAdd->Enable(false ); + m_pIbRemove->Enable(false ); + m_pIbInfo->Enable(false ); m_pBtnNegRed->Disable(); m_pBtnThousand->Disable(); @@ -1200,7 +1200,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) if ( pNumFmtShell->FindEntry( aFormat) ) { - m_pIbAdd->Enable(sal_False ); + m_pIbAdd->Enable(false ); sal_Bool bIsUserDef=pNumFmtShell->IsUserDefined( aFormat ); m_pIbRemove->Enable(bIsUserDef); m_pIbInfo->Enable(bIsUserDef); @@ -1208,9 +1208,9 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) } else { - m_pIbAdd->Enable(sal_True ); - m_pIbInfo->Enable(sal_True ); - m_pIbRemove->Enable(sal_False ); + m_pIbAdd->Enable(true ); + m_pIbInfo->Enable(true ); + m_pIbRemove->Enable(false ); m_pFtComment->SetText(m_pEdComment->GetText()); } @@ -1436,9 +1436,9 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) if ( m_pEdFormat->GetText().isEmpty() ) { - m_pIbAdd->Enable(sal_False ); - m_pIbRemove->Enable(sal_False ); - m_pIbInfo->Enable(sal_False ); + m_pIbAdd->Enable(false ); + m_pIbRemove->Enable(false ); + m_pIbInfo->Enable(false ); m_pFtComment->SetText(OUString()); } else @@ -1448,7 +1448,7 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) if ( pNumFmtShell->FindEntry( aFormat, &nCurKey ) ) { - m_pIbAdd->Enable(sal_False ); + m_pIbAdd->Enable(false ); sal_Bool bUserDef=pNumFmtShell->IsUserDefined( aFormat ); m_pIbRemove->Enable(bUserDef); @@ -1469,9 +1469,9 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) else { - m_pIbAdd->Enable(sal_True ); - m_pIbInfo->Enable(sal_True); - m_pIbRemove->Enable(sal_False ); + m_pIbAdd->Enable(true ); + m_pIbInfo->Enable(true); + m_pIbRemove->Enable(false ); m_pFtComment->SetText(m_pEdComment->GetText()); @@ -1528,7 +1528,7 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) if ( pNumFmtShell->FindEntry( aFormat ) ) { - m_pIbAdd->Enable(sal_False ); + m_pIbAdd->Enable(false ); sal_Bool bUserDef=pNumFmtShell->IsUserDefined( aFormat ); m_pIbRemove->Enable(bUserDef); m_pIbInfo->Enable(bUserDef); @@ -1723,8 +1723,8 @@ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, s void SvxNumberFormatTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pNumberInfoItem,SvxNumberInfoItem,SID_ATTR_NUMBERFORMAT_INFO,sal_False); - SFX_ITEMSET_ARG (&aSet,pLinkItem,SfxLinkItem,SID_LINK_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pNumberInfoItem,SvxNumberInfoItem,SID_ATTR_NUMBERFORMAT_INFO,false); + SFX_ITEMSET_ARG (&aSet,pLinkItem,SfxLinkItem,SID_LINK_TYPE,false); if (pNumberInfoItem) SetNumberFormatList(*pNumberInfoItem); if (pLinkItem) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 321293190d6b..eb872e57e113 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -513,7 +513,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl) void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false); if (pBulletCharFmt) SetCharFmtName( pBulletCharFmt->GetValue()); @@ -762,8 +762,8 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl) void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); + SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,false); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false); if (pNumCharFmt &&pBulletCharFmt) @@ -1200,7 +1200,7 @@ sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { *pSaveNum = *pActNum; rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, sal_False)); + rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false)); } return bModified; }; @@ -2968,7 +2968,7 @@ sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { *pSaveNum = *pActNum; rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, sal_False)); + rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false)); } return bModified; } @@ -3496,10 +3496,10 @@ void SvxNumOptionsTabPage::SetModified(sal_Bool bRepaint) void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,sal_False); - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False); - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); + SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,false); + SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,false); + SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false); + SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,false); if (pNumCharFmt &&pBulletCharFmt) SetCharFmts( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); @@ -3518,7 +3518,7 @@ void SvxNumOptionsTabPage::PageCreated(SfxAllItemSet aSet) void SvxNumPositionTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,sal_False); + SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,false); if (pMetricItem) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 016e40bf6640..46b9901e713d 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -225,7 +225,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : get(m_pOutsideLbl,"labelOuter"); get(m_pPrintRangeQueryText,"labelMsg"); - bBorderModified = sal_False; + bBorderModified = false; m_pBspWin->EnableRTL( sal_False ); // this page needs ExchangeSupport @@ -508,7 +508,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) Swap( aPaperSize ); // Actual Paper Format - Paper ePaper = SvxPaperInfo::GetSvxPaper( aPaperSize, MAP_100TH_MM, sal_True ); + Paper ePaper = SvxPaperInfo::GetSvxPaper( aPaperSize, MAP_100TH_MM, true ); if ( PAPER_USER != ePaper ) aPaperSize = SvxPaperInfo::GetPaperSize( ePaper, MAP_100TH_MM ); @@ -599,8 +599,8 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) InitHeadFoot_Impl( rSet ); - bBorderModified = sal_False; - SwapFirstValues_Impl( sal_False ); + bBorderModified = false; + SwapFirstValues_Impl( false ); UpdateExample_Impl(); m_pLeftMarginEdit->SaveValue(); @@ -1026,7 +1026,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich ); Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ), GetCoreValue( *m_pPaperHeightEdit, eUnit ) ); - Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, (MapUnit)eUnit, sal_True ); + Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, (MapUnit)eUnit, true ); sal_uInt16 nEntryCount = m_pPaperSizeBox->GetEntryCount(); for ( sal_uInt16 i = 0; i < nEntryCount; ++i ) @@ -1146,7 +1146,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl) { if ( !bBorderModified ) - bBorderModified = sal_True; + bBorderModified = true; UpdateExample_Impl(); return 0; } @@ -1675,10 +1675,10 @@ bool SvxPageDescPage::IsMarginOutOfRange() void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pModeItem,SfxAllEnumItem,SID_ENUM_PAGE_MODE,sal_False); - SFX_ITEMSET_ARG (&aSet,pPaperStartItem,SfxAllEnumItem,SID_PAPER_START,sal_False); - SFX_ITEMSET_ARG (&aSet,pPaperEndItem,SfxAllEnumItem,SID_PAPER_END,sal_False); - SFX_ITEMSET_ARG (&aSet,pCollectListItem,SfxStringListItem,SID_COLLECT_LIST,sal_False); + SFX_ITEMSET_ARG (&aSet,pModeItem,SfxAllEnumItem,SID_ENUM_PAGE_MODE,false); + SFX_ITEMSET_ARG (&aSet,pPaperStartItem,SfxAllEnumItem,SID_PAPER_START,false); + SFX_ITEMSET_ARG (&aSet,pPaperEndItem,SfxAllEnumItem,SID_PAPER_END,false); + SFX_ITEMSET_ARG (&aSet,pCollectListItem,SfxStringListItem,SID_COLLECT_LIST,false); if (pModeItem) SetMode((SvxModeType)pModeItem->GetEnumValue()); if (pPaperStartItem && pPaperEndItem) diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 1f549cd140f6..fd5da1ae6864 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -751,10 +751,10 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox ) case LLINESPACE_1: case LLINESPACE_15: case LLINESPACE_2: - m_pLineDistAtLabel->Enable(sal_False); - m_pLineDistAtPercentBox->Enable(sal_False); + m_pLineDistAtLabel->Enable(false); + m_pLineDistAtPercentBox->Enable(false); m_pLineDistAtPercentBox->SetText( OUString() ); - m_pLineDistAtMetricBox->Enable(sal_False); + m_pLineDistAtMetricBox->Enable(false); m_pLineDistAtMetricBox->SetText( OUString() ); break; @@ -923,9 +923,9 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) 0x0008 --->EnableNegativeMode() 0x0010 --->EnableContextualMode() */ - SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); - SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); - SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,sal_False); + SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,false); + SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,false); + SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,false); if (pPageWidthItem) SetPageWidth(pPageWidthItem->GetValue()); @@ -1197,7 +1197,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) m_pExpandCB->Hide(); if(!(nHtmlMode & HTMLMODE_FULL_STYLES) ) m_pJustify->Disable(); - m_pSnapToGridCB->Show(sal_False); + m_pSnapToGridCB->Show(false); } _nWhich = GetWhich(SID_ATTR_PARA_SNAPTOGRID); eItemState = rSet.GetItemState( _nWhich ); @@ -1310,7 +1310,7 @@ void SvxParaAlignTabPage::EnableJustifyExt() void SvxParaAlignTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,sal_False); + SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,false); if (pBoolItem) if(pBoolItem->GetValue()) EnableJustifyExt(); @@ -1617,10 +1617,10 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) } else { - m_pApplyCollBtn->Enable(sal_False); - m_pApplyCollBox->Enable(sal_False); - m_pPagenumEdit->Enable(sal_False); - m_pPagenumText->Enable(sal_False); + m_pApplyCollBtn->Enable(false); + m_pApplyCollBox->Enable(false); + m_pPagenumEdit->Enable(false); + m_pPagenumText->Enable(false); } if ( !bIsPageModel ) @@ -1684,11 +1684,11 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) m_pPageBreakBox->SetState( STATE_DONTKNOW ); else { - m_pPageBreakBox->Enable(sal_False); - m_pBreakTypeFT->Enable(sal_False); - m_pBreakTypeLB->Enable(sal_False); - m_pBreakPositionFT->Enable(sal_False); - m_pBreakPositionLB->Enable(sal_False); + m_pPageBreakBox->Enable(false); + m_pBreakTypeFT->Enable(false); + m_pBreakTypeLB->Enable(false); + m_pBreakPositionFT->Enable(false); + m_pBreakPositionLB->Enable(false); } } @@ -1713,7 +1713,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) else if ( SFX_ITEM_DONTCARE == eItemState ) m_pKeepParaBox->SetState( STATE_DONTKNOW ); else - m_pKeepParaBox->Enable(sal_False); + m_pKeepParaBox->Enable(false); _nWhich = GetWhich( SID_ATTR_PARA_SPLIT ); eItemState = rSet.GetItemState( _nWhich ); @@ -1752,7 +1752,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) else if ( SFX_ITEM_DONTCARE == eTmpState ) m_pWidowBox->SetState( STATE_DONTKNOW ); else - m_pWidowBox->Enable(sal_False); + m_pWidowBox->Enable(false); m_pOrphanBox->Enable(); _nWhich = GetWhich( SID_ATTR_PARA_ORPHANS ); @@ -1775,13 +1775,13 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) else if ( SFX_ITEM_DONTCARE == eTmpState ) m_pOrphanBox->SetState( STATE_DONTKNOW ); else - m_pOrphanBox->Enable(sal_False); + m_pOrphanBox->Enable(false); } } else if ( SFX_ITEM_DONTCARE == eItemState ) m_pKeepTogetherBox->SetState( STATE_DONTKNOW ); else - m_pKeepTogetherBox->Enable(sal_False); + m_pKeepTogetherBox->Enable(false); // so that everything is enabled correctly KeepTogetherHdl_Impl( 0 ); @@ -1814,13 +1814,13 @@ int SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxExtParagraphTabPage::DisablePageBreak() { bPageBreak = sal_False; - m_pPageBreakBox->Enable(sal_False); + m_pPageBreakBox->Enable(false); m_pBreakTypeLB->RemoveEntry(0); - m_pBreakPositionFT->Enable(sal_False); - m_pBreakPositionLB->Enable(sal_False); - m_pApplyCollBtn->Enable(sal_False); - m_pApplyCollBox->Enable(sal_False); - m_pPagenumEdit->Enable(sal_False); + m_pBreakPositionFT->Enable(false); + m_pBreakPositionLB->Enable(false); + m_pApplyCollBtn->Enable(false); + m_pApplyCollBox->Enable(false); + m_pPagenumEdit->Enable(false); } SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : @@ -1903,15 +1903,15 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe if ( nHtmlMode & HTMLMODE_ON ) { bHtmlMode = sal_True; - m_pHyphenBox ->Enable(sal_False); - m_pBeforeText ->Enable(sal_False); - m_pExtHyphenBeforeBox ->Enable(sal_False); - m_pAfterText ->Enable(sal_False); - m_pExtHyphenAfterBox ->Enable(sal_False); - m_pMaxHyphenLabel ->Enable(sal_False); - m_pMaxHyphenEdit ->Enable(sal_False); - m_pPagenumText ->Enable(sal_False); - m_pPagenumEdit ->Enable(sal_False); + m_pHyphenBox ->Enable(false); + m_pBeforeText ->Enable(false); + m_pExtHyphenBeforeBox ->Enable(false); + m_pAfterText ->Enable(false); + m_pExtHyphenAfterBox ->Enable(false); + m_pMaxHyphenLabel ->Enable(false); + m_pMaxHyphenEdit ->Enable(false); + m_pPagenumText ->Enable(false); + m_pPagenumEdit ->Enable(false); // no column break in HTML m_pBreakTypeLB->RemoveEntry(1); } @@ -1955,14 +1955,14 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl) case STATE_NOCHECK: case STATE_DONTKNOW: m_pApplyCollBtn->SetState( STATE_NOCHECK ); - m_pApplyCollBtn->Enable(sal_False); - m_pApplyCollBox->Enable(sal_False); - m_pPagenumText->Enable(sal_False); - m_pPagenumEdit->Enable(sal_False); - m_pBreakTypeFT->Enable(sal_False); - m_pBreakTypeLB->Enable(sal_False); - m_pBreakPositionFT->Enable(sal_False); - m_pBreakPositionLB->Enable(sal_False); + m_pApplyCollBtn->Enable(false); + m_pApplyCollBox->Enable(false); + m_pPagenumText->Enable(false); + m_pPagenumEdit->Enable(false); + m_pBreakTypeFT->Enable(false); + m_pBreakTypeLB->Enable(false); + m_pBreakPositionFT->Enable(false); + m_pBreakPositionLB->Enable(false); break; } return 0; @@ -1984,7 +1984,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl) case STATE_CHECK: m_pWidowRowNo->Enable(); m_pWidowRowLabel->Enable(); - m_pKeepTogetherBox->Enable(sal_False); + m_pKeepTogetherBox->Enable(false); break; case STATE_NOCHECK: @@ -1993,8 +1993,8 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl) // no break case STATE_DONTKNOW: - m_pWidowRowNo->Enable(sal_False); - m_pWidowRowLabel->Enable(sal_False); + m_pWidowRowNo->Enable(false); + m_pWidowRowLabel->Enable(false); break; } return 0; @@ -2007,7 +2007,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl) case STATE_CHECK: m_pOrphanRowNo->Enable(); m_pOrphanRowLabel->Enable(); - m_pKeepTogetherBox->Enable(sal_False); + m_pKeepTogetherBox->Enable(false); break; case STATE_NOCHECK: @@ -2016,8 +2016,8 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl) // no break case STATE_DONTKNOW: - m_pOrphanRowNo->Enable(sal_False); - m_pOrphanRowLabel->Enable(sal_False); + m_pOrphanRowNo->Enable(false); + m_pOrphanRowLabel->Enable(false); break; } return 0; @@ -2079,10 +2079,10 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox *, pListBox ) else if ( 1 == pListBox->GetSelectEntryPos() ) { m_pApplyCollBtn->SetState( STATE_NOCHECK ); - m_pApplyCollBtn->Enable(sal_False); - m_pApplyCollBox->Enable(sal_False); - m_pPagenumText->Enable(sal_False); - m_pPagenumEdit->Enable(sal_False); + m_pApplyCollBtn->Enable(false); + m_pApplyCollBox->Enable(false); + m_pPagenumText->Enable(false); + m_pPagenumEdit->Enable(false); } return 0; } @@ -2094,10 +2094,10 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox *, pListBox ) if ( pListBox->GetSelectEntryPos() == 1 || 1 == nBreakPos) { m_pApplyCollBtn->SetState( STATE_NOCHECK ); - m_pApplyCollBtn->Enable(sal_False); - m_pApplyCollBox->Enable(sal_False); - m_pPagenumText->Enable(sal_False); - m_pPagenumEdit->Enable(sal_False); + m_pApplyCollBtn->Enable(false); + m_pApplyCollBox->Enable(false); + m_pPagenumText->Enable(false); + m_pPagenumEdit->Enable(false); } else PageBreakPosHdl_Impl( m_pBreakPositionLB ); @@ -2106,7 +2106,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox *, pListBox ) void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,sal_False); + SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,false); if (pDisablePageBreakItem) if ( pDisablePageBreakItem->GetValue()) @@ -2186,7 +2186,7 @@ static void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, CheckBox& rBo sal_uInt16 _nWhich = rSet.GetPool()->GetWhich(nSlotId); SfxItemState eState = rSet.GetItemState(_nWhich, sal_True); if(!eState || eState == SFX_ITEM_DISABLED ) - rBox.Enable(sal_False); + rBox.Enable(false); else if(eState >= SFX_ITEM_AVAILABLE) { rBox.EnableTriState( sal_False ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 11157ca10499..43f0f4a003dd 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -907,11 +907,11 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) } if(bInvalidateAnchor) { - m_pToPageRB->Enable( sal_False ); - m_pToParaRB->Enable( sal_False ); - m_pToCharRB->Enable( sal_False ); - m_pAsCharRB->Enable( sal_False ); - m_pToFrameRB->Enable( sal_False ); + m_pToPageRB->Enable( false ); + m_pToParaRB->Enable( false ); + m_pToCharRB->Enable( false ); + m_pAsCharRB->Enable( false ); + m_pToFrameRB->Enable( false ); } pItem = GetItem( rSet, SID_ATTR_TRANSFORM_PROTECT_POS ); @@ -972,10 +972,10 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) if(m_bHtmlMode) { - m_pHoriMirrorCB->Show(sal_False); - m_pKeepRatioCB->Enable(sal_False); + m_pHoriMirrorCB->Show(false); + m_pKeepRatioCB->Enable(false); // #i18732# - hide checkbox in HTML mode - m_pFollowCB->Show(sal_False); + m_pFollowCB->Show(false); } else { @@ -1059,7 +1059,7 @@ void SvxSwPosSizeTabPage::EnableAnchorTypes(sal_uInt16 nAnchorEnable) if((nAnchorEnable & SVX_OBJ_AT_FLY)) m_pToFrameRB->Show(); if(!(nAnchorEnable & SVX_OBJ_PAGE)) - m_pToPageRB->Enable(sal_False); + m_pToPageRB->Enable(false); } short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) @@ -1224,9 +1224,9 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) UpdateExample(); if (bHori) - m_bAtHoriPosModified = sal_True; + m_bAtHoriPosModified = true; else - m_bAtVertPosModified = sal_True; + m_bAtVertPosModified = true; if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // again special treatment { @@ -1292,9 +1292,9 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) UpdateExample(); if (bHori) - m_bAtHoriPosModified = sal_True; + m_bAtHoriPosModified = true; else - m_bAtVertPosModified = sal_True; + m_bAtVertPosModified = true; // special treatment for HTML-Mode with horz-vert-dependencies if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 93e543eeba8c..f920e0d135b7 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -723,7 +723,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl) void SvxTabulatorTabPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,sal_False); + SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,false); if (pControlItem) DisableControls(pControlItem->GetValue()); } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index a0120ea107ec..b09edd773916 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -226,7 +226,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) if( eAniKind == SDRTEXTANI_SLIDE ) { m_pTsbEndless->SetState( STATE_NOCHECK ); - m_pTsbEndless->Enable( sal_False ); + m_pTsbEndless->Enable( false ); } else { diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 8d9faa698b53..9c4da32f62fc 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -286,7 +286,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pCtlPosition->DoCompletelyDisable(sal_True); m_pTsbFullWidth->SetState(STATE_DONTKNOW); - m_pFlPosition->Enable( sal_False ); + m_pFlPosition->Enable( false ); } // adjust to border @@ -699,7 +699,7 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,sal_False); + SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,false); if (pViewItem) SetView( static_cast<SdrView *>(pViewItem->GetValue())); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 790c0f332ed4..2b25f14d699b 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -463,7 +463,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) { - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,false); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); @@ -558,8 +558,8 @@ void SvxTransparenceTabPage::InvalidatePreview (sal_Bool bEnable) void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); @@ -770,8 +770,8 @@ void SvxAreaTabPage::Construct() void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_uInt16 nCount; - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); - SFX_ITEMSET_ARG (&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,sal_False); + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG (&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,false); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if (pPosItem) @@ -2311,13 +2311,13 @@ void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) void SvxAreaTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,sal_False); - SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pHatchingListItem,SvxHatchListItem,SID_HATCH_LIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pBitmapListItem,SvxBitmapListItem,SID_BITMAP_LIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,sal_False); + SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,false); + SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,false); + SFX_ITEMSET_ARG (&aSet,pHatchingListItem,SvxHatchListItem,SID_HATCH_LIST,false); + SFX_ITEMSET_ARG (&aSet,pBitmapListItem,SvxBitmapListItem,SID_BITMAP_LIST,false); + SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,false); if (pColorListItem) SetColorList(pColorListItem->GetColorList()); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 5735bdbfc83d..bc0de1457db3 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -316,7 +316,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS); pModel->GetItemPool().FreezeIdRanges(); // Page - SdrPage* pPage = new SdrPage( *pModel, sal_False ); + SdrPage* pPage = new SdrPage( *pModel, false ); pPage->SetSize(Size(1000,1000)); pModel->InsertPage( pPage, 0 ); // 3D View @@ -508,7 +508,7 @@ void SvxLineTabPage::FillListboxes() nOldSelect = m_pLbEndStyle->GetSelectEntryPos(); m_pLbEndStyle->Clear(); m_pLbEndStyle->InsertEntry( sNone ); - m_pLbEndStyle->Fill( pLineEndList, sal_False ); + m_pLbEndStyle->Fill( pLineEndList, false ); m_pLbEndStyle->SelectEntryPos( nOldSelect ); } @@ -516,7 +516,7 @@ void SvxLineTabPage::FillListboxes() void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,sal_False); + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,false); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if( nDlgType == 0 && pDashList.is() ) @@ -580,7 +580,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) m_pLbEndStyle->Clear(); m_pLbEndStyle->InsertEntry( sNone ); - m_pLbEndStyle->Fill( pLineEndList, sal_False ); + m_pLbEndStyle->Fill( pLineEndList, false ); nCount = m_pLbEndStyle->GetEntryCount(); if( nCount == 0 ) @@ -1118,7 +1118,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS); pModel->GetItemPool().FreezeIdRanges(); - SdrPage* pPage = new SdrPage( *pModel, sal_False ); + SdrPage* pPage = new SdrPage( *pModel, false ); pPage->SetSize(Size(1000,1000)); pModel->InsertPage( pPage, 0 ); SdrView* pView = new SdrView( pModel, &aVDev ); @@ -1820,14 +1820,14 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,sal_False); - SFX_ITEMSET_ARG (&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pLineEndListItem,SvxLineEndListItem,SID_LINEEND_LIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pSdrObjListItem,OfaPtrItem,SID_OBJECT_LIST,sal_False); - SFX_ITEMSET_ARG (&aSet,pSymbolAttrItem,SfxTabDialogItem,SID_ATTR_SET,sal_False); - SFX_ITEMSET_ARG (&aSet,pGraphicItem,SvxGraphicItem,SID_GRAPHIC,sal_False); + SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,false); + SFX_ITEMSET_ARG (&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST,false); + SFX_ITEMSET_ARG (&aSet,pLineEndListItem,SvxLineEndListItem,SID_LINEEND_LIST,false); + SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pSdrObjListItem,OfaPtrItem,SID_OBJECT_LIST,false); + SFX_ITEMSET_ARG (&aSet,pSymbolAttrItem,SfxTabDialogItem,SID_ATTR_SET,false); + SFX_ITEMSET_ARG (&aSet,pGraphicItem,SvxGraphicItem,SID_GRAPHIC,false); if (pColorListItem) SetColorList(pColorListItem->GetColorList()); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 0442da7d4341..b45c7757f31d 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -130,7 +130,7 @@ void SvxLineEndDefTabPage::Construct() pPolyObj->TakeObjInfo( aInfoRec ); SdrObject* pNewObj = 0; if( aInfoRec.bCanConvToPath ) - pNewObj = pPolyObj->ConvertToPolyObj( sal_True, sal_False ); + pNewObj = pPolyObj->ConvertToPolyObj( true, false ); bCreateArrowPossible = pNewObj && pNewObj->ISA( SdrPathObj ); SdrObject::Free( pNewObj ); @@ -405,7 +405,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) if( aInfoRec.bCanConvToPath ) { - pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( sal_True, sal_False ); + pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( true, false ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) return( 0L ); // cancel, additional safety, which diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 19e88c882429..cfc24eed8d84 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -185,7 +185,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) sal_uInt16 nPos; sal_uInt16 nCount; - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); + SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); @@ -543,9 +543,9 @@ void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,sal_False); - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); + SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,false); + SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); if (pColorListItem) SetColorList(pColorListItem->GetColorList()); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 45f224f929f0..a02d54e8035d 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -510,7 +510,7 @@ sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) rAttrs.Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_X, aPt.X())); rAttrs.Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_Y, aPt.Y())); - rAttrs.Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, sal_False ) ); + rAttrs.Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, false ) ); } return( bModified ); @@ -629,7 +629,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe mrOutAttrs ( rInAttrs ), mnProtectSizeState( STATE_NOCHECK ), - mbPageDisabled ( sal_False ), + mbPageDisabled ( false ), mbProtectDisabled( false ), mbSizeDisabled( false ), mbAdjustDisabled( true ) @@ -733,7 +733,7 @@ void SvxPositionSizeTabPage::Construct() // diferent anchor positions m_pMtrPosX->SetText( "" ); m_pMtrPosY->SetText( "" ); - mbPageDisabled = sal_True; + mbPageDisabled = true; return; } } |