commit d6f1ca24932ba85607ba3e526c5721132cd39252
author Marco Cecchetti <marco.cecchetti@collabora.com> Mon Jan 11 16:43:02 2016 +0100
committer Marco Cecchetti <mrcekets@gmail.com> Mon Jan 11 22:16:33 2016 +0000
tree a9f30f18f71068dca089ceb61289d8f2a5fe99d0
parent 8d8ddea6934f6ee0f23109fc574c02a0c8a247fd

lool - search all - unit test failure - solved

Change-Id: I5a74dd60f61fc0fdb88f08383d579b14222aa55d
Reviewed-on: https://gerrit.libreoffice.org/21365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>

sd/qa/unit/tiledrendering/tiledrendering.cxx

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index b3ac27e..7c14fa9 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -442,7 +442,6 @@ void SdTiledRenderingTest::testSearchAll()

void SdTiledRenderingTest::testSearchAllSelections()
{
#if 0
    SdXImpressDocument* pXImpressDocument = createDoc("search-all.odp");
    pXImpressDocument->registerCallback(&SdTiledRenderingTest::callback, this);

@@ -451,7 +450,6 @@ void SdTiledRenderingTest::testSearchAllSelections()
    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), m_nPart);
    // This was 1: only the first match was highlighted.
    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), m_aSelection.size());
#endif
}

#endif

sd/source/ui/view/Outliner.cxx

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 69ec222..caf2da7 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -591,6 +591,8 @@ void Outliner::Initialize (bool bDirectionIsForward)

bool Outliner::SearchAndReplaceAll()
{
    DetectChange();

    bool bRet = true;
    // Save the current position to be restored after having replaced all
    // matches.