[Libreoffice-commits] .: svtools/bmpmaker svtools/inc svtools/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Wed Aug 15 06:19:22 PDT 2012


 svtools/bmpmaker/bmpcore.hxx                 |    2 --
 svtools/inc/svtools/brwbox.hxx               |    4 ----
 svtools/inc/svtools/calendar.hxx             |    3 ---
 svtools/inc/svtools/grfmgr.hxx               |    4 ----
 svtools/inc/svtools/inettbc.hxx              |    2 --
 svtools/inc/svtools/svlbitm.hxx              |    1 -
 svtools/inc/svtools/svlbox.hxx               |    1 -
 svtools/inc/svtools/svtabbx.hxx              |    2 --
 svtools/inc/svtools/toolpanel/toolpanel.hxx  |    3 ---
 svtools/inc/svtools/transfer.hxx             |    7 -------
 svtools/source/brwbox/brwbox1.cxx            |    6 +++---
 svtools/source/brwbox/brwbox2.cxx            |    6 ++----
 svtools/source/brwbox/datwin.cxx             |    9 +++------
 svtools/source/brwbox/datwin.hxx             |   14 ++++----------
 svtools/source/contnr/contentenumeration.cxx |    1 -
 svtools/source/contnr/contentenumeration.hxx |    2 --
 svtools/source/contnr/svlbox.cxx             |    3 +--
 svtools/source/control/inettbc.cxx           |    3 ---
 svtools/source/graphic/grfcache.cxx          |    4 ++--
 svtools/source/graphic/grfcache.hxx          |    5 ++---
 svtools/source/graphic/grfmgr2.cxx           |    2 +-
 svtools/source/inc/gifread.hxx               |    1 -
 svtools/source/uno/svtxgridcontrol.cxx       |    2 --
 svtools/source/uno/svtxgridcontrol.hxx       |    2 --
 24 files changed, 18 insertions(+), 71 deletions(-)

New commits:
commit 3a54474c408d40e768c19e9ceef2da8b550d8f77
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 15 15:18:48 2012 +0200

    -Werror,-Wunused-private-field (Clang towards 3.2)
    
    Change-Id: I1341170e8ca43e23723a88ec05d826981e4473ee

diff --git a/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx
index fb8a555..9230b29 100644
--- a/svtools/bmpmaker/bmpcore.hxx
+++ b/svtools/bmpmaker/bmpcore.hxx
@@ -63,8 +63,6 @@ private:
     Size            aTotSize;
     Point           aPos;
     SvFileStream*   pSRS;
