diff options
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/hltpbase.cxx | 10 | ||||
| -rw-r--r-- | cui/source/options/optupdt.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 26 |
3 files changed, 19 insertions, 19 deletions
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index b636c94ecb0f..6d752f10bf82 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -143,15 +143,15 @@ void SvxHyperlinkTabPageBase::InitStdControls () SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : nullptr; if ( pFrame ) { - std::unique_ptr<TargetList> pList(new TargetList); - SfxFrame::GetDefaultTargetList(*pList); - if( !pList->empty() ) + TargetList aList; + SfxFrame::GetDefaultTargetList(aList); + if( !aList.empty() ) { - size_t nCount = pList->size(); + size_t nCount = aList.size(); size_t i; for ( i = 0; i < nCount; i++ ) { - mxCbbFrame->append_text( pList->at( i ) ); + mxCbbFrame->append_text( aList.at( i ) ); } } } diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index d89fdec0aa4f..c9ad541e8005 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -126,7 +126,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() } LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType(); - std::unique_ptr<SvNumberFormatter> pNumberFormatter(new SvNumberFormatter( ::comphelper::getProcessComponentContext(), eUILang )); + std::optional<SvNumberFormatter> pNumberFormatter( std::in_place, ::comphelper::getProcessComponentContext(), eUILang ); const Color* pColor = nullptr; const Date& rNullDate = pNumberFormatter->GetNullDate(); sal_uInt32 nFormat = pNumberFormatter->GetStandardFormat( SvNumFormatType::DATE, eUILang ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e8b382fe9876..609946a0287d 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -824,9 +824,9 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) pPage->SetSize(Size(1000,1000)); pModel->InsertPage( pPage.get(), 0 ); { - std::unique_ptr<SdrView> pView(new SdrView( *pModel, pVDev )); - pView->hideMarkHandles(); - pView->ShowSdrPage(pPage.get()); + SdrView aView( *pModel, pVDev ); + aView.hideMarkHandles(); + aView.ShowSdrPage(pPage.get()); size_t nSymTmp = static_cast<size_t>(nSymType); if(m_pSymbolList) { @@ -861,8 +861,8 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) pInvisibleSquare->SetMergedItem(XFillTransparenceItem(100)); pInvisibleSquare->SetMergedItem(XLineTransparenceItem(100)); - pView->MarkAll(); - GDIMetaFile aMeta(pView->GetMarkedObjMetaFile()); + aView.MarkAll(); + GDIMetaFile aMeta(aView.GetMarkedObjMetaFile()); m_aSymbolGraphic=Graphic(aMeta); m_aSymbolSize=pObj->GetSnapRect().GetSize(); @@ -872,7 +872,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) bEnable=true; bIgnoreGraphic=true; - pView->UnmarkAll(); + aView.UnmarkAll(); pInvisibleSquare=pPage->RemoveObject(1); SdrObject::Free( pInvisibleSquare); pObj=pPage->RemoveObject(0); @@ -1454,9 +1454,9 @@ IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::Toggleable&, void) pModel->InsertPage( pPage.get(), 0 ); { // 3D View - std::unique_ptr<SdrView> pView(new SdrView( *pModel, pVDev )); - pView->hideMarkHandles(); - pView->ShowSdrPage(pPage.get()); + SdrView aView( *pModel, pVDev ); + aView.hideMarkHandles(); + aView.ShowSdrPage(pPage.get()); // Generate invisible square to give all symbols a // bitmap size, which is independent from specific glyph @@ -1487,10 +1487,10 @@ IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::Toggleable&, void) { pObj->SetMergedItemSet(m_rOutAttrs); } - pView->MarkAll(); - BitmapEx aBitmapEx(pView->GetMarkedObjBitmapEx()); - GDIMetaFile aMeta(pView->GetMarkedObjMetaFile()); - pView->UnmarkAll(); + aView.MarkAll(); + BitmapEx aBitmapEx(aView.GetMarkedObjBitmapEx()); + GDIMetaFile aMeta(aView.GetMarkedObjMetaFile()); + aView.UnmarkAll(); pObj=pPage->RemoveObject(1); SdrObject::Free(pObj); |