[Libreoffice-commits] .: 4 commits - sdext/source

[David Tardon]

 sdext/source/minimizer/pppoptimizerdialog.cxx |    4 +---
 sdext/source/pdfimport/pdfparse/pdfparse.cxx  |    4 ++++
 sdext/source/presenter/PresenterTextView.cxx  |    6 +-----
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 946056f654ae9181dfa947ae9511610f04421706
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 10:19:25 2011 +0100

    WaE: unused variable

diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 5105ac5..0daea86 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -563,7 +563,9 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
     
     try
     {
+        #if OSL_DEBUG_LEVEL > 1
         boost::spirit::parse_info<const char*> aInfo =
+        #endif
             boost::spirit::parse( pBuffer,
                                   pBuffer+nLen,
                                   aGrammar,
@@ -641,7 +643,9 @@ PDFEntry* PDFReader::read( const char* pFileName )
     
     try
     {
+        #if OSL_DEBUG_LEVEL > 1
         boost::spirit::parse_info< file_iterator<> > aInfo =
+        #endif
             boost::spirit::parse( file_start,
                                   file_end,
                                   aGrammar,
commit c849e3074a635c2dbd5d79bf874fc2c7d0dbea86
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 09:54:57 2011 +0100

    WaE: remove unused variable

diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index c517c3a..5773b2d 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -916,11 +916,9 @@ void PresenterTextParagraph::AddWord (
     const PresenterTheme::SharedFontDescriptor& rpFont)
 {
     sal_Int32 nLineStart (0);
-    sal_Int32 nLineEnd (0);
     if ( ! maLines.empty())
     {
         nLineStart = rCurrentLine.startPos;
-        nLineEnd = rCurrentLine.endPos;
     }
     
     const ::rtl::OUString sLineCandidate (
commit 3ca3af215972601316cd422c0b3872fecdcb01ab
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 09:53:46 2011 +0100

    WaE: remove unused variable

diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 8fc0bd7..43b0639 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -139,12 +139,10 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
     {
         if ( rURL.Path.compareToAscii( "execute" ) == 0 )
         {
-            sal_Bool bDialogExecuted = sal_False;
-
             try
             {
                 mpOptimizerDialog = new OptimizerDialog( mxMSF, mxFrame, this );
-                bDialogExecuted = mpOptimizerDialog->execute();
+                mpOptimizerDialog->execute();
 
                 const Any* pVal( mpOptimizerDialog->maStats.GetStatusValue( TK_FileSizeSource ) );
                 if ( pVal )
commit d6053b1d7f7934e81c962850e95fe2d11c30c287
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 09:53:19 2011 +0100

    WaE: remove unused variables

diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index 7b177bd..c517c3a 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -1186,14 +1186,12 @@ awt::Rectangle PresenterTextParagraph::GetCharacterBounds (
 {
     // Find the line that contains the requested character and accumulate
     // the previous line heights.
-    sal_Int32 nFirstCharacterIndex (0);
-    sal_Int32 nEndCharacterIndex (0);
     double nX (mnXOrigin);
     double nY (mnYOrigin + mnVerticalOffset + mnAscent);
     const sal_Int8 nTextDirection (GetTextDirection());
     for (sal_Int32 nLineIndex=0,nLineCount=maLines.size();
          nLineIndex<nLineCount;
-         ++nLineIndex, nFirstCharacterIndex=nEndCharacterIndex, nY+=mnLineHeight)
+         ++nLineIndex, nY+=mnLineHeight)
     {
         Line& rLine (maLines[nLineIndex]);
         // Skip lines before the indexed character.