Kaydet (Commit) e3e6f43b authored tarafından Caolán McNamara's avatar Caolán McNamara

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: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 8a8c0292
......@@ -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();
......
......@@ -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 )
......
......@@ -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;
......
......@@ -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(
......
......@@ -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()
......
......@@ -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);
......
......@@ -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)
......
......@@ -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();
}
......
......@@ -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);
}
}
}
......
......@@ -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();
}
}
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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());
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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();
......
......@@ -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();
......
......@@ -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()
......
......@@ -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 );
}
......
......@@ -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 );