diff options
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/config/mailconfigpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/config/optpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 36 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dialog/docstdlg.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dialog/wordcountdialog.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/envelp/envprt.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 108 | ||||
-rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 22 | ||||
-rw-r--r-- | sw/source/ui/misc/num.cxx | 40 | ||||
-rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 2 |
15 files changed, 133 insertions, 131 deletions
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index f5cbb4577b1a..7b1131fbfc5c 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -346,12 +346,12 @@ void SwTestAccountSettingsDialog::Test() } m_xResult1->set_label(bIsServer ? m_sCompleted : m_sFailed); - m_xImage1->show(!bIsServer); - m_xImage3->show(bIsServer); + m_xImage1->set_visible(!bIsServer); + m_xImage3->set_visible(bIsServer); m_xResult2->set_label(bIsLoggedIn ? m_sCompleted : m_sFailed); - m_xImage2->show(!bIsLoggedIn); - m_xImage4->show(bIsLoggedIn); + m_xImage2->set_visible(!bIsLoggedIn); + m_xImage4->set_visible(bIsLoggedIn); if (!bIsServer || !bIsLoggedIn) { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index d497d3e3dcd0..099a96945bd3 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -372,7 +372,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent, } m_xProspectCB_RTL->set_sensitive(false); SvtCTLOptions aCTLOptions; - m_xProspectCB_RTL->show(aCTLOptions.IsCTLFontEnabled()); + m_xProspectCB_RTL->set_visible(aCTLOptions.IsCTLFontEnabled()); } SwAddPrinterTabPage::~SwAddPrinterTabPage() diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index cc2bf9b3607c..3950bb7952d9 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -368,7 +368,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, FindHdl_Impl, weld::Button&, void) m_xFindDlg->show(); } else - m_xFindDlg->show(!m_xFindDlg->get_visible()); + m_xFindDlg->set_visible(!m_xFindDlg->get_visible()); } IMPL_LINK_NOARG(SwCreateAddressListDialog, CustomizeHdl_Impl, weld::Button&, void) @@ -587,7 +587,7 @@ IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl, weld::Entry&, void) IMPL_LINK_NOARG(SwFindEntryDialog, CloseHdl_Impl, weld::Button&, void) { - m_xDialog->show(false); + m_xDialog->hide(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 75e1ca5bd703..3da4c2bc88d0 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -95,7 +95,9 @@ public: SwFindEntryDialog(SwCreateAddressListDialog* pParent); virtual ~SwFindEntryDialog() override; - void show(bool bShow = true) { m_xDialog->show(bShow); } + void show() { m_xDialog->show(); } + void set_visible(bool bVisible) { m_xDialog->set_visible(bVisible); } + void hide() { m_xDialog->hide(); } bool get_visible() const { return m_xDialog->get_visible(); } weld::ComboBox& GetFieldsListBox() diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index d8dd205ea660..dd3abe56a7ee 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -409,24 +409,24 @@ IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, weld::Button&, rButton, void ) m_xHeadFrame->set_label(MnemonicGenerator::EraseAllMnemonicChars(rButton.get_label().replace('_', '~'))); - m_xLbTextDbColumn->show( !bShowTable ); - m_xIbDbcolToEdit->show( !bShowTable ); - m_xEdDbText->show( !bShowTable ); - m_xFtDbParaColl->show( !bShowTable ); - m_xLbDbParaColl->show( !bShowTable ); - - m_xLbTableDbColumn->show( bShowTable ); - m_xIbDbcolAllTo->show( bShowTable ); - m_xIbDbcolOneTo->show( bShowTable ); - m_xIbDbcolOneFrom->show( bShowTable ); - m_xIbDbcolAllFrom->show( bShowTable ); - m_xFtTableCol->show( bShowTable ); - m_xLbTableCol->show( bShowTable ); - m_xCbTableHeadon->show( bShowTable ); - m_xRbHeadlColnms->show( bShowTable ); - m_xRbHeadlEmpty->show( bShowTable ); - m_xPbTableFormat->show( bShowTable ); - m_xPbTableAutofmt->show( bShowTable ); + m_xLbTextDbColumn->set_visible( !bShowTable ); + m_xIbDbcolToEdit->set_visible( !bShowTable ); + m_xEdDbText->set_visible( !bShowTable ); + m_xFtDbParaColl->set_visible( !bShowTable ); + m_xLbDbParaColl->set_visible( !bShowTable ); + + m_xLbTableDbColumn->set_visible( bShowTable ); + m_xIbDbcolAllTo->set_visible( bShowTable ); + m_xIbDbcolOneTo->set_visible( bShowTable ); + m_xIbDbcolOneFrom->set_visible( bShowTable ); + m_xIbDbcolAllFrom->set_visible( bShowTable ); + m_xFtTableCol->set_visible( bShowTable ); + m_xLbTableCol->set_visible( bShowTable ); + m_xCbTableHeadon->set_visible( bShowTable ); + m_xRbHeadlColnms->set_visible( bShowTable ); + m_xRbHeadlEmpty->set_visible( bShowTable ); + m_xPbTableFormat->set_visible( bShowTable ); + m_xPbTableAutofmt->set_visible( bShowTable ); if( bShowTable ) m_xPbTableFormat->set_sensitive( 0 != m_xLbTableCol->n_children() ); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index d0cd3fbd820f..5e94ce1826a8 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -74,8 +74,8 @@ void SwMailMergeOutputTypePage::dispose() IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::ToggleButton&, void) { bool bLetter = m_xLetterRB->get_active(); - m_xLetterHint->show(bLetter); - m_xMailHint->show(!bLetter); + m_xLetterHint->set_visible(bLetter); + m_xMailHint->set_visible(!bLetter); m_pWizard->GetConfigItem().SetOutputToLetter(bLetter); m_pWizard->updateRoadmapItemLabel( MM_ADDRESSBLOCKPAGE ); m_pWizard->UpdateRoadmap(); diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 24c286a4f7c1..8208b875f13a 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -60,9 +60,9 @@ SwDocStatPage::SwDocStatPage(TabPageParent pParent, const SfxItemSet &rSet) SwFEShell* pFEShell = pDocShell->GetFEShell(); if(!pFEShell) { - m_xUpdatePB->show(false); - m_xLineLbl->show(false); - m_xLineNo->show(false); + m_xUpdatePB->hide(); + m_xLineLbl->hide(); + m_xLineNo->hide(); } } diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 30148e8bb83b..32279a180e8f 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -82,16 +82,16 @@ void SwWordCountFloatDlg::SetValues(const SwDocStat& rCurrent, const SwDocStat& void SwWordCountFloatDlg::showCJK(bool bShowCJK) { - m_xCurrentCjkcharsFT->show(bShowCJK); - m_xDocCjkcharsFT->show(bShowCJK); - m_xCjkcharsLabelFT->show(bShowCJK); + m_xCurrentCjkcharsFT->set_visible(bShowCJK); + m_xDocCjkcharsFT->set_visible(bShowCJK); + m_xCjkcharsLabelFT->set_visible(bShowCJK); } void SwWordCountFloatDlg::showStandardizedPages(bool bShowStandardizedPages) { - m_xCurrentStandardizedPagesFT->show(bShowStandardizedPages); - m_xDocStandardizedPagesFT->show(bShowStandardizedPages); - m_xStandardizedPagesLabelFT->show(bShowStandardizedPages); + m_xCurrentStandardizedPagesFT->set_visible(bShowStandardizedPages); + m_xDocStandardizedPagesFT->set_visible(bShowStandardizedPages); + m_xStandardizedPagesLabelFT->set_visible(bShowStandardizedPages); } SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings, diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 2041e2838f19..cc62d67becdc 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -83,8 +83,8 @@ IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, weld::ToggleButton&, void) { // Envelope from bottom, otherwise Envelope from top const bool bLowerActive = m_xBottomButton->get_active(); - m_xUpper->show(!bLowerActive); - m_xLower->show(bLowerActive); + m_xUpper->set_visible(!bLowerActive); + m_xLower->set_visible(bLowerActive); } IMPL_LINK(SwEnvPrtPage, LowerHdl, weld::ToggleButton&, rButton, void) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0935481a27d7..bd9f3f744bd9 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1318,8 +1318,8 @@ void SwColumnPage::SetInSection(bool bSet) if(!SW_MOD()->GetCTLOptions().IsCTLFontEnabled()) return; - m_xTextDirectionFT->show(bSet); - m_xTextDirectionLB->show(bSet); + m_xTextDirectionFT->set_visible(bSet); + m_xTextDirectionLB->set_visible(bSet); } void ColumnValueSet::UserDraw(const UserDrawEvent& rUDEvt) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 1c19855bd28b..c5564ac48163 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -597,8 +597,8 @@ namespace { void HandleAutoCB(bool _bChecked, weld::Label& _rFT_man, weld::Label& _rFT_auto, weld::MetricSpinButton& _rPF_Edit) { - _rFT_man.show( !_bChecked ); - _rFT_auto.show( _bChecked ); + _rFT_man.set_visible( !_bChecked ); + _rFT_auto.set_visible( _bChecked ); OUString accName = _bChecked ? _rFT_auto.get_label() : _rFT_man.get_label(); _rPF_Edit.set_accessible_name(accName); } @@ -968,11 +968,11 @@ void SwFramePage::Reset( const SfxItemSet *rSet ) { m_xAutoHeightCB->set_sensitive(false); m_xAutoWidthCB->set_sensitive(false); - m_xMirrorPagesCB->show(false); + m_xMirrorPagesCB->hide(); if (m_sDlgType == "FrameDialog") m_xFixedRatioCB->set_sensitive(false); // i#18732 hide checkbox in HTML mode - m_xFollowTextFlowCB->show(false); + m_xFollowTextFlowCB->hide(); } else { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index df1374c1a20f..80060ae955f6 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1211,36 +1211,36 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, weld::ComboBox&, rBox, void) CurTOXType eCurType = lcl_UserData2TOXTypes(nType); pTOXDlg->SetCurrentTOXType(eCurType); - m_xAreaLB->show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) ); - m_xLevelFT->show( 0 != (nType & (TO_CONTENT)) ); - m_xLevelNF->show( 0 != (nType & (TO_CONTENT)) ); - m_xLevelFromChapterCB->show( 0 != (nType & (TO_USER)) ); - m_xAreaFrame->show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) ); + m_xAreaLB->set_visible( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) ); + m_xLevelFT->set_visible( 0 != (nType & (TO_CONTENT)) ); + m_xLevelNF->set_visible( 0 != (nType & (TO_CONTENT)) ); + m_xLevelFromChapterCB->set_visible( 0 != (nType & (TO_USER)) ); + m_xAreaFrame->set_visible( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) ); - m_xFromHeadingsCB->show( 0 != (nType & (TO_CONTENT)) ); - m_xAddStylesCB->show( 0 != (nType & (TO_CONTENT|TO_USER)) ); - m_xAddStylesPB->show( 0 != (nType & (TO_CONTENT|TO_USER)) ); + m_xFromHeadingsCB->set_visible( 0 != (nType & (TO_CONTENT)) ); + m_xAddStylesCB->set_visible( 0 != (nType & (TO_CONTENT|TO_USER)) ); + m_xAddStylesPB->set_visible( 0 != (nType & (TO_CONTENT|TO_USER)) ); - m_xFromTablesCB->show( 0 != (nType & (TO_USER)) ); - m_xFromFramesCB->show( 0 != (nType & (TO_USER)) ); - m_xFromGraphicsCB->show( 0 != (nType & (TO_USER)) ); - m_xFromOLECB->show( 0 != (nType & (TO_USER)) ); + m_xFromTablesCB->set_visible( 0 != (nType & (TO_USER)) ); + m_xFromFramesCB->set_visible( 0 != (nType & (TO_USER)) ); + m_xFromGraphicsCB->set_visible( 0 != (nType & (TO_USER)) ); + m_xFromOLECB->set_visible( 0 != (nType & (TO_USER)) ); - m_xFromCaptionsRB->show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); - m_xFromObjectNamesRB->show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); + m_xFromCaptionsRB->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); + m_xFromObjectNamesRB->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); - m_xTOXMarksCB->show( 0 != (nType & (TO_CONTENT|TO_USER)) ); + m_xTOXMarksCB->set_visible( 0 != (nType & (TO_CONTENT|TO_USER)) ); - m_xCreateFrame->show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_TABLE)) ); - m_xCaptionSequenceFT->show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); - m_xCaptionSequenceLB->show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); - m_xDisplayTypeFT->show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); - m_xDisplayTypeLB->show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); + m_xCreateFrame->set_visible( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_TABLE)) ); + m_xCaptionSequenceFT->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); + m_xCaptionSequenceLB->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); + m_xDisplayTypeFT->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); + m_xDisplayTypeLB->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) ); - m_xAuthorityFrame->show( 0 != (nType & TO_AUTHORITIES) ); + m_xAuthorityFrame->set_visible( 0 != (nType & TO_AUTHORITIES) ); bool bEnableSortLanguage = 0 != (nType & (TO_INDEX|TO_AUTHORITIES)); - m_xSortFrame->show(bEnableSortLanguage); + m_xSortFrame->set_visible(bEnableSortLanguage); if( nType & TO_ILLUSTRATION ) { @@ -1257,10 +1257,10 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, weld::ComboBox&, rBox, void) m_xAddStylesCB->set_label(sAddStyleUser); } - m_xIdxOptionsFrame->show( 0 != (nType & TO_INDEX) ); + m_xIdxOptionsFrame->set_visible( 0 != (nType & TO_INDEX) ); //object index - m_xFromObjFrame->show( 0 != (nType & TO_OBJECT) ); + m_xFromObjFrame->set_visible( 0 != (nType & TO_OBJECT) ); //set control values from the proper TOXDescription { @@ -2074,25 +2074,25 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) m_xLevelLB->select(bToxIsIndex ? 1 : 0); //show or hide controls - m_xEntryNoPB->show(bToxIsContent); - m_xHyperLinkPB->show(bToxSupportsLinks); - m_xRelToStyleCB->show(!bToxIsAuthorities); - m_xChapterInfoPB->show(!bToxIsContent && !bToxIsAuthorities); - m_xEntryPB->show(!bToxIsAuthorities); - m_xPageNoPB->show(!bToxIsAuthorities); - m_xAuthFieldsLB->show(bToxIsAuthorities); - m_xAuthInsertPB->show(bToxIsAuthorities); - m_xAuthRemovePB->show(bToxIsAuthorities); - - m_xFormatFrame->show(!bToxIsAuthorities); - - m_xSortingFrame->show(bToxIsAuthorities); - m_xSortKeyFrame->show(bToxIsAuthorities); - - m_xMainEntryStyleFT->show(bToxIsIndex); - m_xMainEntryStyleLB->show(bToxIsIndex); - m_xAlphaDelimCB->show(bToxIsIndex); - m_xCommaSeparatedCB->show(bToxIsIndex); + m_xEntryNoPB->set_visible(bToxIsContent); + m_xHyperLinkPB->set_visible(bToxSupportsLinks); + m_xRelToStyleCB->set_visible(!bToxIsAuthorities); + m_xChapterInfoPB->set_visible(!bToxIsContent && !bToxIsAuthorities); + m_xEntryPB->set_visible(!bToxIsAuthorities); + m_xPageNoPB->set_visible(!bToxIsAuthorities); + m_xAuthFieldsLB->set_visible(bToxIsAuthorities); + m_xAuthInsertPB->set_visible(bToxIsAuthorities); + m_xAuthRemovePB->set_visible(bToxIsAuthorities); + + m_xFormatFrame->set_visible(!bToxIsAuthorities); + + m_xSortingFrame->set_visible(bToxIsAuthorities); + m_xSortKeyFrame->set_visible(bToxIsAuthorities); + + m_xMainEntryStyleFT->set_visible(bToxIsIndex); + m_xMainEntryStyleLB->set_visible(bToxIsIndex); + m_xAlphaDelimCB->set_visible(bToxIsIndex); + m_xCommaSeparatedCB->set_visible(bToxIsIndex); } aLastTOXType = aCurType; @@ -2385,11 +2385,11 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) } bool bTabStop = TOKEN_TAB_STOP == rToken.eTokenType; - m_xFillCharFT->show(bTabStop); - m_xFillCharCB->show(bTabStop); - m_xTabPosFT->show(bTabStop); - m_xTabPosMF->show(bTabStop); - m_xAutoRightCB->show(bTabStop); + m_xFillCharFT->set_visible(bTabStop); + m_xFillCharCB->set_visible(bTabStop); + m_xTabPosFT->set_visible(bTabStop); + m_xTabPosMF->set_visible(bTabStop); + m_xAutoRightCB->set_visible(bTabStop); m_xAutoRightCB->set_sensitive(bTabStop); if(bTabStop) { @@ -2406,12 +2406,12 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) bool bIsChapterInfo = rToken.eTokenType == TOKEN_CHAPTER_INFO; bool bIsEntryNumber = rToken.eTokenType == TOKEN_ENTRY_NO; - m_xChapterEntryFT->show( bIsChapterInfo ); - m_xChapterEntryLB->show( bIsChapterInfo ); - m_xEntryOutlineLevelFT->show( bIsChapterInfo || bIsEntryNumber ); - m_xEntryOutlineLevelNF->show( bIsChapterInfo || bIsEntryNumber ); - m_xNumberFormatFT->show( bIsEntryNumber ); - m_xNumberFormatLB->show( bIsEntryNumber ); + m_xChapterEntryFT->set_visible( bIsChapterInfo ); + m_xChapterEntryLB->set_visible( bIsChapterInfo ); + m_xEntryOutlineLevelFT->set_visible( bIsChapterInfo || bIsEntryNumber ); + m_xEntryOutlineLevelNF->set_visible( bIsChapterInfo || bIsEntryNumber ); + m_xNumberFormatFT->set_visible( bIsEntryNumber ); + m_xNumberFormatLB->set_visible( bIsEntryNumber ); //now enable the visible buttons //- inserting the same type of control is not allowed diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 5929635026fb..627ccf874e1e 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -672,9 +672,9 @@ void SwIndexMarkPane::ModifyHdl(const weld::Widget& rBox) m_xLevelNF->set_value(m_xLevelNF->normalize(0)); bSetKey2 = true; } - m_xLevelFT->show(bLevelEnable); - m_xLevelNF->show(bLevelEnable); - m_xMainEntryCB->show(nPos == POS_INDEX); + m_xLevelFT->set_visible(bLevelEnable); + m_xLevelNF->set_visible(bLevelEnable); + m_xMainEntryCB->set_visible(nPos == POS_INDEX); m_xKey1FT->set_sensitive(bKeyEnable); m_xKey1DCB->set_sensitive(bKeyEnable); @@ -795,9 +795,9 @@ void SwIndexMarkPane::UpdateDialog() m_xKey1FT->set_sensitive(bKeyEnable); m_xKey1DCB->set_sensitive(bKeyEnable); m_xLevelNF->set_max(MAXLEVEL); - m_xLevelFT->show(bLevelEnable); - m_xLevelNF->show(bLevelEnable); - m_xMainEntryCB->show(!bLevelEnable); + m_xLevelFT->set_visible(bLevelEnable); + m_xLevelNF->set_visible(bLevelEnable); + m_xMainEntryCB->set_visible(!bLevelEnable); m_xKey2FT->set_sensitive(bKey2Enable); m_xKey2DCB->set_sensitive(bKey2Enable); @@ -1099,9 +1099,9 @@ SwAuthorMarkPane::SwAuthorMarkPane(weld::DialogController &rDialog, weld::Builde , m_xCreateEntryPB(rBuilder.weld_button("new")) , m_xEditEntryPB(rBuilder.weld_button("edit")) { - m_xActionBT->show(true); - m_xFromComponentRB->show(bNewEntry); - m_xFromDocContentRB->show(bNewEntry); + m_xActionBT->show(); + m_xFromComponentRB->set_visible(bNewEntry); + m_xFromDocContentRB->set_visible(bNewEntry); m_xFromComponentRB->set_active(bIsFromComponent); m_xFromDocContentRB->set_active(!bIsFromComponent); @@ -1116,8 +1116,8 @@ SwAuthorMarkPane::SwAuthorMarkPane(weld::DialogController &rDialog, weld::Builde m_rDialog.set_title(SwResId( bNewEntry ? STR_AUTHMRK_INSERT : STR_AUTHMRK_EDIT)); - m_xEntryED->show(!bNewEntry); - m_xEntryLB->show(bNewEntry); + m_xEntryED->set_visible(!bNewEntry); + m_xEntryLB->set_visible(bNewEntry); if (bNewEntry) { m_xEntryLB->connect_changed(LINK(this, SwAuthorMarkPane, CompEntryHdl)); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 4a83c575a1cd..5599d7fc2b9b 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -474,26 +474,26 @@ void SwNumPositionTabPage::InitPosAndSpaceMode() void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() { - m_xDistBorderFT->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xDistBorderMF->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xRelativeCB->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xIndentFT->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xIndentMF->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xDistNumFT->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xDistNumMF->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xAlignFT->show( !bLabelAlignmentPosAndSpaceModeActive ); - m_xAlignLB->show( !bLabelAlignmentPosAndSpaceModeActive ); - - m_xLabelFollowedByFT->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xLabelFollowedByLB->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xListtabFT->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xListtabMF->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xAlign2FT->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xAlign2LB->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xAlignedAtFT->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xAlignedAtMF->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xIndentAtFT->show( bLabelAlignmentPosAndSpaceModeActive ); - m_xIndentAtMF->show( bLabelAlignmentPosAndSpaceModeActive ); + m_xDistBorderFT->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xDistBorderMF->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xRelativeCB->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xIndentFT->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xIndentMF->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xDistNumFT->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xDistNumMF->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xAlignFT->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + m_xAlignLB->set_visible( !bLabelAlignmentPosAndSpaceModeActive ); + + m_xLabelFollowedByFT->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xLabelFollowedByLB->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xListtabFT->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xListtabMF->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xAlign2FT->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xAlign2LB->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xAlignedAtFT->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xAlignedAtMF->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xIndentAtFT->set_visible( bLabelAlignmentPosAndSpaceModeActive ); + m_xIndentAtMF->set_visible( bLabelAlignmentPosAndSpaceModeActive ); } VclPtr<SfxTabPage> SwNumPositionTabPage::Create( TabPageParent pParent, diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 88cf8e2d0e11..ba3ecf39fa23 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -108,7 +108,7 @@ SwFormatTablePage::SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rS bHtmlMode = 0 != (static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON); bool bCTL = SW_MOD()->GetCTLOptions().IsCTLFontEnabled(); - m_xProperties->show(!bHtmlMode && bCTL); + m_xProperties->set_visible(!bHtmlMode && bCTL); Init(); } |