-    sal_uLong           nTotCount;
-    sal_uInt16          nPos;
 
     void            ImplCreate( const ::std::vector< DirEntry >& rInDirs,
                                 const DirEntry& rOut,
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 75ffead..14e2152 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -106,9 +106,6 @@ typedef sal_uLong BrowserMode;
     // but shown otherwise. This does not affect other situations which require to temporarily hide the
     // cursor (such as scrolling).
 
-typedef int BrowserColumnMode;
-#define BROWSER_COLUMN_TITLEABBREVATION   1
-
 #define BROWSER_NONE                      0
 #define BROWSER_SELECT                  720
 #define BROWSER_ENHANCESELECTION        722
@@ -501,7 +498,6 @@ public:
 
     // access to dynamic values of cursor row
     String          GetColumnTitle( sal_uInt16 nColumnId ) const;
-    BrowserColumnMode GetColumnMode( sal_uInt16 nColumnId ) const;
     Rectangle       GetFieldRect( sal_uInt16 nColumnId ) const;
     sal_uLong           GetColumnWidth( sal_uInt16 nColumnId ) const;
     sal_uInt16          GetColumnId( sal_uInt16 nPos ) const;
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index 17dd52b..537c179 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -203,9 +203,6 @@ private:
     long            mnDayWidth;
     long            mnDayHeight;
     long            mnWeekWidth;
-    long            mnDummy2;
-    long            mnDummy3;
-    long            mnDummy4;
     WinBits         mnWinStyle;
     sal_uInt16          mnFirstYear;
     sal_uInt16          mnLastYear;
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 775d903..8d2d050 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -97,8 +97,6 @@ class SVT_DLLPUBLIC GraphicAttr
 {
 private:
 
-    long            mnDummy1;
-    long            mnDummy2;
     double          mfGamma;
     sal_uInt32      mnMirrFlags;
     long            mnLeftCrop;
@@ -115,8 +113,6 @@ private:
     sal_uInt8       mcTransparency;
     GraphicDrawMode meDrawMode;
 
-    void*           mpDummy;
-
 public:
 
                     GraphicAttr();
diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx
index a9647dc..b092b61 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/svtools/inc/svtools/inettbc.hxx
@@ -51,8 +51,6 @@ friend class SvtURLBox_Impl;
     INetProtocol                    eSmartProtocol;
     sal_Bool                            bAutoCompleteMode   : 1;
     sal_Bool                            bOnlyDirectories    : 1;
-    sal_Bool                            bModified           : 1;
-    sal_Bool                            bTryAutoComplete    : 1;
     sal_Bool                            bCtrlClick          : 1;
     sal_Bool                            bHistoryDisabled    : 1;
     sal_Bool                            bNoSelection        : 1;
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index a56ea7d..727a0a5 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -169,7 +169,6 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
     SvLBoxButtonData*   pData;
     SvLBoxButtonKind eKind;
     sal_uInt16 nItemFlags;
-    sal_uInt16 nImgArrOffs;
     sal_uInt16 nBaseOffs;
 
     void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, Window* pParent );
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index b1ac2ed..6c7c0fb 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -589,7 +589,6 @@ class SvInplaceEdit2
     Edit*       pEdit;
     sal_Bool        bCanceled;
     sal_Bool        bAlreadyInCallBack;
-    sal_Bool        bMultiLine;
 
     void        CallCallBackHdl_Impl();
     DECL_LINK( Timeout_Impl, void * );
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 4c57018..e4537d4 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -58,8 +58,6 @@ private:
     SvLBoxTab*                  pTabList;
     sal_uInt16                      nTabCount;
     XubString                   aCurEntry;
-    sal_uLong                       nDummy1;
-    sal_uLong                       nDummy2;
 
 protected:
     SvLBoxEntry*                pViewParent;
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
index b5e18d6..ee050bb 100644
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx
@@ -127,9 +127,6 @@ namespace svt
 
     public:
         DECLARE_IREFERENCE()
-
-    private:
-        oslInterlockedCount m_refCount;
     };
 
 //........................................................................
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index b62a813..68eb00c 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -173,7 +173,6 @@ private:
     private:
 
         TransferableHelper& mrParent;
-        void*               mpDummy;
 
     private:
 
@@ -201,7 +200,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener >                     mxTerminateListener;
     DataFlavorExVector*                                                                                 mpFormats;
     TransferableObjectDescriptor*                                                                       mpObjDesc;
-    void*                                                                                               mpDummy1;
 
 protected:
     inline const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >&
@@ -420,8 +418,6 @@ private:
     private:
 
         DragSourceHelper&   mrParent;
-        void*               mpDummy1;
-        void*               mpDummy2;
 
     private:
 
@@ -475,9 +471,6 @@ private:
 
         DropTargetHelper&   mrParent;
         AcceptDropEvent*    mpLastDragOverEvent;
-        void*               mpDummy2;
-        void*               mpDummy3;
-        void*               mpDummy4;
 
     private:
 
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 07c6224..7134b0f 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -259,7 +259,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
     }
 #endif
 
-    pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), String(), nWidth, GetZoom(), 0 ) );
+    pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), String(), nWidth, GetZoom() ) );
     FreezeColumn( 0 );
 
     // adjust headerbar
@@ -296,11 +296,11 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const XubString& rText,
     {
         BrowserColumns::iterator it = pCols->begin();
         ::std::advance( it, nPos );
-        pCols->insert( it, new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom(), nBits ) );
+        pCols->insert( it, new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom() ) );
     }
     else
     {
-        pCols->push_back( new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom(), nBits ) );
+        pCols->push_back( new BrowserColumn( nItemId, Image(), rText, nWidth, GetZoom() ) );
     }
     if ( nCurColId == 0 )
         nCurColId = nItemId;
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index f1f35be..998844a 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -716,9 +716,7 @@ void BrowseBox::Paint( const Rectangle& rRect )
             {
                 ButtonFrame aButtonFrame( Point( nX, 0 ),
                     Size( pCol->Width()-1, GetTitleHeight()-1 ),
-                    pCol->Title(), sal_False, sal_False,
-                    0 != (BROWSER_COLUMN_TITLEABBREVATION&pCol->Flags()),
-                    !IsEnabled());
+                    pCol->Title(), sal_False, sal_False, !IsEnabled());
                 aButtonFrame.Draw( *this );
                 DrawLine( Point( nX + pCol->Width() - 1, 0 ),
                    Point( nX + pCol->Width() - 1, GetTitleHeight()-1 ) );
