Kaydet (Commit) 65975508 authored tarafından David Ostrovsky's avatar David Ostrovsky

Fix typo

Change-Id: I6fe407bb449b0f91509bfc91f42c0b0f320ecb09
Reviewed-on: https://gerrit.libreoffice.org/21914Reviewed-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
Tested-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
üst 70d49424
...@@ -286,7 +286,7 @@ friend class SwConnectionDisposedListener_Impl; ...@@ -286,7 +286,7 @@ friend class SwConnectionDisposedListener_Impl;
SAL_DLLPRIVATE void FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pWorkView, SwDoc *pTargetDoc, SAL_DLLPRIVATE void FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pWorkView, SwDoc *pTargetDoc,
SwWrtShell *pTargetShell, bool bCreateSingleFile, bool bPrinter, SwWrtShell *pTargetShell, bool bCreateSingleFile, bool bPrinter,
SwDoc *pWorkDoc, SwDBManager *pOldDBManager, const bool bIsPDFeport); SwDoc *pWorkDoc, SwDBManager *pOldDBManager, const bool bIsPDFexport);
SAL_DLLPRIVATE bool SavePrintDoc(SfxObjectShellRef xTargetDocShell, SwView *pTargetView, SAL_DLLPRIVATE bool SavePrintDoc(SfxObjectShellRef xTargetDocShell, SwView *pTargetView,
const SwMergeDescriptor &rMergeDescriptor, const SwMergeDescriptor &rMergeDescriptor,
......
...@@ -989,7 +989,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -989,7 +989,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
const OUString* pStoreToFilterOptions = nullptr; const OUString* pStoreToFilterOptions = nullptr;
CreateStoreToFilter(pStoreToFilter, pStoreToFilterOptions, pSourceDocSh, bEMail, rMergeDescriptor); CreateStoreToFilter(pStoreToFilter, pStoreToFilterOptions, pSourceDocSh, bEMail, rMergeDescriptor);
const bool bIsPDFeport = pStoreToFilter && pStoreToFilter->GetFilterName() == "writer_pdf_Export"; const bool bIsPDFexport = pStoreToFilter && pStoreToFilter->GetFilterName() == "writer_pdf_Export";
bCancel = false; bCancel = false;
...@@ -1083,7 +1083,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -1083,7 +1083,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
// Create a copy of the source document and work with that one instead of the source. // Create a copy of the source document and work with that one instead of the source.
// If we're not in the single file mode (which requires modifying the document for the merging), // If we're not in the single file mode (which requires modifying the document for the merging),
// it is enough to do this just once. // it is enough to do this just once.
if( 1 == nDocNo || bCreateSingleFile || bIsPDFeport ) if( 1 == nDocNo || bCreateSingleFile || bIsPDFexport )
CreateWorkDoc(xWorkDocSh, pWorkView, pWorkDoc, pOldDBManager, pSourceDocSh, nMaxDumpDocs, nDocNo); CreateWorkDoc(xWorkDocSh, pWorkView, pWorkDoc, pOldDBManager, pSourceDocSh, nMaxDumpDocs, nDocNo);
SwWrtShell &rWorkShell = pWorkView->GetWrtShell(); SwWrtShell &rWorkShell = pWorkView->GetWrtShell();
...@@ -1144,7 +1144,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -1144,7 +1144,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
//convert fields to text if we are exporting to PDF //convert fields to text if we are exporting to PDF
//this prevents a second merge while updating the fields in SwXTextDocument::getRendererCount() //this prevents a second merge while updating the fields in SwXTextDocument::getRendererCount()
if( bIsPDFeport ) if( bIsPDFexport )
rWorkShell.ConvertFieldsToText(); rWorkShell.ConvertFieldsToText();
xWorkDocSh->DoSaveAs(*pDstMed); xWorkDocSh->DoSaveAs(*pDstMed);
xWorkDocSh->DoSaveCompleted(pDstMed); xWorkDocSh->DoSaveCompleted(pDstMed);
...@@ -1233,7 +1233,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -1233,7 +1233,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
} }
} }
} }
if( bCreateSingleFile || bIsPDFeport ) if( bCreateSingleFile || bIsPDFexport )
{ {
CloseWorkDoc(pWorkDoc, xWorkDocSh, pOldDBManager); CloseWorkDoc(pWorkDoc, xWorkDocSh, pOldDBManager);
} }
...@@ -1253,7 +1253,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, ...@@ -1253,7 +1253,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
(bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord())); (bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord()));
FinishMailMergeFile(xWorkDocSh, pWorkView, pTargetDoc, pTargetShell, bCreateSingleFile, rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER, FinishMailMergeFile(xWorkDocSh, pWorkView, pTargetDoc, pTargetShell, bCreateSingleFile, rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER,
pWorkDoc, pOldDBManager, bIsPDFeport); pWorkDoc, pOldDBManager, bIsPDFexport);
pProgressDlg.disposeAndClear(); pProgressDlg.disposeAndClear();
...@@ -1570,7 +1570,7 @@ void SwDBManager::FreezeLayouts(SwWrtShell *pTargetShell, bool freeze) ...@@ -1570,7 +1570,7 @@ void SwDBManager::FreezeLayouts(SwWrtShell *pTargetShell, bool freeze)
void SwDBManager::FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pWorkView, SwDoc *pTargetDoc, void SwDBManager::FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pWorkView, SwDoc *pTargetDoc,
SwWrtShell *pTargetShell, bool bCreateSingleFile, bool bPrinter, SwWrtShell *pTargetShell, bool bCreateSingleFile, bool bPrinter,
SwDoc *pWorkDoc, SwDBManager *pOldDBManager, const bool bIsPDFeport) SwDoc *pWorkDoc, SwDBManager *pOldDBManager, const bool bIsPDFexport)
{ {
if ( xWorkDocSh.Is() && pWorkView->GetWrtShell().IsExpFieldsLocked() ) if ( xWorkDocSh.Is() && pWorkView->GetWrtShell().IsExpFieldsLocked() )
{ {
...@@ -1588,7 +1588,7 @@ void SwDBManager::FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pW ...@@ -1588,7 +1588,7 @@ void SwDBManager::FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pW
#endif #endif
} }
if( !bIsPDFeport ) if( !bIsPDFexport )
CloseWorkDoc(pWorkDoc, xWorkDocSh, pOldDBManager); CloseWorkDoc(pWorkDoc, xWorkDocSh, pOldDBManager);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment