summaryrefslogtreecommitdiff
path: root/svtools/source/graphic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-15 15:18:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-15 15:19:15 +0200
commit3a54474c408d40e768c19e9ceef2da8b550d8f77 (patch)
tree3abe9c7dee983ac5b1480c3ab7da74cd5a3be6f6 /svtools/source/graphic
parentedf69b5b3fbb94385a4f564aec6e3f54abe4ee32 (diff)
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I1341170e8ca43e23723a88ec05d826981e4473ee
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r--svtools/source/graphic/grfcache.cxx4
-rw-r--r--svtools/source/graphic/grfcache.hxx5
-rw-r--r--svtools/source/graphic/grfmgr2.cxx2
3 files changed, 5 insertions, 6 deletions
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 59aab2fbe45e..03de750ebc86 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -28,6 +28,7 @@
#include <salhelper/timer.hxx>
+#include <svtools/grfmgr.hxx>
#include <tools/debug.hxx>
#include <vcl/metaact.hxx>
#include <vcl/outdev.hxx>
@@ -850,8 +851,7 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const
// - GraphicCache -
// -----------------------
-GraphicCache::GraphicCache( GraphicManager& rMgr, sal_uLong nDisplayCacheSize, sal_uLong nMaxObjDisplayCacheSize ) :
- mrMgr ( rMgr ),
+GraphicCache::GraphicCache( sal_uLong nDisplayCacheSize, sal_uLong nMaxObjDisplayCacheSize ) :
mnReleaseTimeoutSeconds ( 0UL ),
mnMaxDisplaySize ( nDisplayCacheSize ),
mnMaxObjDisplaySize ( nMaxObjDisplayCacheSize ),
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index fed7911c1e5f..493c52d2bb0f 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -31,15 +31,16 @@
#include <vcl/graph.hxx>
#include <vcl/timer.hxx>
-#include <svtools/grfmgr.hxx>
#include <list>
// -----------------------
// - GraphicManagerCache -
// -----------------------
+class GraphicAttr;
class GraphicCacheEntry;
class GraphicDisplayCacheEntry;
+class GraphicObject;
class GraphicCache
{
@@ -47,7 +48,6 @@ private:
typedef std::list< GraphicCacheEntry* > GraphicCacheEntryList;
typedef std::list< GraphicDisplayCacheEntry* > GraphicDisplayCacheEntryList;
- GraphicManager& mrMgr;
Timer maReleaseTimer;
GraphicCacheEntryList maGraphicCache;
GraphicDisplayCacheEntryList maDisplayCache;
@@ -65,7 +65,6 @@ private:
public:
GraphicCache(
- GraphicManager& rMgr,
sal_uLong nDisplayCacheSize = 10000000UL,
sal_uLong nMaxObjDisplayCacheSize = 2400000UL
);
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index f738998b77f9..2cc7ae3762e5 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -52,7 +52,7 @@
// ------------------
GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize ) :
- mpCache( new GraphicCache( *this, nCacheSize, nMaxObjCacheSize ) )
+ mpCache( new GraphicCache( nCacheSize, nMaxObjCacheSize ) )
{
}