@@ -852,7 +850,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
         {
             ButtonFrame aButtonFrame( aRealPos,
                 Size( pFirstCol->Width()-1, nTitleHeight-1 ),
-                pFirstCol->Title(), sal_False, sal_False, sal_False, !IsEnabled());
+                pFirstCol->Title(), sal_False, sal_False, !IsEnabled());
             aButtonFrame.Draw( *pDev );
 
             pDev->Push( PUSH_LINECOLOR );
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 40beb7d..4aab204 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -112,14 +112,12 @@ void ButtonFrame::Draw( OutputDevice& rDev )
 //-------------------------------------------------------------------
 
 BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage,
-                              const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom,
-                              HeaderBarItemBits nFlags )
+                              const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom )
 :   _nId( nItemId ),
     _nWidth( nWidthPixel ),
     _aImage( rImage ),
     _aTitle( rTitle ),
-    _bFrozen( sal_False ),
-    _nFlags( nFlags )
+    _bFrozen( sal_False )
 {
     double n = (double)_nWidth;
     n *= (double)rCurrentZoom.GetDenominator();
@@ -150,8 +148,7 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos
     {
         // paint handle column
         ButtonFrame( rPos, Size( Width()-1, rBox.GetDataRowHeight()-1 ),
-                     String(), sal_False, bCurs,
-                     0 != (BROWSER_COLUMN_TITLEABBREVATION&_nFlags) ).Draw( rDev );
+                     String(), sal_False, bCurs, false ).Draw( rDev );
         Color aOldLineColor = rDev.GetLineColor();
         rDev.SetLineColor( Color( COL_BLACK ) );
         rDev.DrawLine(
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index e910f44..6293182 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -51,23 +51,20 @@ class ButtonFrame
     String      aText;
     sal_Bool        bPressed;
     sal_Bool        bCurs;
-    sal_Bool        bAbbr;
     sal_Bool        m_bDrawDisabled;
 
 public:
                ButtonFrame( const Point& rPt, const Size& rSz,
                             const String &rText,
-                            sal_Bool bPress = sal_False,
-                            sal_Bool bCursor = sal_False,
-                            sal_Bool bAbbreviate = sal_True,
-                            sal_Bool _bDrawDisabled = sal_False)
+                            sal_Bool bPress,
+                            sal_Bool bCursor,
+                            sal_Bool _bDrawDisabled)
                 :aRect( rPt, rSz )
                 ,aInnerRect( Point( aRect.Left()+1, aRect.Top()+1 ),
                             Size( aRect.GetWidth()-2, aRect.GetHeight()-2 ) )
                 ,aText(rText)
                 ,bPressed(bPress)
                 ,bCurs(bCursor)
-                ,bAbbr(bAbbreviate)
                 ,m_bDrawDisabled(_bDrawDisabled)
             {
             }
@@ -85,12 +82,10 @@ class BrowserColumn
     Image               _aImage;
     String              _aTitle;
     sal_Bool                _bFrozen;
-    HeaderBarItemBits   _nFlags;
 
 public:
                         BrowserColumn( sal_uInt16 nItemId, const Image &rImage,
-                                        const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom,
-                                        HeaderBarItemBits nFlags );
+                                        const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom );
     virtual            ~BrowserColumn();
 
     sal_uInt16              GetId() const { return _nId; }
@@ -98,7 +93,6 @@ public:
     sal_uLong               Width() { return _nWidth; }
     Image&              GetImage() { return _aImage; }
     String&             Title() { return _aTitle; }
-    HeaderBarItemBits&  Flags() { return _nFlags; }
 
     sal_Bool                IsFrozen() const { return _bFrozen; }
     void                Freeze( sal_Bool bFreeze = sal_True ) { _bFrozen = bFreeze; }
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 8fe19c9..9246056 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -95,7 +95,6 @@ namespace svt
         :Thread                  ( "FileViewContentEnumerator" )
         ,m_rContent              ( _rContentToFill )
         ,m_rContentMutex         ( _rContentMutex  )
