|
Lines 1753-1758
ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
Link Here
|
| 1753 |
uno::Reference< XConnection> xConnection; |
1753 |
uno::Reference< XConnection> xConnection; |
| 1754 |
sal_Bool bUseMergeData = sal_False; |
1754 |
sal_Bool bUseMergeData = sal_False; |
| 1755 |
uno::Reference< XColumnsSupplier> xColsSupp; |
1755 |
uno::Reference< XColumnsSupplier> xColsSupp; |
|
|
1756 |
bool bDisposeConnection = false; |
| 1756 |
if(pImpl->pMergeData && |
1757 |
if(pImpl->pMergeData && |
| 1757 |
pImpl->pMergeData->sDataSource.equals(rDBName) && pImpl->pMergeData->sCommand.equals(rTableName)) |
1758 |
pImpl->pMergeData->sDataSource.equals(rDBName) && pImpl->pMergeData->sCommand.equals(rTableName)) |
| 1758 |
{ |
1759 |
{ |
|
Lines 1777-1782
ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
Link Here
|
| 1777 |
{ |
1778 |
{ |
| 1778 |
rtl::OUString sDBName(rDBName); |
1779 |
rtl::OUString sDBName(rDBName); |
| 1779 |
xConnection = RegisterConnection( sDBName ); |
1780 |
xConnection = RegisterConnection( sDBName ); |
|
|
1781 |
bDisposeConnection = true; |
| 1780 |
} |
1782 |
} |
| 1781 |
if(bUseMergeData) |
1783 |
if(bUseMergeData) |
| 1782 |
pImpl->pMergeData->xConnection = xConnection; |
1784 |
pImpl->pMergeData->xConnection = xConnection; |
|
Lines 1807-1812
ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
Link Here
|
| 1807 |
{ |
1809 |
{ |
| 1808 |
::comphelper::disposeComponent( xColsSupp ); |
1810 |
::comphelper::disposeComponent( xColsSupp ); |
| 1809 |
} |
1811 |
} |
|
|
1812 |
if(bDisposeConnection) |
| 1813 |
{ |
| 1814 |
::comphelper::disposeComponent( xConnection ); |
| 1815 |
} |
| 1810 |
} |
1816 |
} |
| 1811 |
else |
1817 |
else |
| 1812 |
nRet = pNFmtr->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM ); |
1818 |
nRet = pNFmtr->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM ); |