diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-01-22 14:49:55 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-01-22 14:49:55 +0100 |
| commit | a1d57594cffc6d93bb637247a74c86f138b8ffc5 (patch) | |
| tree | 3c6473872ecaeac1ce5138a4f06a800372219e83 /goodies/source/graphic/grfmgr.cxx | |
| parent | d919fae167e345762843da3e50054963dcc5cf45 (diff) | |
| parent | 8765a3bf9f2926a50d0f644e4263782269abe023 (diff) | |
cbosdo02: merging changesets up to DEV300_m69
Diffstat (limited to 'goodies/source/graphic/grfmgr.cxx')
| -rw-r--r-- | goodies/source/graphic/grfmgr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/goodies/source/graphic/grfmgr.cxx b/goodies/source/graphic/grfmgr.cxx index 5cb37a51e81f..7f5970383075 100644 --- a/goodies/source/graphic/grfmgr.cxx +++ b/goodies/source/graphic/grfmgr.cxx @@ -44,7 +44,7 @@ #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> #include <vcl/salbtype.hxx> -#include <svtools/cacheoptions.hxx> +#include <unotools/cacheoptions.hxx> #include "grfmgr.hxx" // ----------- @@ -845,7 +845,7 @@ const Graphic& GraphicObject::GetGraphic() const // ----------------------------------------------------------------------------- -void GraphicObject::SetGraphic( const Graphic& rGraphic ) +void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj ) { mpMgr->ImplUnregisterObj( *this ); @@ -858,7 +858,7 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic ) delete mpLink, mpLink = NULL; delete mpSimpleCache, mpSimpleCache = NULL; - mpMgr->ImplRegisterObj( *this, maGraphic ); + mpMgr->ImplRegisterObj( *this, maGraphic, 0, pCopyObj); if( mpSwapOutTimer ) mpSwapOutTimer->Start(); |