sw/inc/doc.hxx | 6 +++--- sw/inc/editsh.hxx | 2 +- sw/inc/swabstdlg.hxx | 2 +- sw/source/core/bastyp/calc.cxx | 4 ++-- sw/source/core/doc/docfld.cxx | 24 ++++++++++++------------ sw/source/core/doc/docnew.cxx | 4 ++-- sw/source/core/edit/edfld.cxx | 6 +++--- sw/source/core/fields/dbfld.cxx | 8 ++++---- sw/source/core/fields/docufld.cxx | 2 +- sw/source/core/uibase/app/applab.cxx | 4 ++-- sw/source/core/uibase/dbui/dbmgr.cxx | 18 +++++++++--------- sw/source/core/uibase/dbui/dbtree.cxx | 2 +- sw/source/core/uibase/fldui/fldmgr.cxx | 4 ++-- sw/source/core/uibase/fldui/xfldui.cxx | 4 ++-- sw/source/core/uibase/inc/label.hxx | 4 ++-- sw/source/core/uibase/shells/textsh2.cxx | 6 +++--- sw/source/core/uibase/uiview/view2.cxx | 12 ++++++------ sw/source/core/uibase/uno/unodispatch.cxx | 6 +++--- sw/source/core/uibase/uno/unomailmerge.cxx | 2 +- sw/source/ui/dbui/mailmergewizard.cxx | 2 +- sw/source/ui/dbui/mmpreparemergepage.cxx | 2 +- sw/source/ui/dialog/swdlgfact.cxx | 4 ++-- sw/source/ui/dialog/swdlgfact.hxx | 2 +- sw/source/ui/envelp/envlop1.cxx | 10 +++++----- sw/source/ui/envelp/label1.cxx | 18 +++++++++--------- sw/source/ui/envelp/mailmrge.cxx | 8 ++++---- sw/source/ui/envelp/swuilabimp.hxx | 6 +++--- 27 files changed, 86 insertions(+), 86 deletions(-)
New commits: commit 043bbbf1988e8a5b719e0fa4cab9c576dc2deeec Author: Tor Lillqvist <t...@collabora.com> Date: Tue Apr 22 10:05:49 2014 +0300 There is nothing "new" with SwNewDBMgr any more Change-Id: Icbf3d5663a358bf31b58ab8086ffe9160c26bf8f diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index ac3556d..cfff535 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -315,7 +315,7 @@ class SW_DLLPUBLIC SwDoc : SwDocUpdtFld *mpUpdtFlds; //< Struct for updating fields SwFldTypes *mpFldTypes; - SwDBMgr *mpNewDBMgr; /**< Pointer to the new DBMgr for + SwDBMgr *mpDBMgr; /**< Pointer to the 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( SwDBMgr* pNewMgr ) { mpNewDBMgr = pNewMgr; } - SwDBMgr* GetNewDBMgr() const { return mpNewDBMgr; } + void SetDBMgr( SwDBMgr* pNewMgr ) { mpDBMgr = pNewMgr; } + SwDBMgr* GetDBMgr() const { return mpDBMgr; } 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 09721b3..70c18cb 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -393,7 +393,7 @@ public: void SetFldUpdateFlags( SwFldUpdateFlags eFlags ); /// For evaluation of DB fields (new DB-manager). - SwDBMgr* GetNewDBMgr() const; + SwDBMgr* GetDBMgr() const; SwFieldType* InsertFldType(const SwFieldType &); diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 3d17742..4a3c4b7 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -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, - SwDBMgr* pNewDBMgr, bool bLabel) = 0; + SwDBMgr* pDBMgr, bool bLabel) = 0; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0; diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 4c3a68e..1237428 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -516,7 +516,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins ) if( !ins ) { #if HAVE_FEATURE_DBCONNECTIVITY - SwDBMgr *pMgr = rDoc.GetNewDBMgr(); + SwDBMgr *pMgr = rDoc.GetDBMgr(); OUString sDBName(GetDBName( sTmpName )); OUString sSourceName(sDBName.getToken(0, DB_DELIM)); @@ -580,7 +580,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, sal_uInt16 ins ) SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) )) { #if HAVE_FEATURE_DBCONNECTIVITY - SwDBMgr *pMgr = rDoc.GetNewDBMgr(); + SwDBMgr *pMgr = rDoc.GetDBMgr(); 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 21b5652..25a0e2b 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -352,7 +352,7 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) if( bCloseDB ) { #if HAVE_FEATURE_DBCONNECTIVITY - GetNewDBMgr()->CloseAll(); + GetDBMgr()->CloseAll(); #endif } // Only evaluate on full update @@ -1093,7 +1093,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld ) #if !HAVE_FEATURE_DBCONNECTIVITY SwDBMgr* pMgr = NULL; #else - SwDBMgr* pMgr = GetNewDBMgr(); + SwDBMgr* pMgr = GetDBMgr(); pMgr->CloseAll(sal_False); #endif @@ -1119,7 +1119,7 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt ) #if !HAVE_FEATURE_DBCONNECTIVITY SwDBMgr* pMgr = NULL; #else - SwDBMgr* pMgr = GetNewDBMgr(); + SwDBMgr* pMgr = GetDBMgr(); pMgr->CloseAll(sal_False); #endif @@ -1283,7 +1283,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds ) OUString sDBNumNm( SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ); // already set the current record number - SwDBMgr* pMgr = GetNewDBMgr(); + SwDBMgr* pMgr = GetDBMgr(); pMgr->CloseAll(sal_False); #endif @@ -1556,7 +1556,7 @@ void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc ) (void) rDBFld; (void) rCalc; #else - SwDBMgr* pMgr = GetNewDBMgr(); + SwDBMgr* pMgr = GetDBMgr(); sal_uInt16 nFldType = rDBFld.Which(); @@ -1687,7 +1687,7 @@ const SwDBData& SwDoc::GetDBDesc() } } if(maDBData.sDataSource.isEmpty()) - maDBData = GetNewDBMgr()->GetAddressDBName(); + maDBData = GetDBMgr()->GetAddressDBName(); #endif return maDBData; } @@ -1697,7 +1697,7 @@ void SwDoc::SetInitDBFields( sal_Bool b ) #if !HAVE_FEATURE_DBCONNECTIVITY (void) b; #else - GetNewDBMgr()->SetInitDBFields( b ); + GetDBMgr()->SetInitDBFields( b ); #endif } @@ -1802,7 +1802,7 @@ void SwDoc::GetAllDBNames( std::vector<OUString>& rAllDBNames ) #if !HAVE_FEATURE_DBCONNECTIVITY (void) rAllDBNames; #else - SwDBMgr* pMgr = GetNewDBMgr(); + SwDBMgr* pMgr = GetDBMgr(); const SwDSParamArr& rArr = pMgr->GetDSParamArray(); for(sal_uInt16 i = 0; i < rArr.size(); i++) @@ -1877,7 +1877,7 @@ void SwDoc::AddUsedDBToList( std::vector<OUString>& rDBNameList, const OUString& aData.sDataSource = rDBName.getToken(0, DB_DELIM); aData.sCommand = rDBName.getToken(1, DB_DELIM); aData.nCommandType = -1; - GetNewDBMgr()->CreateDSData(aData); + GetDBMgr()->CreateDSData(aData); rDBNameList.push_back(rDBName); #endif } @@ -2331,7 +2331,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) const OUString sFalse("FALSE"); #if HAVE_FEATURE_DBCONNECTIVITY - bool bIsDBMgr = 0 != rDoc.GetNewDBMgr(); + bool bIsDBMgr = 0 != rDoc.GetDBMgr(); #endif sal_uInt16 nWhich, n; const SfxPoolItem* pItem; @@ -2412,7 +2412,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) SwDBData aDBData(((SwDBNumSetField*)pFld)->GetDBData(&rDoc)); if ( - (bIsDBMgr && rDoc.GetNewDBMgr()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) && + (bIsDBMgr && rDoc.GetDBMgr()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) && (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && ((SwDBNumSetField*)pFld)->IsCondValid())) ) { @@ -2425,7 +2425,7 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) SwDBData aDBData(((SwDBNextSetField*)pFld)->GetDBData(&rDoc)); if ( - (bIsDBMgr && rDoc.GetNewDBMgr()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) && + (bIsDBMgr && rDoc.GetDBMgr()->OpenDataSource(aDBData.sDataSource, aDBData.sCommand)) && (GETFLD_ALL == eGetMode || (GETFLD_CALC & eGetMode && ((SwDBNextSetField*)pFld)->IsCondValid())) ) { diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 81e606e..9680a62 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 SwDBMgr; + mpDBMgr = new SwDBMgr; // create TOXTypes InitTOXTypes(); @@ -641,7 +641,7 @@ SwDoc::~SwDoc() mpCharFmtTbl->erase( mpCharFmtTbl->begin() ); DELETEZ( mpPrt ); - DELETEZ( mpNewDBMgr ); + DELETEZ( mpDBMgr ); // All Flys need to be destroyed before the Drawing Model, // because Flys can still contain DrawContacts, when no diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index a765fbb..a136c12 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -369,16 +369,16 @@ void SwEditShell::UpdateExpFlds(sal_Bool bCloseDB) if (bCloseDB) { #if HAVE_FEATURE_DBCONNECTIVITY - GetDoc()->GetNewDBMgr()->CloseAll(); // close all database connections + GetDoc()->GetDBMgr()->CloseAll(); // close all database connections #endif } EndAllAction(); } -SwDBMgr* SwEditShell::GetNewDBMgr() const +SwDBMgr* SwEditShell::GetDBMgr() const { #if HAVE_FEATURE_DBCONNECTIVITY - return GetDoc()->GetNewDBMgr(); + return GetDoc()->GetDBMgr(); #else return NULL; #endif diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index f656e8f..a475061 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() { - SwDBMgr* pMgr = GetDoc()->GetNewDBMgr(); + SwDBMgr* pMgr = GetDoc()->GetDBMgr(); // first delete bValidValue = false; @@ -571,7 +571,7 @@ SwField* SwDBNextSetField::Copy() const void SwDBNextSetField::Evaluate(SwDoc* pDoc) { - SwDBMgr* pMgr = pDoc->GetNewDBMgr(); + SwDBMgr* pMgr = pDoc->GetDBMgr(); 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) { - SwDBMgr* pMgr = pDoc->GetNewDBMgr(); + SwDBMgr* pMgr = pDoc->GetDBMgr(); const SwDBData& aTmpData = GetDBData(); if( bCondValid && pMgr && pMgr->IsInMerge() && @@ -814,7 +814,7 @@ OUString SwDBSetNumberField::Expand() const void SwDBSetNumberField::Evaluate(SwDoc* pDoc) { - SwDBMgr* pMgr = pDoc->GetNewDBMgr(); + SwDBMgr* pMgr = pDoc->GetDBMgr(); 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 c91bf64..c90c68c 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1371,7 +1371,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc) #if !HAVE_FEATURE_DBCONNECTIVITY (void) pDoc; #else - SwDBMgr* pMgr = pDoc->GetNewDBMgr(); + SwDBMgr* pMgr = pDoc->GetDBMgr(); #endif 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 77b61f2..a029c05 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<SwDBMgr> pNewDBMgr(new SwDBMgr); + boost::scoped_ptr<SwDBMgr> pDBMgr(new SwDBMgr); // Read SwLabItem from Config SwLabCfgItem aLabCfg(bLabel); @@ -170,7 +170,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) SwAbstractDialogFactory* pDialogFactory = SwAbstractDialogFactory::Create(); OSL_ENSURE(pDialogFactory, "SwAbstractDialogFactory fail!"); - boost::scoped_ptr<AbstractSwLabDlg> pDlg(pDialogFactory->CreateSwLabDlg(0, aSet, pNewDBMgr.get(), bLabel)); + boost::scoped_ptr<AbstractSwLabDlg> pDlg(pDialogFactory->CreateSwLabDlg(0, aSet, pDBMgr.get(), bLabel)); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if ( RET_OK == pDlg->Execute() ) diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx index 80b6f38..fdb5e6c 100644 --- a/sw/source/core/uibase/dbui/dbmgr.cxx +++ b/sw/source/core/uibase/dbui/dbmgr.cxx @@ -1038,8 +1038,8 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, static_cast< SwView* >(pWorkFrame->GetViewShell())->GetWrtShell(); rWorkShell.CalcLayout(); SwDoc* pWorkDoc = ((SwDocShell*)(&xWorkDocSh))->GetDoc(); - SwDBMgr* pOldDBMgr = pWorkDoc->GetNewDBMgr(); - pWorkDoc->SetNewDBMgr( this ); + SwDBMgr* pOldDBMgr = pWorkDoc->GetDBMgr(); + pWorkDoc->SetDBMgr( this ); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh)); pWorkDoc->UpdateFlds(NULL, false); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh)); @@ -1225,7 +1225,7 @@ sal_Bool SwDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, } } } - pWorkDoc->SetNewDBMgr( pOldDBMgr ); + pWorkDoc->SetDBMgr( pOldDBMgr ); } xWorkDocSh->DoClose(); } @@ -2469,8 +2469,8 @@ void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh, pView->AttrChangedNotify( &pView->GetWrtShell() );// in order for SelectShell to be called //set the current DBMgr SwDoc* pWorkDoc = pView->GetWrtShell().GetDoc(); - SwDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr(); - pWorkDoc->SetNewDBMgr( this ); + SwDBMgr* pWorkDBMgr = pWorkDoc->GetDBMgr(); + pWorkDoc->SetDBMgr( this ); SwMergeDescriptor aMergeDesc( pImpl->pMergeDialog->GetMergeType(), pView->GetWrtShell(), aDescriptor ); aMergeDesc.sSaveToFilter = pImpl->pMergeDialog->GetSaveFilter(); @@ -2483,7 +2483,7 @@ void SwDBMgr::ExecuteFormLetter( SwWrtShell& rSh, MergeNew(aMergeDesc); - pWorkDoc->SetNewDBMgr( pWorkDBMgr ); + pWorkDoc->SetDBMgr( pWorkDBMgr ); //close the temporary file uno::Reference< util::XCloseable > xClose( xWorkDocSh->GetModel(), uno::UNO_QUERY ); if (xClose.is()) @@ -2802,8 +2802,8 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, // merge the data SwDoc* pWorkDoc = rWorkShell.GetDoc(); - SwDBMgr* pWorkDBMgr = pWorkDoc->GetNewDBMgr(); - pWorkDoc->SetNewDBMgr( this ); + SwDBMgr* pWorkDBMgr = pWorkDoc->GetDBMgr(); + pWorkDoc->SetDBMgr( this ); pWorkDoc->EmbedAllLinks(); SwUndoId nLastUndoId(UNDO_EMPTY); if (rWorkShell.GetLastUndoInfo(0, & nLastUndoId)) @@ -2904,7 +2904,7 @@ sal_Int32 SwDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, Application::Reschedule(); //restore the ole DBMgr - pWorkDoc->SetNewDBMgr( pWorkDBMgr ); + pWorkDoc->SetDBMgr( pWorkDBMgr ); //now the temporary document should be closed SfxObjectShellRef xDocSh(pWorkView->GetDocShell()); xDocSh->DoClose(); diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx index 5a26199..9ea8654 100644 --- a/sw/source/core/uibase/dbui/dbtree.cxx +++ b/sw/source/core/uibase/dbui/dbtree.cxx @@ -163,7 +163,7 @@ Reference<XConnection> SwDBTreeList_Impl::GetConnection(const OUString& rSource { SwConnectionData* pPtr = new SwConnectionData(); pPtr->sSourceName = rSourceName; - xRet = pWrtSh->GetNewDBMgr()->RegisterConnection(pPtr->sSourceName); + xRet = pWrtSh->GetDBMgr()->RegisterConnection(pPtr->sSourceName); aConnections.push_back(pPtr); } return xRet; diff --git a/sw/source/core/uibase/fldui/fldmgr.cxx b/sw/source/core/uibase/fldui/fldmgr.cxx index 7f0f587..cb7b464 100644 --- a/sw/source/core/uibase/fldui/fldmgr.cxx +++ b/sw/source/core/uibase/fldui/fldmgr.cxx @@ -1105,11 +1105,11 @@ sal_Bool SwFldMgr::InsertFld( rData.aDBColumn >>= xColumn; if(xColumn.is()) { - nFormatId = pCurShell->GetNewDBMgr()->GetColumnFmt(xSource, xConnection, xColumn, + nFormatId = pCurShell->GetDBMgr()->GetColumnFmt(xSource, xConnection, xColumn, pCurShell->GetNumberFormatter(), GetCurrLanguage() ); } else - nFormatId = pCurShell->GetNewDBMgr()->GetColumnFmt( + nFormatId = pCurShell->GetDBMgr()->GetColumnFmt( aDBData.sDataSource, aDBData.sCommand, sPar1, pCurShell->GetNumberFormatter(), GetCurrLanguage() ); } diff --git a/sw/source/core/uibase/fldui/xfldui.cxx b/sw/source/core/uibase/fldui/xfldui.cxx index 8c2f2c9..de855ca 100644 --- a/sw/source/core/uibase/fldui/xfldui.cxx +++ b/sw/source/core/uibase/fldui/xfldui.cxx @@ -55,8 +55,8 @@ sal_Bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQry { sal_Bool bNumeric = sal_True; - SwDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetNewDBMgr() : - ::GetActiveView()->GetWrtShell().GetNewDBMgr(); + SwDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetDBMgr() : + ::GetActiveView()->GetWrtShell().GetDBMgr(); OUString sSource(rDBName); Reference< XConnection> xConnection = diff --git a/sw/source/core/uibase/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx index 9141d7e..65931de 100644 --- a/sw/source/core/uibase/inc/label.hxx +++ b/sw/source/core/uibase/inc/label.hxx @@ -34,7 +34,7 @@ class Printer; class SwLabDlg : public SfxTabDialog { SwLabelConfig aLabelsCfg; - SwDBMgr* pNewDBMgr; + SwDBMgr* pDBMgr; SwLabPrtPage* pPrtPage; std::vector<sal_uInt16> aTypeIds; @@ -56,7 +56,7 @@ class SwLabDlg : public SfxTabDialog public: SwLabDlg( Window* pParent, const SfxItemSet& rSet, - SwDBMgr* pNewDBMgr, sal_Bool bLabel); + SwDBMgr* pDBMgr, sal_Bool bLabel); virtual ~SwLabDlg(); SwLabRec* GetRecord(const OUString &rRecName, sal_Bool bCont); diff --git a/sw/source/core/uibase/shells/textsh2.cxx b/sw/source/core/uibase/shells/textsh2.cxx index 7e3ac10..9dd1854 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(); - SwDBMgr* pNewDBMgr = GetShell().GetNewDBMgr(); + SwDBMgr* pDBMgr = GetShell().GetDBMgr(); sal_uInt16 nSlot = rReq.GetSlot(); OUString sSourceArg, sCommandArg; sal_Int32 nCommandTypeArg = 0; @@ -128,7 +128,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) if ( !xConnection.is() ) { Reference<XDataSource> xSource; - xConnection = pNewDBMgr->GetConnection(sSourceArg, xSource); + xConnection = pDBMgr->GetConnection(sSourceArg, xSource); } if(!xConnection.is()) return ; @@ -180,7 +180,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) aDescriptor[daCommandType] <<= nCommandTypeArg; SwMergeDescriptor aMergeDesc( DBMGR_MERGE, *GetShellPtr(), aDescriptor ); - pNewDBMgr->MergeNew(aMergeDesc); + pDBMgr->MergeNew(aMergeDesc); if ( bDisposeResultSet ) ::comphelper::disposeComponent(xCursor); diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx index 4f45362..2b398ad 100644 --- a/sw/source/core/uibase/uiview/view2.cxx +++ b/sw/source/core/uibase/uiview/view2.cxx @@ -1094,8 +1094,8 @@ void SwView::Execute(SfxRequest &rReq) SwWrtShell &rSh = GetWrtShell(); if(m_bInMailMerge && rSh.IsAnyDatabaseFieldInDoc()) { - SwDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); - if (pNewDBMgr) + SwDBMgr* pDBMgr = rSh.GetDBMgr(); + if (pDBMgr) { SwDBData aData; aData = rSh.GetDBData(); @@ -1110,7 +1110,7 @@ void SwView::Execute(SfxRequest &rReq) pValues[0].Value <<= aData.sDataSource; pValues[1].Value <<= aData.sCommand; pValues[2].Value <<= aData.nCommandType; - pNewDBMgr->ExecuteFormLetter(rSh, aProperties, sal_True); + pDBMgr->ExecuteFormLetter(rSh, aProperties, sal_True); } } #endif @@ -2373,7 +2373,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) return ; } } - SwDBMgr* pNewDBMgr = GetWrtShell().GetNewDBMgr(); + SwDBMgr* pDBMgr = GetWrtShell().GetDBMgr(); SwDBData aData; SwWrtShell &rSh = GetWrtShell(); @@ -2391,7 +2391,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) rSh.EnterStdMode(); // force change in text shell; necessary for mixing DB fields AttrChangedNotify( &rSh ); - if (pNewDBMgr) + if (pDBMgr) { Sequence<PropertyValue> aProperties(3); PropertyValue* pValues = aProperties.getArray(); @@ -2401,7 +2401,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) pValues[0].Value <<= aData.sDataSource; pValues[1].Value <<= aData.sCommand; pValues[2].Value <<= aData.nCommandType; - pNewDBMgr->ExecuteFormLetter(GetWrtShell(), aProperties, sal_True); + pDBMgr->ExecuteFormLetter(GetWrtShell(), aProperties, sal_True); } } else diff --git a/sw/source/core/uibase/uno/unodispatch.cxx b/sw/source/core/uibase/uno/unodispatch.cxx index b061c01..84fa31e 100644 --- a/sw/source/core/uibase/uno/unodispatch.cxx +++ b/sw/source/core/uibase/uno/unodispatch.cxx @@ -214,16 +214,16 @@ void SwXDispatch::dispatch(const util::URL& aURL, } #else SwWrtShell& rSh = m_pView->GetWrtShell(); - SwDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); + SwDBMgr* pDBMgr = rSh.GetDBMgr(); if(aURL.Complete.equalsAscii(cURLInsertContent)) { ::svx::ODataAccessDescriptor aDescriptor(aArgs); SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor ); - pNewDBMgr->MergeNew(aMergeDesc); + pDBMgr->MergeNew(aMergeDesc); } else if(aURL.Complete.equalsAscii(cURLInsertColumns)) { - pNewDBMgr->InsertText(rSh, aArgs); + pDBMgr->InsertText(rSh, aArgs); } else if(aURL.Complete.equalsAscii(cURLFormLetter)) { diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx index 2934903..099248b 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 ); } - SwDBMgr* pMgr = rSh.GetNewDBMgr(); + SwDBMgr* pMgr = rSh.GetDBMgr(); //force layout creation rSh.CalcLayout(); OSL_ENSURE( pMgr, "database manager missing" ); diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index a7bca54..ea4d9a8 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -277,7 +277,7 @@ void SwMailMergeWizard::UpdateRoadmap() -----------------------------------------------------------------------*/ void SwMailMergeWizard::CreateTargetDocument() { - GetSwView()->GetWrtShell().GetNewDBMgr()-> + GetSwView()->GetWrtShell().GetDBMgr()-> MergeDocuments( m_rConfigItem, *GetSwView() ); m_rConfigItem.SetMergeDone(); if( m_rConfigItem.GetTargetView() ) diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 0dfd0c0..ddde78e 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -120,7 +120,7 @@ IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl) ::svx::ODataAccessDescriptor aDescriptor(aArgs); SwWrtShell& rSh = m_pWizard->GetSwView()->GetWrtShell(); SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor ); - rSh.GetNewDBMgr()->MergeNew(aMergeDesc); + rSh.GetDBMgr()->MergeNew(aMergeDesc); return 0; } diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index fd15e73..7b63f5c 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -782,9 +782,9 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa } AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, - SwDBMgr* pNewDBMgr, bool bLabel) + SwDBMgr* pDBMgr, bool bLabel) { - SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pNewDBMgr, bLabel); + SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pDBMgr, bLabel); return new AbstractSwLabDlg_Impl(pDlg); } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 0bc39fc..2a40abd 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, - SwDBMgr* pNewDBMgr, bool bLabel) SAL_OVERRIDE; + SwDBMgr* pDBMgr, 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 c6a679a..67dec60 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -242,14 +242,14 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox ) if (pListBox == m_pDatabaseLB) { sActDBName = pListBox->GetSelectEntry(); - pSh->GetNewDBMgr()->GetTableNames(m_pTableLB, sActDBName); + pSh->GetDBMgr()->GetTableNames(m_pTableLB, sActDBName); sActDBName += OUString(DB_DELIM); } else { sActDBName = comphelper::string::setToken(sActDBName, 1, DB_DELIM, m_pTableLB->GetSelectEntry()); } - pSh->GetNewDBMgr()->GetColumnNames(m_pDBFieldLB, m_pDatabaseLB->GetSelectEntry(), + pSh->GetDBMgr()->GetColumnNames(m_pDBFieldLB, m_pDatabaseLB->GetSelectEntry(), m_pTableLB->GetSelectEntry()); return 0; } @@ -284,7 +284,7 @@ IMPL_LINK_NOARG(SwEnvPage, SenderHdl) void SwEnvPage::InitDatabaseBox() { - if (pSh->GetNewDBMgr()) + if (pSh->GetDBMgr()) { m_pDatabaseLB->Clear(); Sequence<OUString> aDataNames = SwDBMgr::GetExistingDatabaseNames(); @@ -296,10 +296,10 @@ void SwEnvPage::InitDatabaseBox() OUString sDBName = sActDBName.getToken( 0, DB_DELIM ); OUString sTableName = sActDBName.getToken( 1, DB_DELIM ); m_pDatabaseLB->SelectEntry(sDBName); - if (pSh->GetNewDBMgr()->GetTableNames(m_pTableLB, sDBName)) + if (pSh->GetDBMgr()->GetTableNames(m_pTableLB, sDBName)) { m_pTableLB->SelectEntry(sTableName); - pSh->GetNewDBMgr()->GetColumnNames(m_pDBFieldLB, sDBName, sTableName); + pSh->GetDBMgr()->GetColumnNames(m_pDBFieldLB, sDBName, sTableName); } else m_pDBFieldLB->Clear(); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 81381ac..b0b5b96 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -81,7 +81,7 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) { if(m_bLabel) { - ((SwLabPage*)&rPage)->SetNewDBMgr(pNewDBMgr); + ((SwLabPage*)&rPage)->SetDBMgr(pDBMgr); ((SwLabPage*)&rPage)->InitDatabaseBox(); } else @@ -92,10 +92,10 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, - SwDBMgr* pDBMgr, sal_Bool bLabel) + SwDBMgr* pDBMgr_, sal_Bool bLabel) : SfxTabDialog(pParent, "LabelDialog", "modules/swriter/ui/labeldialog.ui", &rSet) - , pNewDBMgr(pDBMgr) + , pDBMgr(pDBMgr_) , pPrtPage(0) , aTypeIds(50, 10) , pRecs(new SwLabRecs()) @@ -230,7 +230,7 @@ Printer *SwLabDlg::GetPrt() SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "CardMediumPage", "modules/swriter/ui/cardmediumpage.ui", rSet) - , pNewDBMgr(NULL) + , pDBMgr(NULL) , aItem((const SwLabItem&)rSet.Get(FN_LABEL)) { WaitObject aWait( pParent ); @@ -317,9 +317,9 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox ) WaitObject aObj( GetParentSwLabDlg() ); if (pListBox == m_pDatabaseLB) - GetNewDBMgr()->GetTableNames(m_pTableLB, sActDBName); + GetDBMgr()->GetTableNames(m_pTableLB, sActDBName); - GetNewDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry()); + GetDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry()); return 0; } @@ -439,7 +439,7 @@ SwLabRec* SwLabPage::GetSelectedEntryPos() void SwLabPage::InitDatabaseBox() { - if( GetNewDBMgr() ) + if( GetDBMgr() ) { m_pDatabaseLB->Clear(); ::com::sun::star::uno::Sequence<OUString> aDataNames = SwDBMgr::GetExistingDatabaseNames(); @@ -449,10 +449,10 @@ void SwLabPage::InitDatabaseBox() OUString sDBName = sActDBName.getToken( 0, DB_DELIM ); OUString sTableName = sActDBName.getToken( 1, DB_DELIM ); m_pDatabaseLB->SelectEntry(sDBName); - if( !sDBName.isEmpty() && GetNewDBMgr()->GetTableNames(m_pTableLB, sDBName)) + if( !sDBName.isEmpty() && GetDBMgr()->GetTableNames(m_pTableLB, sDBName)) { m_pTableLB->SelectEntry(sTableName); - GetNewDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, sTableName); + GetDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, sTableName); } else m_pDBFieldLB->Clear(); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 80d7176..db4f7d0 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -352,11 +352,11 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aFromNF.SetMax(SAL_MAX_INT32); aToNF.SetMax(SAL_MAX_INT32); - SwDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); + SwDBMgr* pDBMgr = rSh.GetDBMgr(); if(_xConnection.is()) - pNewDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTblName); + pDBMgr->GetColumnNames(&aAddressFldLB, _xConnection, rTblName); else - pNewDBMgr->GetColumnNames(&aAddressFldLB, rSourceName, rTblName); + pDBMgr->GetColumnNames(&aAddressFldLB, rSourceName, rTblName); for(sal_Int32 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); ++nEntry) aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry)); @@ -647,7 +647,7 @@ bool SwMailMergeDlg::ExecQryShell() { pImpl->xSelSupp->removeSelectionChangeListener( pImpl->xChgLstnr ); } - SwDBMgr* pMgr = rSh.GetNewDBMgr(); + SwDBMgr* pMgr = rSh.GetDBMgr(); if (aPrinterRB.IsChecked()) nMergeType = DBMGR_MERGE_MAILMERGE; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 6b86e8a..e24a86d 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -24,7 +24,7 @@ class SwLabPage : public SfxTabPage { - SwDBMgr* pNewDBMgr; + SwDBMgr* pDBMgr; OUString sActDBName; SwLabItem aItem; @@ -76,8 +76,8 @@ public: void SetToBusinessCard(); void InitDatabaseBox(); - inline void SetNewDBMgr(SwDBMgr* pDBMgr) { pNewDBMgr = pDBMgr; } - inline SwDBMgr* GetNewDBMgr() const { return pNewDBMgr; } + inline void SetDBMgr(SwDBMgr* pDBMgr_) { pDBMgr = pDBMgr_; } + inline SwDBMgr* GetDBMgr() const { return pDBMgr; } }; class SwOneExampleFrame; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits