diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-11 13:39:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-11 13:40:46 +0200 |
| commit | 89245da9f49140427a2582e3af03a5cda05c0f95 (patch) | |
| tree | c88f0316de9231c5b81e3ce950bd5a4884935ec5 /sw/source/core | |
| parent | 10a1b861853bc7c53d03d372f913134f9a9065ad (diff) | |
fix windows build
after my commit 5eea85ec4fa7c458785be749a0e370a0883ff693
"convert SwMoveFlags and SwInsertFlags from enum to enum class"
Change-Id: If5af977fdd77b82de447b71e166d81fca5840395
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/edit/editsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/inc/DocumentContentOperationsManager.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/txtnode/thints.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 39d6d81e2d27..2f8066e15402 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -87,7 +87,7 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints ) { StartAllAction(); { - const enum SwInsertFlags nInsertFlags = + const SwInsertFlags nInsertFlags = (bForceExpandHints) ? (SwInsertFlags::FORCEHINTEXPAND | SwInsertFlags::EMPTYEXPAND) : SwInsertFlags::EMPTYEXPAND; diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx index c60f47bf5afc..c2e72fc76976 100644 --- a/sw/source/core/inc/DocumentContentOperationsManager.hxx +++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx @@ -61,7 +61,7 @@ public: bool Overwrite(const SwPaM &rRg, const OUString& rStr) SAL_OVERRIDE; bool InsertString(const SwPaM &rRg, const OUString&, - const enum SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) SAL_OVERRIDE; + const SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) SAL_OVERRIDE; void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) SAL_OVERRIDE; diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 90dad083c583..e912ed28d4a9 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1259,7 +1259,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) "EndIdx out of bounds!" ); // translate from SetAttrMode to InsertMode (for hints with CH_TXTATR) - const enum SwInsertFlags nInsertFlags = + const SwInsertFlags nInsertFlags = (nMode & SetAttrMode::FORCEHINTEXPAND) ? (SwInsertFlags::FORCEHINTEXPAND | SwInsertFlags::EMPTYEXPAND) : SwInsertFlags::EMPTYEXPAND; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 3ecac1c0d75e..cfe8c012f4fd 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1105,7 +1105,7 @@ bool DocInsertStringSplitCR( { bool bOK = true; - const enum SwInsertFlags nInsertFlags = + const SwInsertFlags nInsertFlags = bForceExpandHints ? ( SwInsertFlags::FORCEHINTEXPAND | SwInsertFlags::EMPTYEXPAND) : SwInsertFlags::EMPTYEXPAND; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 25eb61f2b6fe..77fd7e957a6e 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -408,7 +408,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } const bool bForceExpandHints(CheckForOwnMemberMeta(aPam, bAbsorb)); - const enum SwInsertFlags nInsertFlags = + const SwInsertFlags nInsertFlags = bForceExpandHints ? ( SwInsertFlags::FORCEHINTEXPAND | SwInsertFlags::EMPTYEXPAND) : SwInsertFlags::EMPTYEXPAND; |