summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-11 13:39:10 +0200
committerNoel Grandin <noel@peralex.com>2015-03-11 13:40:46 +0200
commit89245da9f49140427a2582e3af03a5cda05c0f95 (patch)
treec88f0316de9231c5b81e3ce950bd5a4884935ec5
parent10a1b861853bc7c53d03d372f913134f9a9065ad (diff)
fix windows build
after my commit 5eea85ec4fa7c458785be749a0e370a0883ff693 "convert SwMoveFlags and SwInsertFlags from enum to enum class" Change-Id: If5af977fdd77b82de447b71e166d81fca5840395
-rw-r--r--sw/inc/IDocumentContentOperations.hxx2
-rw-r--r--sw/inc/ndtxt.hxx4
-rw-r--r--sw/source/core/edit/editsh.cxx2
-rw-r--r--sw/source/core/inc/DocumentContentOperationsManager.hxx2
-rw-r--r--sw/source/core/txtnode/thints.cxx2
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx2
-rw-r--r--sw/source/core/unocore/unotext.cxx2
7 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index ac1f881cbcfd..39f92650ea04 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -138,7 +138,7 @@ public:
/** Insert string into existing text node at position rRg.Point().
*/
virtual bool InsertString(const SwPaM &rRg, const OUString&,
- const enum SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) = 0;
+ const SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) = 0;
/** change text to Upper/Lower/Hiragana/Katagana/...
*/
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index e5bf4b81a87c..3973cb37af46 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -246,7 +246,7 @@ public:
/// of the node, the longest prefix that fits is inserted
/// @return the prefix of rStr that was actually inserted
OUString InsertText( const OUString & rStr, const SwIndex & rIdx,
- const enum SwInsertFlags nMode
+ const SwInsertFlags nMode
= SwInsertFlags::DEFAULT );
/** delete text content
@@ -254,7 +254,7 @@ public:
an attribute with both extent and dummy char
*/
void EraseText ( const SwIndex &rIdx, const sal_Int32 nCount = SAL_MAX_INT32,
- const enum SwInsertFlags nMode = SwInsertFlags::DEFAULT );
+ const SwInsertFlags nMode = SwInsertFlags::DEFAULT );
/** delete all attributes.
If neither pSet nor nWhich is given, delete all attributes (except
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;