[Libreoffice-commits] .: 2 commits - sd/source

[Caolán McNamara]

 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |    5 -----
 sd/source/ui/dlg/headerfooterdlg.cxx                      |    2 +-
 sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx      |    7 +++----
 sd/source/ui/view/DocumentRenderer.cxx                    |    2 --
 sd/source/ui/view/sdwindow.cxx                            |    4 ----
 sd/source/ui/view/viewshel.cxx                            |    4 ----
 6 files changed, 4 insertions(+), 20 deletions(-)

New commits:
commit e977b852769825451a228188174a190cf8506648
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 16:11:36 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 21ab3f8..6a94e91 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -552,7 +552,6 @@ void
 {
     const SolarMutexGuard aSolarGuard;
     uno::Reference< view::XSelectionSupplier >  xSel( mxController, uno::UNO_QUERY );
-    AccessibleShape* pAccessibleChild;
 
     if( xSel.is() )
     {
@@ -573,10 +572,7 @@ void
                     AccessibleShape* pAcc = AccessibleShape::getImplementation( getAccessibleChild( i ) );
 
                     if( pAcc && pAcc->GetXShape().is() )
-                    {
                         xShapes->add( pAcc->GetXShape() );
-                        pAccessibleChild = pAcc;
-                    }
                 }
 
                 if( xShapes->getCount() )
@@ -593,7 +589,6 @@ void
 
             AccessibleShape* pAcc = AccessibleShape::getImplementation(
                 getAccessibleChild( nAccessibleChildIndex ));
-            pAccessibleChild = pAcc;
             
             // Add or remove the shape that is made accessible from the
             // selection of the controller.
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index c252318..f4d55c3 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -572,7 +572,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat )
     {
         String aStr( SvxDateTimeField::GetFormatted( aDate, aTime, nDateTimeFormats[nFormat], *(SD_MOD()->GetNumberFormatter()), eLanguage ) );
         USHORT nEntry = maCBDateTimeFormat.InsertEntry( aStr );
-        maCBDateTimeFormat.SetEntryData( nEntry, (void*)nDateTimeFormats[nFormat] );
+        maCBDateTimeFormat.SetEntryData( nEntry, (void*)(sal_IntPtr)nDateTimeFormats[nFormat] );
         if( nDateTimeFormats[nFormat] == eFormat )
         {
             maCBDateTimeFormat.SelectEntryPos( nEntry );
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
index b5eae0e..c33a86a 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
@@ -61,7 +61,6 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase )
 {
     SdDrawDocument* pDocument = rBase.GetDocument();
     ::std::auto_ptr<controls::MasterPagesSelector> pSelector;
-    TitledControl* pTitledControl;
 
     ::boost::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer());
     
@@ -79,7 +78,7 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase )
         HID_SD_TASK_PANE_PREVIEW_CURRENT,
         pSelector.get(),
         pSelector->GetWindow());
-    pTitledControl = AddControl (
+    AddControl (
         ::std::auto_ptr<TreeNode>(pSelector.release()),
         SdResId(STR_TASKPANEL_CURRENT_MASTER_PAGES_TITLE),
         HID_SD_CURRENT_MASTERS);
@@ -96,7 +95,7 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase )
         HID_SD_TASK_PANE_PREVIEW_RECENT,
         pSelector.get(),
         pSelector->GetWindow());
-    pTitledControl = AddControl (
+    AddControl (
         ::std::auto_ptr<TreeNode>(pSelector.release()),
         SdResId(STR_TASKPANEL_RECENT_MASTER_PAGES_TITLE),
         HID_SD_RECENT_MASTERS);
@@ -114,7 +113,7 @@ void MasterPagesPanel::impl_construct( ViewShellBase& rBase )
         HID_SD_TASK_PANE_PREVIEW_ALL,
         pSelector.get(),
         pSelector->GetWindow());
-    pTitledControl = AddControl (
+    AddControl (
         ::std::auto_ptr<TreeNode>(pSelector.release()),
         SdResId(STR_TASKPANEL_ALL_MASTER_PAGES_TITLE),
         HID_SD_ALL_MASTERS);
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index aaeeb02..0628f1c 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -2041,13 +2041,11 @@ private:
             // Bugfix zu 44530:
             // Falls implizit umgestellt wurde (Landscape/Portrait)
             // wird dies beim Kacheln, bzw. aufteilen (Poster) beruecksichtigt
-            BOOL bSwitchPageSize = FALSE;
             if( ( rInfo.maPrintSize.Width() > rInfo.maPrintSize.Height()
                     && aPageWidth < aPageHeight )
                 || ( rInfo.maPrintSize.Width() < rInfo.maPrintSize.Height()
                     && aPageWidth > aPageHeight ) )
             {
-                bSwitchPageSize = TRUE;
                 const sal_Int32 nTmp (rInfo.maPrintSize.Width());
                 rInfo.maPrintSize.Width() = rInfo.maPrintSize.Height();
                 rInfo.maPrintSize.Height() = nTmp;
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 46cd452..1c00fa3 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -721,7 +721,6 @@ void Window::UpdateMapOrigin(BOOL bInvalidate)
 
 void Window::UpdateMapMode (void)
 {
-    Size aWinSize = PixelToLogic(GetOutputSizePixel());
     maWinPos -= maViewOrigin;
     Size aPix(maWinPos.X(), maWinPos.Y());
     aPix = LogicToPixel(aPix);
@@ -733,9 +732,6 @@ void Window::UpdateMapMode (void)
 
     if (mpViewShell && mpViewShell->ISA(DrawViewShell))
     {
-        Size aViewSizePixel = LogicToPixel(maViewSize);
-        Size aWinSizePixel = LogicToPixel(aWinSize);
-        
         // Seite soll nicht am Fensterrand "kleben"
         if (aPix.Width() == 0)
         {
commit 97d649bc8ca0ebb1f67a348133179e31eb9e1ee5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 13:38:26 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 8ad2001..d9efe7c 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -812,11 +812,7 @@ void ViewShell::Resize (void)
     // end of included AdjustPosSizePixel.
 
     Size aS (GetParentWindow()->GetOutputSizePixel());
-    Size aVisSizePixel = GetActiveWindow()->GetOutputSizePixel();
-    Rectangle aVisArea = GetParentWindow()->PixelToLogic(
-        Rectangle( Point(0,0), aVisSizePixel));
     Rectangle aCurrentVisArea (GetDocSh()->GetVisArea(ASPECT_CONTENT));
-    Rectangle aWindowRect = GetActiveWindow()->LogicToPixel(aCurrentVisArea);
     if (GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED
         && IsMainViewShell())
     {