diff options
| author | Malte Timmermann <mt@openoffice.org> | 2002-07-01 11:44:39 +0000 |
|---|---|---|
| committer | Malte Timmermann <mt@openoffice.org> | 2002-07-01 11:44:39 +0000 |
| commit | 9016ad96ff7de33d20c2ed6fe15a912ee6e21afc (patch) | |
| tree | c226ddb55d1907ff35c87f948a8051ed9bf38637 /svx/source/editeng/editobj.cxx | |
| parent | #100757#: encode not printable chars (diff) | |
| download | core-9016ad96ff7de33d20c2ed6fe15a912ee6e21afc.tar.gz core-9016ad96ff7de33d20c2ed6fe15a912ee6e21afc.zip | |
#95266# Remove assertion, no longer valid because draw calls MergeParaAttribs() before FinishLoad()
Diffstat (limited to 'svx/source/editeng/editobj.cxx')
| -rw-r--r-- | svx/source/editeng/editobj.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx index 8dfafb810300..282ad28074bb 100644 --- a/svx/source/editeng/editobj.cxx +++ b/svx/source/editeng/editobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: editobj.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: mt $ $Date: 2001-08-28 09:34:09 $ + * last change: $Author: mt $ $Date: 2002-07-01 12:44:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1739,9 +1739,6 @@ void BinTextObject::FinishLoad( SfxStyleSheetPool* pStyleSheetPool ) // Symbol-Convertion because of StyleSheet? if ( pStyleSheetPool && pC->GetLoadStoreTempInfos() && pC->GetLoadStoreTempInfos()->aOrgString_Load.Len() ) { - // When getting this assertion, we shouldn't convert anything here !!! - DBG_ASSERT( ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) != SFX_ITEM_ON ) && pC->aStyle.Len(), "FinishLoad: TempLoadStoreInfos, why?!" ); - SfxStyleSheet* pStyle = (SfxStyleSheet*)pStyleSheetPool->Find( pC->GetStyle(), pC->GetFamily() ); if ( pStyle ) { |