From 164fecadfde2569cb5324017d9bf22e2963008b3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 May 2021 19:53:24 +0200 Subject: no need to allocate these on the heap Change-Id: Ic1a1577ed837d3fa2b7b99474f4cee30300628f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116290 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../drawinglayer/ViewElementListProvider.cxx | 12 +++---- chart2/source/view/main/ChartView.cxx | 37 +++++++++++----------- chart2/source/view/main/VButton.cxx | 10 +++--- 3 files changed, 29 insertions(+), 30 deletions(-) (limited to 'chart2/source') diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index f4f5ecfbd9d6..2f037e767f18 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -155,26 +155,26 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co rtl::Reference pPage = new SdrPage( *pModel, false ); pPage->SetSize(Size(1000,1000)); pModel->InsertPage( pPage.get(), 0 ); - std::unique_ptr pView(new SdrView(*pModel, pVDev)); - pView->hideMarkHandles(); - SdrPageView* pPageView = pView->ShowSdrPage(pPage.get()); + SdrView aView(*pModel, pVDev); + aView.hideMarkHandles(); + SdrPageView* pPageView = aView.ShowSdrPage(pPage.get()); // directly clone to target SdrModel pObj = pObj->CloneSdrObject(*pModel); pPage->NbcInsertObject(pObj); - pView->MarkObj(pObj,pPageView); + aView.MarkObj(pObj,pPageView); if( pSymbolShapeProperties ) pObj->SetMergedItemSet(*pSymbolShapeProperties); - GDIMetaFile aMeta(pView->GetMarkedObjMetaFile()); + GDIMetaFile aMeta(aView.GetMarkedObjMetaFile()); Graphic aGraph(aMeta); Size aSize = pObj->GetSnapRect().GetSize(); aGraph.SetPrefSize(aSize); aGraph.SetPrefMapMode(MapMode(MapUnit::Map100thMM)); - pView->UnmarkAll(); + aView.UnmarkAll(); pObj=pPage->RemoveObject(0); SdrObject::Free( pObj ); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 387fa2ae8b40..143d0bcfc798 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2269,19 +2269,19 @@ void lcl_createButtons(const uno::Reference& xPageShapes, const css::uno::Sequence aPivotFieldEntries = xPivotTableDataProvider->getPageFields(); for (css::chart2::data::PivotTableFieldEntry const & rPageFieldEntry : aPivotFieldEntries) { - std::unique_ptr pButton(new VButton); - pButton->init(xPageShapes, xShapeFactory); + VButton aButton; + aButton.init(xPageShapes, xShapeFactory); awt::Point aNewPosition(rRemainingSpace.X + x + 100, rRemainingSpace.Y + 100); sal_Int32 nDimensionIndex = rPageFieldEntry.DimensionIndex; OUString aFieldOutputDescription = xPivotTableDataProvider->getFieldOutputDescription(nDimensionIndex); - pButton->setLabel(rPageFieldEntry.Name + " | " + aFieldOutputDescription); - pButton->setCID("FieldButton.Page." + OUString::number(nDimensionIndex)); - pButton->setPosition(aNewPosition); - pButton->setSize(aSize); + aButton.setLabel(rPageFieldEntry.Name + " | " + aFieldOutputDescription); + aButton.setCID("FieldButton.Page." + OUString::number(nDimensionIndex)); + aButton.setPosition(aNewPosition); + aButton.setSize(aSize); if (rPageFieldEntry.HasHiddenMembers) - pButton->setArrowColor(Color(0x0000FF)); + aButton.setArrowColor(Color(0x0000FF)); - pButton->createShapes(xModelPage); + aButton.createShapes(xModelPage); x += aSize.Width + 100; } rRemainingSpace.Y += (aSize.Height + 100 + 100); @@ -2297,23 +2297,22 @@ void lcl_createButtons(const uno::Reference& xPageShapes, const css::uno::Sequence aPivotFieldEntries = xPivotTableDataProvider->getRowFields(); for (css::chart2::data::PivotTableFieldEntry const & rRowFieldEntry : aPivotFieldEntries) { - - std::unique_ptr pButton(new VButton); - pButton->init(xPageShapes, xShapeFactory); + VButton aButton; + aButton.init(xPageShapes, xShapeFactory); awt::Point aNewPosition(rRemainingSpace.X + x + 100, rRemainingSpace.Y + rRemainingSpace.Height - aSize.Height - 100); - pButton->setLabel(rRowFieldEntry.Name); - pButton->setCID("FieldButton.Row." + OUString::number(rRowFieldEntry.DimensionIndex)); - pButton->setPosition(aNewPosition); - pButton->setSize(aSize); + aButton.setLabel(rRowFieldEntry.Name); + aButton.setCID("FieldButton.Row." + OUString::number(rRowFieldEntry.DimensionIndex)); + aButton.setPosition(aNewPosition); + aButton.setSize(aSize); if ( rRowFieldEntry.Name == "Data" ) { - pButton->setBGColor( Color(0x00F6F6F6) ); - pButton->showArrow( false ); + aButton.setBGColor( Color(0x00F6F6F6) ); + aButton.showArrow( false ); } else if (rRowFieldEntry.HasHiddenMembers) - pButton->setArrowColor(Color(0x0000FF)); - pButton->createShapes(xModelPage); + aButton.setArrowColor(Color(0x0000FF)); + aButton.createShapes(xModelPage); x += aSize.Width + 100; } rRemainingSpace.Height -= (aSize.Height + 100 + 100); diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx index a628899c04e5..2e20d97110f8 100644 --- a/chart2/source/view/main/VButton.cxx +++ b/chart2/source/view/main/VButton.cxx @@ -95,10 +95,10 @@ void VButton::createShapes(const uno::Reference& xTextProp) { ShapeFactory* pShapeFactory = ShapeFactory::getOrCreateShapeFactory(m_xShapeFactory); - std::unique_ptr pPropNames(new tNameSequence); - std::unique_ptr pPropValues(new tAnySequence); + tNameSequence aPropNames; + tAnySequence aPropValues; - PropertyMapper::getTextLabelMultiPropertyLists(xTextProp, *pPropNames, *pPropValues); + PropertyMapper::getTextLabelMultiPropertyLists(xTextProp, aPropNames, aPropValues); m_xShape.set(pShapeFactory->createGroup2D(m_xTarget, m_sCID), uno::UNO_QUERY); m_xShape->setPosition(m_aPosition); @@ -124,10 +124,10 @@ void VButton::createShapes(const uno::Reference& xTextProp) aTextValueMap["Name"] <<= m_sCID; //CID OUString - PropertyMapper::getMultiPropertyListsFromValueMap(*pPropNames, *pPropValues, aTextValueMap); + PropertyMapper::getMultiPropertyListsFromValueMap(aPropNames, aPropValues, aTextValueMap); uno::Reference xEntry - = pShapeFactory->createText(xContainer, m_sLabel, *pPropNames, *pPropValues, uno::Any()); + = pShapeFactory->createText(xContainer, m_sLabel, aPropNames, aPropValues, uno::Any()); if (xEntry.is()) { -- cgit v1.2.3