sw/qa/core/macros-test.cxx | 2 +-
sw/qa/core/uwriter.cxx | 6 +++---
sw/qa/extras/mailmerge/mailmerge.cxx | 2 +-
sw/qa/extras/uiwriter/uiwriter.cxx | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit d8a17866d65dee0c003dd4cda52ebac4c6eb033c
Author: Noel Grandin <n...@peralex.com>
Date: Wed Mar 11 14:15:28 2015 +0200
fix build after my hasty commit
10a1b861853bc7c53d03d372f913134f9a9065ad
"convert MarkType to enum class"
Change-Id: Iad1c294c4836ededea23c5edcb67dea54dd5357a
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index c266d71..8257bcc 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -203,7 +203,7 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
aPaM.Move(fnMoveForward, fnGoDoc);
IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
sw::mark::IMark *pMark =
- rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::BOOKMARK);
+ rIDMA.makeMark(aPaM, "test",
IDocumentMarkAccess::MarkType::BOOKMARK);
CPPUNIT_ASSERT(pMark);
// select so pMark start position is on a node that is fully deleted
aPaM.Move(fnMoveBackward, fnGoNode);
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 6bdc043..29f02fc 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1179,19 +1179,19 @@ void SwDocTest::testMarkMove()
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
OUString("Paragraph 1"));
aPaM.SetMark();
aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
- pMarksAccess->makeMark(aPaM, OUString("Para1"),
IDocumentMarkAccess::BOOKMARK);
+ pMarksAccess->makeMark(aPaM, OUString("Para1"),
IDocumentMarkAccess::MarkType::BOOKMARK);
m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
OUString("Paragraph 2"));
aPaM.SetMark();
aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
- pMarksAccess->makeMark(aPaM, OUString("Para2"),
IDocumentMarkAccess::BOOKMARK);
+ pMarksAccess->makeMark(aPaM, OUString("Para2"),
IDocumentMarkAccess::MarkType::BOOKMARK);
m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM,
OUString("Paragraph 3"));
aPaM.SetMark();
aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
- pMarksAccess->makeMark(aPaM, OUString("Para3"),
IDocumentMarkAccess::BOOKMARK);
+ pMarksAccess->makeMark(aPaM, OUString("Para3"),
IDocumentMarkAccess::MarkType::BOOKMARK);
}
// join paragraph 2 and 3 and check
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index ca48e68..fc69620 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -245,7 +245,7 @@ int MMTest::documentStartPageNumber( int document ) const
int pos = 0;
for( mark = marks->getAllMarksBegin(); mark != marks->getAllMarksEnd() &&
pos < document; ++mark )
{
- if( IDocumentMarkAccess::GetType( **mark ) ==
IDocumentMarkAccess::UNO_BOOKMARK )
+ if( IDocumentMarkAccess::GetType( **mark ) ==
IDocumentMarkAccess::MarkType::UNO_BOOKMARK )
++pos;
}
CPPUNIT_ASSERT( pos == document );
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 0cce5f4..b285018 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -708,7 +708,7 @@ void SwUiWriterTest::testBookmarkUndo()
IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
SwPaM aPaM( SwNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1) );
- pMarkAccess->makeMark(aPaM, OUString("Mark"),
IDocumentMarkAccess::BOOKMARK);
+ pMarkAccess->makeMark(aPaM, OUString("Mark"),
IDocumentMarkAccess::MarkType::BOOKMARK);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
rUndoManager.Undo();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pMarkAccess->getAllMarksCount());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
