diff options
| author | Henning Brinkmann <hbrinkm@openoffice.org> | 2010-12-01 13:49:43 +0100 |
|---|---|---|
| committer | Henning Brinkmann <hbrinkm@openoffice.org> | 2010-12-01 13:49:43 +0100 |
| commit | 6c59cba1f07e5e4fa13417aa3d5e690031c92f30 (patch) | |
| tree | f3d0b84a43e5a039059a6559a1875e303fa795c6 /writerfilter/source/dmapper/FontTable.cxx | |
| parent | eb51984cee2d08c943680983ecdc5fede61a4c94 (diff) | |
| parent | 9c16b686c71855df1bbcbf1bcc4b175c48abb49c (diff) | |
merged DEV300_m94
Diffstat (limited to 'writerfilter/source/dmapper/FontTable.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/FontTable.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 63e7057bccd7..fd6f15660557 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -41,7 +41,7 @@ namespace dmapper struct FontTable_Impl { - std::vector< FontEntry > aFontEntries; + std::vector< FontEntry::Pointer_t > aFontEntries; FontEntry::Pointer_t pCurrentEntry; FontTable_Impl() {} }; @@ -573,7 +573,7 @@ void FontTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Poin m_pImpl->pCurrentEntry.reset(new FontEntry); ref->resolve(*this); //append it to the table - m_pImpl->aFontEntries.push_back( *m_pImpl->pCurrentEntry ); + m_pImpl->aFontEntries.push_back( m_pImpl->pCurrentEntry ); m_pImpl->pCurrentEntry.reset(); } /*-- 19.06.2006 12:04:34--------------------------------------------------- @@ -662,12 +662,9 @@ void FontTable::lcl_endShape( ) -----------------------------------------------------------------------*/ const FontEntry::Pointer_t FontTable::getFontEntry(sal_uInt32 nIndex) { - FontEntry::Pointer_t pRet; - if(m_pImpl->aFontEntries.size() > nIndex) - { - pRet.reset(&m_pImpl->aFontEntries[nIndex]); - } - return pRet; + return (m_pImpl->aFontEntries.size() > nIndex) + ? m_pImpl->aFontEntries[nIndex] + : FontEntry::Pointer_t(); } /*-- 21.06.2006 11:21:38--------------------------------------------------- |