summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-03-15 11:19:51 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-03-16 01:01:33 +0100
commite3e6f43bc8c01ca6c3ad87180db2b3e623d8eed4 (patch)
tree6a3f041c5073bc05e21ff3d1e4f0b194ba655df3 /chart2
parent8a8c029244e8a27efd92017968313c2116a9776a (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.cxx6
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx16
-rw-r--r--chart2/source/controller/dialogs/res_Titles.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx20
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx22
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx12
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx32
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx22
12 files changed, 72 insertions, 82 deletions
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