[Libreoffice-commits] .: 2 commits - editeng/source fpicker/source

[Caolán McNamara]

 editeng/source/rtf/rtfgrf.cxx                          |    4 ----
 fpicker/source/win32/filepicker/workbench/Test_fps.cxx |    3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 20d8d502cee927cc8c5db8abf647ae6866db9c7c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 20:27:58 2011 +0000

    WaE: nPos not used for anything

diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 46201c5..d7a3070 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -423,7 +423,6 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
             rPicType.uPicLen = nTokenValue;
             if (rPicType.uPicLen)
             {
-                ULONG nPos = rStrm.Tell();
                 rStrm.SeekRel(-1);
                 sal_uInt8 aData[4096];
                 ULONG nSize = sizeof(aData);
@@ -439,7 +438,6 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
                 }
                 nNextCh = GetNextChar();
                 bValidBmp = !pTmpFile->GetError();
-                nPos = rStrm.Tell();
             }
             break;
         case RTF_PICSCALEX:			rPicType.nScalX = nVal; break;
commit 0e4b710053d306488202a166764857206a6cc075
Author: Kenneth Venken <kenneth.venken at gmail.com>
Date:   Tue Jan 25 18:39:27 2011 +0100

    Cpp cleanliness: redundant assignment to self

diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 6838896..46201c5 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -424,7 +424,6 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
             if (rPicType.uPicLen)
             {
                 ULONG nPos = rStrm.Tell();
-                nPos = nPos;
                 rStrm.SeekRel(-1);
                 sal_uInt8 aData[4096];
                 ULONG nSize = sizeof(aData);
@@ -441,7 +440,6 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
                 nNextCh = GetNextChar();
                 bValidBmp = !pTmpFile->GetError();
                 nPos = rStrm.Tell();
-                nPos = nPos;
             }
             break;
         case RTF_PICSCALEX:			rPicType.nScalX = nVal; break;
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 8c66df5..1505006 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -196,9 +196,8 @@ void SAL_CALL FilePickerListener::fileSelectionChanged( const ::com::sun::star::
             }
         }        
     }
-    catch( IllegalArgumentException& ex )
+    catch( IllegalArgumentException&  )
     {
-        ex = ex;
     }
 }