[Libreoffice-commits] .: 2 commits - automation/source chart2/source desktop/source svx/source

[Michael Meeks]

 automation/source/server/XMLParser.cxx                    |    4 ++--
 chart2/source/controller/itemsetwrapper/ItemConverter.cxx |    4 ++++
 chart2/source/controller/main/SelectionHelper.cxx         |    1 -
 desktop/source/app/app.cxx                                |    1 +
 svx/source/svdraw/svdhdl.cxx                              |   13 ++++++-------
 5 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 501a1fbc3e34c0f3afc75d523cc6fc72b94682fd
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 1 15:24:33 2011 +0000

    WaE: more windows tinderbox warning cleanup

diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 5521441..7768775 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -277,11 +277,11 @@ sal_Bool SAXParser::Parse( ParseAction aAct )
         {
             xParser->parseStream ( sSource );
         }
-        catch( class SAXParseException & rPEx)
+        catch( class SAXParseException & )
         {
             // TODO
         }
-        catch( class Exception & rEx)
+        catch( class Exception & )
         {
             // TODO
         }
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index a121a77..42f75c3 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -143,6 +143,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
                     catch( beans::UnknownPropertyException &ex )
                     {
                         delete pItem;
+                        (void)ex;
                         OSL_FAIL(
                                     ::rtl::OUStringToOString(
                                         ex.Message +
@@ -152,6 +153,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
                     }
                     catch( uno::Exception &ex )
                     {
+                        (void)ex;
                         ASSERT_EXCEPTION( ex );
                     }
                 }
@@ -214,6 +216,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
                 }
                 catch( beans::UnknownPropertyException &ex )
                 {
+                    (void)ex;
                     OSL_FAIL(
                                 ::rtl::OUStringToOString(
                                     ex.Message +
@@ -223,6 +226,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
                 }
                 catch( uno::Exception &ex )
                 {
+                    (void)ex;
                     OSL_FAIL( ::rtl::OUStringToOString(
                                     ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
                 }
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 8e54505..328b341 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -329,7 +329,6 @@ bool Selection::isResizeableObjectSelected()
         default:
             return false;
     }
-    return false;
 }
 
 bool Selection::isRotateableObjectSelected( const uno::Reference< frame::XModel >& xChartModel )
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b63ee06..be33fac 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -776,6 +776,7 @@ void Desktop::ensureProcessServiceFactory()
         }
         catch (const css::uno::Exception& e)
         {
+            (void)e;
             OSL_FAIL(rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
             // let exceptions escape and tear down the process, it is
             // completely broken anyway
commit bc0ae5171790dc2656a2102eaced449f9ea54921
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 1 14:17:28 2011 +0000

    remove obsolete Sun internal bugzilla numbers

diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 14f4289..abf2b11 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -664,7 +664,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
         eKindOfMarker = GetNextBigger(eKindOfMarker);
     }
 
-    // #97016# II This handle has the focus, visualize it
+    // This handle has the focus, visualize it
     if(IsFocusHdl() && pHdlList && pHdlList->GetFocusHdl() == this)
     {
         // create animated handle
@@ -705,12 +705,12 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
-            // #98388# when anchor is used take upper left as reference point inside the handle
+            // when anchor is used take upper left as reference point inside the handle
             pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime);
         }
         else if(eKindOfMarker == AnchorTR || eKindOfMarker == AnchorPressedTR)
         {
-            // #101688# AnchorTR for SW, take top right as (0,0)
+            // AnchorTR for SW, take top right as (0,0)
             pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
                 (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
                 (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
@@ -727,18 +727,17 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
     }
     else
     {
-        // create normal handle
-        // #101928# use ImpGetBitmapEx(...) now
+        // create normal handle: use ImpGetBitmapEx(...) now
         BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
-            // #98388# upper left as reference point inside the handle for AnchorPressed, too
+            // upper left as reference point inside the handle for AnchorPressed, too
             pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx);
         }
         else if(eKindOfMarker == AnchorTR || eKindOfMarker == AnchorPressedTR)
         {
-            // #101688# AnchorTR for SW, take top right as (0,0)
+            // AnchorTR for SW, take top right as (0,0)
             pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx,
                 (sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1), 0);
         }