diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdwindow.cxx | 4 |
5 files changed, 4 insertions, 16 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 8b1028377710..23613711361c 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 c9fdee5ff294..1e888d137e6f 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 ed28b54f6f5b..c12321f15d38 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 e02d18fdd02d..c321bd4de391 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 3f86b5900932..f6b627e917f4 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) { |