diff options
Diffstat (limited to 'cui')
79 files changed, 283 insertions, 272 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 93a1d2aaa3b2..40360a67a398 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -787,7 +787,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const m_pEntriesBox->SetTabs(&AccCfgTabs[0], MAP_APPFONT); m_pEntriesBox->Resize(); // OS: Hack for right selection m_pEntriesBox->SetSpaceBetweenEntries(0); - m_pEntriesBox->SetDragDropMode(0); + m_pEntriesBox->SetDragDropMode(DragDropMode::NONE); // detect max keyname width long nMaxWidth = 0; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 3606a61b814f..96ed1acc96b5 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1389,10 +1389,10 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage SetHighlightRange(); SetSelectionMode(SINGLE_SELECTION); - SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | - SV_DRAGDROP_APP_COPY | - SV_DRAGDROP_ENABLE_TOP | - SV_DRAGDROP_APP_DROP); + SetDragDropMode( DragDropMode::CTRL_MOVE | + DragDropMode::APP_COPY | + DragDropMode::ENABLE_TOP | + DragDropMode::APP_DROP); } SvxMenuEntriesListBox::~SvxMenuEntriesListBox() diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index cc1956a6d3b1..fc5194af6567 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -184,7 +184,7 @@ void MacroEventListBox::Resize() maListBox->SetPosSizePixel( aPnt, aSize ); } -void MacroEventListBox::ConnectElements( void ) +void MacroEventListBox::ConnectElements() { Resize(); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index d99a9712e1ff..f80697fb5783 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -52,7 +52,7 @@ public: virtual ~AssignComponentDialog(); virtual void dispose() SAL_OVERRIDE; - OUString getURL( void ) const + OUString getURL() const { return maURL; } }; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 0256b62e099a..7477032f1567 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -886,7 +886,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog( // If we are showing Slot API commands update labels in the UI, and // enable drag'n'drop SetText(CUI_RESSTR(RID_SVXSTR_SELECTOR_ADD_COMMANDS)); - m_pCommands->SetDragDropMode( SV_DRAGDROP_APP_COPY ); + m_pCommands->SetDragDropMode( DragDropMode::APP_COPY ); get(m_pCancelButton, "close"); get(m_pDialogDescription, "helptoolbar"); @@ -984,7 +984,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton ) { // If we are displaying Slot API commands then the dialog is being // run from Tools/Configure and we should not close it, just hide it - if ( m_bShowSlots == false ) + if ( !m_bShowSlots ) { EndDialog( RET_CANCEL ); } @@ -999,7 +999,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton ) // If we are displaying Slot API commands then this the dialog is being // run from Tools/Configure and we should not close it - if ( m_bShowSlots == false ) + if ( !m_bShowSlots ) { EndDialog( RET_OK ); } diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 87b6fbe8178a..dc58061832d7 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -408,7 +408,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent //MarkNextError is not initially called if the UndoEdit mode is active bool bNextSentence = false; if((!m_pSentenceED->IsUndoEditMode() && m_pSentenceED->MarkNextError( bIgnoreCurrentError, xSpell )) || - true == ( bNextSentence = GetNextSentence_Impl(bUseSavedSentence, m_pSentenceED->IsUndoEditMode()) && m_pSentenceED->MarkNextError( false, xSpell ))) + ( bNextSentence = GetNextSentence_Impl(bUseSavedSentence, m_pSentenceED->IsUndoEditMode()) && m_pSentenceED->MarkNextError( false, xSpell ))) { const SpellErrorDescription* pSpellErrorDescription = m_pSentenceED->GetAlternatives(); if( pSpellErrorDescription ) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 3982c34b8e02..a351d820c872 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -407,7 +407,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, OKHdl) OUString aOUStr( &cChar, 1 ); m_pShowText->SetText( aOUStr ); } - EndDialog( sal_True ); + EndDialog( RET_OK ); return 0; } @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl) sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); m_pShowText->SetText(OUString(&cChar, 1)); } - EndDialog( sal_True ); + EndDialog( RET_OK ); return 0; } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 38a0f161f4bc..0e11f72b8ccd 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -470,9 +470,9 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) } // pass on to the engine - m_pSearchEngine->SetWildcard(m_pcbWildCard->IsEnabled() ? m_pcbWildCard->IsChecked() : sal_False); - m_pSearchEngine->SetRegular(m_pcbRegular->IsEnabled() ? m_pcbRegular->IsChecked() : sal_False); - m_pSearchEngine->SetLevenshtein(m_pcbApprox->IsEnabled() ? m_pcbApprox->IsChecked() : sal_False); + m_pSearchEngine->SetWildcard(m_pcbWildCard->IsEnabled() && m_pcbWildCard->IsChecked()); + m_pSearchEngine->SetRegular(m_pcbRegular->IsEnabled() && m_pcbRegular->IsChecked()); + m_pSearchEngine->SetLevenshtein(m_pcbApprox->IsEnabled() && m_pcbApprox->IsChecked()); // (disabled boxes have to be passed to the engine as sal_False) // adjust the Position-Listbox (which is not allowed during Wildcard-search) diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index b0d70226dc24..1270e09f92d4 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -338,7 +338,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) SvxHyperlinkTabPageBase* pCurrentPage = static_cast<SvxHyperlinkTabPageBase*>(GetTabPage( nPageId )); - mbIsHTMLDoc = (pItem->GetInsertMode() & HLINK_HTMLMODE) ? true : false; + mbIsHTMLDoc = (pItem->GetInsertMode() & HLINK_HTMLMODE) != 0; IconChoicePage* pPage = GetTabPage (nPageId); if(pPage) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 29008b2846ae..5fea052f03df 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -939,7 +939,7 @@ namespace svx - void HangulHanjaOptionsDialog::Init( void ) + void HangulHanjaOptionsDialog::Init() { if( !m_xConversionDictionaryList.is() ) { @@ -1271,7 +1271,7 @@ namespace svx // index of the internal iterator, used for First() and Next() methods sal_uInt16 m_nAct; - const OUString* _Next( void ); + const OUString* _Next(); public: SuggestionList(); ~SuggestionList(); @@ -1279,12 +1279,12 @@ namespace svx bool Set( const OUString& _rElement, sal_uInt16 _nNumOfElement ); bool Reset( sal_uInt16 _nNumOfElement ); const OUString* Get( sal_uInt16 _nNumOfElement ) const; - void Clear( void ); + void Clear(); - const OUString* First( void ); - const OUString* Next( void ); + const OUString* First(); + const OUString* Next(); - inline sal_uInt16 GetCount( void ) const { return m_nNumOfEntries; } + inline sal_uInt16 GetCount() const { return m_nNumOfEntries; } }; SuggestionList::SuggestionList() : @@ -1338,7 +1338,7 @@ namespace svx return NULL; } - void SuggestionList::Clear( void ) + void SuggestionList::Clear() { if( m_nNumOfEntries ) { @@ -1353,7 +1353,7 @@ namespace svx } } - const OUString* SuggestionList::_Next( void ) + const OUString* SuggestionList::_Next() { const OUString* pRet = NULL; while( m_nAct < m_vElements.size() && !pRet ) @@ -1366,13 +1366,13 @@ namespace svx return pRet; } - const OUString* SuggestionList::First( void ) + const OUString* SuggestionList::First() { m_nAct = 0; return _Next(); } - const OUString* SuggestionList::Next( void ) + const OUString* SuggestionList::Next() { const OUString* pRet; @@ -1675,7 +1675,7 @@ namespace svx UpdateButtonStates(); } - void HangulHanjaEditDictDialog::UpdateOriginalLB( void ) + void HangulHanjaEditDictDialog::UpdateOriginalLB() { m_aOriginalLB->Clear(); Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; @@ -1708,7 +1708,7 @@ namespace svx m_aDeletePB->Enable(!m_bModifiedOriginal && bHaveValidOriginalString); } - void HangulHanjaEditDictDialog::UpdateSuggestions( void ) + void HangulHanjaEditDictDialog::UpdateSuggestions() { Sequence< OUString > aEntries; bool bFound = GetConversions( m_rDictList[ m_nCurrentDict ], m_aOriginal, aEntries ); @@ -1864,7 +1864,7 @@ namespace svx ModalDialog::dispose(); } - void HangulHanjaEditDictDialog::UpdateScrollbar( void ) + void HangulHanjaEditDictDialog::UpdateScrollbar() { sal_uInt16 nPos = sal_uInt16( m_aScrollSB->GetThumbPos() ); m_nTopPos = nPos; diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index f628d99ba244..13f18c3b5493 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -53,7 +53,7 @@ SvxInsRowColDlg::~SvxInsRowColDlg() m_pDialog.disposeAndClear(); } -short SvxInsRowColDlg::Execute(void) +short SvxInsRowColDlg::Execute() { return m_pDialog->Execute(); } diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 123f04c41989..0995ae4c6ad5 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -241,7 +241,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) } OUString aFileName; - pLinkMgr->GetDisplayNames( pLink, &sType, &aFileName, pLinkNm, pFilter ); + sfx2::LinkManager::GetDisplayNames( pLink, &sType, &aFileName, pLinkNm, pFilter ); aFileName = INetURLObject::decode(aFileName, INetURLObject::DECODE_UNAMBIGUOUS); m_pFtFullFileName->SetText( aFileName ); m_pFtFullSourceName->SetText( sLink ); @@ -375,7 +375,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) OUString sFilter; SvTreeListEntry* pEntry = m_pTbLinks->FirstSelected(); SvBaseLink* pLink = static_cast<SvBaseLink*>(pEntry->GetUserData()); - pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( pLink, &sType, &sFile, 0, 0 ); INetURLObject aUrl(sFile); if(aUrl.GetProtocol() == INetProtocol::File) { @@ -400,7 +400,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) DBG_ASSERT(pLink,"Where is the link?"); if (!pLink) continue; - pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, &sLinkName, &sFilter ); + sfx2::LinkManager::GetDisplayNames( pLink, &sType, &sFile, &sLinkName, &sFilter ); INetURLObject aUrl_(sFile); INetURLObject aUrl2(aPath, INetProtocol::File); aUrl2.insertName( aUrl_.getName() ); @@ -648,7 +648,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool { OUString aEntry, sFileNm, sLinkNm, sTypeNm, sFilter; - pLinkMgr->GetDisplayNames( &rLink, &sTypeNm, &sFileNm, &sLinkNm, &sFilter ); + sfx2::LinkManager::GetDisplayNames( &rLink, &sTypeNm, &sFileNm, &sLinkNm, &sFilter ); // GetTab(0) gives the position of the bitmap which is automatically inserted by the TabListBox. // So the first text column's width is Tab(2)-Tab(1). diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 72afee20dbf7..8cdc64439efa 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -193,7 +193,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent) OUString sHeader(get<FixedText>("pathlist")->GetText()); m_pRadioLB->SetQuickHelpText( sHeader ); sHeader = "\t" + sHeader; - m_pRadioLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); + m_pRadioLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT ); m_pRadioLB->SetSelectHdl( LINK( this, SvxMultiPathDialog, SelectHdl_Impl ) ); m_pRadioLB->SetCheckButtonHdl( LINK( this, SvxMultiPathDialog, CheckHdl_Impl ) ); diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index 04b2fd3a3298..a83e11ac991f 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -35,7 +35,7 @@ SvxNewTableDialog::~SvxNewTableDialog() m_pDialog.disposeAndClear(); } -short SvxNewTableDialog::Execute(void) +short SvxNewTableDialog::Execute() { return m_pDialog->Execute(); } diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 31613bab486b..b0f5e0aa7b5f 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -65,7 +65,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 2d8eb1f933aa..d56700e45e7a 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -269,7 +269,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE; @@ -329,7 +329,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; void SetLanguage(LanguageType eSet); }; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 9aeb9063ba54..70d01e9b87ff 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -66,7 +66,7 @@ public: void EnableTransparency(bool bColor, bool bGraphic); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 3c3a79b206ec..8f129977a546 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -58,7 +58,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; void SetTableMode(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 8b185cdf29cf..fad03f168fe4 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -149,7 +149,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: virtual ~SvxCharNamePage(); @@ -233,7 +233,7 @@ public: virtual void dispose() SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); @@ -315,7 +315,7 @@ public: using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: @@ -362,7 +362,7 @@ public: using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pTwoLinesRanges; } diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 15406bbdbaf8..8e911729fe5f 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -60,7 +60,7 @@ private: void SetLinks (); protected: - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index c2512596ae4d..baa67bc85d4c 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -169,7 +169,7 @@ public: virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } @@ -301,7 +301,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } @@ -369,7 +369,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } @@ -450,7 +450,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetGradientList( XGradientListRef pGrdLst) @@ -528,7 +528,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -615,7 +615,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -750,7 +750,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; XPropertyListRef GetPropertyList( XPropertyListType t ); void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef ); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 3aac79334e39..3bb1f2b414ea 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -215,7 +215,7 @@ public: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -313,7 +313,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; } void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; } @@ -384,7 +384,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; } void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 165bd5dcd4db..4ce44f8ec257 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -116,7 +116,7 @@ public: virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 6018b0fa161a..2aa203c85319 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -221,7 +221,7 @@ namespace svx DECL_LINK( EditDictHdl, void* ); DECL_LINK( DeleteDictHdl, void* ); - void Init( void ); ///< reads settings from core and init controls + void Init(); ///< reads settings from core and init controls public: HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); @@ -306,8 +306,8 @@ namespace svx DECL_LINK( DeletePBPushHdl, void* ); void InitEditDictDialog( sal_uInt32 _nSelDict ); - void UpdateOriginalLB( void ); - void UpdateSuggestions( void ); + void UpdateOriginalLB(); + void UpdateSuggestions(); void UpdateButtonStates(); void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); @@ -321,7 +321,7 @@ namespace svx virtual ~HangulHanjaEditDictDialog(); virtual void dispose() SAL_OVERRIDE; - void UpdateScrollbar( void ); + void UpdateScrollbar(); }; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 5a4bfedca9e8..f63eba3c73c1 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -50,7 +50,7 @@ public: return *maHeaderBar.get(); } - void ConnectElements( void );/**< should be called after all manipulations on elements are done + void ConnectElements();/**< should be called after all manipulations on elements are done calcs real sizes depending on sizes of this */ void Show( bool bVisible = true, sal_uInt16 nFlags = 0 ); ///< same meaning as Windows::Show() void Enable( bool bEnable = true, bool bChild = true ); ///< same meaning as Windows::Enable() diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 49850622cdce..0e66966be946 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -46,7 +46,7 @@ public: SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); virtual ~SvxInsRowColDlg(); - virtual short Execute(void) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; virtual bool isInsertBefore() const SAL_OVERRIDE; virtual sal_uInt16 getInsertCount() const SAL_OVERRIDE; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 5df04b530be6..394d04265344 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -37,7 +37,7 @@ public: SvxNewTableDialog( vcl::Window* pWindow ); virtual ~SvxNewTableDialog(); - virtual short Execute(void) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; virtual sal_Int32 getRows() const SAL_OVERRIDE; virtual sal_Int32 getColumns() const SAL_OVERRIDE; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 518feaf4b153..e2fa378794a2 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -79,7 +79,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; void SetInfoItem( const SvxNumberInfoItem& rItem ); void SetNumberFormatList( const SvxNumberInfoItem& rItem ) @@ -137,7 +137,7 @@ private: void FillCurrencyBox(); void FillFormatListBox_Impl( std::vector<OUString>& rEntries ); void UpdateOptions_Impl( bool bCheckCatChange ); - void UpdateFormatListBox_Impl( sal_uInt16 bCat, bool bUpdateEdit ); + void UpdateFormatListBox_Impl( bool bCat, bool bUpdateEdit ); void Obstructing(); void EnableBySourceFormat_Impl(); void SetCategory( sal_uInt16 nPos ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index f9963056b562..108f9e3bea39 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -115,7 +115,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -152,7 +152,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -196,7 +196,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -242,7 +242,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -355,7 +355,7 @@ public: const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -456,7 +456,7 @@ public: virtual void dispose() SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; + virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 24e14ce186f0..f68bf339bab7 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -185,7 +185,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 7f7bf66431e5..80b2536aed21 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -94,7 +94,7 @@ private: DECL_LINK( AutoHdl_Impl, CheckBox* ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: @@ -159,7 +159,7 @@ class SvxParaAlignTabPage : public SfxTabPage SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: virtual ~SvxParaAlignTabPage(); @@ -208,7 +208,7 @@ public: void DisablePageBreak(); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 0b614899033d..e1db4048acc7 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -132,7 +132,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; void EnableAnchorTypes(sal_uInt16 nAnchorEnable); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 3590a17fa5bf..05903afd03a4 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -60,7 +60,7 @@ public: void DisableControls( const sal_uInt16 nFlag ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 9846f0d6b148..881f3fd4837c 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -72,7 +72,7 @@ private: /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). */ - bool IsTextDirectionLeftToRight (void) const; + bool IsTextDirectionLeftToRight() const; public: diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index b3a56b2dbde2..52489521102e 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -156,7 +156,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -214,7 +214,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -261,7 +261,7 @@ public: virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 5fa829c4d33b..78b63bd68761 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -29,7 +29,7 @@ class SfxShell; // static ---------------------------------------------------------------- bool EnableSSO(); -CreateTabPage GetSSOCreator( void ); +CreateTabPage GetSSOCreator(); // struct OrderedEntry --------------------------------------------------- diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 03d8b77d66c4..10c2ebc1bf90 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -51,7 +51,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent) OUStringBuffer sHeader; sHeader.append('\t').append(sProfile).append('\t').append(sDirectory); - m_pCertPathList->InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT ); + m_pCertPathList->InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HeaderBarItemBits::LEFT ); m_pCertPathList->SetCheckButtonHdl( LINK( this, CertPathDialog, CheckHdl_Impl ) ); m_pAddBtn->SetClickHdl( LINK( this, CertPathDialog, AddHdl_Impl ) ); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 562c762aaecf..b162898bc97c 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -88,7 +88,8 @@ namespace offapp DriverListControl::DriverListControl(vcl::Window* _pParent) - :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER) + :EditBrowseBox(_pParent, EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, WB_BORDER, + BrowserMode::AUTO_VSCROLL | BrowserMode::AUTO_HSCROLL | BrowserMode::HIDECURSOR | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT) ,m_aSeekRow(m_aSettings.end()) ,m_sYes(CUI_RES(RID_SVXSTR_YES)) ,m_sNo(CUI_RES(RID_SVXSTR_NO)) @@ -353,7 +354,7 @@ namespace offapp // the enabled flag SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true ); OSL_ENSURE(pEnabled, "ConnectionPoolOptionsPage::implInitControls: missing the Enabled item!"); - m_pEnablePooling->Check(pEnabled ? pEnabled->GetValue() : sal_True); + m_pEnablePooling->Check(pEnabled == nullptr || pEnabled->GetValue()); m_pEnablePooling->SaveValue(); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 679e313a7eb3..5d834e297cdf 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -135,11 +135,11 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons aSz.Width() = TAB_WIDTH1; rBar.InsertItem( ITEMID_TYPE, aTypeText, LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(), - HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW ); aSz.Width() = TAB_WIDTH2; rBar.InsertItem( ITEMID_PATH, aPathText, LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(), - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); static long aTabs[] = {3, 0, TAB_WIDTH1, TAB_WIDTH1 + TAB_WIDTH2 }; Size aHeadSize = rBar.GetSizePixel(); @@ -249,13 +249,13 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } rBar.SetItemBits( ITEMID_TYPE, nBits ); HeaderSelect_Impl( &rBar ); @@ -268,7 +268,7 @@ void DbRegistrationOptionsPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); aUserData += (bUp ? OUString("1") : OUString("0")); SetUserData( aUserData ); } @@ -320,19 +320,19 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; eMode = SortDescending; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } pBar->SetItemBits( ITEMID_TYPE, nBits ); SvTreeList* pModel = pPathBox->GetModel(); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index ac77289109ce..4276de7311b7 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -80,8 +80,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent, m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear()); HeaderBar &rBar = m_pCheckLB->GetTheHeaderBar(); - HeaderBarItemBits nBits = rBar.GetItemBits(1) | HIB_FIXEDPOS | HIB_FIXED; - nBits &= ~HIB_CLICKABLE; + HeaderBarItemBits nBits = rBar.GetItemBits(1) | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED; + nBits &= ~HeaderBarItemBits::CLICKABLE; rBar.SetItemBits(1, nBits); rBar.SetItemBits(2, nBits); @@ -432,15 +432,15 @@ void SvxFontSubstCheckListBox::Resize() void SvxFontSubstCheckListBox::SetTabs() { SvSimpleTable::SetTabs(); - sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE; + SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::ADJUST_NUMERIC|SvLBoxTabFlags::FORCE; SvLBoxTab* pTab = aTabs[1]; pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; + pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; pTab = aTabs[2]; pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; + pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index f65e4a84f4e2..a8e8c8e9bed8 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -905,11 +905,11 @@ void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rU const OUString &rColorSetting, const OUString &rPreview) { // filling - const WinBits nHeadBits = HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS; - m_pHeaderHB->InsertItem(1, rOn, 0, nHeadBits | HIB_CENTER); - m_pHeaderHB->InsertItem(2, rUIElems, 0, nHeadBits | HIB_LEFT); - m_pHeaderHB->InsertItem(3, rColorSetting, 0, nHeadBits | HIB_LEFT); - m_pHeaderHB->InsertItem(4, rPreview, 0, nHeadBits | HIB_LEFT); + const HeaderBarItemBits nHeadBits = HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXED | HeaderBarItemBits::FIXEDPOS; + m_pHeaderHB->InsertItem(1, rOn, 0, nHeadBits | HeaderBarItemBits::CENTER); + m_pHeaderHB->InsertItem(2, rUIElems, 0, nHeadBits | HeaderBarItemBits::LEFT); + m_pHeaderHB->InsertItem(3, rColorSetting, 0, nHeadBits | HeaderBarItemBits::LEFT); + m_pHeaderHB->InsertItem(4, rPreview, 0, nHeadBits | HeaderBarItemBits::LEFT); m_pHeaderHB->set_height_request(GetTextHeight() + 6); } @@ -1156,7 +1156,7 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet* ) UpdateColorConfig(); } -int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) +SfxTabPage::sfxpg SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 7ce24b8770d5..c16c2973ee0f 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -56,7 +56,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 4e649d401f77..cd6858228f3c 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -171,7 +171,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet OUString sHeader = sHeader1 + "\t" + sHeader2 + "\t"; m_pCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, - HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED ); + HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED ); m_pCheckLB->SetStyle( m_pCheckLB->GetStyle()|WB_HSCROLL| WB_VSCROLL ); } @@ -367,19 +367,19 @@ SvTreeListEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs() { SvSimpleTable::SetTabs(); - sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE; + SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::ADJUST_NUMERIC|SvLBoxTabFlags::FORCE; if( aTabs.size() > 1 ) { SvLBoxTab* pTab = aTabs[1]; pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; + pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } if( aTabs.size() > 2 ) { SvLBoxTab* pTab = aTabs[2]; pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; + pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } } diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 421fa06c33af..0a9b466a792c 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -183,7 +183,7 @@ void OpenGLCfg::setForceOpenGL(bool bOpenGL) // class OfaMiscTabPage -------------------------------------------------- -int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) +SvxGeneralTabPage::sfxpg OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); @@ -1397,8 +1397,8 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang ); rSet->Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) ); - sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale ); - bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0; + SvtScriptType nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale ); + bool bNewCJK = bool( nNewType & SvtScriptType::ASIAN ); SvtCompatibilityOptions aCompatOpts; aCompatOpts.SetDefault( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE, !bNewCJK ); } @@ -1743,12 +1743,12 @@ namespace IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) { LanguageType eLang = pBox->GetSelectLanguage(); - sal_uInt16 nType = SvtLanguageOptions::GetScriptTypeOfLanguage(eLang); + SvtScriptType nType = SvtLanguageOptions::GetScriptTypeOfLanguage(eLang); // first check if CTL must be enabled // #103299# - if CTL font setting is not readonly if(!pLangConfig->aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_CTLFONT)) { - bool bIsCTLFixed = (nType & SCRIPTTYPE_COMPLEX) != 0; + bool bIsCTLFixed = bool(nType & SvtScriptType::COMPLEX); lcl_checkLanguageCheckBox(m_pCTLSupportCB, bIsCTLFixed, m_bOldCtl); SupportHdl( m_pCTLSupportCB ); } @@ -1756,7 +1756,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox ) // #103299# - if CJK support is not readonly if(!pLangConfig->aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_ALLCJK)) { - bool bIsCJKFixed = (nType & SCRIPTTYPE_ASIAN) != 0; + bool bIsCJKFixed = bool(nType & SvtScriptType::ASIAN); lcl_checkLanguageCheckBox(m_pAsianSupportCB, bIsCJKFixed, m_bOldAsian); SupportHdl( m_pAsianSupportCB ); } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index dd9fe86db86f..8dc2397ffe4a 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -70,7 +70,7 @@ private: DECL_LINK( OnFileDlgToggled, void* ); #endif protected: - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index aca396d94ba9..f102d9e50eb8 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -436,7 +436,7 @@ void SvxGeneralTabPage::SetAddress_Impl() -int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) +SvxGeneralTabPage::sfxpg SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) FillItemSet( pSet_ ); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 79298f0bc0e2..48e2626a31ec 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -923,7 +923,7 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) { } -int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index ee9b46a9c69d..d1b4362794ea 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -172,7 +172,7 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 38b232ac4342..95471d1121c5 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -172,7 +172,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& .append("\t").append(get<FixedText>("version")->GetText()) .append("\t").append(get<FixedText>("features")->GetText()) .append("\t"); - m_pJavaList->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT); + m_pJavaList->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HeaderBarItemBits::LEFT); m_pJavaList->setColSizes(); m_pJavaEnableCB->SetClickHdl( LINK( this, SvxJavaOptionsPage, EnableHdl_Impl ) ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index cfc0cbe1a9ca..730df834fee1 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -82,7 +82,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicCacheVal( long nSizeInBytes ) m_pNfGraphicCache->SetValue( nSizeInBytes >> 20 ); } -long OfaMemoryOptionsPage::GetNfGraphicObjectCacheVal( void ) const +long OfaMemoryOptionsPage::GetNfGraphicObjectCacheVal() const { return long( ::rtl::math::round( double( m_pNfGraphicObjectCache->GetValue() ) * NF2BYTES ) ); } @@ -102,7 +102,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes m_pNfGraphicObjectCache->SetLast( long( double( nSizeInBytes ) * BYTES2NF ) ); } -int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 74f2859cfb80..a9c823b2d640 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -48,12 +48,12 @@ private: sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes inline void SetNfGraphicCacheVal( long nSizeInBytes ); - long GetNfGraphicObjectCacheVal( void ) const; // returns # of Bytes + long GetNfGraphicObjectCacheVal() const; // returns # of Bytes void SetNfGraphicObjectCacheVal( long nSizeInBytes ); inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); protected: - virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index d8b6af402ec9..465bb4acf437 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -78,7 +78,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) HeaderBar &rBlBar = mpBlackList->GetTheHeaderBar(); HeaderBar &rWiBar = mpWhiteList->GetTheHeaderBar(); - WinBits nHBits = HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE; + HeaderBarItemBits nHBits = HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE; rBlBar.InsertItem( 1, mpOS->GetText(), 0, nHBits ); rBlBar.InsertItem( 2, mpOSVersion->GetText(), 0, nHBits ); rBlBar.InsertItem( 3, mpVendor->GetText(), 0, nHBits ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index dbcb5d1b20b7..468f56eeed0e 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -222,10 +222,10 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) rBar.InsertItem( ITEMID_TYPE, get<FixedText>("type")->GetText(), 0, - HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW ); rBar.InsertItem( ITEMID_PATH, get<FixedText>("path")->GetText(), 0, - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_TYPE)); long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_PATH)); @@ -363,13 +363,13 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } rBar.SetItemBits( ITEMID_TYPE, nBits ); HeaderSelect_Impl( &rBar ); @@ -386,7 +386,7 @@ void SvxPathTabPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); aUserData += bUp ? OUString("1") : OUString("0"); SetUserData( aUserData ); } @@ -648,19 +648,19 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; eMode = SortDescending; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } pBar->SetItemBits( ITEMID_TYPE, nBits ); SvTreeList* pModel = pPathBox->GetModel(); diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 17c630c7819f..e97f790b3a32 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -55,19 +55,19 @@ void PasswordTable::Resort( bool bForced ) if ( 0 == nColumn || bForced ) // only the first column is sorted { HeaderBarItemBits nBits = GetTheHeaderBar().GetItemBits(1); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; eMode = SortDescending; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } GetTheHeaderBar().SetItemBits( 1, nBits ); SvTreeList* pListModel = GetModel(); @@ -116,9 +116,9 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent) long aStaticTabs[]= { 2, 0, 0 }; m_pPasswordsLB->SetTabs( aStaticTabs ); m_pPasswordsLB->InsertHeaderItem( 1, get<FixedText>("website")->GetText(), - HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW ); m_pPasswordsLB->InsertHeaderItem( 2, get<FixedText>("username")->GetText(), - HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS ); pPasswordsLBContainer->set_height_request(m_pPasswordsLB->GetTextHeight()*8); m_pPasswordsLB->SetHeaderBarClickHdl( LINK( this, WebConnectionInfoDialog, HeaderBarClickedHdl ) ); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 479913f3d157..8d7329fe19b1 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -330,7 +330,7 @@ void AlignmentTabPage::Reset( const SfxItemSet* rCoreAttrs ) UpdateEnableControls(); } -int AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 0145ec6d7035..9d492b843612 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -461,7 +461,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, sHeader.append(get<vcl::Window>("t")->GetText()); sHeader.append('\t'); m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, - HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); + HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED); m_pEditPB->SetClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl)); } @@ -764,19 +764,19 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) void OfaACorrCheckListBox::SetTabs() { SvSimpleTable::SetTabs(); - sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE; + SvLBoxTabFlags nAdjust = SvLBoxTabFlags::ADJUST_RIGHT|SvLBoxTabFlags::ADJUST_LEFT|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::ADJUST_NUMERIC|SvLBoxTabFlags::FORCE; if( aTabs.size() > 1 ) { SvLBoxTab* pTab = aTabs[1]; pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; + pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } if( aTabs.size() > 2 ) { SvLBoxTab* pTab = aTabs[2]; pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE; + pTab->nFlags |= SvLBoxTabFlags::PUSHABLE|SvLBoxTabFlags::ADJUST_CENTER|SvLBoxTabFlags::FORCE; } } @@ -968,7 +968,7 @@ void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true); } -int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } @@ -1485,7 +1485,7 @@ void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true); } -int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } @@ -1867,7 +1867,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) sHeader += get<vcl::Window>("t")->GetText(); sHeader += "\t"; m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, - HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); + HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED); m_pCheckLB->Hide(); } else diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 285618e637ba..6ff30321d4d3 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1079,7 +1079,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s -int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) /* [Description] @@ -1186,7 +1186,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() const WinBits nBits(m_pBackgroundColorSet->GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD); m_pBackgroundColorSet->SetStyle(nBits); - m_pBackgroundColorSet->SetColCount(m_pBackgroundColorSet->getColumnCount()); + m_pBackgroundColorSet->SetColCount(SvxColorValueSet::getColumnCount()); } @@ -1505,7 +1505,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle ) // new file chosen aBgdGraphicPath = pImportDlg->GetPath(); aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); - bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? sal_True : pImportDlg->IsAsLink(); + bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly || pImportDlg->IsAsLink(); m_pBtnLink->Check( bLink ); m_pBtnLink->Enable(); @@ -1630,8 +1630,6 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) nWhich = pTableBck_Impl->nCellWhich; break; case TBL_DEST_ROW: - if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & HTMLMODE_SOME_STYLES)) - m_pLbSelect->Disable(); pActItem = pTableBck_Impl->pRowBrush; nWhich = pTableBck_Impl->nRowWhich; break; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 724fb244e1a7..387e003402c3 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -602,7 +602,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) -int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 2958ebac5eee..96da16d8c445 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1210,7 +1210,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) -int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -1776,7 +1776,7 @@ IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox ) } -int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -2967,7 +2967,7 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) -int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -3540,7 +3540,7 @@ void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet ) -int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 8f4ddcd35ecb..af1c96b4be62 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -407,11 +407,11 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) CalcZoom(); } -int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) { if ( _pSet ) FillItemSet( _pSet ); - return sal_True; + return LEAVE_PAGE; } /*-------------------------------------------------------------------- diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index c362ece30b01..852607ca84c5 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -589,7 +589,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) m_pLbLanguage->SelectLanguage( eLangType ); if(pAutoEntryAttr) AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue()); - UpdateFormatListBox_Impl(sal_False,true); + UpdateFormatListBox_Impl(false,true); //! This spoils everything because it rematches currency formats based on //! the selected m_pLbCurrency entry instead of the current format. @@ -816,7 +816,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) } -int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -947,7 +947,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa else SetCategory(nCategory ); - UpdateFormatListBox_Impl( sal_True, false ); + UpdateFormatListBox_Impl( true, false ); } } else if ( m_pLbFormat->GetEntryCount() > 0 ) @@ -1020,7 +1020,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa void SvxNumberFormatTabPage::UpdateFormatListBox_Impl ( - sal_uInt16 bCat, // Category or country/language ListBox? + bool bCat, // Category or country/language ListBox? bool bUpdateEdit ) { @@ -1247,7 +1247,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) // category-ListBox ------------------------------------------------- if (pLb == m_pLbCategory || pLb == m_pLbCurrency) { - UpdateFormatListBox_Impl( sal_True, true ); + UpdateFormatListBox_Impl( true, true ); EditHdl_Impl( NULL ); UpdateOptions_Impl( false ); @@ -1258,7 +1258,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) // language/country-ListBox ---------------------------------------------- if (pLb == m_pLbLanguage) { - UpdateFormatListBox_Impl( sal_False, true ); + UpdateFormatListBox_Impl( false, true ); EditHdl_Impl(m_pEdFormat); return 0; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 12b1311214ae..34a19e76227d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -285,11 +285,11 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) @@ -453,11 +453,11 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) @@ -659,11 +659,11 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) @@ -900,11 +900,11 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) bModified = false; } -int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -1273,11 +1273,11 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) } -int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) +SfxTabPage::sfxpg SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet ) @@ -3066,7 +3066,7 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) m_pPreviewWIN->Invalidate(); } -int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) { @@ -3075,7 +3075,7 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) DistanceHdl_Impl(m_pIndentMF); FillItemSet(_pSet); } - return sal_True; + return LEAVE_PAGE; } bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 80c627db1f83..6a37a3d1f1ed 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -603,13 +603,11 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) // horizontal alignment pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); - m_pHorzBox->Check( pItem ? static_cast<const SfxBoolItem*>(pItem)->GetValue() - : sal_False ); + m_pHorzBox->Check( pItem && static_cast<const SfxBoolItem*>(pItem)->GetValue() ); // vertical alignment pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT2 ); - m_pVertBox->Check( pItem ? static_cast<const SfxBoolItem*>(pItem)->GetValue() - : sal_False ); + m_pVertBox->Check( pItem && static_cast<const SfxBoolItem*>(pItem)->GetValue() ); // set example window on the table m_pBspWin->SetTable( true ); @@ -624,8 +622,8 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) DisableVerticalPageDir(); m_pAdaptBox->Show(); pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); - m_pAdaptBox->Check( pItem ? - static_cast<const SfxBoolItem*>(pItem)->GetValue() : sal_False ); + m_pAdaptBox->Check( pItem && + static_cast<const SfxBoolItem*>(pItem)->GetValue() ); //!!! hidden, because not implemented by StarDraw m_pLayoutBox->Hide(); @@ -1488,7 +1486,7 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) -int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) { // Inquiry whether the page margins are beyond the printing area. // If not, ask user whether they shall be taken. diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index e84a6e1315f4..56b1345db3ad 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -599,7 +599,7 @@ void SvxStdParagraphTabPage::EnableRelativeMode() bRelativeMode = true; } -int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { ELRLoseFocusHdl( NULL ); @@ -1064,7 +1064,7 @@ void SvxParaAlignTabPage::dispose() SfxTabPage::dispose(); } -int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); @@ -1830,7 +1830,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet ) m_pOrphanBox->SaveValue(); } -int SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 9434db815b31..64c9085f0a35 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -777,7 +777,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) else rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ), - m_pPositionCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pPositionCB->GetState() == TRISTATE_TRUE ) ); bModified = true; } @@ -788,7 +788,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) else rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), - m_pSizeCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pSizeCB->GetState() == TRISTATE_TRUE ) ); bModified = true; } @@ -1080,7 +1080,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet) } } -int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index c0183bb32018..2d8b7c0c7326 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -380,7 +380,7 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag ) -int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) FillItemSet( _pSet ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 78df0184126c..d04a830b9dbd 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -206,7 +206,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) // autogrowsize if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SfxItemState::DONTCARE ) { - m_pTsbAutoGrowSize->SetState( static_cast<const SdrOnOffItem&>( rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). + m_pTsbAutoGrowSize->SetState( static_cast<const SdrOnOffItem&>( rAttrs->Get( SDRATTR_TEXT_AUTOGROWSIZE ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowSize->EnableTriState( false ); } @@ -686,7 +686,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) } -bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const +bool SvxTextAttrPage::IsTextDirectionLeftToRight() const { // Determine the text writing direction with left to right as default. bool bLeftToRightDirection = true; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index c6d568cea597..7cd0685cb031 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -499,7 +499,7 @@ void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) InitPreview ( rSet ); } -int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) +SfxTabPage::sfxpg SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) FillItemSet( _pSet ); @@ -1004,7 +1004,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( nDlgType == 0 ) // area dialog { @@ -1272,8 +1272,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) TriState eState = m_pTsbTile->GetState(); if( m_pTsbTile->IsValueChangedFromSaved() ) { - XFillBmpTileItem aFillBmpTileItem( - sal::static_int_cast< sal_Bool >( eState ) ); + XFillBmpTileItem aFillBmpTileItem( eState != TRISTATE_FALSE ); pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILE ); if ( !pOld || !( *static_cast<const XFillBmpTileItem*>(pOld) == aFillBmpTileItem ) ) { @@ -1289,7 +1288,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) if( m_pTsbStretch->IsValueChangedFromSaved() ) { XFillBmpStretchItem aFillBmpStretchItem( - sal::static_int_cast< sal_Bool >( eState ) ); + eState != TRISTATE_FALSE ); pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_STRETCH ); if ( !pOld || !( *static_cast<const XFillBmpStretchItem*>(pOld) == aFillBmpStretchItem ) ) { @@ -1522,28 +1521,35 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) m_pLbHatchBckgrdColor->SelectEntry( rColorItem.GetColorValue() ); } - if (SfxItemState::DONTCARE != rAttrs->GetItemState(XATTR_FILLGRADIENT)) + SfxItemState const eGradState(rAttrs->GetItemState(XATTR_FILLGRADIENT)); + XFillGradientItem const* pGradientItem(nullptr); + if (SfxItemState::DONTCARE != eGradState) { - XFillGradientItem const& rGradientItem( - static_cast<const XFillGradientItem&>( - rAttrs->Get(XATTR_FILLGRADIENT)) ); - OUString const aString( rGradientItem.GetName() ); - XGradient const aGradient( rGradientItem.GetGradientValue() ); - + pGradientItem = &static_cast<const XFillGradientItem&>( + rAttrs->Get(XATTR_FILLGRADIENT)); + OUString const aString( pGradientItem->GetName() ); + XGradient const aGradient( pGradientItem->GetGradientValue() ); m_pLbGradient->SelectEntryByList(pGradientList, aString, aGradient); } - if (!m_pLbGradient->GetSelectEntryCount()) + if (!m_pLbGradient->GetSelectEntryCount() + && (SfxItemState::DEFAULT == eGradState + || (pGradientItem && pGradientItem->GetName().isEmpty()))) { // avoid relying on pool default - cannot export that m_pLbGradient->SelectEntryPos(0); // anything better than nothing isMissingGradient = true; } - if (SfxItemState::DONTCARE != rAttrs->GetItemState(XATTR_FILLHATCH)) + SfxItemState const eHatchState(rAttrs->GetItemState(XATTR_FILLHATCH)); + XFillHatchItem const* pHatch(nullptr); + if (SfxItemState::DONTCARE != eHatchState) { - m_pLbHatching->SelectEntry( static_cast<const XFillHatchItem&>( - rAttrs->Get(XATTR_FILLHATCH)).GetName() ); + pHatch = &static_cast<const XFillHatchItem&>( + rAttrs->Get(XATTR_FILLHATCH)); + m_pLbHatching->SelectEntry(pHatch->GetName()); } - if (!m_pLbHatching->GetSelectEntryCount()) + if (!m_pLbHatching->GetSelectEntryCount() + && (SfxItemState::DEFAULT == eHatchState + || (pHatch && pHatch->GetName().isEmpty()))) { // avoid relying on pool default - cannot export that m_pLbHatching->SelectEntryPos(0); // anything better than nothing isMissingHatching = true; @@ -1554,14 +1560,17 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) rAttrs->Get(XATTR_FILLBACKGROUND)).GetValue() ); } - if (SfxItemState::DONTCARE != rAttrs->GetItemState(XATTR_FILLBITMAP)) + SfxItemState const eBitmapState(rAttrs->GetItemState(XATTR_FILLBITMAP)); + XFillBitmapItem const* pBitmapItem(nullptr); + if (SfxItemState::DONTCARE != eBitmapState) { - XFillBitmapItem const& rBitmapItem( - static_cast<const XFillBitmapItem&>( - rAttrs->Get(XATTR_FILLBITMAP))); - m_pLbBitmap->SelectEntry(rBitmapItem.GetName()); + pBitmapItem = &static_cast<const XFillBitmapItem&>( + rAttrs->Get(XATTR_FILLBITMAP)); + m_pLbBitmap->SelectEntry(pBitmapItem->GetName()); } - if (!m_pLbBitmap->GetSelectEntryCount()) + if (!m_pLbBitmap->GetSelectEntryCount() + && (SfxItemState::DEFAULT == eBitmapState + || (pBitmapItem && pBitmapItem->GetName().isEmpty()))) { // avoid relying on pool default - cannot export that m_pLbBitmap->SelectEntryPos(0); // anything better than nothing isMissingBitmap = true; @@ -2306,12 +2315,12 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) m_pMtrFldYSize->SetValue( m_pMtrFldYSize->GetValue() ); } - rXFSet.Put( XFillBmpTileItem( sal::static_int_cast< sal_Bool >( eState ) ) ); + rXFSet.Put( XFillBmpTileItem( eState != TRISTATE_FALSE ) ); if( m_pTsbStretch->IsEnabled() ) rXFSet.Put( XFillBmpStretchItem( - sal::static_int_cast< sal_Bool >( m_pTsbStretch->GetState() ) ) ); + m_pTsbStretch->GetState() != TRISTATE_FALSE ) ); if( m_pTsbScale->IsEnabled() ) rXFSet.Put( XFillBmpSizeLogItem( m_pTsbScale->GetState() == TRISTATE_FALSE ) ); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 1848967f0230..e75afb7d1a29 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -233,7 +233,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) -int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) +SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) { if ( CheckChanges_Impl() == -1L ) return KEEP_PAGE; @@ -248,7 +248,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) { - if( nDlgType == 0 && *pbAreaTP == false ) // area dialog + if( nDlgType == 0 && !*pbAreaTP ) // area dialog { if(PT_BITMAP == *pPageType) { @@ -988,7 +988,7 @@ void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const { if (pLabeled == m_pLbBitmaps) - return const_cast<FixedText*>(m_pLbBitmapsHidden.get()); + return m_pLbBitmapsHidden.get(); else return SvxTabPage::GetParentLabeledBy (pLabeled); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 13bb93b10198..b96b0d64e51c 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -435,7 +435,7 @@ void SvxColorTabPage::ImpColorCountChanged() { if (!pColorList.is()) return; - m_pValSetColorList->SetColCount(m_pValSetColorList->getColumnCount()); + m_pValSetColorList->SetColCount(SvxColorValueSet::getColumnCount()); } @@ -507,7 +507,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) -int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) return KEEP_PAGE; @@ -588,7 +588,7 @@ long SvxColorTabPage::CheckChanges_Impl() bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet ) { if( ( nDlgType != 0 ) || - ( *pPageType == PT_COLOR && *pbAreaTP == false ) ) + ( *pPageType == PT_COLOR && !*pbAreaTP ) ) { OUString aString; Color aColor; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 9b292e9068e3..55c81296f638 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -256,7 +256,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) -int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( CheckChanges_Impl() == -1L ) return KEEP_PAGE; @@ -337,7 +337,7 @@ long SvxGradientTabPage::CheckChanges_Impl() bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) { - if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == false ) + if( nDlgType == 0 && *pPageType == PT_GRADIENT && !*pbAreaTP ) { // CheckChanges(); <-- duplicate inquiry ? diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 1a6085edcb3e..3e839505e0cc 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -238,7 +238,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) return KEEP_PAGE; @@ -302,7 +302,7 @@ long SvxHatchTabPage::CheckChanges_Impl() bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) { - if( nDlgType == 0 && *pbAreaTP == false ) // area dialog + if( nDlgType == 0 && !*pbAreaTP ) // area dialog { if( *pPageType == PT_HATCH ) { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index b2225d067075..300db7422607 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -694,7 +694,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( nDlgType == 0 ) // Line dialog { @@ -846,7 +846,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) TriState eState = m_pTsbCenterStart->GetState(); if( m_pTsbCenterStart->IsValueChangedFromSaved() ) { - XLineStartCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); + XLineStartCenterItem aItem( eState != TRISTATE_FALSE ); pOld = GetOldItem( *rAttrs, XATTR_LINESTARTCENTER ); if ( !pOld || !( *static_cast<const XLineStartCenterItem*>(pOld) == aItem ) ) { @@ -857,7 +857,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) eState = m_pTsbCenterEnd->GetState(); if( m_pTsbCenterEnd->IsValueChangedFromSaved() ) { - XLineEndCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); + XLineEndCenterItem aItem( eState != TRISTATE_FALSE ); pOld = GetOldItem( *rAttrs, XATTR_LINEENDCENTER ); if ( !pOld || !( *static_cast<const XLineEndCenterItem*>(pOld) == aItem ) ) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index b6ca76d3b17b..0e68ad35c932 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -219,7 +219,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) -int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index b66c5f7cc11f..e33cd057f4ed 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -184,7 +184,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) -int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 8f37b100e60c..9c18dc3240f7 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -256,7 +256,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) FillItemSet( _pSet ); @@ -274,10 +274,14 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) { const SfxPoolItem* pOld = NULL; - TriState eState = m_pTsbShowShadow->GetState(); if( m_pTsbShowShadow->IsValueChangedFromSaved() ) { - SdrOnOffItem aItem( makeSdrShadowItem(sal::static_int_cast< sal_Bool >( eState )) ); + TriState eState = m_pTsbShowShadow->GetState(); + assert(eState != TRISTATE_INDET); + // given how m_pTsbShowShadow is set up and saved in Reset(), + // eState == TRISTATE_INDET would imply + // !IsValueChangedFromSaved() + SdrOnOffItem aItem( makeSdrShadowItem(eState == TRISTATE_TRUE) ); pOld = GetOldItem( *rAttrs, SDRATTR_SHADOW ); if ( !pOld || !( *static_cast<const SdrOnOffItem*>(pOld) == aItem ) ) { diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index acf51ba5be2a..2da50ac83e69 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -337,7 +337,7 @@ void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/) -int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { @@ -585,7 +585,7 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { @@ -840,7 +840,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ), - m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbPosProtect->GetState() == TRISTATE_TRUE ) ); } bModified = true; @@ -879,7 +879,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) else rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), - m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ) ); bModified = true; } @@ -892,7 +892,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) else rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOWIDTH ), - m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE ) ); } bModified = true; } @@ -906,7 +906,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) else rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOHEIGHT ), - m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE ) ); } bModified = true; } @@ -1048,7 +1048,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) -int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) +SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) { diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index c3430a6be0fc..5a1ed48a356b 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -57,6 +57,22 @@ </columns> <data> <row> + <col id="0" translatable="yes">None</col> + <col id="1">5</col> + </row> + <row> + <col id="0" translatable="yes">Bullet</col> + <col id="1">6</col> + </row> + <row> + <col id="0" translatable="yes">Graphics</col> + <col id="1">8</col> + </row> + <row> + <col id="0" translatable="yes">Linked graphics</col> + <col id="1">136</col> + </row> + <row> <col id="0" translatable="yes">1, 2, 3, ...</col> <col id="1">4</col> </row> @@ -85,22 +101,6 @@ <col id="1">10</col> </row> <row> - <col id="0" translatable="yes">Bullet</col> - <col id="1">6</col> - </row> - <row> - <col id="0" translatable="yes">Graphics</col> - <col id="1">8</col> - </row> - <row> - <col id="0" translatable="yes">Linked graphics</col> - <col id="1">136</col> - </row> - <row> - <col id="0" translatable="yes">None</col> - <col id="1">5</col> - </row> - <row> <col id="0" translatable="yes">Native Numbering</col> <col id="1">12</col> </row> diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index 47dc17e5e707..ee5100ad23d4 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -76,6 +76,7 @@ <property name="fill">True</property> <property name="position">3</property> <property name="secondary">True</property> + <property name="non_homogeneous">True</property> </packing> </child> </object> @@ -108,7 +109,7 @@ <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <object class="GtkEntry" id="search_term"> <property name="visible">True</property> @@ -202,7 +203,7 @@ <object class="GtkBox" id="box7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="spacing">6</property> <child> <object class="GtkButton" id="suggestion1"> <property name="visible">True</property> |