diff options
21 files changed, 50 insertions, 53 deletions
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index dc606fdb7209..970c1b49fe06 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -92,7 +92,7 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( // Make the frame window transparent and make the parent able to // draw behind it. if (pParentWindow.get() != NULL) - pParentWindow->EnableChildTransparentMode(true); + pParentWindow->EnableChildTransparentMode(); } pWindow->Show(bInitiallyVisible); diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index c8d9c364fd05..e90e3f56256c 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -440,7 +440,7 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi { const sal_Int32 nLines (rsDistance.copy(0,rsDistance.getLength()-1).toInt32()); // Take the height of the first line as the height of every line. - const sal_uInt32 nFirstLineHeight (mpEditEngine->GetLineHeight(0,0)); + const sal_uInt32 nFirstLineHeight (mpEditEngine->GetLineHeight(0)); nDistance = nFirstLineHeight * nLines; } @@ -456,7 +456,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap() mpOutputDevice.disposeAndClear(); mpOutputDevice = VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), 0, 0); mpOutputDevice->SetMapMode(MAP_PIXEL); - mpOutputDevice->SetOutputSizePixel(maSize, true); + mpOutputDevice->SetOutputSizePixel(maSize); mpOutputDevice->SetLineColor(); mpOutputDevice->SetFillColor(); mpOutputDevice->SetBackground(Wallpaper()); @@ -503,7 +503,7 @@ void PresenterTextView::Implementation::CheckTop() if (mpEditEngine!=NULL && mnTotalHeight < 0) mnTotalHeight = mpEditEngine->GetTextHeight(); if (mpEditEngine!=NULL && mnTop >= mnTotalHeight) - mnTop = mnTotalHeight - mpEditEngine->GetLineHeight(0,0); + mnTop = mnTotalHeight - mpEditEngine->GetLineHeight(0); if (mnTotalHeight < maSize.Height()) mnTop = 0; diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index c7729447d130..7b91a73a7a2c 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -226,7 +226,7 @@ void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) // Removing the precious flag so that the following call to // RemoveUnnessesaryMasterPages() will remove this master page. pMasterPage->SetPrecious(false); - mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, false, true); + mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, false); } } else diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 3cce7291df9c..393774a334f9 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -624,7 +624,7 @@ IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventD if (pData != NULL) { - FireContainerChange(pData->first, pData->second, false); + FireContainerChange(pData->first, pData->second); delete pData; } @@ -697,10 +697,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( std::vector<MasterPageContainerChangeEvent::EventType>::const_iterator iEventType; for (iEventType=pEventTypes->begin(); iEventType!=pEventTypes->end(); ++iEventType) { - FireContainerChange( - *iEventType, - (*aEntry)->maToken, - false); + FireContainerChange( *iEventType,(*aEntry)->maToken); } } } diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index a0c3745d0c8a..6bac4037cd7a 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -406,7 +406,7 @@ void ShowWindow::TerminateShow() // show navigator? if( mbShowNavigatorAfterSpecialMode ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, true ); + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR ); mbShowNavigatorAfterSpecialMode = false; } } @@ -460,7 +460,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) if( mbShowNavigatorAfterSpecialMode ) { if (mpViewShell) - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, true ); + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR ); mbShowNavigatorAfterSpecialMode = false; } } diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index e3dd97c128bf..4ec13bc8aeb7 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -332,7 +332,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const const OUString aShowName( aShow ); - SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(false); + SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(); if(pCustomShowList) { SdCustomShow* pCustomShow; @@ -528,7 +528,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const throw IllegalArgumentException(); if( bValuesChanged ) - mpDoc->SetChanged( true ); + mpDoc->SetChanged(); } Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) @@ -550,7 +550,7 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U return Any( rPresSettings.mbAnimationAllowed ); case ATTR_PRESENT_CUSTOMSHOW: { - SdCustomShowList* pList = mpDoc->GetCustomShowList(false); + SdCustomShowList* pList = mpDoc->GetCustomShowList(); SdCustomShow* pShow = (pList && rPresSettings.mbCustomShow) ? pList->GetCurObject() : NULL; OUString aShowName; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 07f7f3c8c0df..bf369a235420 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -700,7 +700,7 @@ void SAL_CALL SlideshowImpl::disposing() } else if( meAnimationMode == ANIMATIONMODE_PREVIEW ) { - mpViewShell->ShowUIControls (true); + mpViewShell->ShowUIControls(); } } @@ -2208,7 +2208,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) break; } - pWidthMenu->EnableItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator), true); + pWidthMenu->EnableItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator)); if( nWidth == mdUserPaintStrokeWidth) pWidthMenu->CheckItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator) ); } @@ -3145,7 +3145,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) // Note that in this special case we do NOT pass // bSkipAllMainSequenceEffects because we display the same // slide as before and do not want to show all its effects. - displayCurrentSlide(false); + displayCurrentSlide(); } } } diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index a163f2cb6e4d..93fc920193d5 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -65,7 +65,7 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) DragAndDropContext::~DragAndDropContext() { - SetTargetSlideSorter (NULL, Point(0,0), InsertionIndicatorHandler::UnknownMode, false); + SetTargetSlideSorter (NULL, Point(0,0), InsertionIndicatorHandler::UnknownMode); } void DragAndDropContext::Dispose() diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 4e97ce2ca5f4..a5eef4c56a55 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1019,7 +1019,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri // aTabControl.SetPageText( nPageId, rName ); // set document to modified state - pDocument->SetChanged( true ); + pDocument->SetChanged(); // inform navigator about change SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 9a02c8870196..900316600168 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -209,7 +209,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli if (pDescriptor.get() == NULL) { // Call GetPageDescriptor() to create the missing descriptor. - pDescriptor = GetPageDescriptor(nIndex,true); + pDescriptor = GetPageDescriptor(nIndex); } if (pDescriptor->GetXDrawPage() == rxSlide) @@ -247,7 +247,7 @@ sal_Int32 SlideSorterModel::GetIndex (const SdrPage* pPage) const if (pDescriptor.get() == NULL) { // Call GetPageDescriptor() to create the missing descriptor. - pDescriptor = GetPageDescriptor(nIndex, true); + pDescriptor = GetPageDescriptor(nIndex); } if (pDescriptor->GetPage() == pPage) diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 2b15485e12eb..25b4739ddcb3 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -276,7 +276,7 @@ void SlideSorterView::HandleDrawModeChange() // PreviewRenderer that is used by the cache is replaced by this as // well. mpPreviewCache.reset(); - GetPreviewCache()->InvalidateCache(true); + GetPreviewCache()->InvalidateCache(); RequestRepaint(); } diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index f89330eee447..4abd3ccb07fe 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -90,15 +90,15 @@ void FramePainter::AdaptColor ( maCenter.maBitmap.SetEmpty(); // Replace the color in all bitmaps. - maTopLeft.maBitmap.Replace(aSourceColor, aNewColor, 0); - maTop.maBitmap.Replace(aSourceColor, aNewColor, 0); - maTopRight.maBitmap.Replace(aSourceColor, aNewColor, 0); - maLeft.maBitmap.Replace(aSourceColor, aNewColor, 0); - maCenter.maBitmap.Replace(aSourceColor, aNewColor, 0); - maRight.maBitmap.Replace(aSourceColor, aNewColor, 0); - maBottomLeft.maBitmap.Replace(aSourceColor, aNewColor, 0); - maBottom.maBitmap.Replace(aSourceColor, aNewColor, 0); - maBottomRight.maBitmap.Replace(aSourceColor, aNewColor, 0); + maTopLeft.maBitmap.Replace(aSourceColor, aNewColor); + maTop.maBitmap.Replace(aSourceColor, aNewColor); + maTopRight.maBitmap.Replace(aSourceColor, aNewColor); + maLeft.maBitmap.Replace(aSourceColor, aNewColor); + maCenter.maBitmap.Replace(aSourceColor, aNewColor); + maRight.maBitmap.Replace(aSourceColor, aNewColor); + maBottomLeft.maBitmap.Replace(aSourceColor, aNewColor); + maBottom.maBitmap.Replace(aSourceColor, aNewColor); + maBottomRight.maBitmap.Replace(aSourceColor, aNewColor); } //===== FramePainter::OffsetBitmap ============================================ diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 15731f7661d1..857f932b5db8 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -186,7 +186,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) GetParentWindow()->GrabFocus(); if( pPickObj ) - mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, true ); + mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj ); else mpView->InsertObjectAtView(pObj, *pPV, SdrInsertFlags::SETDEFLAYER); @@ -194,7 +194,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_INSERT_TABLE, true, false ); + rBindings.Invalidate( SID_INSERT_TABLE, true ); break; } case SID_TABLEDESIGN: diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 4cf26949ace4..b5b9645a6587 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -190,7 +190,7 @@ Image PreviewRenderer::RenderSubstitution ( svtools::ColorConfig aColorConfig; mpPreviewDevice->SetFillColor(aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor); mpPreviewDevice->DrawRect (aPaintRectangle); - mpPreviewDevice->EnableMapMode(true); + mpPreviewDevice->EnableMapMode(); // Paint substitution text and a frame around it. PaintSubstitutionText (rSubstitutionText); @@ -366,7 +366,7 @@ void PreviewRenderer::PaintFrame() mpPreviewDevice->SetLineColor(maFrameColor); mpPreviewDevice->SetFillColor(); mpPreviewDevice->DrawRect(aPaintRectangle); - mpPreviewDevice->EnableMapMode(true); + mpPreviewDevice->EnableMapMode(); } } @@ -423,7 +423,7 @@ void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) mpView->SetPreviewRenderer(true); #if 1 mpView->SetPageVisible(false); - mpView->SetPageBorderVisible(true); + mpView->SetPageBorderVisible(); mpView->SetBordVisible(false); mpView->SetGridVisible(false); mpView->SetHlplVisible(false); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index e55be9d19a18..390c81e79736 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -961,7 +961,7 @@ throw (UnknownPropertyException, PropertyVetoException, } if( bChanged || bOptionsChanged ) - mxModel->SetModified( true ); + mxModel->SetModified(); } void DocumentSettings::ExtractURL( XPropertyListType t, Any* pValue ) diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 52effdb3ed59..c1525a9514c3 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -91,7 +91,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes const OUString aFileName( aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() ) ); GraphicDescriptor aDesc( *pInStrm, &aFileName ); - if( !aDesc.Detect( false ) ) + if( !aDesc.Detect() ) { INetURLObject aCheckURL( aFileName ); if( aCheckURL.getExtension().equalsIgnoreAsciiCase("cgm") ) diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index eada245e9cb7..c28814aff9a1 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -146,7 +146,7 @@ public: inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw() { if(mrModel.GetDoc()) - return mrModel.GetDoc()->GetCustomShowList(false); + return mrModel.GetDoc()->GetCustomShowList(); else return NULL; }; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index e3b59f101234..5ece5f1ddfee 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -709,7 +709,7 @@ void SdLayerManager::UpdateLayerView( bool modify ) const throw() } if(modify) - mpModel->mpDoc->SetChanged(true); + mpModel->mpDoc->SetChanged(); } } diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index d2366dce54ff..9c6cb32cf961 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1679,14 +1679,14 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd { sal_Int32 nCount = rDoc.GetSdPageCount( PK_STANDARD ); sal_Int32 nDestId = rPDFExtOutDevData.CreateDest( aPageRect, nCount - 1, vcl::PDFWriter::FitRectangle ); - sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect, -1 ); + sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect ); rPDFExtOutDevData.SetLinkDest( nLinkId, nDestId ); } break; case presentation::ClickAction_FIRSTPAGE : { sal_Int32 nDestId = rPDFExtOutDevData.CreateDest( aPageRect, 0, vcl::PDFWriter::FitRectangle ); - sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect, -1 ); + sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect ); rPDFExtOutDevData.SetLinkDest( nLinkId, nDestId ); } break; @@ -1696,7 +1696,7 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd if ( nDestPage ) nDestPage--; sal_Int32 nDestId = rPDFExtOutDevData.CreateDest( aPageRect, nDestPage, vcl::PDFWriter::FitRectangle ); - sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect, -1 ); + sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect ); rPDFExtOutDevData.SetLinkDest( nLinkId, nDestId ); } break; @@ -1707,7 +1707,7 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd if ( nDestPage > nLastPage ) nDestPage = nLastPage; sal_Int32 nDestId = rPDFExtOutDevData.CreateDest( aPageRect, nDestPage, vcl::PDFWriter::FitRectangle ); - sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect, -1 ); + sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect ); rPDFExtOutDevData.SetLinkDest( nLinkId, nDestId ); } break; @@ -1725,7 +1725,7 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd case presentation::ClickAction_DOCUMENT : case presentation::ClickAction_PROGRAM : { - sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect, -1 ); + sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect ); rPDFExtOutDevData.SetLinkURL( nLinkId, aBookmark ); } break; @@ -1735,7 +1735,7 @@ void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, Sd if ( nPage != -1 ) { sal_Int32 nDestId = rPDFExtOutDevData.CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ); - sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect, -1 ); + sal_Int32 nLinkId = rPDFExtOutDevData.CreateLink( aLinkRect ); rPDFExtOutDevData.SetLinkDest( nLinkId, nDestId ); } } @@ -2128,7 +2128,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sEffect ) || xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) ) { - pPDFExtOutDevData->SetPageTransition( eType, nTime, -1 ); + pPDFExtOutDevData->SetPageTransition( eType, nTime ); } } } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 7ff746963d04..95d217c72523 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -712,7 +712,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : if( pEntry && mpShape->GetSdrObject() ) { - SdAnimationInfo* pInfo = GetAnimationInfo(false); + SdAnimationInfo* pInfo = GetAnimationInfo(); switch(pEntry->nWID) { @@ -1320,7 +1320,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno if( ( nFound & FOUND_CLICKACTION ) == 0 ) break; - SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( false ); + SdAnimationInfo* pInfo = mpShape->GetAnimationInfo(); if( presentation::ClickAction_NONE == eClickAction && NULL == pInfo ) { bOk = true; @@ -1476,7 +1476,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) if( mpShape == NULL || aName != maStrOnClick ) throw container::NoSuchElementException(); - SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( false ); + SdAnimationInfo* pInfo = mpShape->GetAnimationInfo(); presentation::ClickAction eClickAction = presentation::ClickAction_NONE; if( pInfo ) diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 57c957b06526..2308701cc833 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1619,7 +1619,7 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro SdrPageView* pPageView = mpView->ShowSdrPage( GetPage() ); _SelectObjectInView( xGroup, pPageView ); - mpView->DismantleMarkedObjects( false ); + mpView->DismantleMarkedObjects(); mpView->HideSdrPage(); GetModel()->SetModified(); @@ -1640,7 +1640,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< _SelectObjectsInView( xShapes, pPageView ); - mpView->CombineMarkedObjects( true ); + mpView->CombineMarkedObjects(); mpView->AdjustMarkHdl(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); |