[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - include/LibreOfficeKit sd/qa sd/source
Henry Castro
hcastro at collabora.com
Thu Feb 18 00:07:56 UTC 2016
include/LibreOfficeKit/LibreOfficeKitEnums.h | 12 +
sd/qa/unit/tiledrendering/data/insert-delete.odp |binary
sd/qa/unit/tiledrendering/tiledrendering.cxx | 122 ++++++++++++++++
sd/source/ui/inc/SlideSorterViewShell.hxx | 3
sd/source/ui/inc/ViewShell.hxx | 3
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 4
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 36 +++-
7 files changed, 168 insertions(+), 12 deletions(-)
New commits:
commit 8e19dadb7734fc54c41c688854aa2649ec9acf18
Author: Henry Castro <hcastro at collabora.com>
Date: Wed Feb 17 20:05:30 2016 -0400
sd lok: add LOK_CALLBACK_PARTS_COUNT_CHANGED callback
In the tiled rendering case, when a slide is deleted or inserted
the sorted slides are updated on client side.
However, when .uno:Undo and .uno:Redo actions are requested on
client side the sorted slides are required to update all
sorted slides.
So every time when .uno:InsertPage, .uno:DeletePage, .uno:Undo, .uno:Redo
actions are requested, it will notify verbose action (PageInserted, PageDeleted)
with index on client side to update the sorted slide index.
Change-Id: Iebda2aa11be13aea8fbb6d0cc50442805d7485e9
Reviewed-on: https://gerrit.libreoffice.org/22309
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Henry Castro <hcastro at collabora.com>
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 343d169..7e2cc30 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -280,6 +280,18 @@ typedef enum
* }
*/
LOK_CALLBACK_ERROR,
+
+ /**
+ * A part has been added to or removed from the document.
+ *
+ * {
+ * "action" : "PartInserted" | "PartDeleted"
+ * "part" : "Part Index"
+ * }
+ *
+ * Note: this is currently emitted by Impress.
+ */
+ LOK_CALLBACK_PARTS_COUNT_CHANGED
}
LibreOfficeKitCallbackType;
diff --git a/sd/qa/unit/tiledrendering/data/insert-delete.odp b/sd/qa/unit/tiledrendering/data/insert-delete.odp
new file mode 100644
index 0000000..e388fb6
Binary files /dev/null and b/sd/qa/unit/tiledrendering/data/insert-delete.odp differ
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 5c88c53..0c037f8 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -31,10 +31,14 @@
#include <sfx2/viewfrm.hxx>
#include <svl/srchitem.hxx>
+#include <ImpressViewShellBase.hxx>
+#include <SlideSorterViewShell.hxx>
+#include <SlideSorter.hxx>
#include <DrawDocShell.hxx>
#include <ViewShell.hxx>
#include <sdpage.hxx>
#include <unomodel.hxx>
+#include <drawdoc.hxx>
#include <comphelper/lok.hxx>
using namespace css;
@@ -51,6 +55,7 @@ public:
virtual void tearDown() SAL_OVERRIDE;
#if !defined(WNT) && !defined(MACOSX)
+ void testInsertPage();
void testRegisterCallback();
void testPostKeyEvent();
void testPostMouseEvent();
@@ -67,6 +72,7 @@ public:
CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
#if !defined(WNT) && !defined(MACOSX)
+ CPPUNIT_TEST(testInsertPage);
CPPUNIT_TEST(testRegisterCallback);
CPPUNIT_TEST(testPostKeyEvent);
CPPUNIT_TEST(testPostMouseEvent);
@@ -97,6 +103,7 @@ private:
sal_Int32 m_nPart;
std::vector<OString> m_aSearchResultSelection;
std::vector<int> m_aSearchResultPart;
+ std::vector<unsigned> m_aPageList;
int m_nSelectionBeforeSearchResult;
int m_nSelectionAfterSearchResult;
#endif
@@ -223,6 +230,19 @@ void SdTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
}
}
break;
+ case LOK_CALLBACK_PARTS_COUNT_CHANGED:
+ {
+ boost::property_tree::ptree aTree;
+ std::stringstream aStream(pPayload);
+ boost::property_tree::read_json(aStream, aTree);
+ auto aAction = aTree.get<std::string>("action", "");
+ auto aPart = aTree.get<std::string>("part", "");
+ if (!aAction.empty() && !aPart.empty())
+ {
+ m_aPageList.push_back(std::atoi(aPart.data()));
+ }
+ }
+ break;
}
}
@@ -498,6 +518,108 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch()
CPPUNIT_ASSERT_EQUAL(OString("match"), pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
}
+void SdTiledRenderingTest::testInsertPage()
+{
+ uno::Sequence<beans::PropertyValue> aFilterOptions;
+ uno::Reference<frame::XDesktop2> xLoader(mxDesktop, uno::UNO_QUERY);
+ CPPUNIT_ASSERT(xLoader.is());
+
+ uno::Reference<lang::XComponent> xComponent;
+ xComponent = xLoader->loadComponentFromURL(
+ getURLFromSrc(DATA_DIRECTORY) + OUString("insert-delete.odp"),
+ "_blank",
+ 0,
+ aFilterOptions);
+ CPPUNIT_ASSERT(xComponent.is());
+
+ SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
+ CPPUNIT_ASSERT(pFoundShell);
+
+ ::sd::DrawDocShell* xDocSh = dynamic_cast<sd::DrawDocShell*>(pFoundShell);
+ CPPUNIT_ASSERT(xDocSh);
+
+ sd::ViewShell* pViewShell = xDocSh->GetViewShell();
+ CPPUNIT_ASSERT(pViewShell);
+
+ Application::Reschedule(true);
+ Scheduler::ProcessTaskScheduling(true);
+ sd::slidesorter::SlideSorterViewShell* pSSVS =
+ sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase());
+ CPPUNIT_ASSERT(pSSVS);
+
+ comphelper::LibreOfficeKit::setActive();
+ SdXImpressDocument* pXImpressDocument = SdXImpressDocument::getImplementation(xDocSh->GetModel());
+ CPPUNIT_ASSERT(pXImpressDocument);
+ SdDrawDocument *pDoc = pXImpressDocument->GetDocShell()->GetDoc();
+ CPPUNIT_ASSERT(pDoc);
+
+ // the document has 1 slide
+ CPPUNIT_ASSERT(pDoc->GetSdPageCount(PK_STANDARD) == 1);
+
+ pXImpressDocument->registerCallback(&SdTiledRenderingTest::callback, this);
+
+ uno::Sequence<beans::PropertyValue> aArgs;
+
+ // Insert slides
+ for(unsigned nIterator=1; nIterator <= 10; nIterator++)
+ comphelper::dispatchCommand(".uno:InsertPage", aArgs);
+
+ // Verify inserted slides
+ for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+ {
+ SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+ CPPUNIT_ASSERT(pPage);
+ }
+
+ m_aPageList.clear();
+
+ // Delete slides
+ for(unsigned nIterator=1; nIterator <= 10; nIterator++)
+ comphelper::dispatchCommand(".uno:DeletePage", aArgs);
+
+ // Verify deleted slides
+ for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+ {
+ SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+ CPPUNIT_ASSERT(pPage == nullptr);
+ }
+
+ m_aPageList.clear();
+
+ // Undo deleted slides
+ for(unsigned nIterator=1; nIterator <= 10; nIterator++)
+ comphelper::dispatchCommand(".uno:Undo", aArgs);
+
+ // Verify inserted slides
+ for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+ {
+ SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+ CPPUNIT_ASSERT(pPage);
+ }
+
+ m_aPageList.clear();
+
+ // Redo deleted slides
+ for(unsigned nIterator=1; nIterator <= 10; nIterator++)
+ comphelper::dispatchCommand(".uno:Redo", aArgs);
+
+ // Verify deleted slides
+ for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+ {
+ SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+ CPPUNIT_ASSERT(pPage == nullptr);
+ }
+
+ // the document has 1 slide
+ CPPUNIT_ASSERT(pDoc->GetSdPageCount(PK_STANDARD) == 1);
+
+ comphelper::LibreOfficeKit::setActive(false);
+
+ uno::Reference<util::XCloseable> xClose(xComponent, uno::UNO_QUERY);
+ CPPUNIT_ASSERT(xClose.is());
+ xClose->close(false);
+}
+
#endif
CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index fe03910..92fd749 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -70,7 +70,8 @@ public:
pane is returned. When no slidesorter is visible then NULL is
returned.
*/
- static SlideSorterViewShell* GetSlideSorter (ViewShellBase& rBase);
+ // Exported for unit test
+ SD_DLLPUBLIC static SlideSorterViewShell* GetSlideSorter (ViewShellBase& rBase);
virtual SdPage* GetActualPage() SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index bc962ca..dce8078 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -365,7 +365,8 @@ public:
// virtual void OuterResizePixel(const Point &rPos, const Size &rSize);
// virtual void InnerResizePixel(const Point &rPos, const Size &rSize);
- ViewShellBase& GetViewShellBase() const;
+ // Exported for unit test
+ SD_DLLPUBLIC ViewShellBase& GetViewShellBase() const;
/** Return <TRUE/> when the called view shell is the main sub shell of
its ViewShellBase object, i.e. is display in the center pane. This
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index c2f20cf..3bd56cf 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -223,8 +223,8 @@ private:
void AdaptSize();
SdPage* GetPage (const sal_Int32 nCoreIndex) const;
- void InsertSlide (SdPage* pPage);
- void DeleteSlide (const SdPage* pPage);
+ sal_Int32 InsertSlide (SdPage* pPage);
+ sal_Int32 DeleteSlide (const SdPage* pPage);
void UpdateIndices (const sal_Int32 nFirstIndex);
};
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 9a02c88..4d32f11 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include "ViewShellBase.hxx"
#include "DrawViewShell.hxx"
@@ -42,6 +43,8 @@
#include "FrameView.hxx"
#include <tools/diagnose_ex.h>
+#include <boost/property_tree/json_parser.hpp>
+#include <comphelper/lok.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -524,6 +527,7 @@ vcl::Region SlideSorterModel::RestoreSelection()
bool SlideSorterModel::NotifyPageEvent (const SdrPage* pSdrPage)
{
::osl::MutexGuard aGuard (maMutex);
+ sal_Int32 nIndex = -1;
SdPage* pPage = const_cast<SdPage*>(dynamic_cast<const SdPage*>(pSdrPage));
if (pPage == NULL)
@@ -537,30 +541,42 @@ bool SlideSorterModel::NotifyPageEvent (const SdrPage* pSdrPage)
return false;
if (pPage->IsInserted())
- InsertSlide(pPage);
+ nIndex = InsertSlide(pPage);
else
- DeleteSlide(pPage);
+ nIndex = DeleteSlide(pPage);
CheckModel(*this);
+ if (comphelper::LibreOfficeKit::isActive() &&
+ nIndex != -1)
+ {
+ boost::property_tree::ptree aTree;
+ std::stringstream aStream;
+ aTree.put("action", pPage->IsInserted() ? "PartInserted" : "PartDeleted");
+ aTree.put("part", OUString::number(nIndex).toUtf8().getStr());
+ boost::property_tree::write_json(aStream, aTree);
+ const OString aPayload = aStream.str().c_str();
+ GetDocument()->libreOfficeKitCallback(LOK_CALLBACK_PARTS_COUNT_CHANGED, aPayload.getStr());
+ }
+
return true;
}
-void SlideSorterModel::InsertSlide (SdPage* pPage)
+sal_Int32 SlideSorterModel::InsertSlide (SdPage* pPage)
{
// Find the index at which to insert the given page.
sal_uInt16 nCoreIndex (pPage->GetPageNum());
sal_Int32 nIndex (FromCoreIndex(nCoreIndex));
if (pPage != GetPage(nIndex))
- return;
+ return -1;
// Check that the pages in the document before and after the given page
// are present in this model.
if (nIndex>0)
if (GetPage(nIndex-1) != GetPageDescriptor(nIndex-1)->GetPage())
- return;
+ return -1;
if (size_t(nIndex)<maPageDescriptors.size()-1)
if (GetPage(nIndex+1) != GetPageDescriptor(nIndex)->GetPage())
- return;
+ return -1;
// Insert the given page at index nIndex
maPageDescriptors.insert(
@@ -573,9 +589,11 @@ void SlideSorterModel::InsertSlide (SdPage* pPage)
// Update page indices.
UpdateIndices(nIndex+1);
+
+ return nIndex;
}
-void SlideSorterModel::DeleteSlide (const SdPage* pPage)
+sal_Int32 SlideSorterModel::DeleteSlide (const SdPage* pPage)
{
sal_Int32 nIndex(0);
@@ -602,11 +620,13 @@ void SlideSorterModel::DeleteSlide (const SdPage* pPage)
{
if (maPageDescriptors[nIndex])
if (maPageDescriptors[nIndex]->GetPage() != pPage)
- return;
+ return -1;
maPageDescriptors.erase(maPageDescriptors.begin()+nIndex);
UpdateIndices(nIndex);
}
+
+ return nIndex;
}
void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex)
More information about the Libreoffice-commits
mailing list