diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-19 10:19:05 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-19 11:04:15 +0200 |
| commit | bd204222480e97717287cffcbfa9dc98f4852f27 (patch) | |
| tree | ab327245ddeb1f6b9b116934287b7b1f2ce7742f /forms | |
| parent | 2e488d7bd3b71e588cd1862a56c489dd7070474c (diff) | |
Disambiguate needlessly overloaded OGridControlModel::createColumn
Change-Id: Ie12370fbd0b1d5aaacd56d6e21de29b6134d9741
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Grid.cxx | 6 | ||||
| -rw-r--r-- | forms/source/component/Grid.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 6b7409240dc6..81f923db76fb 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -318,9 +318,9 @@ Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& { SolarMutexGuard g; const Sequence< OUString >& rColumnTypes = frm::getColumnTypes(); - return createColumn( ::detail::findPos( ColumnType, rColumnTypes ) ); + return createColumnById( ::detail::findPos( ColumnType, rColumnTypes ) ); } -Reference<XPropertySet> OGridControlModel::createColumn(sal_Int32 nTypeId) const +Reference<XPropertySet> OGridControlModel::createColumnById(sal_Int32 nTypeId) const { Reference<XPropertySet> xReturn; switch (nTypeId) @@ -880,7 +880,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t // reading the model names OUString sModelName; _rxInStream >> sModelName; - Reference<XPropertySet> xCol(createColumn(getColumnTypeByModelName(sModelName))); + Reference<XPropertySet> xCol(createColumnById(getColumnTypeByModelName(sModelName))); DBG_ASSERT(xCol.is(), "OGridControlModel::read : unknown column type !"); sal_Int32 nObjLen = _rxInStream->readLong(); if (nObjLen) diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index a2f7d4771299..a5ed51e6a98d 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -182,7 +182,7 @@ protected: ElementDescription* _pElement ) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createColumn(sal_Int32 nTypeId) const; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createColumnById(sal_Int32 nTypeId) const; static OGridColumn* getColumnImplementation(const InterfaceRef& _rxIFace); |