summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/evoab2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-28 16:43:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-31 22:00:27 +0200
commit90ac4671c13ed4f548bb4188355b02217b9e24ba (patch)
treeb07d9238cbe7b7d39530b6e18875196278790368 /connectivity/source/drivers/evoab2
parentd62d07b3d29014f76c0d676c891cbafa80d0765f (diff)
make IntlWrapper arg to GetPresentation non-implicit and non-optional
which requires explicitly adding null in 1) SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemSet* p2ndSet) where SdrItemBrowserControl is only used by SdrItemBrowser and the only use of that is within DBG_UTIL in SdrPaintView 2) SwCursorShell::GetContentAtPos( const Point& rPt, within a #ifdef DBG_UTIL block in 3) SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, bool bSrchFlag ) const where the other branch uses SvxResId 4) SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const 5) XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const looks very much like all uses (outside the dumpers) are intended to be in the ui locale results in that INetContentTypes::GetPresentation always called with UI Locale Change-Id: I5a110c107838b4db3c355476426d6532f2b6ce52 Reviewed-on: https://gerrit.libreoffice.org/40538 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity/source/drivers/evoab2')
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 52bc5b567de1..6fc4365e0f21 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -86,9 +86,9 @@ struct ComparisonData
const SortDescriptor& rSortOrder;
IntlWrapper aIntlWrapper;
- ComparisonData( const SortDescriptor& _rSortOrder, const Reference< XComponentContext >& _rxContext )
- :rSortOrder( _rSortOrder )
- ,aIntlWrapper( _rxContext, SvtSysLocale().GetLanguageTag() )
+ ComparisonData(const SortDescriptor& _rSortOrder)
+ : rSortOrder(_rSortOrder)
+ , aIntlWrapper(SvtSysLocale().GetUILanguageTag())
{
}
};
@@ -695,8 +695,8 @@ void OEvoabResultSet::construct( const QueryData& _rData )
if ( m_pVersionHelper->hasContacts() && !_rData.aSortOrder.empty() )
{
- ComparisonData aCompData( _rData.aSortOrder, comphelper::getComponentContext(getConnection()->getDriver().getMSFactory()) );
- m_pVersionHelper->sortContacts( aCompData );
+ ComparisonData aCompData(_rData.aSortOrder);
+ m_pVersionHelper->sortContacts(aCompData);
}
}
m_nLength = m_pVersionHelper->getNumContacts();