[Libreoffice-commits] core.git: 2 commits - libreofficekit/qa sd/qa

[Miklos Vajna]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   15 +++--------
 sd/qa/unit/tiledrendering/tiledrendering.cxx        |   26 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit 7b68534ab0d322522ee5f64250526050187b6a9c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Apr 14 15:07:41 2015 +0200

    gtktiledviewer: can use gtk_toggle_tool_button_new_from_stock() for these
    
    Change-Id: I3c1163f9757a4592692bb8a920d1dc679bf53699

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index ae867fe..7715875 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -294,29 +294,24 @@ int main( int argc, char* argv[] )
 #endif
 
     gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), -1);
-    pEnableEditing = gtk_toggle_tool_button_new();
-    gtk_tool_button_set_label(GTK_TOOL_BUTTON(pEnableEditing), "Editing");
+    pEnableEditing = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_EDIT);
     gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pEnableEditing, -1);
     g_signal_connect(G_OBJECT(pEnableEditing), "toggled", G_CALLBACK(toggleEditing), NULL);
 
     gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), -1);
-    pBold = gtk_toggle_tool_button_new();
-    gtk_tool_button_set_label(GTK_TOOL_BUTTON(pBold), "Bold");
+    pBold = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_BOLD);
     gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pBold, -1);
     g_signal_connect(G_OBJECT(pBold), "toggled", G_CALLBACK(toggleToolItem), NULL);
     lcl_registerToolItem(pBold, ".uno:Bold");
-    pItalic = gtk_toggle_tool_button_new();
-    gtk_tool_button_set_label(GTK_TOOL_BUTTON(pItalic), "Italic");
+    pItalic = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ITALIC);
     gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pItalic, -1);
     g_signal_connect(G_OBJECT(pItalic), "toggled", G_CALLBACK(toggleToolItem), NULL);
     lcl_registerToolItem(pItalic, ".uno:Italic");
-    pUnderline = gtk_toggle_tool_button_new();
-    gtk_tool_button_set_label(GTK_TOOL_BUTTON(pUnderline), "Underline");
+    pUnderline = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_UNDERLINE);
     gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pUnderline, -1);
     g_signal_connect(G_OBJECT(pUnderline), "toggled", G_CALLBACK(toggleToolItem), NULL);
     lcl_registerToolItem(pUnderline, ".uno:Underline");
-    pStrikethrough = gtk_toggle_tool_button_new();
-    gtk_tool_button_set_label(GTK_TOOL_BUTTON(pStrikethrough), "Strikethrough");
+    pStrikethrough = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_STRIKETHROUGH);
     gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pStrikethrough, -1);
     g_signal_connect(G_OBJECT(pStrikethrough), "toggled", G_CALLBACK(toggleToolItem), NULL);
     lcl_registerToolItem(pStrikethrough, ".uno:Strikeout");
commit 7d82dfd5d2c7610199a243c1eaa1e1a69e279527
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Apr 14 14:29:44 2015 +0200

    Add SdXImpressDocument::resetSelection() testcase.
    
    Change-Id: I5bd6965bde1a5dcbe26abc197a67e09c06a2bb21

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 16ec351..7e3cf19 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -44,6 +44,7 @@ public:
     void testPostMouseEvent();
     void testSetTextSelection();
     void testSetGraphicSelection();
+    void testResetSelection();
 #endif
 
     CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
@@ -53,6 +54,7 @@ public:
     CPPUNIT_TEST(testPostMouseEvent);
     CPPUNIT_TEST(testSetTextSelection);
     CPPUNIT_TEST(testSetGraphicSelection);
+    CPPUNIT_TEST(testResetSelection);
 #endif
     CPPUNIT_TEST_SUITE_END();
 
@@ -243,6 +245,30 @@ void SdTiledRenderingTest::testSetGraphicSelection()
     CPPUNIT_ASSERT(aShapeBefore.getHeight() < aShapeAfter.getHeight());
 }
 
+void SdTiledRenderingTest::testResetSelection()
+{
+    SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+    uno::Reference<container::XIndexAccess> xDrawPage(pXImpressDocument->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+    uno::Reference<text::XTextRange> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY);
+    xShape->setString("Aaa bbb.");
+    // Create a selection on the second word.
+    sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell();
+    SdPage* pActualPage = pViewShell->GetActualPage();
+    SdrObject* pObject = pActualPage->GetObj(0);
+    SdrView* pView = pViewShell->GetView();
+    pView->SdrBeginTextEdit(pObject);
+    CPPUNIT_ASSERT(pView->GetTextEditObject());
+    EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
+    ESelection aWordSelection(0, 4, 0, 7);
+    rEditView.SetSelection(aWordSelection);
+    // Did we indeed manage to select the second word?
+    CPPUNIT_ASSERT_EQUAL(OUString("bbb"), rEditView.GetSelected());
+
+    // Now use resetSelection() to reset the selection.
+    pXImpressDocument->resetSelection();
+    CPPUNIT_ASSERT(!pView->GetTextEditObject());
+}
+
 #endif
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);