summaryrefslogtreecommitdiff
path: root/sw/source/uibase/dbui/dbmgr.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-04-17 21:35:35 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-26 08:50:54 +0200
commitc70d49c7c888da8cfd73db8585e7be1f37fc398a (patch)
treec0e540401850018464ca76300536faf9aa7e27d2 /sw/source/uibase/dbui/dbmgr.cxx
parentcd4344d3bdef631b3e64ac12a9e64bc9670c1b7c (diff)
use strong_int for LanguageType
Change-Id: If99a944f7032180355da291ad283b4cfcea4f448 Reviewed-on: https://gerrit.libreoffice.org/36629 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/dbui/dbmgr.cxx')
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 1012e1896598..02edbcaeb0a5 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -384,7 +384,7 @@ static bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
static void lcl_GetColumnCnt(SwDSParam *pParam,
const uno::Reference< beans::XPropertySet > &rColumnProps,
- long nLanguage, OUString &rResult, double* pNumber)
+ LanguageType nLanguage, OUString &rResult, double* pNumber)
{
SwDBFormatData aFormatData;
if(!pParam->xFormatter.is())
@@ -396,13 +396,13 @@ static void lcl_GetColumnCnt(SwDSParam *pParam,
aFormatData.aNullDate = pParam->aNullDate;
aFormatData.xFormatter = pParam->xFormatter;
- aFormatData.aLocale = LanguageTag( (LanguageType)nLanguage ).getLocale();
+ aFormatData.aLocale = LanguageTag( nLanguage ).getLocale();
rResult = SwDBManager::GetDBField( rColumnProps, aFormatData, pNumber);
}
static bool lcl_GetColumnCnt(SwDSParam* pParam, const OUString& rColumnName,
- long nLanguage, OUString& rResult, double* pNumber)
+ LanguageType nLanguage, OUString& rResult, double* pNumber)
{
uno::Reference< sdbcx::XColumnsSupplier > xColsSupp( pParam->xResultSet, uno::UNO_QUERY );
uno::Reference<container::XNameAccess> xCols;
@@ -1689,7 +1689,7 @@ sal_uLong SwDBManager::GetColumnFormat( const OUString& rDBName,
const OUString& rTableName,
const OUString& rColNm,
SvNumberFormatter* pNFormatr,
- long nLanguage )
+ LanguageType nLanguage )
{
sal_uLong nRet = 0;
if(pNFormatr)
@@ -1768,7 +1768,7 @@ sal_uLong SwDBManager::GetColumnFormat( uno::Reference< sdbc::XDataSource> const
uno::Reference< sdbc::XConnection> const & xConnection,
uno::Reference< beans::XPropertySet> const & xColumn,
SvNumberFormatter* pNFormatr,
- long nLanguage )
+ LanguageType nLanguage )
{
auto xSource = xSource_in;
@@ -1788,7 +1788,7 @@ sal_uLong SwDBManager::GetColumnFormat( uno::Reference< sdbc::XDataSource> const
uno::Reference< util::XNumberFormats > xDocNumberFormats = xDocNumFormatsSupplier->getNumberFormats();
uno::Reference< util::XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, uno::UNO_QUERY);
- css::lang::Locale aLocale( LanguageTag( (LanguageType)nLanguage ).getLocale());
+ css::lang::Locale aLocale( LanguageTag( nLanguage ).getLocale());
//get the number formatter of the data source
uno::Reference<beans::XPropertySet> xSourceProps(xSource, uno::UNO_QUERY);
@@ -2061,7 +2061,7 @@ bool SwDBManager::IsDataSourceOpen(const OUString& rDataSource,
// read column data at a specified position
bool SwDBManager::GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
const OUString& rColumnName, sal_uInt32 nAbsRecordId,
- long nLanguage,
+ LanguageType nLanguage,
OUString& rResult, double* pNumber)
{
bool bRet = false;
@@ -2123,7 +2123,7 @@ bool SwDBManager::GetColumnCnt(const OUString& rSourceName, const OUString& rTab
}
// reads the column data at the current position
-bool SwDBManager::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
+bool SwDBManager::GetMergeColumnCnt(const OUString& rColumnName, LanguageType nLanguage,
OUString &rResult, double *pNumber)
{
if( !IsValidMergeRecord() )
@@ -2143,7 +2143,7 @@ bool SwDBManager::ToNextMergeRecord()
}
bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter,
- sal_uInt16 nLanguage, SwCalc &rCalc )
+ LanguageType nLanguage, SwCalc &rCalc )
{
if( !IsValidMergeRecord() )
return false;