[Libreoffice-commits] .: sd/source

[Caolán McNamara]

 sd/source/ui/unoidl/sddetect.cxx |    5 -----
 sd/source/ui/view/drviews1.cxx   |    4 ----
 sd/source/ui/view/drviews3.cxx   |    4 ----
 3 files changed, 13 deletions(-)

New commits:
commit 20d79780cf5d3927febe82264a4cc7803aa82655
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 31 11:14:24 2011 +0000

    WaE: various new gcc 4.6.0 warnings

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 23666d0..fa3367f 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -121,7 +121,6 @@ SdFilterDetect::~SdFilterDetect()
     // now some parameters that can already be in the array, but may be overwritten or new inserted here
     // remember their indices in the case new values must be added to the array
     sal_Int32 nPropertyCount = lDescriptor.getLength();
-    sal_Int32 nIndexOfFilterName = -1;
     sal_Int32 nIndexOfInputStream = -1;
     sal_Int32 nIndexOfContent = -1;
     sal_Int32 nIndexOfReadOnlyFlag = -1;
@@ -150,10 +149,6 @@ SdFilterDetect::~SdFilterDetect()
         {
             lDescriptor[nProperty].Value >>= sTemp;
             aPreselectedFilterName = sTemp;
-
-            // if the preselected filter name is not correct, it must be erased after detection
-            // remember index of property to get access to it later
-            nIndexOfFilterName = nProperty;
         }
         else if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
             nIndexOfInputStream = nProperty;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index e9a3395..d1acb96 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -186,7 +186,6 @@ void DrawViewShell::SelectionHasChanged (void)
         SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 
     SdrOle2Obj* pOleObj = NULL;
-    SdrGrafObj* pGrafObj = NULL;
 
     if ( mpDrawView->AreObjectsMarked() )
     {
@@ -206,10 +205,7 @@ void DrawViewShell::SelectionHasChanged (void)
                 UpdateIMapDlg( pObj );
             }
             else if (nSdrObjKind == OBJ_GRAF)
-            {
-                pGrafObj = (SdrGrafObj*) pObj;
                 UpdateIMapDlg( pObj );
-            }
         }
     }
 
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 6d759ba..9c0a210 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -152,8 +152,6 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
     {
         case SID_SWITCHPAGE:  // BASIC
         {
-            BOOL bWasBasic = FALSE;
-
             // switch page in running slide show
             if(SlideShow::IsRunning(GetViewShellBase()) && rReq.GetArgs())
             {
@@ -193,7 +191,6 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
 
                         nSelectedPage = (short) nWhatPage;
                         mePageKind	  = (PageKind) nWhatKind;
-                        bWasBasic	  = TRUE;
                     }
                 }
                 else
@@ -790,7 +787,6 @@ void  DrawViewShell::GetRulerState(SfxItemSet& rSet)
     if( mpDrawView->IsTextEdit() )
     {
         Point aPnt1 = GetActiveWindow()->GetWinViewPos();
-        Point aPnt2 = GetActiveWindow()->GetViewOrigin();
         Rectangle aMinMaxRect = Rectangle( aPnt1, Size(ULONG_MAX, ULONG_MAX) );
         rSet.Put( SfxRectangleItem(SID_RULER_LR_MIN_MAX, aMinMaxRect) );
     }