diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-04 15:06:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-04 15:06:28 +0000 |
| commit | c745459e3ac2b36b1bf286493c48fec514cd84e3 (patch) | |
| tree | 7bb794f46f9057d24b63586323cdd4436315f34b | |
| parent | ea4b18a7134bfb7c8f7c4c4d9cfb668ca2383bc5 (diff) | |
INTEGRATION: CWS tl15 (1.38.222); FILE MERGED
2005/10/25 14:53:56 os 1.38.222.3: RESYNC: (1.39-1.40); FILE MERGED
2005/09/23 04:25:06 tl 1.38.222.2: RESYNC: (1.38-1.39); FILE MERGED
2005/09/06 07:58:27 os 1.38.222.1: #125488# call of SfxObjectShell::IsAbortingImport removed
| -rw-r--r-- | svx/source/items/frmitems.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx index 4d562e97fb95..66eddcaed471 100644 --- a/svx/source/items/frmitems.cxx +++ b/svx/source/items/frmitems.cxx @@ -4,9 +4,9 @@ * * $RCSfile: frmitems.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: rt $ $Date: 2005-10-19 12:10:38 $ + * last change: $Author: kz $ $Date: 2005-11-04 16:06:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -4200,15 +4200,6 @@ const GraphicObject* SvxBrushItem::GetGraphicObject( SfxObjectShell* pSh ) const if ( bLoadAgain && pStrLink && !pImpl->pGraphicObject && !pImpl->xMedium.Is() ) // wenn Grafik schon geladen, als Cache benutzen { -/* os: #125481# invalid code - loading cannot be aborted anymore but the related - flag is for some reasons set in SfxViewFrame::~SfxViewFrame() - if( pSh && pSh->IsAbortingImport() ) - { - SvxBrushItem* pThis = (SvxBrushItem*)this; - pThis->bLoadAgain = sal_False; - return 0; - } - */ //JP 29.6.2001: only with "valid" names - empty names now allowed if( pStrLink->Len() ) { |