summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-03-08 10:47:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-03-08 10:44:29 +0100
commitb8fe96f1da2c42c04a8094ca8c57d49763b7bded (patch)
treed2b1852c89f1776ef8ee25bbb99c6bd74a1ae984 /extensions
parent7960ccb41db49a7883afa036b820a7b7ffcb4a89 (diff)
loplugin:constantparam in desktop..i18npool
Change-Id: Ie2e1004c1ccc03777a8da9cb1144e89eb28ff313 Reviewed-on: https://gerrit.libreoffice.org/50928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx20
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx14
-rw-r--r--extensions/source/propctrlr/handlerhelper.hxx17
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx2
6 files changed, 23 insertions, 34 deletions
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 478d0674c930..99eb2076d118 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -451,7 +451,7 @@ namespace pcr
aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, false, true );
break;
case PropertyControlType::ComboBox:
- aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, false, true );
+ aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, true );
break;
default:
aDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, false );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index a24eb5cf1868..77123d2c3b51 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1163,7 +1163,7 @@ namespace pcr
Optional< double > aValueNotPresent( false, 0 );
aDescriptor.Control = PropertyHandlerHelper::createNumericControl(
- _rxControlFactory, nDigits, aValueNotPresent, aValueNotPresent, false );
+ _rxControlFactory, nDigits, aValueNotPresent, aValueNotPresent );
Reference< XNumericControl > xNumericControl( aDescriptor.Control, UNO_QUERY_THROW );
if ( nValueUnit != -1 )
@@ -1187,10 +1187,10 @@ namespace pcr
|| ( nPropId == PROPERTY_ID_SHOW_FILTERSORT )
)
{
- aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_SHOWHIDE, SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE), false, false);
+ aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_SHOWHIDE, SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE), false);
}
else
- aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), false, false);
+ aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), false);
bNeedDefaultStringIfVoidAllowed = true;
}
@@ -1232,7 +1232,7 @@ namespace pcr
// create the control
if ( PROPERTY_ID_TARGET_FRAME == nPropId )
- aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, false, false );
+ aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, false );
else
{
aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, false, false );
@@ -1272,7 +1272,7 @@ namespace pcr
aMinValue.Value = 0;
aDescriptor.Control = PropertyHandlerHelper::createNumericControl(
- _rxControlFactory, 0, aMinValue, aMaxValue, false );
+ _rxControlFactory, 0, aMinValue, aMaxValue );
}
break;
@@ -1282,7 +1282,7 @@ namespace pcr
Optional< double > aMaxValue( true, 20 );
aDescriptor.Control = PropertyHandlerHelper::createNumericControl(
- _rxControlFactory, 0, aMinValue, aMaxValue, false );
+ _rxControlFactory, 0, aMinValue, aMaxValue );
}
break;
@@ -1299,7 +1299,7 @@ namespace pcr
aListEntries.resize( aDatasources.getLength() );
std::copy( aDatasources.begin(), aDatasources.end(), aListEntries.begin() );
aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl(
- _rxControlFactory, aListEntries, false, true );
+ _rxControlFactory, aListEntries, true );
}
break;
@@ -1308,7 +1308,7 @@ namespace pcr
std::vector< OUString > aFieldNames;
impl_initFieldList_nothrow( aFieldNames );
aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl(
- _rxControlFactory, aFieldNames, false, false );
+ _rxControlFactory, aFieldNames, false );
}
break;
@@ -2406,7 +2406,7 @@ namespace pcr
else
impl_fillQueryNames_throw( aNames );
}
- _out_rProperty.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aNames, false, true );
+ _out_rProperty.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aNames, true );
}
break;
@@ -2516,7 +2516,7 @@ namespace pcr
else
impl_fillTableNames_throw( aListEntries );
}
- _out_rDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, false, false );
+ _out_rDescriptor.Control = PropertyHandlerHelper::createComboBoxControl( _rxControlFactory, aListEntries, false );
}
break;
case ListSourceType_SQL:
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 926f5aa12237..28097d3623a6 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -459,7 +459,7 @@ namespace pcr
Optional< double > aZero( true, 0 );
Optional< double > aValueNotPresent( false, 0 );
aLineDesc.Control = PropertyHandlerHelper::createNumericControl(
- _rxControlFactory, 2, bIsSize ? aZero : aValueNotPresent, aValueNotPresent, false );
+ _rxControlFactory, 2, bIsSize ? aZero : aValueNotPresent, aValueNotPresent );
Reference< XNumericControl > xNumericControl( aLineDesc.Control, UNO_QUERY_THROW );
xNumericControl->setValueUnit( MeasureUnit::MM_100TH );
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index e89612e75c70..ddebb7de3632 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -71,7 +71,7 @@ namespace pcr
// special handling for booleans (this will become a list)
if ( _rProperty.Type.getTypeClass() == TypeClass_BOOLEAN )
{
- _out_rDescriptor.Control = createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), bReadOnlyControl, false);
+ _out_rDescriptor.Control = createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), bReadOnlyControl);
return;
}
@@ -145,26 +145,26 @@ namespace pcr
}
Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
- const char** pTransIds, size_t nElements, bool _bReadOnlyControl, bool _bSorted )
+ const char** pTransIds, size_t nElements, bool _bReadOnlyControl )
{
std::vector<OUString> aInitialListEntries;
for (size_t i = 0; i < nElements; ++i)
aInitialListEntries.push_back(PcrRes(pTransIds[i]));
- return lcl_implCreateListLikeControl(_rxControlFactory, aInitialListEntries, _bReadOnlyControl, _bSorted, true);
+ return lcl_implCreateListLikeControl(_rxControlFactory, aInitialListEntries, _bReadOnlyControl, /*_bSorted*/false, true);
}
Reference< XPropertyControl > PropertyHandlerHelper::createComboBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
- const std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted )
+ const std::vector< OUString >& _rInitialListEntries, bool _bSorted )
{
- return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, false );
+ return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, /*_bReadOnlyControl*/false, _bSorted, false );
}
Reference< XPropertyControl > PropertyHandlerHelper::createNumericControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
- sal_Int16 _nDigits, const Optional< double >& _rMinValue, const Optional< double >& _rMaxValue, bool _bReadOnlyControl )
+ sal_Int16 _nDigits, const Optional< double >& _rMinValue, const Optional< double >& _rMaxValue )
{
Reference< XNumericControl > xNumericControl(
- _rxControlFactory->createPropertyControl( PropertyControlType::NumericField, _bReadOnlyControl ),
+ _rxControlFactory->createPropertyControl( PropertyControlType::NumericField, /*_bReadOnlyControl*/false ),
UNO_QUERY_THROW
);
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index eaf15afbbeb9..63904bf776de 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -98,7 +98,7 @@ namespace pcr
);
/** creates an <member scope="css::inspection">PropertyControlType::ListBox</member>-type control
- and fills it with initial values
+ and fills it with initial values.
@param _rxControlFactory
A control factory. Must not be <NULL/>.
@@ -112,9 +112,6 @@ namespace pcr
@param _bReadOnlyControl
determines whether the control should be read-only
- @param _bSorted
- determines whether the list entries should be sorted
-
@return
the newly created control
*/
@@ -122,8 +119,7 @@ namespace pcr
createListBoxControl(
const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory,
const char** pTransIds, size_t nElements,
- bool _bReadOnlyControl,
- bool _bSorted
+ bool _bReadOnlyControl
);
/** creates an <member scope="css::inspection">PropertyControlType::ComboBox</member>-type control
@@ -135,9 +131,6 @@ namespace pcr
@param _rInitialListEntries
the initial values of the control
- @param _bReadOnlyControl
- determines whether the control should be read-only
-
@param _bSorted
determines whether the list entries should be sorted
@@ -148,7 +141,6 @@ namespace pcr
createComboBoxControl(
const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory,
const std::vector< OUString >& _rInitialListEntries,
- bool _bReadOnlyControl,
bool _bSorted
);
@@ -166,8 +158,6 @@ namespace pcr
@param _rMaxValue
maximum value which can be entered in the control
(<member scope="css::inspection">XNumericControl::MaxValue</member>)
- @param _bReadOnlyControl
- determines whether the control should be read-only
@return
the newly created control
@@ -177,8 +167,7 @@ namespace pcr
const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory,
sal_Int16 _nDigits,
const css::beans::Optional< double >& _rMinValue,
- const css::beans::Optional< double >& _rMaxValue,
- bool _bReadOnlyControl
+ const css::beans::Optional< double >& _rMaxValue
);
/** marks the document passed in our UNO context as modified
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 2f5d063ddc4d..ad398327b989 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -403,7 +403,7 @@ namespace pcr
aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, false, false );
break;
case PropertyControlType::NumericField:
- aDescriptor.Control = PropertyHandlerHelper::createNumericControl( _rxControlFactory, 0, aMinValue, aMaxValue, false );
+ aDescriptor.Control = PropertyHandlerHelper::createNumericControl( _rxControlFactory, 0, aMinValue, aMaxValue );
break;
default:
aDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, false );