diff options
Diffstat (limited to 'toolkit/source/controls')
| -rw-r--r-- | toolkit/source/controls/grid/sortablegriddatamodel.cxx | 3 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index c8a5acdd8ae9..9f7edd97a369 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -552,7 +552,8 @@ void lcl_clear( STLCONTAINER& i_container ) // get predicate object ::std::unique_ptr< ::comphelper::IKeyPredicateLess > const pPredicate( ::comphelper::getStandardLessPredicate( dataType, m_collator ) ); - ENSURE_OR_RETURN_FALSE( pPredicate.get(), "SortableGridDataModel::impl_reIndex_nothrow: no sortable data found!" ); + ENSURE_OR_RETURN_FALSE( + pPredicate, "SortableGridDataModel::impl_reIndex_nothrow: no sortable data found!"); // then sort CellDataLessComparison const aComparator( aColumnData, *pPredicate, i_sortAscending ); diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 69aaa59d3d19..e27ec6da790e 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1312,7 +1312,7 @@ void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& r { if ( ( pHandles[n] >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( pHandles[n] <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { - if ( !pFD.get() ) + if (!pFD) { css::uno::Any* pProp = &maData[ BASEPROPERTY_FONTDESCRIPTOR ]; pFD.reset( new awt::FontDescriptor ); @@ -1339,7 +1339,7 @@ void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& r // same as a few lines above // Don't merge FD property into array, as it is sorted - if ( pFD.get() ) + if (pFD) { css::uno::Any aValue; aValue <<= *pFD; |