[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - libreofficekit/qa sc/inc sc/source

[Mihai Varga]

 libreofficekit/qa/data/calc_sheetnames.ods |binary
 libreofficekit/qa/unit/tiledrendering.cxx  |   24 +++++++++++++++++++++---
 sc/inc/docuno.hxx                          |    3 +++
 sc/source/ui/unoobj/docuno.cxx             |    8 ++++++++
 4 files changed, 32 insertions(+), 3 deletions(-)

New commits:
commit ba1b1a8a1a2def94b7a0d1cbb16792fc17de4f94
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Wed Jul 22 16:21:08 2015 +0300

    tiledrendering: added getPartName method for calc
    
    This method is used to get the sheet's name and to display it
    in the tabs (sheet selector)
    I've also added an unit test for it and uncommented a similar one
    
    Change-Id: Ia866815c594a873812c71a6c86e303c869e1f093
    Reviewed-on: https://gerrit.libreoffice.org/17294
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 50fe21c7807afb9650c048e1a82bd97a7fc1d226)
    Reviewed-on: https://gerrit.libreoffice.org/17368

diff --git a/libreofficekit/qa/data/calc_sheetnames.ods b/libreofficekit/qa/data/calc_sheetnames.ods
new file mode 100644
index 0000000..f6627a0
Binary files /dev/null and b/libreofficekit/qa/data/calc_sheetnames.ods differ
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index 63eb756..fb2f741 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -65,8 +65,9 @@ public:
 
     void testDocumentLoadFail( Office* pOffice );
     void testDocumentTypes( Office* pOffice );
-#if 0
     void testImpressSlideNames( Office* pOffice );
+    void testCalcSheetNames( Office* pOffice );
+#if 0
     void testOverlay( Office* pOffice );
 #endif
 
@@ -90,8 +91,9 @@ void TiledRenderingTest::runAllTests()
 
     testDocumentLoadFail( pOffice.get() );
     testDocumentTypes( pOffice.get() );
-#if 0
     testImpressSlideNames( pOffice.get() );
+    testCalcSheetNames( pOffice.get() );
+#if 0
     testOverlay( pOffice.get() );
 #endif
 }
@@ -142,7 +144,6 @@ void TiledRenderingTest::testDocumentTypes( Office* pOffice )
     // TODO: do this for all supported document types
 }
 
-#if 0
 void TiledRenderingTest::testImpressSlideNames( Office* pOffice )
 {
     const string sDocPath = m_sSrcRoot + "/libreofficekit/qa/data/impress_slidenames.odp";
@@ -164,6 +165,23 @@ void TiledRenderingTest::testImpressSlideNames( Office* pOffice )
     // have a localised version of "Slide 3".
 }
 
+void TiledRenderingTest::testCalcSheetNames( Office* pOffice )
+{
+    const string sDocPath = m_sSrcRoot + "/libreofficekit/qa/data/calc_sheetnames.ods";
+    const string sLockFile = m_sSrcRoot +"/libreofficekit/qa/data/.~lock.calc_sheetnames.ods#";
+
+    // FIXME: LOK will fail when trying to open a locked file
+    remove( sLockFile.c_str() );
+
+    scoped_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) );
+
+    CPPUNIT_ASSERT( pDocument->getParts() == 3 );
+    CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 0 ), "TestText1" ) == 0 );
+    CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 1 ), "TestText2" ) == 0 );
+    CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 2 ), "Sheet3" ) == 0 );
+}
+
+#if 0
 static void dumpRGBABitmap( const OUString& rPath, const unsigned char* pBuffer,
                             const int nWidth, const int nHeight )
 {
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index a7e9af5..cd68885 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -388,6 +388,9 @@ public:
     /// @see vcl::ITiledRenderable::getParts().
     virtual int getParts() SAL_OVERRIDE;
 
+    /// @see vcl::ITiledRenderable::getPartName().
+    virtual OUString getPartName(int nPart) SAL_OVERRIDE;
+
     /// @see vcl::ITiledRenderable::initializeForTiledRendering().
     virtual void initializeForTiledRendering() SAL_OVERRIDE;
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6d148da..e1235b9 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -510,6 +510,14 @@ int ScModelObj::getPart()
     return pViewData->GetTabNo();
 }
 
+OUString ScModelObj::getPartName( int nPart )
+{
+    OUString sTabName;
+    ScViewData* pViewData = ScDocShell::GetViewData();
+    pViewData->GetDocument()->GetName(nPart, sTabName);
+    return sTabName;
+}
+
 Size ScModelObj::getDocumentSize()
 {
     Size aSize(10, 10); // minimum size