[Libreoffice-commits] .: dbaccess/source sw/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/browser/brwctrlr.cxx |    2 --
 dbaccess/source/ui/inc/brwctrlr.hxx     |    1 -
 sw/source/core/text/porexp.cxx          |    2 +-
 sw/source/core/text/porexp.hxx          |    1 -
 sw/source/core/text/porftn.hxx          |    3 +--
 sw/source/core/text/txtftn.cxx          |    7 +++----
 6 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 68aecf0dd81b6660e78e8dd758ec9431727f4f0b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Dec 23 15:15:36 2012 +0100

    remove unused variables [-Werror,-Wunused-private-field]
    
    Change-Id: I3cb08dd52c5a34be6585ac9fc0c4b6bb04b6ae8c

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 13b5960..f0bccc5 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -619,7 +619,6 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
     ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD))
     ,m_sModuleIdentifier( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DataSourceBrowser" ) ) )
     ,m_pFormControllerImpl(NULL)
-    ,m_nPendingLoadFinished(0)
     ,m_nFormActionNestingLevel(0)
     ,m_bLoadCanceled( sal_False )
     ,m_bCannotSelectUnfiltered( true )
@@ -1293,7 +1292,6 @@ void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::containe
 sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( RuntimeException )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen at sun.com", "SbaXDataBrowserController::suspend" );
-    OSL_ENSURE(m_nPendingLoadFinished == 0, "SbaXDataBrowserController::suspend : there shouldn't be a pending load !");
 
     m_aAsyncGetCellFocus.CancelCall();
     m_aAsyncDisplayError.CancelCall();
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 27df5e6..4563d97 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -111,7 +111,6 @@ namespace dbaui
         // members for asynchronous load operations
         FormControllerImpl*     m_pFormControllerImpl;  // implementing the XFormController
 
-        sal_uLong                   m_nPendingLoadFinished;         // the event used to tell ourself that the load is finished
         sal_uInt16              m_nFormActionNestingLevel;      // see enter-/leaveFormAction
 
         sal_Bool                m_bLoadCanceled : 1;            // the load was canceled somehow
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 0bb0f7d..b5aa30f 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -252,7 +252,7 @@ void SwBlankPortion::HandlePortion( SwPortionHandler& rPH ) const
  *************************************************************************/
 
 SwPostItsPortion::SwPostItsPortion( sal_Bool bScrpt )
-    : nViewWidth(0), bScript( bScrpt )
+    : bScript( bScrpt )
 {
     nLineLength = 1;
     SetWhichPor( POR_POSTITS );
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 33506bf..cb7aa02 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -79,7 +79,6 @@ public:
 
 class SwPostItsPortion : public SwExpandPortion
 {
-    KSHORT  nViewWidth;
     sal_Bool    bScript;
 public:
             SwPostItsPortion( sal_Bool bScrpt );
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 75b660f..d342eb3 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -30,14 +30,13 @@ class SwTxtFtn;
 
 class SwFtnPortion : public SwFldPortion
 {
-    SwTxtFrm *pFrm;         // To be able to call RemoveFtn in the dtor
     SwTxtFtn *pFtn;
     KSHORT nOrigHeight;
     // #i98418#
     bool mbPreferredScriptTypeSet;
     sal_uInt8 mnPreferredScriptType;
 public:
-    SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrm, SwTxtFtn *pFtn,
+    SwFtnPortion( const XubString &rExpand, SwTxtFtn *pFtn,
                   KSHORT nOrig = KSHRT_MAX );
     inline KSHORT& Orig() { return nOrigHeight; }
 
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 0c3f056..b4aa5ef 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -850,7 +850,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
     SwDoc *pDoc = pFrm->GetNode()->GetDoc();
 
     if( rInf.IsTest() )
-        return new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ), pFrm, pFtn );
+        return new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ), pFtn );
 
     SWAP_IF_SWAPPED( pFrm )
 
@@ -970,7 +970,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
     }
     // Endlich: FtnPortion anlegen und raus hier...
     SwFtnPortion *pRet = new SwFtnPortion( rFtn.GetViewNumStr( *pDoc ),
-                                            pFrm, pFtn, nReal );
+                                           pFtn, nReal );
     rInf.SetFtnInside( true );
 
     UNDO_SWAP( pFrm )
@@ -1401,10 +1401,9 @@ SwFtnSave::~SwFtnSave()
  *                      SwFtnPortion::SwFtnPortion()
  *************************************************************************/
 
-SwFtnPortion::SwFtnPortion( const XubString &rExpand, SwTxtFrm *pFrame,
+SwFtnPortion::SwFtnPortion( const XubString &rExpand,
                             SwTxtFtn *pFootn, KSHORT nReal )
         : SwFldPortion( rExpand, 0 )
-        , pFrm(pFrame)
         , pFtn(pFootn)
         , nOrigHeight( nReal )
         // #i98418#