diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2009-08-28 14:15:32 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2009-08-28 14:15:32 +0000 |
| commit | d9d92875a62f7c2142f4c851f10eccdf896cc4ee (patch) | |
| tree | 60dde468976535223036ac6d8c8823d54d724c3a /sw/source/ui/dbui | |
| parent | 0dbda8a93911a7bbed0faa078626036fb3077499 (diff) | |
fix warning
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index ff29ca8638e2..034429f39ca7 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -458,7 +458,7 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) case DBMGR_MERGE_MAILMERGE: // Serienbrief { SwView& rView = rMergeDesc.rSh.GetView(); -#ifdef TL_NOT_NOW /*TLPDF*/
+#ifdef TL_NOT_NOW /*TLPDF*/ SfxDispatcher *pDis = rView.GetViewFrame()->GetDispatcher(); SfxItemSet aPrintArgs( rView.GetPool(), SID_SILENT, SID_SILENT, //5528 @@ -523,7 +523,7 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) } } -#endif //def TL_NOT_NOW /*TLPDF*/
+#endif //def TL_NOT_NOW /*TLPDF*/ // TLPDF pDis->Execute( SID_PRINTDOC, // TLPDF SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, @@ -540,8 +540,8 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) aVal >>= _bVal; aVal >>= _nVal; aVal >>= _sVal; - }
-#endif
+ } +#endif // printing should be done synchronous otherwise the document // might already become invalid during the process @@ -550,8 +550,8 @@ BOOL SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) aOptions.realloc( nOpts + 1 ); aOptions[ nOpts ].Name = rtl::OUString::createFromAscii( "Wait" ); aOptions[ nOpts ].Value <<= sal_True ; -
- const SwModuleOptions * pModOpt = SW_MOD()->GetModuleConfig();
+ + const SwModuleOptions * pModOpt = SW_MOD()->GetModuleConfig(); if (pModOpt->IsSinglePrintJob()) { } @@ -925,8 +925,8 @@ BOOL SwNewDBMgr::MergePrint( SwView& rView, //TLPDF if( rOpt.IsPrintSingleJobs() ) //TLPDF pPrt->SetEndPrintHdl( Link() ); - BOOL bUserBreak = FALSE, - bRet = FALSE; +//TLPDF BOOL bUserBreak = FALSE; + BOOL bRet = FALSE; long nStartRow, nEndRow; //calculate number of data sets to be printed |