mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lok: reset the font list when there are no items

Browse Source 
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 <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Henry Castro 2016-05-24 17:24:16 -04:00 committed by Ashod Nakashian
parent 61b43a02cc
commit b2f994469f
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/qa/desktop_lib/test_desktop_lib.cxx
View File

@ -270,7 +270,8 @@ void DesktopLOKTest::testGetStyles()
void DesktopLOKTest::testGetFonts() 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; boost::property_tree::ptree aTree;
char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, ".uno:CharFontName"); char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, ".uno:CharFontName");
std::stringstream aStream(pJSON); std::stringstream aStream(pJSON);
@ -285,6 +286,8 @@ void DesktopLOKTest::testGetFonts()
// check that we have font sizes available for each font // check that we have font sizes available for each font
CPPUNIT_ASSERT( rPair.second.size() > 0); CPPUNIT_ASSERT( rPair.second.size() > 0);
} }
free(pJSON);
comphelper::LibreOfficeKit::setActive(false);
} }
void DesktopLOKTest::testCreateView() void DesktopLOKTest::testCreateView()

10
vcl/source/outdev/font.cxx
View File

@ -74,9 +74,19 @@ int OutputDevice::GetDevFontCount() const
if( !mpDeviceFontList ) if( !mpDeviceFontList )
{ {
if (!mpFontCollection) if (!mpFontCollection)
{
return 0; return 0;
}
mpDeviceFontList = mpFontCollection->GetDeviceFontList(); mpDeviceFontList = mpFontCollection->GetDeviceFontList();
if (!mpDeviceFontList->Count())
{
delete mpDeviceFontList;
mpDeviceFontList = nullptr;
return 0;
}
} }
return mpDeviceFontList->Count(); return mpDeviceFontList->Count();
} }