desktop/qa/desktop_lib/test_desktop_lib.cxx | 5 ++++- vcl/source/outdev/font.cxx | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
New commits: commit b2f994469f3e2f1fe72e9f103b840aa949ace6dd Author: Henry Castro <[email protected]> Date: Tue May 24 17:24:16 2016 -0400 lok: reset the font list when there are no items In the pre-init stage the devices were initialized with no font list, but later the font list is updated. So those devices were not updated. Change-Id: I157d4c7079f9b1252916eb92b512aadb8e77329f Reviewed-on: https://gerrit.libreoffice.org/25419 Tested-by: Jenkins <[email protected]> Reviewed-by: Ashod Nakashian <[email protected]> diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index efa055a..bdda55e 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -270,7 +270,8 @@ void DesktopLOKTest::testGetStyles() void DesktopLOKTest::testGetFonts() { - LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); + comphelper::LibreOfficeKit::setActive(); + LibLODocument_Impl* pDocument = loadDoc("blank_presentation.odp"); boost::property_tree::ptree aTree; char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, ".uno:CharFontName"); std::stringstream aStream(pJSON); @@ -285,6 +286,8 @@ void DesktopLOKTest::testGetFonts() // check that we have font sizes available for each font CPPUNIT_ASSERT( rPair.second.size() > 0); } + free(pJSON); + comphelper::LibreOfficeKit::setActive(false); } void DesktopLOKTest::testCreateView() diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index c6c4f4f..01aa841 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -74,9 +74,19 @@ int OutputDevice::GetDevFontCount() const if( !mpDeviceFontList ) { if (!mpFontCollection) + { return 0; + } mpDeviceFontList = mpFontCollection->GetDeviceFontList(); + + if (!mpDeviceFontList->Count()) + { + delete mpDeviceFontList; + mpDeviceFontList = nullptr; + + return 0; + } } return mpDeviceFontList->Count(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
