[Libreoffice-commits] core.git: 2 commits - sc/source svgio/qa

[Tomaž Vajngerl]

 sc/source/ui/view/tabcont.cxx      |    4 ++--
 svgio/qa/cppunit/SvgImportTest.cxx |   19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit b6fe593c8a60cc689e1bbb4d92d7cad89785be0d
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Wed Oct 14 22:31:09 2015 +0200

    tdf#93318 reintroduce first/last button in Calc tab bar
    
    Seems that first/last button are still useful when there are a lot
    of tabs. Using ctrl+click is not discoverable enough for the users
    so for now bring the buttons back.
    Also turn on enabling/disabling buttons when they have some
    effect (this was turned off for Calc for unknown reasons).
    
    Change-Id: I6bbb04d44066ebc6b89fe3d941ecafdbb378284a

diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 53f5e85..75cf372 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -38,7 +38,7 @@
 // STATIC DATA -----------------------------------------------------------
 
 ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData )
-    : TabBar(pParent, WB_3DLOOK | WB_MINSCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
+    : TabBar(pParent, WB_3DLOOK | WB_MINSCROLL | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
     , DropTargetHelper(this)
     , DragSourceHelper(this)
     , pViewData(pData)
@@ -79,7 +79,7 @@ ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData )
     EnableEditMode();
     UpdateInputContext();
 
-    SetScrollAlwaysEnabled(true);
+    SetScrollAlwaysEnabled(false);
 
     SetScrollAreaContextHdl( LINK( this, ScTabControl, ShowPageList ) );
 }
commit 6ea647924d57da308b273242db72ae571acbc3c8
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Tue Oct 13 18:39:08 2015 +0200

    make test more readable - use Primitive2DSequence
    
    Change-Id: I8e49fce5a4d8f5b46b9bd1dd3f71a8c7dc90c20d

diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx
index 2027ab7..d056053 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -31,14 +31,15 @@ using namespace css::uno;
 using namespace css::io;
 using namespace css::graphic;
 using drawinglayer::primitive2d::arePrimitive2DSequencesEqual;
+using drawinglayer::primitive2d::Primitive2DSequence;
 
 class Test : public test::BootstrapFixture, public XmlTestTools
 {
-    void checkRectPrimitive(css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rPrimitive);
+    void checkRectPrimitive(Primitive2DSequence& rPrimitive);
 
     void testStyles();
 
-    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > parseSvg(const char* aSource);
+    Primitive2DSequence parseSvg(const char* aSource);
 
 public:
     virtual void setUp() override;
@@ -49,7 +50,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > Test::parseSvg(const char* aSource)
+Primitive2DSequence Test::parseSvg(const char* aSource)
 {
     const Reference<XSvgParser> xSvgParser = SvgTools::create(m_xContext);
 
@@ -78,7 +79,7 @@ void Test::tearDown()
     BootstrapFixture::tearDown();
 }
 
-void Test::checkRectPrimitive(css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rPrimitive)
+void Test::checkRectPrimitive(Primitive2DSequence& rPrimitive)
 {
     Primitive2dXmlDump dumper;
     xmlDocPtr pDocument = dumper.dumpAndParse(rPrimitive);
@@ -96,29 +97,27 @@ void Test::checkRectPrimitive(css::uno::Sequence< css::uno::Reference< css::grap
 // however the end result should be the same.
 void Test::testStyles()
 {
-    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRect = parseSvg("/svgio/qa/cppunit/data/Rect.svg");
+    Primitive2DSequence aSequenceRect = parseSvg("/svgio/qa/cppunit/data/Rect.svg");
     CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRect.getLength());
     checkRectPrimitive(aSequenceRect);
 
-    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithStyle = parseSvg("/svgio/qa/cppunit/data/RectWithStyles.svg");
+    Primitive2DSequence aSequenceRectWithStyle = parseSvg("/svgio/qa/cppunit/data/RectWithStyles.svg");
     CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithStyle.getLength());
     checkRectPrimitive(aSequenceRectWithStyle);
 
-    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithParentStyle = parseSvg("/svgio/qa/cppunit/data/RectWithParentStyles.svg");
+    Primitive2DSequence aSequenceRectWithParentStyle = parseSvg("/svgio/qa/cppunit/data/RectWithParentStyles.svg");
     CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithParentStyle.getLength());
     checkRectPrimitive(aSequenceRectWithParentStyle);
 
-    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithStylesByGroup = parseSvg("/svgio/qa/cppunit/data/RectWithStylesByGroup.svg");
+    Primitive2DSequence aSequenceRectWithStylesByGroup = parseSvg("/svgio/qa/cppunit/data/RectWithStylesByGroup.svg");
     CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithStylesByGroup.getLength());
     checkRectPrimitive(aSequenceRectWithStylesByGroup);
 
     CPPUNIT_ASSERT(arePrimitive2DSequencesEqual(aSequenceRect, aSequenceRectWithStyle));
     CPPUNIT_ASSERT(arePrimitive2DSequencesEqual(aSequenceRect, aSequenceRectWithParentStyle));
     CPPUNIT_ASSERT(arePrimitive2DSequencesEqual(aSequenceRect, aSequenceRectWithStylesByGroup));
-
 }
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }