[Libreoffice-commits] core.git: sw/inc sw/source
Tor Lillqvist
tml at collabora.com
Mon Apr 21 22:17:21 PDT 2014
sw/inc/dbmgr.hxx | 10 -
sw/inc/doc.hxx | 8 -
sw/inc/editsh.hxx | 4
sw/inc/swabstdlg.hxx | 4
sw/source/core/bastyp/calc.cxx | 4
sw/source/core/doc/docfld.cxx | 12 +-
sw/source/core/doc/docnew.cxx | 2
sw/source/core/edit/edfld.cxx | 2
sw/source/core/fields/dbfld.cxx | 8 -
sw/source/core/fields/docufld.cxx | 2
sw/source/core/uibase/app/applab.cxx | 2
sw/source/core/uibase/dbui/dbmgr.cxx | 154 ++++++++++++++--------------
sw/source/core/uibase/dbui/mmconfigitem.cxx | 4
sw/source/core/uibase/fldui/xfldui.cxx | 2
sw/source/core/uibase/inc/label.hxx | 6 -
sw/source/core/uibase/inc/unomailmerge.hxx | 4
sw/source/core/uibase/shells/textsh2.cxx | 10 -
sw/source/core/uibase/uiview/view2.cxx | 4
sw/source/core/uibase/uno/unodispatch.cxx | 2
sw/source/core/uibase/uno/unomailmerge.cxx | 2
sw/source/core/uibase/utlui/initui.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 4
sw/source/ui/dbui/dbinsdlg.cxx | 8 -
sw/source/ui/dialog/swdlgfact.cxx | 2
sw/source/ui/dialog/swdlgfact.hxx | 2
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/label1.cxx | 4
sw/source/ui/envelp/mailmrge.cxx | 4
sw/source/ui/envelp/swuilabimp.hxx | 6 -
sw/source/ui/fldui/changedb.cxx | 2
sw/source/ui/fldui/flddb.cxx | 2
31 files changed, 142 insertions(+), 142 deletions(-)
New commits:
commit b166e7af2bc3f6750b1f56adf004a115229d4c2d
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 22 08:05:48 2014 +0300
There is nothing "new" with SwNewDBMgr any more
Change-Id: I28c48be099ba680a5d6ea91981a1e1bfadff3f84
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index a3ee375..82ffe44 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -173,11 +173,11 @@ struct SwMergeDescriptor
};
-struct SwNewDBMgr_Impl;
+struct SwDBMgr_Impl;
class SwConnectionDisposedListener_Impl;
class AbstractMailMergeDlg;
-class SW_DLLPUBLIC SwNewDBMgr
+class SW_DLLPUBLIC SwDBMgr
{
friend class SwConnectionDisposedListener_Impl;
@@ -194,7 +194,7 @@ friend class SwConnectionDisposedListener_Impl;
sal_Bool bMergeLock : 1; /**< prevent update of database fields while document is
actually printed at the SwViewShell */
SwDSParamArr aDataSourceParams;
- SwNewDBMgr_Impl* pImpl;
+ SwDBMgr_Impl* pImpl;
const SwXMailMerge* pMergeEvtSrc; ///< != 0 if mail merge events are to be send
SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate);
@@ -214,8 +214,8 @@ friend class SwConnectionDisposedListener_Impl;
SAL_DLLPRIVATE sal_Bool ToNextRecord(SwDSParam* pParam);
public:
- SwNewDBMgr();
- ~SwNewDBMgr();
+ SwDBMgr();
+ ~SwDBMgr();
/// MailMergeEvent source
const SwXMailMerge * GetMailMergeEvtSrc() const { return pMergeEvtSrc; }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 19929d2..ac3556d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -132,7 +132,7 @@ class GraphicObject;
class SwGrfFmtColl;
class SwGrfFmtColls;
class SwLineNumberInfo;
-class SwNewDBMgr;
+class SwDBMgr;
class SwNoTxtNode;
class SwNodeIndex;
class SwNodeRange;
@@ -315,7 +315,7 @@ class SW_DLLPUBLIC SwDoc :
SwDocUpdtFld *mpUpdtFlds; //< Struct for updating fields
SwFldTypes *mpFldTypes;
- SwNewDBMgr *mpNewDBMgr; /**< Pointer to the new DBMgr for
+ SwDBMgr *mpNewDBMgr; /**< Pointer to the new DBMgr for
evaluation of DB-fields. */
VirtualDevice *mpVirDev; //< can be used for formatting
@@ -1144,8 +1144,8 @@ public:
const Point* pPt = 0 ) const;
// Database and DB-Manager
- void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { mpNewDBMgr = pNewMgr; }
- SwNewDBMgr* GetNewDBMgr() const { return mpNewDBMgr; }
+ void SetNewDBMgr( SwDBMgr* pNewMgr ) { mpNewDBMgr = pNewMgr; }
+ SwDBMgr* GetNewDBMgr() const { return mpNewDBMgr; }
void ChangeDBFields( const std::vector<OUString>& rOldNames,
const OUString& rNewName );
void SetInitDBFields(sal_Bool b);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index e87219c..09721b3 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -52,7 +52,7 @@ class SvxAutoCorrect;
class SwField;
class SwFieldType;
class SwDDEFieldType;
-class SwNewDBMgr;
+class SwDBMgr;
struct SwDocStat;
class SwAutoCompleteWord;
@@ -393,7 +393,7 @@ public:
void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
/// For evaluation of DB fields (new DB-manager).
- SwNewDBMgr* GetNewDBMgr() const;
+ SwDBMgr* GetNewDBMgr() const;
SwFieldType* InsertFldType(const SwFieldType &);
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c6695612..3d17742 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -65,7 +65,7 @@ struct SwDBData;
class SwField;
class Printer;
class SwLabItem;
-class SwNewDBMgr;
+class SwDBMgr;
class SwTableFUNC;
class SwChildWinWrapper;
struct SfxChildWinInfo;
@@ -353,7 +353,7 @@ public:
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0;
virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
- SwNewDBMgr* pNewDBMgr, bool bLabel) = 0;
+ SwDBMgr* pNewDBMgr, bool bLabel) = 0;
virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 4840c16..4e3c139 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -517,7 +517,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins )
if( !ins )
{
- SwNewDBMgr *pMgr = rDoc.GetNewDBMgr();
+ SwDBMgr *pMgr = rDoc.GetNewDBMgr();
OUString sDBName(GetDBName( sTmpName ));
OUString sSourceName(sDBName.getToken(0, DB_DELIM));
@@ -579,7 +579,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins )
if( sColumnName.equalsIgnoreAsciiCase(
SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ))
{
- SwNewDBMgr *pMgr = rDoc.GetNewDBMgr();
+ SwDBMgr *pMgr = rDoc.GetNewDBMgr();
OUString sDBName(GetDBName( sTmpName ));
OUString sSourceName(sDBName.getToken(0, DB_DELIM));
OUString sTableName(sDBName.getToken(0, ';').getToken(1, DB_DELIM));
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 844e64b..a609091 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1016,7 +1016,7 @@ static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
}
static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
- SwNewDBMgr* pMgr )
+ SwDBMgr* pMgr )
{
const SwTxtFld* pTxtFld = rSGEFld.GetTxtFld();
if( !pTxtFld )
@@ -1078,7 +1078,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC );
mbNewFldLst = false;
- SwNewDBMgr* pMgr = GetNewDBMgr();
+ SwDBMgr* pMgr = GetNewDBMgr();
pMgr->CloseAll(sal_False);
if( !mpUpdtFlds->GetSortLst()->empty() )
@@ -1099,7 +1099,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
mpUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC );
mbNewFldLst = false;
- SwNewDBMgr* pMgr = GetNewDBMgr();
+ SwDBMgr* pMgr = GetNewDBMgr();
pMgr->CloseAll(sal_False);
for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin();
@@ -1259,7 +1259,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
OUString sDBNumNm( SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) );
// already set the current record number
- SwNewDBMgr* pMgr = GetNewDBMgr();
+ SwDBMgr* pMgr = GetNewDBMgr();
pMgr->CloseAll(sal_False);
// Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have.
@@ -1517,7 +1517,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
{
- SwNewDBMgr* pMgr = GetNewDBMgr();
+ SwDBMgr* pMgr = GetNewDBMgr();
sal_uInt16 nFldType = rDBFld.Which();
@@ -1742,7 +1742,7 @@ void SwDoc::GetAllUsedDB( std::vector<OUString>& rDBNameList,
void SwDoc::GetAllDBNames( std::vector<OUString>& rAllDBNames )
{
- SwNewDBMgr* pMgr = GetNewDBMgr();
+ SwDBMgr* pMgr = GetNewDBMgr();
const SwDSParamArr& rArr = pMgr->GetDSParamArray();
for(sal_uInt16 i = 0; i < rArr.size(); i++)
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 8bea815..81e606e 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -399,7 +399,7 @@ SwDoc::SwDoc()
maStatsUpdateTimer.SetTimeoutHdl( LINK( this, SwDoc, DoIdleStatsUpdate ) );
// Create DBMgr
- mpNewDBMgr = new SwNewDBMgr;
+ mpNewDBMgr = new SwDBMgr;
// create TOXTypes
InitTOXTypes();
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index e7d34db..2d2b2c3 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -369,7 +369,7 @@ void SwEditShell::UpdateExpFlds(sal_Bool bCloseDB)
EndAllAction();
}
-SwNewDBMgr* SwEditShell::GetNewDBMgr() const
+SwDBMgr* SwEditShell::GetNewDBMgr() const
{
return GetDoc()->GetNewDBMgr();
}
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index a59cdf1..f656e8f 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -265,7 +265,7 @@ SwFieldType* SwDBField::ChgTyp( SwFieldType* pNewType )
/// get current field value and cache it
void SwDBField::Evaluate()
{
- SwNewDBMgr* pMgr = GetDoc()->GetNewDBMgr();
+ SwDBMgr* pMgr = GetDoc()->GetNewDBMgr();
// first delete
bValidValue = false;
@@ -571,7 +571,7 @@ SwField* SwDBNextSetField::Copy() const
void SwDBNextSetField::Evaluate(SwDoc* pDoc)
{
- SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
+ SwDBMgr* pMgr = pDoc->GetNewDBMgr();
const SwDBData& rData = GetDBData();
if( !bCondValid ||
!pMgr || !pMgr->IsDataSourceOpen(rData.sDataSource, rData.sCommand, sal_False))
@@ -660,7 +660,7 @@ SwField* SwDBNumSetField::Copy() const
void SwDBNumSetField::Evaluate(SwDoc* pDoc)
{
- SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
+ SwDBMgr* pMgr = pDoc->GetNewDBMgr();
const SwDBData& aTmpData = GetDBData();
if( bCondValid && pMgr && pMgr->IsInMerge() &&
@@ -814,7 +814,7 @@ OUString SwDBSetNumberField::Expand() const
void SwDBSetNumberField::Evaluate(SwDoc* pDoc)
{
- SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
+ SwDBMgr* pMgr = pDoc->GetNewDBMgr();
const SwDBData& aTmpData = GetDBData();
if (!pMgr || !pMgr->IsInMerge() ||
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index bf28048..65d9960 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1366,7 +1366,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
if( TYP_CONDTXTFLD == nSubType )
{
- SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
+ SwDBMgr* pMgr = pDoc->GetNewDBMgr();
bValid = sal_False;
OUString sTmpName = (bCanToggle && !bIsHidden) ? aTRUETxt : aFALSETxt;
diff --git a/sw/source/core/uibase/app/applab.cxx b/sw/source/core/uibase/app/applab.cxx
index 4118e70..77b61f2 100644
--- a/sw/source/core/uibase/app/applab.cxx
+++ b/sw/source/core/uibase/app/applab.cxx
@@ -158,7 +158,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
static sal_uInt16 nBCTitleNo = 0;
// Create DB-Manager
- boost::scoped_ptr<SwNewDBMgr> pNewDBMgr(new SwNewDBMgr);
+ boost::scoped_ptr<SwDBMgr> pNewDBMgr(new SwDBMgr);
// Read SwLabItem from Config
SwLabCfgItem aLabCfg(bLabel);
diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx
index f0c368f..80b6f38 100644
--- a/sw/source/core/uibase/dbui/dbmgr.cxx
+++ b/sw/source/core/uibase/dbui/dbmgr.cxx
@@ -206,22 +206,22 @@ void lcl_CopyCompatibilityOptions( SwWrtShell& rSourceShell, SwWrtShell& rTarget
class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1
< lang::XEventListener >
{
- SwNewDBMgr& rDBMgr;
+ SwDBMgr& rDBMgr;
virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
public:
- SwConnectionDisposedListener_Impl(SwNewDBMgr& rMgr);
+ SwConnectionDisposedListener_Impl(SwDBMgr& rMgr);
virtual ~SwConnectionDisposedListener_Impl();
};
-struct SwNewDBMgr_Impl
+struct SwDBMgr_Impl
{
SwDSParam* pMergeData;
AbstractMailMergeDlg* pMergeDialog;
uno::Reference<lang::XEventListener> xDisposeListener;
- SwNewDBMgr_Impl(SwNewDBMgr& rDBMgr)
+ SwDBMgr_Impl(SwDBMgr& rDBMgr)
:pMergeData(0)
,pMergeDialog(0)
,xDisposeListener(new SwConnectionDisposedListener_Impl(rDBMgr))
@@ -233,7 +233,7 @@ static void lcl_InitNumberFormatter(SwDSParam& rParam, uno::Reference<XDataSourc
uno::Reference<XComponentContext> xContext = ::comphelper::getProcessComponentContext();
rParam.xFormatter = uno::Reference<util::XNumberFormatter>(util::NumberFormatter::create(xContext), UNO_QUERY);
if(!xSource.is())
- xSource = SwNewDBMgr::getDataSourceAsParent(rParam.xConnection, rParam.sDataSource);
+ xSource = SwDBMgr::getDataSourceAsParent(rParam.xConnection, rParam.sDataSource);
uno::Reference<XPropertySet> xSourceProps(xSource, UNO_QUERY);
if(xSourceProps.is())
@@ -296,7 +296,7 @@ static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam,
SwDBFormatData aFormatData;
if(!pParam->xFormatter.is())
{
- uno::Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(
+ uno::Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(
pParam->xConnection,pParam->sDataSource);
lcl_InitNumberFormatter(*pParam, xSource );
}
@@ -305,14 +305,14 @@ static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam,
aFormatData.aLocale = LanguageTag( (LanguageType)nLanguage ).getLocale();
- rResult = SwNewDBMgr::GetDBField( xColumnProps, aFormatData, pNumber);
+ rResult = SwDBMgr::GetDBField( xColumnProps, aFormatData, pNumber);
return sal_True;
};
/*--------------------------------------------------------------------
Description: import data
--------------------------------------------------------------------*/
-sal_Bool SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
+sal_Bool SwDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
{
OSL_ENSURE(!bInMerge && !pImpl->pMergeData, "merge already activated!");
@@ -395,7 +395,7 @@ sal_Bool SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
OSL_FAIL("exception in MergeNew()");
}
- uno::Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(xConnection,aData.sDataSource);
+ uno::Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(xConnection,aData.sDataSource);
lcl_InitNumberFormatter(*pImpl->pMergeData, xSource);
@@ -447,7 +447,7 @@ sal_Bool SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc )
/*--------------------------------------------------------------------
Description: import data
--------------------------------------------------------------------*/
-sal_Bool SwNewDBMgr::Merge(SwWrtShell* pSh)
+sal_Bool SwDBMgr::Merge(SwWrtShell* pSh)
{
pSh->StartAllAction();
@@ -459,7 +459,7 @@ sal_Bool SwNewDBMgr::Merge(SwWrtShell* pSh)
return sal_True;
}
-void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh )
+void SwDBMgr::ImportFromConnection( SwWrtShell* pSh )
{
if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB)
{
@@ -523,7 +523,7 @@ static OUString lcl_FindColumn(const OUString& sFormatStr,sal_uInt16 &nUsedPos
return sReturn;
}
-void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
+void SwDBMgr::ImportDBEntry(SwWrtShell* pSh)
{
if(pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB)
{
@@ -595,7 +595,7 @@ void SwNewDBMgr::ImportDBEntry(SwWrtShell* pSh)
/*--------------------------------------------------------------------
Description: fill Listbox with tablelist
--------------------------------------------------------------------*/
-sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
+sal_Bool SwDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
{
sal_Bool bRet = sal_False;
OUString sOldTableName(pListBox->GetSelectEntry());
@@ -646,7 +646,7 @@ sal_Bool SwNewDBMgr::GetTableNames(ListBox* pListBox, const OUString& rDBName)
/*--------------------------------------------------------------------
Description: fill Listbox with column names of a database
--------------------------------------------------------------------*/
-sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox,
+sal_Bool SwDBMgr::GetColumnNames(ListBox* pListBox,
const OUString& rDBName, const OUString& rTableName, sal_Bool bAppend)
{
if (!bAppend)
@@ -664,7 +664,7 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox,
OUString sDBName(rDBName);
xConnection = RegisterConnection( sDBName );
}
- uno::Reference< XColumnsSupplier> xColsSupp = SwNewDBMgr::GetColumnSupplier(xConnection, rTableName);
+ uno::Reference< XColumnsSupplier> xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
if(xColsSupp.is())
{
uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
@@ -679,13 +679,13 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox,
return(sal_True);
}
-sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox,
+sal_Bool SwDBMgr::GetColumnNames(ListBox* pListBox,
uno::Reference< XConnection> xConnection,
const OUString& rTableName, sal_Bool bAppend)
{
if (!bAppend)
pListBox->Clear();
- uno::Reference< XColumnsSupplier> xColsSupp = SwNewDBMgr::GetColumnSupplier(xConnection, rTableName);
+ uno::Reference< XColumnsSupplier> xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
if(xColsSupp.is())
{
uno::Reference<XNameAccess> xCols = xColsSupp->getColumns();
@@ -703,19 +703,19 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox,
/*--------------------------------------------------------------------
Description: CTOR
--------------------------------------------------------------------*/
-SwNewDBMgr::SwNewDBMgr()
+SwDBMgr::SwDBMgr()
: bCancel(false)
, bInitDBFields(false)
, bSingleJobs(false)
, bInMerge(false)
, bMergeSilent(false)
, bMergeLock(false)
- , pImpl(new SwNewDBMgr_Impl(*this))
+ , pImpl(new SwDBMgr_Impl(*this))
, pMergeEvtSrc(NULL)
{
}
-SwNewDBMgr::~SwNewDBMgr()
+SwDBMgr::~SwDBMgr()
{
for(sal_uInt16 nPos = 0; nPos < aDataSourceParams.size(); nPos++)
{
@@ -821,7 +821,7 @@ static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell )
rWorkShell.SetLabelDoc( sal_False );
}
-sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
+sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
const SwMergeDescriptor& rMergeDescriptor)
{
//check if the doc is synchronized and contains at least one linked section
@@ -941,7 +941,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
PrintMonitor aPrtMonDlg(&pSourceShell->GetView().GetEditWin(), PrintMonitor::MONITOR_TYPE_PRINT);
aPrtMonDlg.m_pDocName->SetText(pSourceShell->GetView().GetDocShell()->GetTitle(22));
- aPrtMonDlg.m_pCancel->SetClickHdl(LINK(this, SwNewDBMgr, PrtCancelHdl));
+ aPrtMonDlg.m_pCancel->SetClickHdl(LINK(this, SwDBMgr, PrtCancelHdl));
if (!IsMergeSilent())
aPrtMonDlg.Show();
@@ -1038,7 +1038,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
static_cast< SwView* >(pWorkFrame->GetViewShell())->GetWrtShell();
rWorkShell.CalcLayout();
SwDoc* pWorkDoc = ((SwDocShell*)(&xWorkDocSh))->GetDoc();
- SwNewDBMgr* pOldDBMgr = pWorkDoc->GetNewDBMgr();
+ SwDBMgr* pOldDBMgr = pWorkDoc->GetNewDBMgr();
pWorkDoc->SetNewDBMgr( this );
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh));
pWorkDoc->UpdateFlds(NULL, false);
@@ -1356,24 +1356,24 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
return bNoError;
}
-void SwNewDBMgr::MergeCancel()
+void SwDBMgr::MergeCancel()
{
bCancel = sal_True;
}
-IMPL_LINK_INLINE_START( SwNewDBMgr, PrtCancelHdl, Button *, pButton )
+IMPL_LINK_INLINE_START( SwDBMgr, PrtCancelHdl, Button *, pButton )
{
pButton->GetParent()->Hide();
MergeCancel();
return 0;
}
-IMPL_LINK_INLINE_END( SwNewDBMgr, PrtCancelHdl, Button *, pButton )
+IMPL_LINK_INLINE_END( SwDBMgr, PrtCancelHdl, Button *, pButton )
/*--------------------------------------------------------------------
Description: determine the column's Numberformat and transfer
to the forwarded Formatter, if applicable.
--------------------------------------------------------------------*/
-sal_uLong SwNewDBMgr::GetColumnFmt( const OUString& rDBName,
+sal_uLong SwDBMgr::GetColumnFmt( const OUString& rDBName,
const OUString& rTableName,
const OUString& rColNm,
SvNumberFormatter* pNFmtr,
@@ -1391,7 +1391,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( const OUString& rDBName,
pImpl->pMergeData->sDataSource.equals(rDBName) && pImpl->pMergeData->sCommand.equals(rTableName))
{
xConnection = pImpl->pMergeData->xConnection;
- xSource = SwNewDBMgr::getDataSourceAsParent(xConnection,rDBName);
+ xSource = SwDBMgr::getDataSourceAsParent(xConnection,rDBName);
bUseMergeData = true;
xColsSupp = xColsSupp.query( pImpl->pMergeData->xResultSet );
}
@@ -1419,7 +1419,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( const OUString& rDBName,
bool bDispose = !xColsSupp.is();
if(bDispose)
{
- xColsSupp = SwNewDBMgr::GetColumnSupplier(xConnection, rTableName);
+ xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
}
if(xColsSupp.is())
{
@@ -1453,7 +1453,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( const OUString& rDBName,
return nRet;
}
-sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
+sal_uLong SwDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
uno::Reference< XConnection> xConnection,
uno::Reference< XPropertySet> xColumn,
SvNumberFormatter* pNFmtr,
@@ -1530,12 +1530,12 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource,
OSL_FAIL("no FormatKey property found");
}
if(bUseDefault)
- nRet = SwNewDBMgr::GetDbtoolsClient().getDefaultNumberFormat(xColumn, xDocNumberFormatTypes, aLocale);
+ nRet = SwDBMgr::GetDbtoolsClient().getDefaultNumberFormat(xColumn, xDocNumberFormatTypes, aLocale);
}
return nRet;
}
-sal_Int32 SwNewDBMgr::GetColumnType( const OUString& rDBName,
+sal_Int32 SwDBMgr::GetColumnType( const OUString& rDBName,
const OUString& rTableName,
const OUString& rColNm )
{
@@ -1560,7 +1560,7 @@ sal_Int32 SwNewDBMgr::GetColumnType( const OUString& rDBName,
}
if( !xColsSupp.is() )
{
- xColsSupp = SwNewDBMgr::GetColumnSupplier(xConnection, rTableName);
+ xColsSupp = SwDBMgr::GetColumnSupplier(xConnection, rTableName);
bDispose = true;
}
if(xColsSupp.is())
@@ -1580,14 +1580,14 @@ sal_Int32 SwNewDBMgr::GetColumnType( const OUString& rDBName,
return nRet;
}
-uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const OUString& rDataSource,
+uno::Reference< sdbc::XConnection> SwDBMgr::GetConnection(const OUString& rDataSource,
uno::Reference<XDataSource>& rxSource)
{
Reference< sdbc::XConnection> xConnection;
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
try
{
- Reference<XCompletedConnection> xComplConnection(SwNewDBMgr::GetDbtoolsClient().getDataSource(rDataSource, xContext),UNO_QUERY);
+ Reference<XCompletedConnection> xComplConnection(SwDBMgr::GetDbtoolsClient().getDataSource(rDataSource, xContext),UNO_QUERY);
if ( xComplConnection.is() )
{
rxSource.set(xComplConnection,UNO_QUERY);
@@ -1602,7 +1602,7 @@ uno::Reference< sdbc::XConnection> SwNewDBMgr::GetConnection(const OUString& rDa
return xConnection;
}
-uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection,
+uno::Reference< sdbcx::XColumnsSupplier> SwDBMgr::GetColumnSupplier(uno::Reference<sdbc::XConnection> xConnection,
const OUString& rTableOrQuery,
sal_uInt8 eTableOrQuery)
{
@@ -1626,7 +1626,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe
Reference<XRowSet> xRowSet(xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY);
OUString sDataSource;
- Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(xConnection, sDataSource);
+ Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(xConnection, sDataSource);
Reference<XPropertySet> xSourceProperties(xSource, UNO_QUERY);
if(xSourceProperties.is())
{
@@ -1650,13 +1650,13 @@ uno::Reference< sdbcx::XColumnsSupplier> SwNewDBMgr::GetColumnSupplier(uno::Refe
return xRet;
}
-OUString SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
+OUString SwDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
const SwDBFormatData& rDBFormatData,
double* pNumber)
{
uno::Reference< XColumn > xColumn(xColumnProps, UNO_QUERY);
OUString sRet;
- OSL_ENSURE(xColumn.is(), "SwNewDBMgr::::ImportDBField: illegal arguments");
+ OSL_ENSURE(xColumn.is(), "SwDBMgr::::ImportDBField: illegal arguments");
if(!xColumn.is())
return sRet;
@@ -1694,7 +1694,7 @@ OUString SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
try
{
- SwDbtoolsClient& aClient = SwNewDBMgr::GetDbtoolsClient();
+ SwDbtoolsClient& aClient = SwDBMgr::GetDbtoolsClient();
sRet = aClient.getFormattedValue(
xColumnProps,
rDBFormatData.xFormatter,
@@ -1722,7 +1722,7 @@ OUString SwNewDBMgr::GetDBField(uno::Reference<XPropertySet> xColumnProps,
}
// releases the merge data source table or query after merge is completed
-void SwNewDBMgr::EndMerge()
+void SwDBMgr::EndMerge()
{
OSL_ENSURE(bInMerge, "merge is not active");
bInMerge = sal_False;
@@ -1731,7 +1731,7 @@ void SwNewDBMgr::EndMerge()
}
// checks if a desired data source table or query is open
-sal_Bool SwNewDBMgr::IsDataSourceOpen(const OUString& rDataSource,
+sal_Bool SwDBMgr::IsDataSourceOpen(const OUString& rDataSource,
const OUString& rTableOrQuery, sal_Bool bMergeOnly)
{
if(pImpl->pMergeData)
@@ -1756,7 +1756,7 @@ sal_Bool SwNewDBMgr::IsDataSourceOpen(const OUString& rDataSource,
}
// read column data at a specified position
-sal_Bool SwNewDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
+sal_Bool SwDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& rTableName,
const OUString& rColumnName, sal_uInt32 nAbsRecordId,
long nLanguage,
OUString& rResult, double* pNumber)
@@ -1822,7 +1822,7 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& r
}
// reads the column data at the current position
-sal_Bool SwNewDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
+sal_Bool SwDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
{
if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is() || pImpl->pMergeData->bAfterSelection )
@@ -1835,13 +1835,13 @@ sal_Bool SwNewDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt1
return bRet;
}
-sal_Bool SwNewDBMgr::ToNextMergeRecord()
+sal_Bool SwDBMgr::ToNextMergeRecord()
{
OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
return ToNextRecord(pImpl->pMergeData);
}
-sal_Bool SwNewDBMgr::ToNextRecord(
+sal_Bool SwDBMgr::ToNextRecord(
const OUString& rDataSource, const OUString& rCommand, sal_Int32 /*nCommandType*/)
{
SwDSParam* pFound = 0;
@@ -1860,7 +1860,7 @@ sal_Bool SwNewDBMgr::ToNextRecord(
return ToNextRecord(pFound);
}
-sal_Bool SwNewDBMgr::ToNextRecord(SwDSParam* pParam)
+sal_Bool SwDBMgr::ToNextRecord(SwDSParam* pParam)
{
sal_Bool bRet = sal_True;
if(!pParam || !pParam->xResultSet.is() || pParam->bEndOfDB ||
@@ -1908,12 +1908,12 @@ sal_Bool SwNewDBMgr::ToNextRecord(SwDSParam* pParam)
to assure that the next page can be created in mail merge
the cursor position must be validated
---------------------------------------------------------------------------*/
-sal_Bool SwNewDBMgr::ExistsNextRecord() const
+sal_Bool SwDBMgr::ExistsNextRecord() const
{
return pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB;
}
-sal_uInt32 SwNewDBMgr::GetSelectedRecordId()
+sal_uInt32 SwDBMgr::GetSelectedRecordId()
{
sal_uInt32 nRet = 0;
OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
@@ -1929,7 +1929,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId()
return nRet;
}
-sal_Bool SwNewDBMgr::ToRecordId(sal_Int32 nSet)
+sal_Bool SwDBMgr::ToRecordId(sal_Int32 nSet)
{
OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge");
if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()|| nSet < 0)
@@ -1946,7 +1946,7 @@ sal_Bool SwNewDBMgr::ToRecordId(sal_Int32 nSet)
return bRet;
}
-sal_Bool SwNewDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery,
+sal_Bool SwDBMgr::OpenDataSource(const OUString& rDataSource, const OUString& rTableOrQuery,
sal_Int32 nCommandType, bool bCreate)
{
SwDBData aData;
@@ -2007,13 +2007,13 @@ sal_Bool SwNewDBMgr::OpenDataSource(const OUString& rDataSource, const OUString&
return pFound->xResultSet.is();
}
-uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(OUString& rDataSource)
+uno::Reference< XConnection> SwDBMgr::RegisterConnection(OUString& rDataSource)
{
- SwDSParam* pFound = SwNewDBMgr::FindDSConnection(rDataSource, sal_True);
+ SwDSParam* pFound = SwDBMgr::FindDSConnection(rDataSource, sal_True);
uno::Reference< XDataSource> xSource;
if(!pFound->xConnection.is())
{
- pFound->xConnection = SwNewDBMgr::GetConnection(rDataSource, xSource );
+ pFound->xConnection = SwDBMgr::GetConnection(rDataSource, xSource );
try
{
uno::Reference<XComponent> xComponent(pFound->xConnection, UNO_QUERY);
@@ -2027,7 +2027,7 @@ uno::Reference< XConnection> SwNewDBMgr::RegisterConnection(OUString& rDataSourc
return pFound->xConnection;
}
-sal_uInt32 SwNewDBMgr::GetSelectedRecordId(
+sal_uInt32 SwDBMgr::GetSelectedRecordId(
const OUString& rDataSource, const OUString& rTableOrQuery, sal_Int32 nCommandType)
{
sal_uInt32 nRet = 0xffffffff;
@@ -2068,7 +2068,7 @@ sal_uInt32 SwNewDBMgr::GetSelectedRecordId(
}
// close all data sources - after fields were updated
-void SwNewDBMgr::CloseAll(sal_Bool bIncludingMerge)
+void SwDBMgr::CloseAll(sal_Bool bIncludingMerge)
{
//the only thing done here is to reset the selection index
//all connections stay open
@@ -2091,7 +2091,7 @@ void SwNewDBMgr::CloseAll(sal_Bool bIncludingMerge)
}
}
-SwDSParam* SwNewDBMgr::FindDSData(const SwDBData& rData, sal_Bool bCreate)
+SwDSParam* SwDBMgr::FindDSData(const SwDBData& rData, sal_Bool bCreate)
{
//prefer merge data if available
if(pImpl->pMergeData && rData.sDataSource == pImpl->pMergeData->sDataSource &&
@@ -2140,7 +2140,7 @@ SwDSParam* SwNewDBMgr::FindDSData(const SwDBData& rData, sal_Bool bCreate)
return pFound;
}
-SwDSParam* SwNewDBMgr::FindDSConnection(const OUString& rDataSource, sal_Bool bCreate)
+SwDSParam* SwDBMgr::FindDSConnection(const OUString& rDataSource, sal_Bool bCreate)
{
//prefer merge data if available
if(pImpl->pMergeData && rDataSource == pImpl->pMergeData->sDataSource )
@@ -2176,19 +2176,19 @@ SwDSParam* SwNewDBMgr::FindDSConnection(const OUString& rDataSource, sal_Bool b
return pFound;
}
-const SwDBData& SwNewDBMgr::GetAddressDBName()
+const SwDBData& SwDBMgr::GetAddressDBName()
{
return SW_MOD()->GetDBConfig()->GetAddressSource();
}
-Sequence<OUString> SwNewDBMgr::GetExistingDatabaseNames()
+Sequence<OUString> SwDBMgr::GetExistingDatabaseNames()
{
Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext);
return xDBContext->getElementNames();
}
-OUString SwNewDBMgr::LoadAndRegisterDataSource()
+OUString SwDBMgr::LoadAndRegisterDataSource()
{
sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
@@ -2373,7 +2373,7 @@ OUString SwNewDBMgr::LoadAndRegisterDataSource()
}
-void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
+void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
const Sequence<PropertyValue>& rProperties,
sal_Bool bWithDataSourceBrowser)
{
@@ -2406,7 +2406,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
SwDSParam* pFound = 0;
if(!xConnection.is())
{
- xConnection = SwNewDBMgr::RegisterConnection(sDataSource);
+ xConnection = SwDBMgr::RegisterConnection(sDataSource);
pFound = FindDSConnection(sDataSource, sal_True);
}
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2469,7 +2469,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
pView->AttrChangedNotify( &pView->GetWrtShell() );// in order for SelectShell to be called
//set the current DBMgr
SwDoc* pWorkDoc = pView->GetWrtShell().GetDoc();
- SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
+ SwDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
pWorkDoc->SetNewDBMgr( this );
SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), pView->GetWrtShell(), aDescriptor );
@@ -2535,7 +2535,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh,
DELETEZ(pImpl->pMergeDialog);
}
-void SwNewDBMgr::InsertText(SwWrtShell& rSh,
+void SwDBMgr::InsertText(SwWrtShell& rSh,
const Sequence< PropertyValue>& rProperties)
{
OUString sDataSource, sDataTableOrQuery;
@@ -2570,7 +2570,7 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh,
if(xChild.is())
xSource = uno::Reference<XDataSource>(xChild->getParent(), UNO_QUERY);
if(!xSource.is())
- xSource = SwNewDBMgr::GetDbtoolsClient().getDataSource(sDataSource, xContext);
+ xSource = SwDBMgr::GetDbtoolsClient().getDataSource(sDataSource, xContext);
uno::Reference< XColumnsSupplier > xColSupp( xResSet, UNO_QUERY );
SwDBData aDBData;
aDBData.sDataSource = sDataSource;
@@ -2601,22 +2601,22 @@ void SwNewDBMgr::InsertText(SwWrtShell& rSh,
}
}
-SwDbtoolsClient* SwNewDBMgr::pDbtoolsClient = NULL;
+SwDbtoolsClient* SwDBMgr::pDbtoolsClient = NULL;
-SwDbtoolsClient& SwNewDBMgr::GetDbtoolsClient()
+SwDbtoolsClient& SwDBMgr::GetDbtoolsClient()
{
if ( !pDbtoolsClient )
pDbtoolsClient = new SwDbtoolsClient;
return *pDbtoolsClient;
}
-void SwNewDBMgr::RemoveDbtoolsClient()
+void SwDBMgr::RemoveDbtoolsClient()
{
delete pDbtoolsClient;
pDbtoolsClient = 0;
}
-uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const OUString& _sDataSourceName)
+uno::Reference<XDataSource> SwDBMgr::getDataSourceAsParent(const uno::Reference< XConnection>& _xConnection,const OUString& _sDataSourceName)
{
uno::Reference<XDataSource> xSource;
try
@@ -2625,7 +2625,7 @@ uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Referen
if ( xChild.is() )
xSource = uno::Reference<XDataSource>(xChild->getParent(), UNO_QUERY);
if ( !xSource.is() )
- xSource = SwNewDBMgr::GetDbtoolsClient().getDataSource(_sDataSourceName, ::comphelper::getProcessComponentContext());
+ xSource = SwDBMgr::GetDbtoolsClient().getDataSource(_sDataSourceName, ::comphelper::getProcessComponentContext());
}
catch(const Exception&)
{
@@ -2634,7 +2634,7 @@ uno::Reference<XDataSource> SwNewDBMgr::getDataSourceAsParent(const uno::Referen
return xSource;
}
-uno::Reference<XResultSet> SwNewDBMgr::createCursor(const OUString& _sDataSourceName,
+uno::Reference<XResultSet> SwDBMgr::createCursor(const OUString& _sDataSourceName,
const OUString& _sCommand,
sal_Int32 _nCommandType,
const uno::Reference<XConnection>& _xConnection
@@ -2674,7 +2674,7 @@ uno::Reference<XResultSet> SwNewDBMgr::createCursor(const OUString& _sDataSource
}
// merge all data into one resulting document and return the number of merged documents
-sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
+sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
SwView& rSourceView )
{
// check the availability of all data in the config item
@@ -2714,7 +2714,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
bCancel = sal_False;
CreateMonitor aMonitorDlg(&rSourceView.GetEditWin());
- aMonitorDlg.SetCancelHdl(LINK(this, SwNewDBMgr, PrtCancelHdl));
+ aMonitorDlg.SetCancelHdl(LINK(this, SwDBMgr, PrtCancelHdl));
if (!IsMergeSilent())
{
aMonitorDlg.Show();
@@ -2802,7 +2802,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
// merge the data
SwDoc* pWorkDoc = rWorkShell.GetDoc();
- SwNewDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
+ SwDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr();
pWorkDoc->SetNewDBMgr( this );
pWorkDoc->EmbedAllLinks();
SwUndoId nLastUndoId(UNDO_EMPTY);
@@ -2927,14 +2927,14 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
}
catch(const Exception&)
{
- OSL_FAIL("exception caught in SwNewDBMgr::MergeDocuments");
+ OSL_FAIL("exception caught in SwDBMgr::MergeDocuments");
}
DELETEZ(pImpl->pMergeData);
bInMerge = sal_False;
return nRet;
}
-SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwNewDBMgr& rMgr) :
+SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwDBMgr& rMgr) :
rDBMgr(rMgr)
{
};
diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx
index d078732..fadd827 100644
--- a/sw/source/core/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx
@@ -856,7 +856,7 @@ Reference< XColumnsSupplier> SwMailMergeConfigItem::GetColumnsSupplier()
{
if(!m_pImpl->xColumnsSupplier.is() && m_pImpl->xConnection.is())
{
- m_pImpl->xColumnsSupplier = SwNewDBMgr::GetColumnSupplier(m_pImpl->xConnection,
+ m_pImpl->xColumnsSupplier = SwDBMgr::GetColumnSupplier(m_pImpl->xConnection,
m_pImpl->aDBData.sCommand,
m_pImpl->aDBData.nCommandType == CommandType::TABLE ?
SW_DB_SELECT_TABLE : SW_DB_SELECT_QUERY );
@@ -886,7 +886,7 @@ Reference< XResultSet> SwMailMergeConfigItem::GetResultSet() const
if(!m_pImpl->xConnection.is() && !m_pImpl->aDBData.sDataSource.isEmpty())
{
m_pImpl->xConnection.reset(
- SwNewDBMgr::GetConnection( m_pImpl->aDBData.sDataSource, m_pImpl->xSource ),
+ SwDBMgr::GetConnection( m_pImpl->aDBData.sDataSource, m_pImpl->xSource ),
SharedConnection::TakeOwnership
);
}
diff --git a/sw/source/core/uibase/fldui/xfldui.cxx b/sw/source/core/uibase/fldui/xfldui.cxx
index 000a5b7..8c2f2c9 100644
--- a/sw/source/core/uibase/fldui/xfldui.cxx
+++ b/sw/source/core/uibase/fldui/xfldui.cxx
@@ -55,7 +55,7 @@ sal_Bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQry
{
sal_Bool bNumeric = sal_True;
- SwNewDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetNewDBMgr() :
+ SwDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetNewDBMgr() :
::GetActiveView()->GetWrtShell().GetNewDBMgr();
OUString sSource(rDBName);
diff --git a/sw/source/core/uibase/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx
index 7934bfa..9141d7e 100644
--- a/sw/source/core/uibase/inc/label.hxx
+++ b/sw/source/core/uibase/inc/label.hxx
@@ -28,13 +28,13 @@ class SwLabRec;
class SwLabRecs;
class SwLabItem;
class SwLabPrtPage;
-class SwNewDBMgr;
+class SwDBMgr;
class Printer;
class SwLabDlg : public SfxTabDialog
{
SwLabelConfig aLabelsCfg;
- SwNewDBMgr* pNewDBMgr;
+ SwDBMgr* pNewDBMgr;
SwLabPrtPage* pPrtPage;
std::vector<sal_uInt16> aTypeIds;
@@ -56,7 +56,7 @@ class SwLabDlg : public SfxTabDialog
public:
SwLabDlg( Window* pParent, const SfxItemSet& rSet,
- SwNewDBMgr* pNewDBMgr, sal_Bool bLabel);
+ SwDBMgr* pNewDBMgr, sal_Bool bLabel);
virtual ~SwLabDlg();
SwLabRec* GetRecord(const OUString &rRecName, sal_Bool bCont);
diff --git a/sw/source/core/uibase/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx
index 8126d82..2050ba8 100644
--- a/sw/source/core/uibase/inc/unomailmerge.hxx
+++ b/sw/source/core/uibase/inc/unomailmerge.hxx
@@ -59,7 +59,7 @@ namespace com { namespace sun { namespace star {
typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32>
OPropertyListenerContainerHelper;
-class SwNewDBMgr;
+class SwDBMgr;
class MailMergeExecuteFinalizer;
class SwXMailMerge :
@@ -122,7 +122,7 @@ class SwXMailMerge :
com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSaveFilterData;
sal_Bool bDisposing;
- SwNewDBMgr *m_pMgr;
+ SwDBMgr *m_pMgr;
void launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
diff --git a/sw/source/core/uibase/shells/textsh2.cxx b/sw/source/core/uibase/shells/textsh2.cxx
index ebd67d2..7e3ac10 100644
--- a/sw/source/core/uibase/shells/textsh2.cxx
+++ b/sw/source/core/uibase/shells/textsh2.cxx
@@ -86,7 +86,7 @@ struct DBTextStruct_Impl
void SwTextShell::ExecDB(SfxRequest &rReq)
{
const SfxItemSet *pArgs = rReq.GetArgs();
- SwNewDBMgr* pNewDBMgr = GetShell().GetNewDBMgr();
+ SwDBMgr* pNewDBMgr = GetShell().GetNewDBMgr();
sal_uInt16 nSlot = rReq.GetSlot();
OUString sSourceArg, sCommandArg;
sal_Int32 nCommandTypeArg = 0;
@@ -168,7 +168,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
sal_Bool bDisposeResultSet = sal_False;
if ( !xCursor.is() )
{
- xCursor = SwNewDBMgr::createCursor(sSourceArg,sCommandArg,nCommandTypeArg,xConnection);
+ xCursor = SwDBMgr::createCursor(sSourceArg,sCommandArg,nCommandTypeArg,xConnection);
bDisposeResultSet = xCursor.is();
}
@@ -241,20 +241,20 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct )
{
bool bDispose = false;
Reference< sdbc::XConnection> xConnection = pDBStruct->xConnection;
- Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource);
+ Reference<XDataSource> xSource = SwDBMgr::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource);
// #111987# the connection is disposed an so no parent has been found
if(xConnection.is() && !xSource.is())
return 0;
if ( !xConnection.is() )
{
- xConnection = SwNewDBMgr::GetConnection(pDBStruct->aDBData.sDataSource, xSource);
+ xConnection = SwDBMgr::GetConnection(pDBStruct->aDBData.sDataSource, xSource);
bDispose = true;
}
Reference< XColumnsSupplier> xColSupp;
if(xConnection.is())
- xColSupp = SwNewDBMgr::GetColumnSupplier(xConnection,
+ xColSupp = SwDBMgr::GetColumnSupplier(xConnection,
pDBStruct->aDBData.sCommand,
pDBStruct->aDBData.nCommandType == CommandType::QUERY ?
SW_DB_SELECT_QUERY : SW_DB_SELECT_TABLE);
diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index 9350cfa..20aa003 100644
--- a/sw/source/core/uibase/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
@@ -1091,7 +1091,7 @@ void SwView::Execute(SfxRequest &rReq)
SwWrtShell &rSh = GetWrtShell();
if(m_bInMailMerge && rSh.IsAnyDatabaseFieldInDoc())
{
- SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
+ SwDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
if (pNewDBMgr)
{
SwDBData aData;
@@ -2362,7 +2362,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
return ;
}
}
- SwNewDBMgr* pNewDBMgr = GetWrtShell().GetNewDBMgr();
+ SwDBMgr* pNewDBMgr = GetWrtShell().GetNewDBMgr();
SwDBData aData;
SwWrtShell &rSh = GetWrtShell();
diff --git a/sw/source/core/uibase/uno/unodispatch.cxx b/sw/source/core/uibase/uno/unodispatch.cxx
index 31503a4..9c7ba21 100644
--- a/sw/source/core/uibase/uno/unodispatch.cxx
+++ b/sw/source/core/uibase/uno/unodispatch.cxx
@@ -206,7 +206,7 @@ void SwXDispatch::dispatch(const util::URL& aURL,
if(!m_pView)
throw uno::RuntimeException();
SwWrtShell& rSh = m_pView->GetWrtShell();
- SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
+ SwDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
if(aURL.Complete.equalsAscii(cURLInsertContent))
{
::svx::ODataAccessDescriptor aDescriptor(aArgs);
diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index 1ecafb7..2934903 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -669,7 +669,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
throw IllegalArgumentException("Invalid value of property: OutputType", static_cast < cppu::OWeakObject * > ( this ), 0 );
}
- SwNewDBMgr* pMgr = rSh.GetNewDBMgr();
+ SwDBMgr* pMgr = rSh.GetNewDBMgr();
//force layout creation
rSh.CalcLayout();
OSL_ENSURE( pMgr, "database manager missing" );
diff --git a/sw/source/core/uibase/utlui/initui.cxx b/sw/source/core/uibase/utlui/initui.cxx
index 11d6caf..eea83f0 100644
--- a/sw/source/core/uibase/utlui/initui.cxx
+++ b/sw/source/core/uibase/utlui/initui.cxx
@@ -146,7 +146,7 @@ std::vector<OUString>* pAuthFieldTypeList = 0;
void _FinitUI()
{
- SwNewDBMgr::RemoveDbtoolsClient();
+ SwDBMgr::RemoveDbtoolsClient();
delete SwViewShell::GetShellRes();
SwViewShell::SetShellRes( 0 );
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 65e0a1b..3fbafc8 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl)
{
- const OUString sNewSource = SwNewDBMgr::LoadAndRegisterDataSource();
+ const OUString sNewSource = SwDBMgr::LoadAndRegisterDataSource();
if(!sNewSource.isEmpty())
{
SvTreeListEntry* pNewSource = m_pListLB->InsertEntry(sNewSource);
@@ -594,7 +594,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
m_xDBContext->getByName(m_aDBData.sDataSource) >>= xSourceProperties;
pUserData->sURL = lcl_getFlatURL( xSourceProperties );
- pUserData->xColumnsSupplier = SwNewDBMgr::GetColumnSupplier(pUserData->xConnection,
+ pUserData->xColumnsSupplier = SwDBMgr::GetColumnSupplier(pUserData->xConnection,
m_aDBData.sCommand,
m_aDBData.nCommandType == CommandType::TABLE ?
SW_DB_SELECT_TABLE : SW_DB_SELECT_QUERY );
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index dae0b0f..d6dd12f 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -322,7 +322,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
}
else
{
- pNew->nDBNumFmt = SwNewDBMgr::GetDbtoolsClient().getDefaultNumberFormat(xCol,
+ pNew->nDBNumFmt = SwDBMgr::GetDbtoolsClient().getDefaultNumberFormat(xCol,
xDocNumberFormatTypes, LanguageTag( rSh.GetCurLang() ).getLocale());
}
@@ -950,7 +950,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
// we don't have a cursor, so we have to create our own RowSet
if ( !xResultSet.is() )
{
- xResultSet = SwNewDBMgr::createCursor(aDBData.sDataSource,aDBData.sCommand,aDBData.nCommandType,xConnection);
+ xResultSet = SwDBMgr::createCursor(aDBData.sDataSource,aDBData.sCommand,aDBData.nCommandType,xConnection);
bDisposeResultSet = xResultSet.is();
}
@@ -1286,7 +1286,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
Reference< XPropertySet > xColumnProps;
xCols->getByName(pDBCol->pColInfo->sColumn) >>= xColumnProps;
- pFld->SetExpansion( SwNewDBMgr::GetDBField(
+ pFld->SetExpansion( SwDBMgr::GetDBField(
xColumnProps,
aDBFormatData,
&nValue ) );
@@ -1320,7 +1320,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
double nValue = DBL_MAX;
Reference< XPropertySet > xColumnProps;
xCols->getByName(pDBCol->pColInfo->sColumn) >>= xColumnProps;
- sIns = SwNewDBMgr::GetDBField(
+ sIns = SwDBMgr::GetDBField(
xColumnProps,
aDBFormatData,
&nValue );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 06baaf3..fd15e73 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -782,7 +782,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa
}
AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
- SwNewDBMgr* pNewDBMgr, bool bLabel)
+ SwDBMgr* pNewDBMgr, bool bLabel)
{
SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pNewDBMgr, bLabel);
return new AbstractSwLabDlg_Impl(pDlg);
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index e68de8d..0bc39fc 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -403,7 +403,7 @@ public:
SwField* pField, sal_Bool bNextButton = sal_False) SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) SAL_OVERRIDE;
virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
- SwNewDBMgr* pNewDBMgr, bool bLabel) SAL_OVERRIDE;
+ SwDBMgr* pNewDBMgr, bool bLabel) SAL_OVERRIDE;
virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index a316ec1..c6a679a 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -287,7 +287,7 @@ void SwEnvPage::InitDatabaseBox()
if (pSh->GetNewDBMgr())
{
m_pDatabaseLB->Clear();
- Sequence<OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
+ Sequence<OUString> aDataNames = SwDBMgr::GetExistingDatabaseNames();
const OUString* pDataNames = aDataNames.getConstArray();
for (sal_Int32 i = 0; i < aDataNames.getLength(); i++)
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index b6d3427..81381ac 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -92,7 +92,7 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
}
SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
- SwNewDBMgr* pDBMgr, sal_Bool bLabel)
+ SwDBMgr* pDBMgr, sal_Bool bLabel)
: SfxTabDialog(pParent, "LabelDialog",
"modules/swriter/ui/labeldialog.ui", &rSet)
, pNewDBMgr(pDBMgr)
@@ -442,7 +442,7 @@ void SwLabPage::InitDatabaseBox()
if( GetNewDBMgr() )
{
m_pDatabaseLB->Clear();
- ::com::sun::star::uno::Sequence<OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
+ ::com::sun::star::uno::Sequence<OUString> aDataNames = SwDBMgr::GetExistingDatabaseNames();
const OUString* pDataNames = aDataNames.getConstArray();
for (long i = 0; i < aDataNames.getLength(); i++)
m_pDatabaseLB->InsertEntry(pDataNames[i]);
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 5518706..80d7176 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -352,7 +352,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
aFromNF.SetMax(SAL_MAX_INT32);
aToNF.SetMax(SAL_MAX_INT32);
- SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
+ SwDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
if(_xConnection.is())
pNewDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTblName);
else
@@ -647,7 +647,7 @@ bool SwMailMergeDlg::ExecQryShell()
{
pImpl->xSelSupp->removeSelectionChangeListener( pImpl->xChgLstnr );
}
- SwNewDBMgr* pMgr = rSh.GetNewDBMgr();
+ SwDBMgr* pMgr = rSh.GetNewDBMgr();
if (aPrinterRB.IsChecked())
nMergeType = DBMGR_MERGE_MAILMERGE;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 9c61456..6b86e8a 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -24,7 +24,7 @@
class SwLabPage : public SfxTabPage
{
- SwNewDBMgr* pNewDBMgr;
+ SwDBMgr* pNewDBMgr;
OUString sActDBName;
SwLabItem aItem;
@@ -76,8 +76,8 @@ public:
void SetToBusinessCard();
void InitDatabaseBox();
- inline void SetNewDBMgr(SwNewDBMgr* pDBMgr) { pNewDBMgr = pDBMgr; }
- inline SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
+ inline void SetNewDBMgr(SwDBMgr* pDBMgr) { pNewDBMgr = pDBMgr; }
+ inline SwDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
};
class SwOneExampleFrame;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index c79bb29..4af3c05 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -261,7 +261,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl)
{
- const OUString sNewDB = SwNewDBMgr::LoadAndRegisterDataSource();
+ const OUString sNewDB = SwDBMgr::LoadAndRegisterDataSource();
if (!sNewDB.isEmpty())
m_pAvailDBTLB->AddDataSource(sNewDB);
return 0;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index f62a2db..6595751 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -460,7 +460,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl)
{
- OUString sNewDB = SwNewDBMgr::LoadAndRegisterDataSource();
+ OUString sNewDB = SwDBMgr::LoadAndRegisterDataSource();
if(!sNewDB.isEmpty())
{
m_pDatabaseTLB->AddDataSource(sNewDB);
More information about the Libreoffice-commits
mailing list