MM: don't read column content twice to fill SwCalc

Currently we fill the SwCalc dict twice via lcl_GetColumnCnt and
GetMergeColumnCnt.

This also drops the unused nFmt argument from GetMergeColumnCnt.

Change-Id: I2f7fd1578353e919209002c0c3040adc14b08528

4 files changed, 58 insertions, 55 deletions

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index b79cda077a2c..aa6117b3871c 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -311,7 +311,7 @@ public:
     void            CloseAll(bool bIncludingMerge = true);
 
     bool            GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
-                                      OUString &rResult, double *pNumber, sal_uInt32 *pFormat);
+                                      OUString &rResult, double *pNumber);
     bool            FillCalcWithMergeData(SvNumberFormatter *pDocFormatter,
                                           sal_uInt16 nLanguage, bool asString, SwCalc &aCalc);
     bool            ToNextMergeRecord();
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index fb724d29bcdf..c81dec16341b 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -322,13 +322,13 @@ void SwDBField::Evaluate()
     if(!pMgr || !pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, true))
         return ;
 
-    sal_uInt32 nFmt;
+    sal_uInt32 nFmt = 0;
 
     // search corresponding column name
     OUString aColNm( static_cast<SwDBFieldType*>(GetTyp())->GetColumnName() );
 
     SvNumberFormatter* pDocFormatter = GetDoc()->GetNumberFormatter();
-    pMgr->GetMergeColumnCnt(aColNm, GetLanguage(), aContent, &nValue, &nFmt);
+    pMgr->GetMergeColumnCnt(aColNm, GetLanguage(), aContent, &nValue);
     if( !( nSubType & nsSwExtendedSubType::SUB_OWN_FMT ) )
         SetFormat( nFmt = pMgr->GetColumnFmt( aTmpData.sDataSource, aTmpData.sCommand,
                                         aColNm, pDocFormatter, GetLanguage() ));
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 3e02a324fe34..2a74a435394b 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1381,9 +1381,8 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
                                                 sDataTableOrQuery, false))
                 {
                     double fNumber;
-                    sal_uInt32 nTmpFormat;
                     pMgr->GetMergeColumnCnt(GetColumnName( sTmpName ),
-                        GetLanguage(), aContent, &fNumber, &nTmpFormat );
+                        GetLanguage(), aContent, &fNumber );
                     bValid = true;
                 }
                 else if( !sDBName.isEmpty() && !sDataSource.isEmpty() &&
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index fc79e8054b52..3b085cce228a 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -276,8 +276,27 @@ static bool lcl_MoveAbsolute(SwDSParam* pParam, long nAbsPos)
     return bRet;
 }
 
-static bool lcl_GetColumnCnt(SwDSParam* pParam,
-    const OUString& rColumnName, long nLanguage, OUString& rResult, double* pNumber)
+static void lcl_GetColumnCnt(SwDSParam *pParam,
+                             const uno::Reference< XPropertySet > &rColumnProps,
+                             long nLanguage, OUString &rResult, double* pNumber)
+{
+    SwDBFormatData aFormatData;
+    if(!pParam->xFormatter.is())
+    {
+        uno::Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(
+                                    pParam->xConnection,pParam->sDataSource);
+        lcl_InitNumberFormatter(*pParam, xSource );
+    }
+    aFormatData.aNullDate = pParam->aNullDate;
+    aFormatData.xFormatter = pParam->xFormatter;
+
+    aFormatData.aLocale = LanguageTag( (LanguageType)nLanguage ).getLocale();
+
+    rResult = SwDBManager::GetDBField( rColumnProps, aFormatData, pNumber);
+}
+
+static bool lcl_GetColumnCnt(SwDSParam* pParam, const OUString& rColumnName,
+                             long nLanguage, OUString& rResult, double* pNumber)
 {
     uno::Reference< XColumnsSupplier > xColsSupp( pParam->xResultSet, UNO_QUERY );
     uno::Reference<XNameAccess> xCols;
@@ -293,20 +312,7 @@ static bool lcl_GetColumnCnt(SwDSParam* pParam,
     Any aCol = xCols->getByName(rColumnName);
     uno::Reference< XPropertySet > xColumnProps;
     aCol >>= xColumnProps;
-
-    SwDBFormatData aFormatData;
-    if(!pParam->xFormatter.is())
-    {
-        uno::Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(
-                                    pParam->xConnection,pParam->sDataSource);
-        lcl_InitNumberFormatter(*pParam, xSource );
-    }
-    aFormatData.aNullDate = pParam->aNullDate;
-    aFormatData.xFormatter = pParam->xFormatter;
-
-    aFormatData.aLocale = LanguageTag( (LanguageType)nLanguage ).getLocale();
-
-    rResult = SwDBManager::GetDBField( xColumnProps, aFormatData, pNumber);
+    lcl_GetColumnCnt( pParam, xColumnProps, nLanguage, rResult, pNumber );
     return true;
 };
 
@@ -1867,7 +1873,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,
-                                   OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
+                                   OUString &rResult, double *pNumber)
 {
     if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection )
     {
@@ -1912,46 +1918,44 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter,
                 continue;
             }
 
