diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-09 18:00:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-09 23:16:18 +0100 |
| commit | a707dc29ece936f5f03a905b253a2af7cf67440f (patch) | |
| tree | 05fd8cdb1c6330e3c90869f2534bc5bc2c9d9fa4 /sw | |
| parent | 337243fd28ce49d71108a9a16b885adf612384bc (diff) | |
Avoid clash with ERROR macro from wingdi.h on Windows
Change-Id: Ifd9d9f08184eaf00e2d33765c80b7df234bce02a
Reviewed-on: https://gerrit.libreoffice.org/47669
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 932d3c165eed..555d4dc9079f 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -243,7 +243,7 @@ class SW_DLLPUBLIC SwDBManager enum class MergeStatus { - OK = 0, CANCEL, ERROR + Ok = 0, Cancel, Error }; MergeStatus m_aMergeStatus; ///< current / last merge status @@ -304,8 +304,8 @@ public: bool Merge( const SwMergeDescriptor& rMergeDesc ); void MergeCancel(); - bool IsMergeOk() { return MergeStatus::OK == m_aMergeStatus; }; - bool IsMergeError() { return MergeStatus::ERROR <= m_aMergeStatus; }; + bool IsMergeOk() { return MergeStatus::Ok == m_aMergeStatus; }; + bool IsMergeError() { return MergeStatus::Error <= m_aMergeStatus; }; static std::shared_ptr<SwMailMergeConfigItem> PerformMailMerge(SwView const * pView); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index bd7e3f82ee14..2beeaa439bb7 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -791,7 +791,7 @@ void SwDBManager::GetColumnNames(ListBox* pListBox, } SwDBManager::SwDBManager(SwDoc* pDoc) - : m_aMergeStatus( MergeStatus::OK ) + : m_aMergeStatus( MergeStatus::Ok ) , bInitDBFields(false) , bInMerge(false) , bMergeSilent(false) @@ -1094,7 +1094,7 @@ public: uno::Reference< mail::XMailMessage>, const OUString& ) override { osl::MutexGuard aGuard( m_rDBManager.pImpl->m_aAllEmailSendMutex ); - m_rDBManager.m_aMergeStatus = MergeStatus::ERROR; + m_rDBManager.m_aMergeStatus = MergeStatus::Error; m_rDBManager.pImpl->m_xLastMessage.clear(); xMailDispatcher->stop(); } @@ -1221,7 +1221,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, } const bool bIsPDFexport = pStoreToFilter && pStoreToFilter->GetFilterName() == "writer_pdf_Export"; - m_aMergeStatus = MergeStatus::OK; + m_aMergeStatus = MergeStatus::Ok; // in case of creating a single resulting file this has to be created here SwView* pTargetView = rMergeDescriptor.pMailMergeConfigItem ? @@ -1374,7 +1374,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, if( !aTempFile->IsValid() ) { ErrorHandler::HandleError( ERRCODE_IO_NOTSUPPORTED ); - m_aMergeStatus = MergeStatus::ERROR; + m_aMergeStatus = MergeStatus::Error; } } @@ -1496,7 +1496,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, &rMergeDescriptor.aSaveToFilterData, bIsPDFexport, xWorkDocSh, *pWorkShell, &sFileURL ) ) { - m_aMergeStatus = MergeStatus::ERROR; + m_aMergeStatus = MergeStatus::Error; } // back to the MM DB manager @@ -1606,7 +1606,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, pStoreToFilterOptions, &rMergeDescriptor.aSaveToFilterData, bIsPDFexport, xTargetDocShell.get(), *pTargetShell ) ) { - m_aMergeStatus = MergeStatus::ERROR; + m_aMergeStatus = MergeStatus::Error; } } else if( IsMergeOk() && bMT_PRINTER ) @@ -1669,8 +1669,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, void SwDBManager::MergeCancel() { - if (m_aMergeStatus < MergeStatus::CANCEL) - m_aMergeStatus = MergeStatus::CANCEL; + if (m_aMergeStatus < MergeStatus::Cancel) + m_aMergeStatus = MergeStatus::Cancel; } IMPL_LINK( SwDBManager, PrtCancelHdl, Button *, pButton, void ) |