diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-30 21:42:00 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-30 23:54:45 +0200 |
| commit | 0472978510569d52d41ac1daa87d7251d6041812 (patch) | |
| tree | 95ee43e069e5aa215cc98b64c2ed62c50e5c14d3 /sw | |
| parent | 1fc1d74ce397e8f92757aa88093286a56d78ac5f (diff) | |
No need to store these OUStrings in class object
Change-Id: I96ff3ff8eda5ffb96432c519a9584d7d1d82b332
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/uibase/inc/mailmrge.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/core/uibase/inc/mailmrge.hxx b/sw/source/core/uibase/inc/mailmrge.hxx index e93b16cb4850..b312e056093e 100644 --- a/sw/source/core/uibase/inc/mailmrge.hxx +++ b/sw/source/core/uibase/inc/mailmrge.hxx @@ -105,8 +105,6 @@ class SwMailMergeDlg : public SvxStandardDialog SwWrtShell& rSh; SwModuleOptions* pModOpt; - OUString rDBName; - OUString rTableName; sal_uInt16 nMergeType; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aSelection; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index e3e4abf53841..8f9be8ac2067 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -192,8 +192,6 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, pImpl (new SwMailMergeDlg_Impl), rSh (rShell), - rDBName (rSourceName), - rTableName (rTblName), nMergeType (DBMGR_MERGE_MAILING), m_aDialogSize( GetSizePixel() ) { @@ -288,9 +286,9 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, Sequence<PropertyValue> aProperties(3); PropertyValue* pProperties = aProperties.getArray(); pProperties[0].Name = "DataSourceName"; - pProperties[0].Value <<= rDBName; + pProperties[0].Value <<= rSourceName; pProperties[1].Name = "Command"; - pProperties[1].Value <<= rTableName; + pProperties[1].Value <<= rTblName; pProperties[2].Name = "CommandType"; pProperties[2].Value <<= nCommandType; xD->dispatch(aURL, aProperties); @@ -356,9 +354,9 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); if(_xConnection.is()) - pNewDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTableName); + pNewDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTblName); else - pNewDBMgr->GetColumnNames(&aAddressFldLB, rDBName, rTableName); + pNewDBMgr->GetColumnNames(&aAddressFldLB, rSourceName, rTblName); for(sal_Int32 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); ++nEntry) aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry)); |