strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress144 (1.9.40); FILE MERGED

Browse source 
2008/05/29 08:07:38 af 1.9.40.1: #i58744# Fixed delay between preview creations.
This commit is contained in:
Vladimir Glazounov 2008-07-01 12:36:32 +00:00
parent f08965c686
commit ce02935be9
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx vendored
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: SlsBitmapCache.cxx,v $
* $Revision: 1.9 $
* $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@ -73,7 +73,7 @@ public:
void SetAccessTime (sal_Int32 nAccessTime) { mnLastAccessTime = nAccessTime; }
::boost::shared_ptr<BitmapEx> GetPreview (void) const { return mpPreview; }
inline void SetPreview (const ::boost::shared_ptr<BitmapEx>& rpPreview);
bool HasPreview (void) const { return (mpPreview.get() != NULL); }
bool HasPreview (void) const;
bool HasReplacement (void) const { return (mpReplacement.get() != NULL); }
inline bool HasLosslessReplacement (void) const;
void Clear (void) { mpPreview.reset(); mpReplacement.reset(); mpCompressor.reset(); }
@ -383,8 +383,10 @@ void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious)
{
iEntry = mpBitmapContainer->insert(CacheBitmapContainer::value_type (
rKey,
CacheEntry (::boost::shared_ptr<BitmapEx>(new BitmapEx()),
mnCurrentAccessTime++, bIsPrecious))).first;
CacheEntry (
::boost::shared_ptr<BitmapEx>(),
mnCurrentAccessTime++, bIsPrecious))
).first;
UpdateCacheSize(iEntry->second, ADD);
}
}
@ -647,6 +649,17 @@ inline void BitmapCache::CacheEntry::SetPreview (const ::boost::shared_ptr<Bitma
bool BitmapCache::CacheEntry::HasPreview (void) const
{
if (mpPreview.get() != NULL)
return mpPreview->GetSizePixel().Width()>0 && mpPreview->GetSizePixel().Height()>0;
else
return false;
}
inline bool BitmapCache::CacheEntry::HasLosslessReplacement (void) const
{
return mpReplacement.get()!=NULL