-        ,m_refCount              ( 0               )
         ,m_xCommandEnv           ( _rxCommandEnv   )
         ,m_pFilter               ( NULL            )
         ,m_pTranslator           ( _pTranslator    )
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index 04d7792..59c1eb6 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/document/XStandaloneDocumentInfo.hpp>
 #include <salhelper/thread.hxx>
-#include <rtl/ref.hxx>
 #include <ucbhelper/content.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/datetime.hxx>
@@ -198,7 +197,6 @@ namespace svt
         ContentData&                    m_rContent;
         ::osl::Mutex&                   m_rContentMutex;
 
-        oslInterlockedCount             m_refCount;
         mutable ::osl::Mutex            m_aMutex;
 
         FolderDescriptor                m_aFolder;
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index d0d30ad..bc95659 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -130,8 +130,7 @@ SvInplaceEdit2::SvInplaceEdit2
 
      aCallBackHdl       ( rNotifyEditEnd ),
     bCanceled           ( sal_False ),
-    bAlreadyInCallBack  ( sal_False ),
-    bMultiLine          ( bMulti )
+    bAlreadyInCallBack  ( sal_False )
 
 {
     DBG_CTOR(SvInplaceEdit2,0);
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 21ff710..238ead8 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -750,7 +750,6 @@ SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart )
         eSmartProtocol( eSmart ),
         bAutoCompleteMode( sal_False ),
         bOnlyDirectories( sal_False ),
-        bTryAutoComplete( sal_False ),
         bCtrlClick( sal_False ),
         bHistoryDisabled( sal_False ),
         bNoSelection( sal_False ),
@@ -770,7 +769,6 @@ SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart )
         eSmartProtocol( eSmart ),
         bAutoCompleteMode( sal_False ),
         bOnlyDirectories( sal_False ),
-        bTryAutoComplete( sal_False ),
         bCtrlClick( sal_False ),
         bHistoryDisabled( sal_False ),
         bNoSelection( sal_False ),
@@ -785,7 +783,6 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart
         eSmartProtocol( eSmart ),
         bAutoCompleteMode( sal_False ),
         bOnlyDirectories( sal_False ),
-        bTryAutoComplete( sal_False ),
         bCtrlClick( sal_False ),
         bHistoryDisabled( sal_False ),
         bNoSelection( sal_False ),
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 59aab2f..03de750 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 fed7911..493c52d 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 f738998..2cc7ae3 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 ) )
 {
 }
 
diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx
index 2c96fb1..35d9b3a 100644
--- a/svtools/source/inc/gifread.hxx
+++ b/svtools/source/inc/gifread.hxx
@@ -67,7 +67,6 @@ class GIFReader : public GraphicReader
     BitmapPalette       aGPalette;
     BitmapPalette       aLPalette;
     SvStream&           rIStm;
-    void*               pCallerData;
     HPBYTE              pSrcBuf;
     GIFLZWDecompressor* pDecomp;
     BitmapWriteAccess*  pAcc8;
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 0a874af..41b6c12 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -58,8 +58,6 @@ using namespace ::com::sun::star::accessibility;
 
 SVTXGridControl::SVTXGridControl()
     :m_pTableModel( new UnoControlTableModel() )
-    ,m_bHasColumnHeaders( false )
-    ,m_bHasRowHeaders( false )
     ,m_bTableModelInitCompleted( false )
     ,m_nSelectedRowCount( 0 )
     ,m_aSelectionListeners( *this )
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index 60c3a3a..ef04359 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -57,8 +57,6 @@ class SVTXGridControl : public SVTXGridControl_Base
 {
 private:
     ::boost::shared_ptr< UnoControlTableModel >                                         m_pTableModel;
-    bool                                                                                m_bHasColumnHeaders;
-    bool                                                                                m_bHasRowHeaders;
     bool                                                                                m_bTableModelInitCompleted;
     sal_Int32                                                                           m_nSelectedRowCount;
     SelectionListenerMultiplexer                                                        m_aSelectionListeners;


More information about the Libreoffice-commits mailing list