diff options
| -rw-r--r-- | libreofficekit/qa/data/calc_sheetnames.ods | bin | 0 -> 6966 bytes | |||
| -rw-r--r-- | libreofficekit/qa/unit/tiledrendering.cxx | 24 | ||||
| -rw-r--r-- | sc/inc/docuno.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 8 |
4 files changed, 32 insertions, 3 deletions
diff --git a/libreofficekit/qa/data/calc_sheetnames.ods b/libreofficekit/qa/data/calc_sheetnames.ods Binary files differnew file mode 100644 index 000000000000..f6627a058499 --- /dev/null +++ b/libreofficekit/qa/data/calc_sheetnames.ods diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx index 63eb756b9d20..fb2f7416ba34 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 a7e9af5afb2c..cd6888598f69 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 6d148dab9af0..e1235b90cb7a 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 |