[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source filter/source include/svtools include/svx include/vcl sc/source sfx2/source starmath/source svtools/source svx/source sw/source vcl/source vcl/unx xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Mar 16 00:02:02 UTC 2019
basctl/source/dlged/managelang.cxx | 12 -
chart2/source/controller/dialogs/res_BarGeometry.cxx | 6
chart2/source/controller/dialogs/res_BarGeometry.hxx | 2
chart2/source/controller/dialogs/res_ErrorBar.cxx | 16 +-
chart2/source/controller/dialogs/res_Titles.cxx | 8 -
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 20 +--
chart2/source/controller/dialogs/tp_ChartType.cxx | 22 +--
chart2/source/controller/dialogs/tp_DataSource.cxx | 12 -
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 2
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 6
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 6
chart2/source/controller/dialogs/tp_Scale.cxx | 32 ++---
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 22 +--
cui/source/customize/cfgutil.cxx | 8 -
cui/source/dialogs/hangulhanjadlg.cxx | 2
cui/source/dialogs/postdlg.cxx | 4
cui/source/options/securityoptions.cxx | 2
cui/source/tabpages/align.cxx | 8 -
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/chardlg.cxx | 6
cui/source/tabpages/numfmt.cxx | 18 +-
cui/source/tabpages/numpages.cxx | 102 ++++++++--------
cui/source/tabpages/paragrph.cxx | 2
cui/source/tabpages/swpossizetabpage.cxx | 4
cui/source/tabpages/textattr.cxx | 12 -
cui/source/tabpages/tpline.cxx | 2
dbaccess/source/ui/control/curledit.cxx | 4
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/ConnectionPage.cxx | 16 +-
dbaccess/source/ui/dlg/detailpages.cxx | 14 +-
filter/source/pdf/impdialog.cxx | 8 -
include/svtools/ServerDetailsControls.hxx | 10 -
include/svx/colorbox.hxx | 8 -
include/svx/frmdirlbox.hxx | 3
include/svx/langbox.hxx | 2
include/vcl/weld.hxx | 26 ++--
sc/source/ui/dbgui/dapitype.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 6
sfx2/source/dialog/basedlgs.cxx | 2
sfx2/source/dialog/passwd.cxx | 2
sfx2/source/dialog/securitypage.cxx | 8 -
starmath/source/dialog.cxx | 6
svtools/source/dialogs/PlaceEditDialog.cxx | 14 +-
svtools/source/dialogs/ServerDetailsControls.cxx | 70 +++++------
svtools/source/dialogs/addresstemplate.cxx | 4
svtools/source/dialogs/prnsetup.cxx | 4
svx/source/dialog/hdft.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 8 -
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/dbui/createaddresslistdialog.cxx | 4
sw/source/ui/dbui/createaddresslistdialog.hxx | 4
sw/source/ui/dbui/dbinsdlg.cxx | 36 ++---
sw/source/ui/dbui/mmoutputtypepage.cxx | 4
sw/source/ui/dialog/docstdlg.cxx | 6
sw/source/ui/dialog/wordcountdialog.cxx | 12 -
sw/source/ui/envelp/envprt.cxx | 4
sw/source/ui/frmdlg/column.cxx | 4
sw/source/ui/frmdlg/frmpage.cxx | 8 -
sw/source/ui/index/cnttab.cxx | 108 ++++++++---------
sw/source/ui/index/swuiidxmrk.cxx | 22 +--
sw/source/ui/misc/num.cxx | 40 +++---
sw/source/ui/table/tabledlg.cxx | 2
sw/source/uibase/inc/column.hxx | 2
vcl/source/app/salvtables.cxx | 5
vcl/unx/gtk3/gtk3gtkinst.cxx | 13 --
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 16 +-
xmlsecurity/source/dialogs/macrosecurity.cxx | 4
67 files changed, 414 insertions(+), 443 deletions(-)
New commits:
commit e3e6f43bc8c01ca6c3ad87180db2b3e623d8eed4
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 15 11:19:51 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Mar 16 01:01:33 2019 +0100
clarify that set_visible(true/false) is just show/hide
ditch duplicate method
Change-Id: Iea35d6437f48809a06e093241bddf301f00c502b
Reviewed-on: https://gerrit.libreoffice.org/69302
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 85797a55f869..1162a16ff3ed 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -237,13 +237,13 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent, std::s
if (m_xLocalizationMgr->isLibraryLocalized())
{
// change to "Add Interface Language" mode
- m_xLanguageLB->set_visible(false);
- m_xCheckLangLB->set_visible(true);
+ m_xLanguageLB->hide();
+ m_xCheckLangLB->show();
m_xDialog->set_title(m_xAltTitle->get_label());
- m_xLanguageFT->set_visible(false);
- m_xCheckLangFT->set_visible(true);
- m_xDefinedFT->set_visible(false);
- m_xAddedFT->set_visible(true);
+ m_xLanguageFT->hide();
+ m_xCheckLangFT->show();
+ m_xDefinedFT->hide();
+ m_xAddedFT->show();
}
FillLanguageBox();
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 128a1bc8ba32..ccd9e7b6c9c6 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -38,10 +38,10 @@ void BarGeometryResources::connect_changed(const Link<weld::TreeView&,void>& rLi
m_xLB_Geometry->connect_changed(rLink);
}
-void BarGeometryResources::show( bool bShow )
+void BarGeometryResources::set_visible( bool bShow )
{
- m_xFT_Geometry->show( bShow );
- m_xLB_Geometry->show( bShow );
+ m_xFT_Geometry->set_visible( bShow );
+ m_xLB_Geometry->set_visible( bShow );
}
void BarGeometryResources::set_sensitive( bool bEnable )
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index e63bf9160ee2..298d0af03ee0 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -29,7 +29,7 @@ class BarGeometryResources
public:
explicit BarGeometryResources(weld::Builder* pParent);
- void show( bool bShow );
+ void set_visible( bool bShow );
void set_sensitive( bool bEnable );
sal_Int32 get_selected_index() const;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 3de82496c6fe..d2788b8e2d3f 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -45,7 +45,7 @@ void lcl_enableRangeChoosing(bool bEnable, TabPageParent pParent)
{
weld::Window* pWeldDialog = pController->getDialog();
pWeldDialog->set_modal(!bEnable);
- pWeldDialog->show(!bEnable);
+ pWeldDialog->set_visible(!bEnable);
}
else if (::Dialog* pVCLDialog = pParent.pParent ? pParent.pParent->GetParentDialog() : nullptr)
{
@@ -241,17 +241,17 @@ void ErrorBarResources::UpdateControlStates()
m_apRangeSelectionHelper.get() &&
m_apRangeSelectionHelper->hasRangeSelection());
- m_xMfPositive->show( ! bShowRange );
- m_xMfNegative->show( ! bShowRange );
+ m_xMfPositive->set_visible( ! bShowRange );
+ m_xMfNegative->set_visible( ! bShowRange );
// use range but without range chooser => hide controls
- m_xEdRangePositive->show( bShowRange && ! m_bHasInternalDataProvider );
- m_xIbRangePositive->show( bCanChooseRange );
- m_xEdRangeNegative->show( bShowRange && ! m_bHasInternalDataProvider );
- m_xIbRangeNegative->show( bCanChooseRange );
+ m_xEdRangePositive->set_visible( bShowRange && ! m_bHasInternalDataProvider );
+ m_xIbRangePositive->set_visible( bCanChooseRange );
+ m_xEdRangeNegative->set_visible( bShowRange && ! m_bHasInternalDataProvider );
+ m_xIbRangeNegative->set_visible( bCanChooseRange );
bool bShowPosNegAndSync = ! (bShowRange && m_bHasInternalDataProvider);
- m_xFlParameters->show( bShowPosNegAndSync );
+ m_xFlParameters->set_visible( bShowPosNegAndSync );
// unit for metric fields
bool bIsErrorMargin(
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 22bb474b2f82..4a46bb5c8018 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -40,10 +40,10 @@ TitleResources::TitleResources(weld::Builder& rBuilder, bool bShowSecondaryAxesT
, m_xEd_SecondaryXAxis(rBuilder.weld_entry("secondaryXaxis"))
, m_xEd_SecondaryYAxis(rBuilder.weld_entry("secondaryYaxis"))
{
- m_xFT_SecondaryXAxis->show( bShowSecondaryAxesTitle );
- m_xFT_SecondaryYAxis->show( bShowSecondaryAxesTitle );
- m_xEd_SecondaryXAxis->show( bShowSecondaryAxesTitle );
- m_xEd_SecondaryYAxis->show( bShowSecondaryAxesTitle );
+ m_xFT_SecondaryXAxis->set_visible( bShowSecondaryAxesTitle );
+ m_xFT_SecondaryYAxis->set_visible( bShowSecondaryAxesTitle );
+ m_xEd_SecondaryXAxis->set_visible( bShowSecondaryAxesTitle );
+ m_xEd_SecondaryYAxis->set_visible( bShowSecondaryAxesTitle );
}
TitleResources::~TitleResources()
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 15a6bda7e859..3b27e1493836 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -110,8 +110,8 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
{
//init and enable controls
- m_xED_CrossesAt->show( !m_bCrossingAxisIsCategoryAxis );
- m_xED_CrossesAtCategory->show( m_bCrossingAxisIsCategoryAxis );
+ m_xED_CrossesAt->set_visible( !m_bCrossingAxisIsCategoryAxis );
+ m_xED_CrossesAtCategory->set_visible( m_bCrossingAxisIsCategoryAxis );
if (m_bCrossingAxisIsCategoryAxis)
{
for( sal_Int32 nN=0; nN<m_aCategories.getLength(); nN++ )
@@ -208,21 +208,15 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
if( !m_bSupportAxisPositioning )
{
- m_xFL_AxisLine->show(false);
-
- m_xFL_Labels->show(false);
-
- m_xBxPlaceTicks->show(false);
+ m_xFL_AxisLine->hide();
+ m_xFL_Labels->hide();
+ m_xBxPlaceTicks->hide();
}
else if( !AxisHelper::isAxisPositioningEnabled() )
{
-
m_xFL_AxisLine->set_sensitive(false);
-
m_xFL_Labels->set_sensitive(false);
-
m_xBxPlaceTicks->set_sensitive(false);
-
//todo: maybe set a special help id to all those controls
}
}
@@ -266,8 +260,8 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, weld::ComboBox&, void)
{
sal_Int32 nPos = m_xLB_CrossesAt->get_active();
- m_xED_CrossesAt->show( (nPos==2) && !m_bCrossingAxisIsCategoryAxis );
- m_xED_CrossesAtCategory->show( (nPos==2) && m_bCrossingAxisIsCategoryAxis );
+ m_xED_CrossesAt->set_visible( (nPos==2) && !m_bCrossingAxisIsCategoryAxis );
+ m_xED_CrossesAtCategory->set_visible( (nPos==2) && m_bCrossingAxisIsCategoryAxis );
if (m_xED_CrossesAt->get_text().isEmpty())
m_xED_CrossesAt->set_value(0.0);
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 72cc850b3415..b6a4a5eae31b 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -73,8 +73,8 @@ Dim3DLookResourceGroup::Dim3DLookResourceGroup(weld::Builder* pBuilder)
void Dim3DLookResourceGroup::showControls( bool bShow )
{
- m_xCB_3DLook->show(bShow);
- m_xLB_Scheme->show(bShow);
+ m_xCB_3DLook->set_visible(bShow);
+ m_xLB_Scheme->set_visible(bShow);
}
void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter )
@@ -140,7 +140,7 @@ SortByXValuesResourceGroup::SortByXValuesResourceGroup(weld::Builder* pBuilder)
void SortByXValuesResourceGroup::showControls( bool bShow )
{
- m_xCB_XValueSorting->show(bShow);
+ m_xCB_XValueSorting->set_visible(bShow);
}
void SortByXValuesResourceGroup::fillControls( const ChartTypeParameter& rParameter )
@@ -195,10 +195,10 @@ StackingResourceGroup::StackingResourceGroup(weld::Builder* pBuilder)
void StackingResourceGroup::showControls( bool bShow, bool bShowDeepStacking )
{
- m_xCB_Stacked->show(bShow);
- m_xRB_Stack_Y->show(bShow);
- m_xRB_Stack_Y_Percent->show(bShow);
- m_xRB_Stack_Z->show(bShow&&bShowDeepStacking);
+ m_xCB_Stacked->set_visible(bShow);
+ m_xRB_Stack_Y->set_visible(bShow);
+ m_xRB_Stack_Y_Percent->set_visible(bShow);
+ m_xRB_Stack_Z->set_visible(bShow&&bShowDeepStacking);
}
void StackingResourceGroup::fillControls( const ChartTypeParameter& rParameter )
@@ -451,9 +451,9 @@ SteppedPropertiesDialog& SplineResourceGroup::getSteppedPropertiesDialog()
void SplineResourceGroup::showControls( bool bShow )
{
- m_xFT_LineType->show(bShow);
- m_xLB_LineType->show(bShow);
- m_xPB_DetailsDialog->show(bShow);
+ m_xFT_LineType->set_visible(bShow);
+ m_xLB_LineType->set_visible(bShow);
+ m_xPB_DetailsDialog->set_visible(bShow);
}
void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
@@ -577,7 +577,7 @@ GeometryResourceGroup::GeometryResourceGroup(weld::Builder* pBuilder)
void GeometryResourceGroup::showControls(bool bShow)
{
- m_aGeometryResources.show(bShow);
+ m_aGeometryResources.set_visible(bShow);
}
void GeometryResourceGroup::fillControls(const ChartTypeParameter& rParameter)
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 17f32f126772..00963cf054f7 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -126,7 +126,7 @@ void lcl_enableRangeChoosing(bool bEnable, weld::DialogController* pDialog)
return;
weld::Dialog* pDlg = pDialog->getDialog();
pDlg->set_modal(!bEnable);
- pDlg->show(!bEnable);
+ pDlg->set_visible(!bEnable);
}
void lcl_addLSequenceToDataSource(
@@ -202,7 +202,7 @@ DataSourceTabPage::DataSourceTabPage(TabPageParent pParent, DialogModel & rDialo
m_xLB_SERIES->get_height_rows(10));
m_xLB_ROLE->set_size_request(m_xLB_ROLE->get_approximate_digit_width() * 60,
m_xLB_ROLE->get_height_rows(5));
- m_xFT_CAPTION->show(!bHideDescription);
+ m_xFT_CAPTION->set_visible(!bHideDescription);
m_aFixedTextRange = m_xFT_RANGE->get_label();
SetText( SchResId( STR_OBJECT_DATASERIES_PLURAL ) );
@@ -460,11 +460,11 @@ void DataSourceTabPage::updateControlState()
bool bHasCategories = m_rDialogModel.isCategoryDiagram();
- m_xFT_DATALABELS->show(!bHasCategories);
- m_xFT_CATEGORIES->show( bHasCategories);
+ m_xFT_DATALABELS->set_visible(!bHasCategories);
+ m_xFT_CATEGORIES->set_visible( bHasCategories);
bool bShowIB = bHasRangeChooser;
- m_xIMB_RANGE_CAT->show(bShowIB);
+ m_xIMB_RANGE_CAT->set_visible(bShowIB);
m_xFT_ROLE->set_sensitive(bHasSelectedSeries);
m_xLB_ROLE->set_sensitive(bHasSelectedSeries);
@@ -475,7 +475,7 @@ void DataSourceTabPage::updateControlState()
m_xFT_SERIES->set_sensitive(true);
m_xLB_SERIES->set_sensitive(true);
- m_xIMB_RANGE_MAIN->show(bShowIB);
+ m_xIMB_RANGE_MAIN->set_visible(bShowIB);
isValid();
}
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index bbf87155d895..2cbfe653e576 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -76,7 +76,7 @@ void SchLayoutTabPage::Reset(const SfxItemSet* rInAttrs)
if(m_pGeometryResources)
{
m_pGeometryResources->select(static_cast<sal_uInt16>(nVal));
- m_pGeometryResources->show(true);
+ m_pGeometryResources->set_visible(true);
}
}
}
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index df169e8ddb37..0cd66b00a26c 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -82,7 +82,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
{
- m_xFL_StartingAngle->show(false);
+ m_xFL_StartingAngle->hide();
}
if (rInAttrs->GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SfxItemState::SET)
{
@@ -91,7 +91,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
{
- m_xCB_Clockwise->show(false);
+ m_xCB_Clockwise->hide();
}
if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SfxItemState::SET)
{
@@ -100,7 +100,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
{
- m_xFL_PlotOptions->show(false);
+ m_xFL_PlotOptions->hide();
}
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 5a7db1ae3878..6205f9f45a8d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -36,7 +36,7 @@ namespace
{
if( rChooserButton.get_visible() != bShow )
{
- rChooserButton.show( bShow );
+ rChooserButton.set_visible( bShow );
}
}
@@ -55,7 +55,7 @@ namespace
return;
weld::Dialog* pDlg = pDialog->getDialog();
pDlg->set_modal(!bEnable);
- pDlg->show(!bEnable);
+ pDlg->set_visible(!bEnable);
}
} // anonymous namespace
@@ -96,7 +96,7 @@ RangeChooserTabPage::RangeChooserTabPage(TabPageParent pParent, DialogModel & rD
, m_xFT_TimeEnd(m_xBuilder->weld_label("label2"))
, m_xEd_TimeEnd(m_xBuilder->weld_entry("ED_TIME_BASED_END"))
{
- m_xFT_Caption->show(!bHideDescription);
+ m_xFT_Caption->set_visible(!bHideDescription);
SetText(m_xFTTitle->get_label());// OH:remove later with dialog
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index fc0375d9c60c..5437e1c4c333 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -120,22 +120,22 @@ void ScaleTabPage::EnableControls()
|| m_nAxisType == chart2::AxisType::DATE;
bool bDateAxis = m_nAxisType == chart2::AxisType::DATE;
- m_xBxType->show(m_bAllowDateAxis);
+ m_xBxType->set_visible(m_bAllowDateAxis);
- m_xCbxLogarithm->show( bValueAxis && !bDateAxis );
+ m_xCbxLogarithm->set_visible( bValueAxis && !bDateAxis );
- m_xBxMinMax->show(bValueAxis);
+ m_xBxMinMax->set_visible(bValueAxis);
- m_xTxtMain->show( bValueAxis );
- m_xCbxAutoStepMain->show( bValueAxis );
+ m_xTxtMain->set_visible( bValueAxis );
+ m_xCbxAutoStepMain->set_visible( bValueAxis );
- m_xTxtHelpCount->show( bValueAxis && !bDateAxis );
- m_xTxtHelp->show( bDateAxis );
- m_xMtStepHelp->show( bValueAxis );
- m_xCbxAutoStepHelp->show( bValueAxis );
+ m_xTxtHelpCount->set_visible( bValueAxis && !bDateAxis );
+ m_xTxtHelp->set_visible( bDateAxis );
+ m_xMtStepHelp->set_visible( bValueAxis );
+ m_xCbxAutoStepHelp->set_visible( bValueAxis );
- m_xBxOrigin->show( m_bShowAxisOrigin && bValueAxis );
- m_xBxResolution->show( bDateAxis );
+ m_xBxOrigin->set_visible( m_bShowAxisOrigin && bValueAxis );
+ m_xBxResolution->set_visible( bDateAxis );
bool bWasDateAxis = m_xMt_MainDateStep->get_visible();
if( bWasDateAxis != bDateAxis )
@@ -147,11 +147,11 @@ void ScaleTabPage::EnableControls()
m_xMt_MainDateStep->set_value(m_xFmtFldStepMain->get_value());
}
- m_xFmtFldStepMain->show( bValueAxis && !bDateAxis );
- m_xMt_MainDateStep->show( bDateAxis );
+ m_xFmtFldStepMain->set_visible( bValueAxis && !bDateAxis );
+ m_xMt_MainDateStep->set_visible( bDateAxis );
- m_xLB_MainTimeUnit->show( bDateAxis );
- m_xLB_HelpTimeUnit->show( bDateAxis );
+ m_xLB_MainTimeUnit->set_visible( bDateAxis );
+ m_xLB_HelpTimeUnit->set_visible( bDateAxis );
EnableValueHdl(*m_xCbxAutoMin);
EnableValueHdl(*m_xCbxAutoMax);
@@ -397,7 +397,7 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
m_nHelpTimeUnit = m_xLB_HelpTimeUnit->get_active();
if( m_nAxisType != chart2::AxisType::REALNUMBER )
- m_xCbxLogarithm->show( false );
+ m_xCbxLogarithm->hide();
//check which entries need user action
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index e7b344bce71a..b84ee44db192 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -161,7 +161,7 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
{
- m_xCBAxisSideBySide->show(false);
+ m_xCBAxisSideBySide->hide();
}
//missing value treatment
@@ -196,7 +196,7 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
{
- m_xGridPlotOptions->show(false);
+ m_xGridPlotOptions->hide();
}
}
@@ -208,12 +208,12 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
}
else
{
- m_xCBIncludeHiddenCells->show(false);
+ m_xCBIncludeHiddenCells->hide();
// check if the radiobutton guys above
// are visible. If they aren't, we can
// as well hide the whole frame
if(!m_xGridPlotOptions->get_visible())
- m_xGrpPlotOptions->show(false);
+ m_xGrpPlotOptions->hide();
}
if (rInAttrs->GetItemState(SCHATTR_HIDE_LEGEND_ENTRY, true, &pPoolItem) == SfxItemState::SET)
@@ -236,16 +236,12 @@ void SchOptionTabPage::Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlap
void SchOptionTabPage::AdaptControlPositionsAndVisibility()
{
- m_xGrpAxis->show(m_bProvidesSecondaryYAxis);
+ m_xGrpAxis->set_visible(m_bProvidesSecondaryYAxis);
+ m_xGrpBar->set_visible(m_bProvidesOverlapAndGapWidth);
+ m_xCBConnect->set_visible(m_bProvidesBarConnectors);
- m_xGrpBar->show(m_bProvidesOverlapAndGapWidth);
-
- m_xCBConnect->show(m_bProvidesBarConnectors);
-
- if( !m_xMTGap->get_visible() && !m_xMTOverlap->get_visible() )
- {
- m_xGrpBar->show(false);
- }
+ if (!m_xMTGap->get_visible() && !m_xMTOverlap->get_visible())
+ m_xGrpBar->hide();
}
} //namespace chart
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index c7252ad9e498..c5c462932654 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1099,10 +1099,10 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(
m_xDialogDescription->show();
m_xOKButton->show();
- m_xLibraryFT->show(!m_bShowSlots);
- m_xCategoryFT->show(m_bShowSlots);
- m_xMacronameFT->show(!m_bShowSlots);
- m_xCommandsFT->show(m_bShowSlots);
+ m_xLibraryFT->set_visible(!m_bShowSlots);
+ m_xCategoryFT->set_visible(m_bShowSlots);
+ m_xMacronameFT->set_visible(!m_bShowSlots);
+ m_xCommandsFT->set_visible(m_bShowSlots);
const OUString aModuleName(vcl::CommandInfoProvider::GetModuleIdentifier(xFrame));
m_xCategories->SetFunctionListBox(m_xCommands.get());
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 633154b2ecdb..0ff836f6d4f9 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -327,7 +327,7 @@ namespace svx
void SuggestionDisplay::implUpdateDisplay()
{
- m_xListBox->show(m_bDisplayListBox);
+ m_xListBox->set_visible(m_bDisplayListBox);
if (!m_bDisplayListBox)
m_xValueSetWin->show();
else
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index e9408131c0c1..570109c6ddfb 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -54,8 +54,8 @@ SvxPostItDialog::SvxPostItDialog(weld::Window* pParent, const SfxItemSet& rCoreS
bool bNew = true;
sal_uInt16 nWhich = 0;
- m_xPrevBtn->show(bPrevNext);
- m_xNextBtn->show(bPrevNext);
+ m_xPrevBtn->set_visible(bPrevNext);
+ m_xNextBtn->set_visible(bPrevNext);
nWhich = m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR );
OUString aAuthorStr, aDateStr;
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index e1af87dc49d2..c402b25b8816 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -30,7 +30,7 @@ namespace
{
bool bEnable = rOptions.IsOptionEnabled(eOption);
rCheckBox.set_sensitive(bEnable);
- rFixedImage.show(!bEnable);
+ rFixedImage.set_visible(!bEnable);
rCheckBox.set_active(rOptions.IsOptionSet(eOption));
return bEnable;
}
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index a3ed47d518a4..116685b2d468 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -145,7 +145,7 @@ AlignmentTabPage::AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCor
m_xCbStacked->connect_toggled(LINK(this, AlignmentTabPage, UpdateEnableClickHdl));
// Asian vertical mode
- m_xCbAsianMode->show(SvtCJKOptions().IsVerticalTextEnabled());
+ m_xCbAsianMode->set_visible(SvtCJKOptions().IsVerticalTextEnabled());
m_xLbFrameDir->append(SvxFrameDirection::Horizontal_LR_TB, SvxResId(RID_SVXSTR_FRAMEDIR_LTR));
m_xLbFrameDir->append(SvxFrameDirection::Horizontal_RL_TB, SvxResId(RID_SVXSTR_FRAMEDIR_RTL));
@@ -634,11 +634,11 @@ void AlignmentTabPage::UpdateEnableControls()
m_xBtnShrink->set_sensitive( (m_xBtnWrap->get_state() == TRISTATE_FALSE) && !bHorBlock && !bHorFill && !bHorDist );
// visibility of frames
- m_xAlignmentFrame->show(m_xLbHorAlign->get_visible() || m_xEdIndent->get_visible() ||
+ m_xAlignmentFrame->set_visible(m_xLbHorAlign->get_visible() || m_xEdIndent->get_visible() ||
m_xLbVerAlign->get_visible());
- m_xOrientFrame->show(m_xCtrlDial->get_visible() || m_xVsRefEdge->get_visible() ||
+ m_xOrientFrame->set_visible(m_xCtrlDial->get_visible() || m_xVsRefEdge->get_visible() ||
m_xCbStacked->get_visible() || m_xCbAsianMode->get_visible());
- m_xPropertiesFrame->show(m_xBtnWrap->get_visible() || m_xBtnHyphen->get_visible() ||
+ m_xPropertiesFrame->set_visible(m_xBtnWrap->get_visible() || m_xBtnHyphen->get_visible() ||
m_xBtnShrink->get_visible() || m_xLbFrameDir->get_visible());
bool bStackedText = m_xCbStacked->get_active();
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 86d39648b796..bdf559e6d4d5 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -857,7 +857,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
m_xBitmapContainer->show();
m_xFileFrame->show();
- m_xBtnLink->show(!(nHtmlMode & HTMLMODE_ON));
+ m_xBtnLink->set_visible(!(nHtmlMode & HTMLMODE_ON));
m_xTypeFrame->show();
m_xPreviewWin2->show();
m_xBtnPreview->show();
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 317327e12a07..6a0db1844a97 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -330,8 +330,8 @@ SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet
m_xCTLFontStyleFT->set_label(sFontStyleString);
m_xWestFrame->show();
- m_xEastFrame->show(bShowCJK);
- m_xCTLFrame->show(bShowCTL);
+ m_xEastFrame->set_visible(bShowCJK);
+ m_xCTLFrame->set_visible(bShowCTL);
m_xWestFontLanguageLB->SetLanguageList(SvxLanguageListFlags::WESTERN, true, false, true);
m_xEastFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CJK, true, false, true);
@@ -1453,7 +1453,7 @@ void SvxCharEffectsPage::Initialize()
m_xPositionLB->hide();
}
- m_xA11yWarningFT->show(officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get());
+ m_xA11yWarningFT->set_visible(officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get());
}
void SvxCharEffectsPage::UpdatePreview_Impl()
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 964ca5d62111..2e8d10c7a21b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -447,7 +447,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
bool bInit = false; // set to sal_True for debug test
m_xCbSourceFormat->set_active( bInit );
m_xCbSourceFormat->set_sensitive( bInit );
- m_xCbSourceFormat->show( bInit );
+ m_xCbSourceFormat->set_visible( bInit );
}
// pNumItem must have been set from outside!
@@ -660,8 +660,8 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl()
void SvxNumberFormatTabPage::HideLanguage(bool bFlag)
{
- m_xFtLanguage->show(!bFlag);
- m_xLbLanguage->show(!bFlag);
+ m_xFtLanguage->set_visible(!bFlag);
+ m_xLbLanguage->set_visible(!bFlag);
}
/*************************************************************************
@@ -1101,8 +1101,8 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
void SvxNumberFormatTabPage::UpdateThousandEngineeringCheckBox()
{
bool bIsScientific = m_xLbCategory->get_selected_index() == CAT_SCIENTIFIC;
- m_xBtnThousand->show( !bIsScientific );
- m_xBtnEngineering->show( bIsScientific );
+ m_xBtnThousand->set_visible( !bIsScientific );
+ m_xBtnEngineering->set_visible( bIsScientific );
}
@@ -1115,10 +1115,10 @@ void SvxNumberFormatTabPage::UpdateThousandEngineeringCheckBox()
void SvxNumberFormatTabPage::UpdateDecimalsDenominatorEditBox()
{
bool bIsFraction = m_xLbCategory->get_selected_index() == CAT_FRACTION;
- m_xFtDecimals->show( !bIsFraction );
- m_xEdDecimals->show( !bIsFraction );
- m_xFtDenominator->show( bIsFraction );
- m_xEdDenominator->show( bIsFraction );
+ m_xFtDecimals->set_visible( !bIsFraction );
+ m_xEdDecimals->set_visible( !bIsFraction );
+ m_xFtDenominator->set_visible( bIsFraction );
+ m_xEdDenominator->set_visible( bIsFraction );
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a4f8c281158f..2fa752fcfc1f 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1299,16 +1299,16 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet )
}
bool bCharFmt = pActNum->IsFeatureSupported(SvxNumRuleFlags::CHAR_STYLE);
- m_xCharFmtFT->show(bCharFmt);
- m_xCharFmtLB->show(bCharFmt);
+ m_xCharFmtFT->set_visible(bCharFmt);
+ m_xCharFmtLB->set_visible(bCharFmt);
bool bContinuous = pActNum->IsFeatureSupported(SvxNumRuleFlags::CONTINUOUS);
bool bAllLevel = bContinuous && !bHTMLMode;
- m_xAllLevelFT->show(bAllLevel);
- m_xAllLevelNF->show(bAllLevel);
+ m_xAllLevelFT->set_visible(bAllLevel);
+ m_xAllLevelNF->set_visible(bAllLevel);
- m_xAllLevelsFrame->show(bContinuous);
+ m_xAllLevelsFrame->set_visible(bContinuous);
// again misusage: in Draw there is numeration only until the bitmap
// without SVX_NUM_NUMBER_NONE
@@ -1538,46 +1538,46 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType )
bool bBitmap = (nType == SHOW_BITMAP);
bool bEnableBitmap = (nType == SHOW_BITMAP);
bool bNumeric = !(bBitmap||bBullet);
- m_xSeparatorFT->show(bNumeric);
- m_xPrefixFT->show(bNumeric);
- m_xPrefixED->show(bNumeric);
- m_xSuffixFT->show(bNumeric);
- m_xSuffixED->show(bNumeric);
+ m_xSeparatorFT->set_visible(bNumeric);
+ m_xPrefixFT->set_visible(bNumeric);
+ m_xPrefixED->set_visible(bNumeric);
+ m_xSuffixFT->set_visible(bNumeric);
+ m_xSuffixED->set_visible(bNumeric);
bool bCharFmt = pActNum->IsFeatureSupported(SvxNumRuleFlags::CHAR_STYLE);
- m_xCharFmtFT->show(!bBitmap && bCharFmt);
- m_xCharFmtLB->show(!bBitmap && bCharFmt);
+ m_xCharFmtFT->set_visible(!bBitmap && bCharFmt);
+ m_xCharFmtLB->set_visible(!bBitmap && bCharFmt);
// this is rather misusage, as there is no own flag
// for complete numeration
bool bAllLevelFeature = pActNum->IsFeatureSupported(SvxNumRuleFlags::CONTINUOUS);
bool bAllLevel = bNumeric && bAllLevelFeature && !bHTMLMode;
- m_xAllLevelFT->show(bAllLevel);
- m_xAllLevelNF->show(bAllLevel);
+ m_xAllLevelFT->set_visible(bAllLevel);
+ m_xAllLevelNF->set_visible(bAllLevel);
- m_xStartFT->show(!(bBullet||bBitmap));
- m_xStartED->show(!(bBullet||bBitmap));
+ m_xStartFT->set_visible(!(bBullet||bBitmap));
+ m_xStartED->set_visible(!(bBullet||bBitmap));
- m_xBulletFT->show(bBullet);
- m_xBulletPB->show(bBullet);
+ m_xBulletFT->set_visible(bBullet);
+ m_xBulletPB->set_visible(bBullet);
bool bBullColor = pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_COLOR);
- m_xBulColorFT->show(!bBitmap && bBullColor);
- m_xBulColLB->show(!bBitmap && bBullColor);
+ m_xBulColorFT->set_visible(!bBitmap && bBullColor);
+ m_xBulColLB->set_visible(!bBitmap && bBullColor);
bool bBullResSize = pActNum->IsFeatureSupported(SvxNumRuleFlags::BULLET_REL_SIZE);
- m_xBulRelSizeFT->show(!bBitmap && bBullResSize);
- m_xBulRelSizeMF->show(!bBitmap && bBullResSize);
+ m_xBulRelSizeFT->set_visible(!bBitmap && bBullResSize);
+ m_xBulRelSizeMF->set_visible(!bBitmap && bBullResSize);
- m_xBitmapFT->show(bBitmap);
- m_xBitmapMB->show(bBitmap);
+ m_xBitmapFT->set_visible(bBitmap);
+ m_xBitmapMB->set_visible(bBitmap);
- m_xWidthFT->show(bBitmap);
- m_xWidthMF->show(bBitmap);
- m_xHeightFT->show(bBitmap);
- m_xHeightMF->show(bBitmap);
- m_xRatioCB->show(bBitmap);
+ m_xWidthFT->set_visible(bBitmap);
+ m_xWidthMF->set_visible(bBitmap);
+ m_xHeightFT->set_visible(bBitmap);
+ m_xHeightMF->set_visible(bBitmap);
+ m_xRatioCB->set_visible(bBitmap);
- m_xOrientFT->show(bBitmap && bAllLevelFeature);
- m_xOrientLB->show(bBitmap && bAllLevelFeature);
+ m_xOrientFT->set_visible(bBitmap && bAllLevelFeature);
+ m_xOrientLB->set_visible(bBitmap && bAllLevelFeature);
m_xWidthFT->set_sensitive(bEnableBitmap);
m_xWidthMF->set_sensitive(bEnableBitmap);
@@ -2929,28 +2929,28 @@ void SvxNumPositionTabPage::InitPosAndSpaceMode()
void SvxNumPositionTabPage::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_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 &&
pActNum->IsFeatureSupported(SvxNumRuleFlags::CONTINUOUS) );
- m_xDistNumMF->show( !bLabelAlignmentPosAndSpaceModeActive &&
+ m_xDistNumMF->set_visible( !bLabelAlignmentPosAndSpaceModeActive &&
pActNum->IsFeatureSupported(SvxNumRuleFlags::CONTINUOUS));
- 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_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> SvxNumPositionTabPage::Create(TabPageParent pParent,
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 6b00615c5776..0663807d37e2 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1190,7 +1190,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
m_xExpandCB->hide();
if(!(nHtmlMode & HTMLMODE_FULL_STYLES) )
m_xJustify->set_sensitive(false);
- m_xSnapToGridCB->show(false);
+ m_xSnapToGridCB->hide();
}
_nWhich = GetWhich(SID_ATTR_PARA_SNAPTOGRID);
eItemState = rSet->GetItemState( _nWhich );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 388b801500ab..b2c159dda940 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -975,10 +975,10 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet)
if(m_bHtmlMode)
{
- m_xHoriMirrorCB->show(false);
+ m_xHoriMirrorCB->hide();
m_xKeepRatioCB->set_sensitive(false);
// #i18732# - hide checkbox in HTML mode
- m_xFollowCB->show(false);
+ m_xFollowCB->hide();
}
else
{
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 03bf5caf2b5c..364ff951d9ac 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -471,12 +471,12 @@ void SvxTextAttrPage::Construct()
break;
}
- m_xTsbAutoGrowHeight->show( bAutoGrowHeightEnabled );
- m_xTsbAutoGrowWidth->show( bAutoGrowWidthEnabled );
- m_xTsbFitToSize->show( bFitToSizeEnabled );
- m_xTsbContour->show( bContourEnabled );
- m_xTsbAutoGrowSize->show( bAutoGrowSizeEnabled );
- m_xTsbWordWrapText->show( bWordWrapTextEnabled );
+ m_xTsbAutoGrowHeight->set_visible( bAutoGrowHeightEnabled );
+ m_xTsbAutoGrowWidth->set_visible( bAutoGrowWidthEnabled );
+ m_xTsbFitToSize->set_visible( bFitToSizeEnabled );
+ m_xTsbContour->set_visible( bContourEnabled );
+ m_xTsbAutoGrowSize->set_visible( bAutoGrowSizeEnabled );
+ m_xTsbWordWrapText->set_visible( bWordWrapTextEnabled );
}
VclPtr<SfxTabPage> SvxTextAttrPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 57d58f95adf8..8b65a270f6ab 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -191,7 +191,7 @@ void SvxLineTabPage::ShowSymbolControls(bool bOn)
// Symbols on a line (e.g. StarCharts), symbol-enable controls
m_bSymbols=bOn;
- m_xFlSymbol->show(bOn);
+ m_xFlSymbol->set_visible(bOn);
m_aCtlPreview.ShowSymbol(bOn);
}
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 7c8df5e88e21..6ae44b05f0cd 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -56,7 +56,7 @@ void OConnectionURLEdit::SetText(const OUString& _rStr)
void OConnectionURLEdit::SetText(const OUString& _rStr, const Selection& /*_rNewSelection*/)
{
- m_xForcedPrefix->show(m_bShowPrefix);
+ m_xForcedPrefix->set_visible(m_bShowPrefix);
bool bIsEmpty = _rStr.isEmpty();
// calc the prefix
@@ -85,7 +85,7 @@ OUString OConnectionURLEdit::GetText() const
void OConnectionURLEdit::ShowPrefix(bool _bShowPrefix)
{
m_bShowPrefix = _bShowPrefix;
- m_xForcedPrefix->show(m_bShowPrefix);
+ m_xForcedPrefix->set_visible(m_bShowPrefix);
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 48605ccf84ea..a336a398fd7c 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -124,10 +124,10 @@ namespace dbaui
m_xConnectionURL->ShowPrefix( ::dbaccess::DST_JDBC == m_pCollection->determineType(m_eType) );
bool bEnableBrowseButton = m_pCollection->supportsBrowsing( m_eType );
- m_xPB_Connection->show( bEnableBrowseButton );
+ m_xPB_Connection->set_visible( bEnableBrowseButton );
bool bEnableCreateButton = m_pCollection->supportsDBCreation( m_eType );
- m_xPB_CreateDB->show( bEnableCreateButton );
+ m_xPB_CreateDB->set_visible( bEnableCreateButton );
const SfxStringItem* pUrlItem = _rSet.GetItem<SfxStringItem>(DSID_CONNECTURL);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index d11f83269de9..0138f3d70db4 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -197,10 +197,10 @@ namespace dbaui
bool bShowUser = ( eAuthMode == AuthUserPwd );
m_xPB_Connection->set_help_id(HID_DSADMIN_BROWSECONN);
- m_xFL2->show( bShowUserAuthenfication );
- m_xUserNameLabel->show( bShowUser && bShowUserAuthenfication );
- m_xUserName->show( bShowUser && bShowUserAuthenfication );
- m_xPasswordRequired->show( bShowUserAuthenfication );
+ m_xFL2->set_visible( bShowUserAuthenfication );
+ m_xUserNameLabel->set_visible( bShowUser && bShowUserAuthenfication );
+ m_xUserName->set_visible( bShowUser && bShowUserAuthenfication );
+ m_xPasswordRequired->set_visible( bShowUserAuthenfication );
// collect the items
const SfxStringItem* pUidItem = _rSet.GetItem<SfxStringItem>(DSID_USER);
@@ -228,11 +228,11 @@ namespace dbaui
else
m_xJavaDriver->set_text(pJdbcDrvItem->GetValue());
- m_xJavaDriverLabel->show(bEnableJDBC);
- m_xJavaDriver->show(bEnableJDBC);
- m_xTestJavaDriver->show(bEnableJDBC);
+ m_xJavaDriverLabel->set_visible(bEnableJDBC);
+ m_xJavaDriver->set_visible(bEnableJDBC);
+ m_xTestJavaDriver->set_visible(bEnableJDBC);
m_xTestJavaDriver->set_sensitive( !m_xJavaDriver->get_text().trim().isEmpty() );
- m_xFL3->show(bEnableJDBC);
+ m_xFL3->set_visible(bEnableJDBC);
checkTestConnection();
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 60408c5e7b4b..a9c19e8d2e27 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -205,7 +205,7 @@ namespace dbaui
if ( bValid )
{
m_xShowDeleted->set_active(pDeletedItem->GetValue());
- m_xFT_Message->show(m_xShowDeleted->get_active());
+ m_xFT_Message->set_visible(m_xShowDeleted->get_active());
}
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
@@ -228,7 +228,7 @@ namespace dbaui
}
else
{
- m_xFT_Message->show(m_xShowDeleted->get_active());
+ m_xFT_Message->set_visible(m_xShowDeleted->get_active());
// it was one of the checkboxes -> we count as modified from now on
callModifiedHdl();
}
@@ -395,13 +395,13 @@ namespace dbaui
else
{
m_bUseClass = false;
- m_xFTDriverClass->show(false);
- m_xEDDriverClass->show(false);
- m_xTestJavaDriver->show(false);
+ m_xFTDriverClass->hide();
+ m_xEDDriverClass->hide();
+ m_xTestJavaDriver->hide();
}
- m_xFTSocket->show(bShowSocket && !m_bUseClass);
- m_xEDSocket->show(bShowSocket && !m_bUseClass);
+ m_xFTSocket->set_visible(bShowSocket && !m_bUseClass);
+ m_xEDSocket->set_visible(bShowSocket && !m_bUseClass);
m_xEDHostname->connect_changed(LINK(this,OGenericAdministrationPage,OnControlEntryModifyHdl));
m_xNFPortNumber->connect_value_changed(LINK(this,OGenericAdministrationPage,OnControlSpinButtonModifyHdl));
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index e7959a610387..5183f6deb350 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -578,11 +578,11 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
}
else
{
- mxCbExportNotesPages->show(false);
+ mxCbExportNotesPages->hide();
mxCbExportNotesPages->set_active(false);
- mxCbExportOnlyNotesPages->show(false);
+ mxCbExportOnlyNotesPages->hide();
mxCbExportOnlyNotesPages->set_active(false);
- mxCbExportHiddenSlides->show(false);
+ mxCbExportHiddenSlides->hide();
mxCbExportHiddenSlides->set_active(false);
}
@@ -593,7 +593,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
mxRbSelection->set_active(true);
}
- mxCbExportPlaceholders->show(mbIsWriter);
+ mxCbExportPlaceholders->set_visible(mbIsWriter);
if( !mbIsWriter )
{
mxCbExportPlaceholders->set_active(false);
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 12fd0f2bba2e..d569ac8e20ac 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -41,7 +41,7 @@ class DetailsContainer
void setChangeHdl( const Link<DetailsContainer*,void>& rLink ) { m_aChangeHdl = rLink; }
- virtual void show( bool bShow = true );
+ virtual void set_visible( bool bShow );
virtual INetURLObject getUrl( );
/** Try to split the URL in the controls of that container.
@@ -72,7 +72,7 @@ class HostDetailsContainer : public DetailsContainer
public:
HostDetailsContainer(PlaceEditDialog* pDialog, sal_uInt16 nPort, const OUString& sScheme);
- virtual void show( bool bShow = true ) override;
+ virtual void set_visible( bool bShow ) override;
virtual INetURLObject getUrl( ) override;
virtual bool setUrl( const INetURLObject& rUrl ) override;
@@ -90,7 +90,7 @@ class DavDetailsContainer : public HostDetailsContainer
public:
DavDetailsContainer(PlaceEditDialog* pDialog);
- virtual void show( bool bShow = true ) override;
+ virtual void set_visible( bool bShow ) override;
virtual bool enableUserCredentials( ) override { return false; };
protected:
@@ -110,7 +110,7 @@ class SmbDetailsContainer : public DetailsContainer
virtual INetURLObject getUrl( ) override;
virtual bool setUrl( const INetURLObject& rUrl ) override;
- virtual void show( bool bShow = true ) override;
+ virtual void set_visible( bool bShow ) override;
};
class CmisDetailsContainer : public DetailsContainer
@@ -127,7 +127,7 @@ class CmisDetailsContainer : public DetailsContainer
public:
CmisDetailsContainer(PlaceEditDialog* pDialog, OUString const & sBinding);
- virtual void show( bool bShow = true ) override;
+ virtual void set_visible( bool bShow ) override;
virtual INetURLObject getUrl( ) override;
virtual bool setUrl( const INetURLObject& rUrl ) override;
virtual void setUsername( const OUString& rUsername ) override;
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index ab79efd8b5df..a9b38b7612ba 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -138,13 +138,7 @@ public:
bool get_sensitive() const { return m_xButton->get_sensitive(); }
void show() { m_xButton->show(); }
void hide() { m_xButton->hide(); }
- void show(bool bShow)
- {
- if (bShow)
- show();
- else
- hide();
- }
+ void set_visible(bool bShow) { m_xButton->set_visible(bShow); }
void set_help_id(const OString& rHelpId) { m_xButton->set_help_id(rHelpId); }
weld::MenuButton& get_widget() { return *m_xButton; }
};
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index cb2e1452fbba..c1cd4b376869 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -50,7 +50,8 @@ public:
int get_active() const { return m_xControl->get_active(); }
void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); }
void hide() { m_xControl->hide(); }
- void show(bool bShow = true) { m_xControl->show(bShow); }
+ void set_visible(bool bVisible) { m_xControl->set_visible(bVisible); }
+ void show() { m_xControl->show(); }
int get_count() const { return m_xControl->get_count(); }
/** Inserts a string with corresponding direction enum into the listbox. */
void append(SvxFrameDirection eDirection, const OUString& rString)
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 723faf6e02b4..e20c35a96adf 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -162,7 +162,7 @@ public:
bool get_active_id_changed_from_saved() const { return m_eSavedLanguage != get_active_id(); }
void show() { m_xControl->show(); }
void hide() { m_xControl->hide(); }
- void show(bool bShow) { if (bShow) show(); else hide(); }
+ void set_visible(bool bShow) { m_xControl->set_visible(bShow); }
void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); }
void set_active(int nPos) { m_xControl->set_active(nPos); }
int get_active() const { return m_xControl->get_active(); }
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 0856e4748929..b0c669d28bf7 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -88,23 +88,24 @@ protected:
public:
virtual void set_sensitive(bool sensitive) = 0;
virtual bool get_sensitive() const = 0;
- virtual void set_visible(bool visible) = 0;
- virtual bool get_visible() const = 0; //if this widget visibility is true
- virtual bool is_visible() const = 0; //if this widget visibility and all parents is true
- virtual void set_can_focus(bool bCanFocus) = 0;
- virtual void grab_focus() = 0;
- virtual bool has_focus() const = 0;
- virtual void set_has_default(bool has_default) = 0;
- virtual bool get_has_default() const = 0;
virtual void show() = 0;
virtual void hide() = 0;
- void show(bool bShow)
+ // This function simply calls show() or hide() but is convenient when the
+ // visibility depends on some condition
+ virtual void set_visible(bool visible)
{
- if (bShow)
+ if (visible)
show();
else
hide();
}
+ virtual bool get_visible() const = 0; //if this widget visibility is true
+ virtual bool is_visible() const = 0; //if this widget visibility and all parents is true
+ virtual void set_can_focus(bool bCanFocus) = 0;
+ virtual void grab_focus() = 0;
+ virtual bool has_focus() const = 0;
+ virtual void set_has_default(bool has_default) = 0;
+ virtual bool get_has_default() const = 0;
virtual void set_size_request(int nWidth, int nHeight) = 0;
virtual Size get_size_request() const = 0;
virtual Size get_preferred_size() const = 0;
@@ -1283,7 +1284,8 @@ public:
bool get_visible() const { return m_xSpinButton->get_visible(); }
void grab_focus() { m_xSpinButton->grab_focus(); }
bool has_focus() const { return m_xSpinButton->has_focus(); }
- void show(bool bShow = true) { m_xSpinButton->show(bShow); }
+ void show() { m_xSpinButton->show(); }
+ void set_visible(bool bShow) { m_xSpinButton->set_visible(bShow); }
void hide() { m_xSpinButton->hide(); }
void set_digits(unsigned int digits);
void set_accessible_name(const OUString& rName) { m_xSpinButton->set_accessible_name(rName); }
@@ -1361,7 +1363,7 @@ public:
bool get_visible() const { return m_xSpinButton->get_visible(); }
void grab_focus() { m_xSpinButton->grab_focus(); }
bool has_focus() const { return m_xSpinButton->has_focus(); }
- void show(bool bShow = true) { m_xSpinButton->show(bShow); }
+ void show() { m_xSpinButton->show(); }
void hide() { m_xSpinButton->hide(); }
void save_value() { m_xSpinButton->save_value(); }
bool get_value_changed_from_saved() const
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index f8791c4bc4b4..d4e817b2404d 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -46,7 +46,7 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool b
m_xBtnNamedRange->set_sensitive(false);
// Intentionally hide this button to see if anyone complains.
- m_xBtnExternal->show(false);
+ m_xBtnExternal->hide();
}
ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 3030ee27ea5b..d1e7229f1490 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -389,13 +389,13 @@ void ScTablePage::PageNoHdl(const weld::ToggleButton* pBtn)
IMPL_LINK_NOARG(ScTablePage, ScaleHdl, weld::ComboBox&, void)
{
// controls for Box "Reduce/enlarge"
- m_xBxScaleAll->show(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_PERCENT);
+ m_xBxScaleAll->set_visible(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_PERCENT);
// controls for Grid "Scale to width/height"
- m_xGrHeightWidth->show(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_TO);
+ m_xGrHeightWidth->set_visible(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_TO);
// controls for Box "Scale to pages"
- m_xBxScalePageNum->show(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_TO_PAGES);
+ m_xBxScalePageNum->set_visible(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_TO_PAGES);
}
IMPL_LINK(ScTablePage, ToggleHdl, weld::ToggleButton&, rBox, void)
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 07af730ace62..43312afa52aa 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -883,7 +883,7 @@ void SfxSingleTabDialogController::SetTabPage(SfxTabPage* pTabPage)
m_xSfxPage->SetUserData(sUserData);
m_xSfxPage->Reset(GetInputItemSet());
- m_xHelpBtn->show(Help::IsContextHelpEnabled());
+ m_xHelpBtn->set_visible(Help::IsContextHelpEnabled());
// Set TabPage text in the Dialog if there is any
OUString sTitle(m_xSfxPage->GetText());
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index ea859cad9a22..7d89d5c90376 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -147,7 +147,7 @@ void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
void SfxPasswordDialog::ShowMinLengthText(bool bShow)
{
- m_xMinLengthFT->show(bShow);
+ m_xMinLengthFT->set_visible(bShow);
}
short SfxPasswordDialog::run()
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index eb9b216f3900..d6db1818e7c6 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -306,8 +306,8 @@ void SfxSecurityPage_Impl::Reset_Impl()
m_xUnProtectPB->set_sensitive(false);
}
- m_xProtectPB->show(bProtect);
- m_xUnProtectPB->show(bUnProtect);
+ m_xProtectPB->set_visible(bProtect);
+ m_xUnProtectPB->set_visible(bUnProtect);
}
}
@@ -396,8 +396,8 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl, weld::Button&, void
m_xRecordChangesCB->set_active(bNewProtection);
- m_xUnProtectPB->show(bNewProtection);
- m_xProtectPB->show(!bNewProtection);
+ m_xUnProtectPB->set_visible(bNewProtection);
+ m_xProtectPB->set_visible(!bNewProtection);
}
VclPtr<SfxTabPage> SfxSecurityPage::Create(TabPageParent pParent, const SfxItemSet * rItemSet)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index dea622fdad57..b8fae68c547a 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -331,7 +331,7 @@ SmFontDialog::SmFontDialog(weld::Window * pParent, OutputDevice *pFntListDevice,
m_xBoldCheckBox->set_sensitive(false);
m_xItalicCheckBox->set_active(false);
m_xItalicCheckBox->set_sensitive(false);
- m_xAttrFrame->show(false);
+ m_xAttrFrame->hide();
}
}
@@ -705,9 +705,9 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
// of an associated HelpID is checked
bActive = aCatMf2Hid[nCategory][i] != nullptr;
- pFT->show(bActive);
+ pFT->set_visible(bActive);
pFT->set_sensitive(bActive);
- pMF->show(bActive);
+ pMF->set_visible(bActive);
pMF->set_sensitive(bActive);
// set measurement unit and number of decimal places
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 34f93b949ecc..089a7f525dc4 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -354,19 +354,19 @@ void PlaceEditDialog::SelectType(bool bSkipSeparator)
}
if (m_xCurrentDetails.get())
- m_xCurrentDetails->show(false);
+ m_xCurrentDetails->set_visible(false);
const int nPos = m_xLBServerType->get_active( );
m_xCurrentDetails = m_aDetailsContainers[nPos];
m_nCurrentType = nPos;
- m_xCurrentDetails->show();
+ m_xCurrentDetails->set_visible(true);
- m_xCBPassword->show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
- m_xEDPassword->show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
- m_xFTPasswordLabel->show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
- m_xEDUsername->show( m_xCurrentDetails->enableUserCredentials() );
- m_xFTUsernameLabel->show( m_xCurrentDetails->enableUserCredentials() );
+ m_xCBPassword->set_visible( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
+ m_xEDPassword->set_visible( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
+ m_xFTPasswordLabel->set_visible( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
+ m_xEDUsername->set_visible( m_xCurrentDetails->enableUserCredentials() );
+ m_xFTUsernameLabel->set_visible( m_xCurrentDetails->enableUserCredentials() );
m_xDialog->resize_to_request();
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 3e87457d533c..e65150b7cff5 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -51,7 +51,7 @@ DetailsContainer::~DetailsContainer( )
{
}
-void DetailsContainer::show( bool )
+void DetailsContainer::set_visible( bool )
{
m_pDialog->m_xDetailsGrid->set_sensitive(true);
@@ -88,17 +88,17 @@ HostDetailsContainer::HostDetailsContainer(PlaceEditDialog* pDialog, sal_uInt16
m_nDefaultPort( nPort ),
m_sScheme( sScheme )
{
- show( false );
+ set_visible( false );
}
-void HostDetailsContainer::show( bool bShow )
+void HostDetailsContainer::set_visible( bool bShow )
{
- m_pDialog->m_xFTHost->show( bShow );
- m_pDialog->m_xHostBox->show( bShow );
- m_pDialog->m_xEDRoot->show( bShow );
- m_pDialog->m_xFTRoot->show( bShow );
+ m_pDialog->m_xFTHost->set_visible( bShow );
+ m_pDialog->m_xHostBox->set_visible( bShow );
+ m_pDialog->m_xEDRoot->set_visible( bShow );
+ m_pDialog->m_xFTRoot->set_visible( bShow );
- DetailsContainer::show( bShow );
+ DetailsContainer::set_visible( bShow );
if ( bShow )
{
@@ -156,17 +156,17 @@ DavDetailsContainer::DavDetailsContainer(PlaceEditDialog* pBuilder)
{
m_pDialog->m_xCBDavs->connect_toggled(LINK(this, DavDetailsContainer, ToggledDavsHdl));
- show( false );
+ set_visible( false );
}
-void DavDetailsContainer::show( bool bShow )
+void DavDetailsContainer::set_visible( bool bShow )
{
- HostDetailsContainer::show( bShow );
+ HostDetailsContainer::set_visible( bShow );
if ( !bShow )
m_pDialog->m_xCBDavs->set_active(false);
- m_pDialog->m_xCBDavs->show(bShow);
+ m_pDialog->m_xCBDavs->set_visible(bShow);
}
bool DavDetailsContainer::verifyScheme( const OUString& rScheme )
@@ -207,7 +207,7 @@ SmbDetailsContainer::SmbDetailsContainer(PlaceEditDialog* pDialog)
{
m_pDialog->m_xEDShare->connect_changed( LINK( this, DetailsContainer, ValueChangeHdl ) );
- show( false );
+ set_visible( false );
}
INetURLObject SmbDetailsContainer::getUrl( )
@@ -257,15 +257,15 @@ bool SmbDetailsContainer::setUrl( const INetURLObject& rUrl )
return bSuccess;
}
-void SmbDetailsContainer::show( bool bShow )
+void SmbDetailsContainer::set_visible( bool bShow )
{
- m_pDialog->m_xEDShare->show( bShow );
- m_pDialog->m_xFTShare->show( bShow );
- m_pDialog->m_xEDRoot->show( bShow );
- m_pDialog->m_xFTRoot->show( bShow );
+ m_pDialog->m_xEDShare->set_visible( bShow );
+ m_pDialog->m_xFTShare->set_visible( bShow );
+ m_pDialog->m_xEDRoot->set_visible( bShow );
+ m_pDialog->m_xFTRoot->set_visible( bShow );
- m_pDialog->m_xFTHost->show( bShow );
- m_pDialog->m_xHostBox->show( bShow );
+ m_pDialog->m_xFTHost->set_visible( bShow );
+ m_pDialog->m_xHostBox->set_visible( bShow );
m_pDialog->m_xEDPort->set_sensitive( !bShow );
m_pDialog->m_xFTPort->set_sensitive( !bShow );
@@ -287,10 +287,10 @@ CmisDetailsContainer::CmisDetailsContainer(PlaceEditDialog* pParentDialog, OUStr
InteractionHandler::createWithParent(xContext, m_xParentDialog), UNO_QUERY);
m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() );
- show( false );
+ set_visible( false );
}
-void CmisDetailsContainer::show( bool bShow )
+void CmisDetailsContainer::set_visible( bool bShow )
{
m_pDialog->m_xLBRepository->connect_changed( LINK( this, CmisDetailsContainer, SelectRepoHdl ) );
m_pDialog->m_xBTRepoRefresh->connect_clicked( LINK( this, CmisDetailsContainer, RefreshReposHdl ) );
@@ -301,24 +301,24 @@ void CmisDetailsContainer::show( bool bShow )
|| m_sBinding.startsWith( ALFRESCO_CLOUD_BASE_URL )
|| ( m_sBinding == ONEDRIVE_BASE_URL ) )
{
- m_pDialog->m_xFTHost->show( false );
- m_pDialog->m_xHostBox->show( false );
- m_pDialog->m_xFTRepository->show( false );
- m_pDialog->m_xRepositoryBox->show( false );
- m_pDialog->m_xEDRoot->show( false );
- m_pDialog->m_xFTRoot->show( false );
+ m_pDialog->m_xFTHost->hide();
+ m_pDialog->m_xHostBox->hide();
+ m_pDialog->m_xFTRepository->hide();
+ m_pDialog->m_xRepositoryBox->hide();
+ m_pDialog->m_xEDRoot->hide();
+ m_pDialog->m_xFTRoot->hide();
}
else
{
- m_pDialog->m_xFTHost->show( bShow );
- m_pDialog->m_xHostBox->show( bShow );
- m_pDialog->m_xFTRepository->show( bShow );
- m_pDialog->m_xRepositoryBox->show( bShow );
- m_pDialog->m_xEDRoot->show( bShow );
- m_pDialog->m_xFTRoot->show( bShow );
+ m_pDialog->m_xFTHost->set_visible( bShow );
+ m_pDialog->m_xHostBox->set_visible( bShow );
+ m_pDialog->m_xFTRepository->set_visible( bShow );
+ m_pDialog->m_xRepositoryBox->set_visible( bShow );
+ m_pDialog->m_xEDRoot->set_visible( bShow );
+ m_pDialog->m_xFTRoot->set_visible( bShow );
}
- DetailsContainer::show( bShow );
+ DetailsContainer::set_visible( bShow );
m_pDialog->m_xEDPort->set_sensitive( !bShow );
m_pDialog->m_xFTPort->set_sensitive( !bShow );
}
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index d297231d65df..c2abda3193d8 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -975,8 +975,8 @@ void AssignmentPersistentData::ImplCommit()
// an invisible left hand side column, too. But right now, the left hand side controls are always
// visible)
bool bHideRightColumn = pRightColumnLabel->isEmpty();
- (*pRightLabelControl)->show(!bHideRightColumn);
- (*pRightListControl)->show(!bHideRightColumn);
+ (*pRightLabelControl)->set_visible(!bHideRightColumn);
+ (*pRightListControl)->set_visible(!bHideRightColumn);
// the new selections of the listboxes
implSelectField(pLeftListControl->get(), *pLeftAssignment);
implSelectField(pRightListControl->get(), *pRightAssignment);
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index aed17b36ff4e..03afe9eef0ad 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -40,7 +40,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter,
}
pBox->set_sensitive(nCount != 0);
- pPropBtn->show( pPrinter->HasSupport( PrinterSupport::SetupDialog ) );
+ pPropBtn->set_visible( pPrinter->HasSupport( PrinterSupport::SetupDialog ) );
}
@@ -244,7 +244,7 @@ PrinterSetupDialog::~PrinterSetupDialog()
void PrinterSetupDialog::SetOptionsHdl(const Link<weld::Button&, void>& rLink)
{
m_xBtnOptions->connect_clicked(rLink);
- m_xBtnOptions->show(rLink.IsSet());
+ m_xBtnOptions->set_visible(rLink.IsSet());
}
void PrinterSetupDialog::ImplSetInfo()
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 9fe7f811d9eb..120aa86dbd72 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -342,7 +342,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet )
const SfxPoolItem* pExt2 = GetItem(*rSet, SID_ATTR_PAGE_EXT2);
if (dynamic_cast<const SfxBoolItem*>(pExt1) && dynamic_cast<const SfxBoolItem*>(pExt2) )
bIsCalc = true;
- m_xCntSharedFirstBox->show(!bIsCalc);
+ m_xCntSharedFirstBox->set_visible(!bIsCalc);
// Evaluate header-/footer- attributes
const SvxSetItem* pSetItem = nullptr;
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();
}
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index ca92ca48b32d..55590a1b613c 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -193,7 +193,7 @@ public:
void ShowBalance(bool bShow)
{
- m_xBalanceColsCB->show(bShow);
+ m_xBalanceColsCB->set_visible(bShow);
}
void SetInSection(bool bSet);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c2c5ea026936..82bae7894824 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -295,11 +295,6 @@ public:
return m_xWidget->IsEnabled();
}
- virtual void set_visible(bool visible) override
- {
- m_xWidget->Show(visible);
- }
-
virtual bool get_visible() const override
{
return m_xWidget->IsVisible();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 488db5a24fb6..15f3a780df83 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1516,11 +1516,6 @@ public:
return gtk_widget_get_sensitive(m_pWidget);
}
- virtual void set_visible(bool visible) override
- {
- gtk_widget_set_visible(m_pWidget, visible);
- }
-
virtual bool get_visible() const override
{
return gtk_widget_get_visible(m_pWidget);
@@ -6608,14 +6603,6 @@ public:
return aRet;
}
- virtual void set_visible(bool visible) override
- {
- GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
- if (GTK_IS_SCROLLED_WINDOW(pParent))
- gtk_widget_set_visible(pParent, visible);
- gtk_widget_set_visible(m_pWidget, visible);
- }
-
virtual void show() override
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 05c37d478b05..d0bd4ff9a616 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -632,23 +632,23 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
bool bAllCertsValid = (nValidCerts == nInfos);
bool bShowValidState = nInfos && (bAllSigsValid && bAllCertsValid && bAllNewSignatures);
- m_xSigsValidImg->show( bShowValidState);
- m_xSigsValidFI->show( bShowValidState );
+ m_xSigsValidImg->set_visible( bShowValidState);
+ m_xSigsValidFI->set_visible( bShowValidState );
bool bShowInvalidState = nInfos && !bAllSigsValid;
- m_xSigsInvalidImg->show( bShowInvalidState );
- m_xSigsInvalidFI->show( bShowInvalidState );
+ m_xSigsInvalidImg->set_visible( bShowInvalidState );
+ m_xSigsInvalidFI->set_visible( bShowInvalidState );
bool bShowNotValidatedState = nInfos && bAllSigsValid && !bAllCertsValid;
- m_xSigsNotvalidatedImg->show(bShowNotValidatedState);
- m_xSigsNotvalidatedFI->show(bShowNotValidatedState);
+ m_xSigsNotvalidatedImg->set_visible(bShowNotValidatedState);
+ m_xSigsNotvalidatedFI->set_visible(bShowNotValidatedState);
//bAllNewSignatures is always true if we are not in document mode
bool bShowOldSignature = nInfos && bAllSigsValid && bAllCertsValid && !bAllNewSignatures;
- m_xSigsOldSignatureImg->show(bShowOldSignature);
- m_xSigsOldSignatureFI->show(bShowOldSignature);
+ m_xSigsOldSignatureImg->set_visible(bShowOldSignature);
+ m_xSigsOldSignatureFI->set_visible(bShowOldSignature);
SignatureHighlightHdl(*m_xSignaturesLB);
}
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index febd07d1b58d..3e61b21dfa2a 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -358,14 +358,14 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(weld::Container* pP
m_aTrustedAuthors = m_pDlg->m_aSecOptions.GetTrustedAuthors();
mbAuthorsReadonly = m_pDlg->m_aSecOptions.IsReadOnly( SvtSecurityOptions::EOption::MacroTrustedAuthors );
- m_xTrustCertROFI->show(mbAuthorsReadonly);
+ m_xTrustCertROFI->set_visible(mbAuthorsReadonly);
m_xTrustCertLB->set_sensitive(!mbAuthorsReadonly);
FillCertLB();
css::uno::Sequence< OUString > aSecureURLs = m_pDlg->m_aSecOptions.GetSecureURLs();
mbURLsReadonly = m_pDlg->m_aSecOptions.IsReadOnly( SvtSecurityOptions::EOption::SecureUrls );
- m_xTrustFileROFI->show(mbURLsReadonly);
+ m_xTrustFileROFI->set_visible(mbURLsReadonly);
m_xTrustFileLocLB->set_sensitive(!mbURLsReadonly);
m_xAddLocPB->set_sensitive(!mbURLsReadonly);
More information about the Libreoffice-commits
mailing list