summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2016-01-30 05:41:01 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2016-01-30 11:44:34 +0000
commit65975508832152a80bbaa4e9899f5497c2881b11 (patch)
treec8a6270c41b90c220ddbb209033b982865567bbc
parent70d49424b8b54ee80676495fe49a7d3eb1f805c0 (diff)
Fix typo
Change-Id: I6fe407bb449b0f91509bfc91f42c0b0f320ecb09 Reviewed-on: https://gerrit.libreoffice.org/21914 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
-rw-r--r--sw/inc/dbmgr.hxx2
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx14
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 8b0af90c35b6..b923c71ab17b 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -286,7 +286,7 @@ friend class SwConnectionDisposedListener_Impl;
SAL_DLLPRIVATE void FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pWorkView, SwDoc *pTargetDoc,
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,
const SwMergeDescriptor &rMergeDescriptor,
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f3f1b6ce6c33..864e45b934ac 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -989,7 +989,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
const OUString* pStoreToFilterOptions = nullptr;
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;
@@ -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.
// 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.
- if( 1 == nDocNo || bCreateSingleFile || bIsPDFeport )
+ if( 1 == nDocNo || bCreateSingleFile || bIsPDFexport )
CreateWorkDoc(xWorkDocSh, pWorkView, pWorkDoc, pOldDBManager, pSourceDocSh, nMaxDumpDocs, nDocNo);
SwWrtShell &rWorkShell = pWorkView->GetWrtShell();
@@ -1144,7 +1144,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
//convert fields to text if we are exporting to PDF
//this prevents a second merge while updating the fields in SwXTextDocument::getRendererCount()
- if( bIsPDFeport )
+ if( bIsPDFexport )
rWorkShell.ConvertFieldsToText();
xWorkDocSh->DoSaveAs(*pDstMed);
xWorkDocSh->DoSaveCompleted(pDstMed);
@@ -1233,7 +1233,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
}
}
}
- if( bCreateSingleFile || bIsPDFeport )
+ if( bCreateSingleFile || bIsPDFexport )
{
CloseWorkDoc(pWorkDoc, xWorkDocSh, pOldDBManager);
}
@@ -1253,7 +1253,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
(bSynchronizedDoc && (nStartRow != nEndRow)? ExistsNextRecord() : ToNextMergeRecord()));
FinishMailMergeFile(xWorkDocSh, pWorkView, pTargetDoc, pTargetShell, bCreateSingleFile, rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER,
- pWorkDoc, pOldDBManager, bIsPDFeport);
+ pWorkDoc, pOldDBManager, bIsPDFexport);
pProgressDlg.disposeAndClear();
@@ -1570,7 +1570,7 @@ void SwDBManager::FreezeLayouts(SwWrtShell *pTargetShell, bool freeze)
void SwDBManager::FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pWorkView, SwDoc *pTargetDoc,
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() )
{
@@ -1588,7 +1588,7 @@ void SwDBManager::FinishMailMergeFile(SfxObjectShellLock &xWorkDocSh, SwView *pW
#endif
}
- if( !bIsPDFeport )
+ if( !bIsPDFexport )
CloseWorkDoc(pWorkDoc, xWorkDocSh, pOldDBManager);
}