diff options
Diffstat (limited to 'goodies/source')
-rw-r--r-- | goodies/source/filter.vcl/egif/egif.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/eos2met/eos2met.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/epbm/epbm.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/epgm/epgm.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/epict/epict.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/eppm/eppm.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/eps/eps.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/etiff/etiff.cxx | 2 | ||||
-rw-r--r-- | goodies/source/filter.vcl/ipcd/ipcd.cxx | 2 | ||||
-rw-r--r-- | goodies/source/graphic/grfcache.cxx | 18 | ||||
-rw-r--r-- | goodies/source/graphic/grfmgr.cxx | 2 | ||||
-rw-r--r-- | goodies/source/inv/invader.cxx | 2 | ||||
-rw-r--r-- | goodies/source/unographic/descriptor.cxx | 2 | ||||
-rw-r--r-- | goodies/source/unographic/provider.cxx | 2 | ||||
-rw-r--r-- | goodies/source/unographic/renderer.cxx | 2 | ||||
-rw-r--r-- | goodies/source/unographic/transformer.cxx | 2 |
16 files changed, 29 insertions, 19 deletions
diff --git a/goodies/source/filter.vcl/egif/egif.cxx b/goodies/source/filter.vcl/egif/egif.cxx index e1547c7339d0..9f2aeaddd686 100644 --- a/goodies/source/filter.vcl/egif/egif.cxx +++ b/goodies/source/filter.vcl/egif/egif.cxx @@ -35,7 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/window.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "giflzwc.hxx" diff --git a/goodies/source/filter.vcl/eos2met/eos2met.cxx b/goodies/source/filter.vcl/eos2met/eos2met.cxx index e0b6c2bdea43..b818e9cd26ba 100644 --- a/goodies/source/filter.vcl/eos2met/eos2met.cxx +++ b/goodies/source/filter.vcl/eos2met/eos2met.cxx @@ -47,7 +47,7 @@ #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include "strings.hrc" #include "dlgeos2.hxx" diff --git a/goodies/source/filter.vcl/epbm/epbm.cxx b/goodies/source/filter.vcl/epbm/epbm.cxx index 92aeb501e141..a624e7f45cfb 100644 --- a/goodies/source/filter.vcl/epbm/epbm.cxx +++ b/goodies/source/filter.vcl/epbm/epbm.cxx @@ -35,7 +35,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "strings.hrc" diff --git a/goodies/source/filter.vcl/epgm/epgm.cxx b/goodies/source/filter.vcl/epgm/epgm.cxx index b6056339f11e..32d6e74a5cfe 100644 --- a/goodies/source/filter.vcl/epgm/epgm.cxx +++ b/goodies/source/filter.vcl/epgm/epgm.cxx @@ -35,7 +35,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "strings.hrc" diff --git a/goodies/source/filter.vcl/epict/epict.cxx b/goodies/source/filter.vcl/epict/epict.cxx index 73e321a5b5b3..3e4dca455d05 100644 --- a/goodies/source/filter.vcl/epict/epict.cxx +++ b/goodies/source/filter.vcl/epict/epict.cxx @@ -33,7 +33,7 @@ #include <vcl/metaact.hxx> #include <svtools/filter.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <math.h> diff --git a/goodies/source/filter.vcl/eppm/eppm.cxx b/goodies/source/filter.vcl/eppm/eppm.cxx index 8cd71176e31b..d17b4f7777ae 100644 --- a/goodies/source/filter.vcl/eppm/eppm.cxx +++ b/goodies/source/filter.vcl/eppm/eppm.cxx @@ -35,7 +35,7 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> #include <vcl/msgbox.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include "strings.hrc" diff --git a/goodies/source/filter.vcl/eps/eps.cxx b/goodies/source/filter.vcl/eps/eps.cxx index 8a163659050a..dc8e407b178e 100644 --- a/goodies/source/filter.vcl/eps/eps.cxx +++ b/goodies/source/filter.vcl/eps/eps.cxx @@ -46,7 +46,7 @@ #include <vcl/msgbox.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/gradient.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> #include <vcl/graphictools.hxx> diff --git a/goodies/source/filter.vcl/etiff/etiff.cxx b/goodies/source/filter.vcl/etiff/etiff.cxx index 12289cb8f0a9..3cdec42d0978 100644 --- a/goodies/source/filter.vcl/etiff/etiff.cxx +++ b/goodies/source/filter.vcl/etiff/etiff.cxx @@ -35,7 +35,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/fltcall.hxx> #include <svtools/FilterConfigItem.hxx> diff --git a/goodies/source/filter.vcl/ipcd/ipcd.cxx b/goodies/source/filter.vcl/ipcd/ipcd.cxx index f70d1c8b84c5..f7a5f3652cbf 100644 --- a/goodies/source/filter.vcl/ipcd/ipcd.cxx +++ b/goodies/source/filter.vcl/ipcd/ipcd.cxx @@ -36,7 +36,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/svapp.hxx> #include <svtools/fltcall.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svtools/FilterConfigItem.hxx> //============================ PCDReader ================================== diff --git a/goodies/source/graphic/grfcache.cxx b/goodies/source/graphic/grfcache.cxx index 1a2af16ed741..f0a41ceca53f 100644 --- a/goodies/source/graphic/grfcache.cxx +++ b/goodies/source/graphic/grfcache.cxx @@ -37,6 +37,8 @@ #include <tools/poly.hxx> #include "grfcache.hxx" +#include <memory> + // ----------- // - Defines - // ----------- @@ -612,7 +614,12 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti if( !bInserted ) { GraphicCacheEntry* pEntry = static_cast< GraphicCacheEntry* >( maGraphicCache.First() ); - const GraphicID aID( rObj ); + ::std::auto_ptr< GraphicID > apID; + + if( !pID ) + { + apID.reset( new GraphicID( rObj ) ); + } while( !bInserted && pEntry ) { @@ -647,10 +654,13 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti } } } - else if( rEntryID == aID ) + else { - pEntry->AddGraphicObjectReference( rObj, rSubstitute ); - bInserted = TRUE; + if( rEntryID == *apID ) + { + pEntry->AddGraphicObjectReference( rObj, rSubstitute ); + bInserted = TRUE; + } } if( !bInserted ) diff --git a/goodies/source/graphic/grfmgr.cxx b/goodies/source/graphic/grfmgr.cxx index 5cb37a51e81f..39c1e53e7184 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" // ----------- diff --git a/goodies/source/inv/invader.cxx b/goodies/source/inv/invader.cxx index be15ff2e75d4..0aed6e76848f 100644 --- a/goodies/source/inv/invader.cxx +++ b/goodies/source/inv/invader.cxx @@ -37,7 +37,7 @@ #include "invader.hrc" #include "strings.hrc" #include "score.hxx" -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <cppuhelper/servicefactory.hxx> #include <comphelper/processfactory.hxx> #include <vcl/msgbox.hxx> diff --git a/goodies/source/unographic/descriptor.cxx b/goodies/source/unographic/descriptor.cxx index e75b008cfb69..c19318d6e11e 100644 --- a/goodies/source/unographic/descriptor.cxx +++ b/goodies/source/unographic/descriptor.cxx @@ -37,7 +37,7 @@ #include <vos/mutex.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svtools/filter.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_ #include <com/sun/star/beans/PropertyState.hpp> diff --git a/goodies/source/unographic/provider.cxx b/goodies/source/unographic/provider.cxx index 2eb0aede9bdf..1f7de99d4473 100644 --- a/goodies/source/unographic/provider.cxx +++ b/goodies/source/unographic/provider.cxx @@ -46,7 +46,7 @@ #include <tools/resmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svtools/filter.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <vcl/salbtype.hxx> #include <vcl/virdev.hxx> #include <com/sun/star/io/XStream.hpp> diff --git a/goodies/source/unographic/renderer.cxx b/goodies/source/unographic/renderer.cxx index 78f006cc69be..d280ed832999 100644 --- a/goodies/source/unographic/renderer.cxx +++ b/goodies/source/unographic/renderer.cxx @@ -48,7 +48,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/propertysetinfo.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "grfmgr.hxx" #include "graphic.hxx" #include "renderer.hxx" diff --git a/goodies/source/unographic/transformer.cxx b/goodies/source/unographic/transformer.cxx index 4422d161d7c4..7e18c10cdd41 100644 --- a/goodies/source/unographic/transformer.cxx +++ b/goodies/source/unographic/transformer.cxx @@ -43,7 +43,7 @@ #include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <vcl/salbtype.hxx> #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> |