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

tdf#43157 Clean up OSL_ENSURE in FontTable.cxx

Browse Source 
Clean up OSL_ENSURE in FontTable.cxx.

Change-Id: Ibe0b58d00ac5cd63e6227f5d73e70fd1785aa694
Reviewed-on: https://gerrit.libreoffice.org/28640
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
drazil
2016-09-03 15:40:25 +08:00
committed by Miklos Vajna
parent d3035126aa
commit 12c11e6578
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
writerfilter/source/dmapper/FontTable.cxx
View File

@@ -53,7 +53,7 @@ FontTable::~FontTable()
void FontTable::lcl_attribute(Id Name, Value & val) void FontTable::lcl_attribute(Id Name, Value & val)
{ {
OSL_ENSURE( m_pImpl->pCurrentEntry, "current entry has to be set here"); SAL_WARN_IF( !m_pImpl->pCurrentEntry, "writerfilter.dmapper", "current entry has to be set here" );
if(!m_pImpl->pCurrentEntry) if(!m_pImpl->pCurrentEntry)
return ; return ;
int nIntValue = val.getInt(); int nIntValue = val.getInt();
@@ -104,7 +104,7 @@ void FontTable::lcl_attribute(Id Name, Value & val)
void FontTable::lcl_sprm(Sprm& rSprm) void FontTable::lcl_sprm(Sprm& rSprm)
{ {
OSL_ENSURE( m_pImpl->pCurrentEntry, "current entry has to be set here"); SAL_WARN_IF( !m_pImpl->pCurrentEntry, "writerfilter.dmapper", "current entry has to be set here" );
if(!m_pImpl->pCurrentEntry) if(!m_pImpl->pCurrentEntry)
return ; return ;
sal_uInt32 nSprmId = rSprm.getId(); sal_uInt32 nSprmId = rSprm.getId();
@@ -158,7 +158,7 @@ void FontTable::resolveSprm(Sprm & r_Sprm)
void FontTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref) void FontTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
{ {
//create a new font entry //create a new font entry
OSL_ENSURE( !m_pImpl->pCurrentEntry, "current entry has to be NULL here"); SAL_WARN_IF( m_pImpl->pCurrentEntry, "writerfilter.dmapper", "current entry has to be NULL here" );
m_pImpl->pCurrentEntry.reset(new FontEntry); m_pImpl->pCurrentEntry.reset(new FontEntry);
ref->resolve(*this); ref->resolve(*this);
//append it to the table //append it to the table