+            // get the column type
+            sal_Int32 nColumnType = DataType::SQLNULL;
+            Any aCol = xCols->getByName( pColNames[nCol] );
+            uno::Reference<XPropertySet> xColumnProps;
+            aCol >>= xColumnProps;
+            Any aType = xColumnProps->getPropertyValue( "Type" );
+            aType >>= nColumnType;
             double aNumber = DBL_MAX;
-            if( lcl_GetColumnCnt(pImpl->pMergeData, rColName, nLanguage, aString, &aNumber) )
+
+            lcl_GetColumnCnt( pImpl->pMergeData, xColumnProps, nLanguage, aString, &aNumber );
+
+            sal_uInt32 nFmt = GetColumnFmt( pImpl->pMergeData->sDataSource,
+                                            pImpl->pMergeData->sCommand,
+                                            pColNames[nCol], pDocFormatter, nLanguage );
+            // aNumber is overwritten by SwDBField::FormatValue, so store initial status
+            bool colIsNumber = aNumber != DBL_MAX;
+            bool bValidValue = SwDBField::FormatValue( pDocFormatter, aString, nFmt,
+                                                       aNumber, nColumnType, NULL );
+            if( colIsNumber )
             {
-                // get the column type
-                sal_Int32 nColumnType = DataType::SQLNULL;
-                Any aCol = xCols->getByName( pColNames[nCol] );
-                uno::Reference<XPropertySet> xCol;
-                aCol >>= xCol;
-                Any aType = xCol->getPropertyValue( "Type" );
-                aType >>= nColumnType;
-
-                sal_uInt32 nFmt;
-                if( !GetMergeColumnCnt(pColNames[nCol], nLanguage, aString, &aNumber, &nFmt) )
-                    continue;
-
-                // aNumber is overwritten by SwDBField::FormatValue, so store initial status
-                bool colIsNumber = aNumber != DBL_MAX;
-                bool bValidValue = SwDBField::FormatValue( pDocFormatter, aString, nFmt,
-                                                           aNumber, nColumnType, NULL );
-                if( colIsNumber )
-                {
-                    if( bValidValue )
-                    {
-                        SwSbxValue aValue;
-                        if( !asString )
-                            aValue.PutDouble( aNumber );
-                        else
-                            aValue.PutString( aString );
-                        SAL_INFO( "sw.dbmgr", "'" << pColNames[nCol] << "': " << aNumber << " / " << aString );
-                        rCalc.VarChange( pColNames[nCol], aValue );
-                    }
-                }
-                else
+                if( bValidValue )
                 {
                     SwSbxValue aValue;
-                    aValue.PutString( aString );
-                    SAL_INFO( "sw.dbmgr", "'" << pColNames[nCol] << "': " << aString );
+                    if( !asString )
+                        aValue.PutDouble( aNumber );
+                    else
+                        aValue.PutString( aString );
+                    SAL_INFO( "sw.dbmgr", "'" << pColNames[nCol] << "': " << aNumber << " / " << aString );
                     rCalc.VarChange( pColNames[nCol], aValue );
                 }
             }
+            else
+            {
+                SwSbxValue aValue;
+                aValue.PutString( aString );
+                SAL_INFO( "sw.dbmgr", "'" << pColNames[nCol] << "': " << aString );
+                rCalc.VarChange( pColNames[nCol], aValue );
+            }
         }
         return bExistsNextRecord;
     }