diff options
Diffstat (limited to 'reportdesign/source/ui/report/ReportController.cxx')
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 3aded47f3db2..3259d777ee2b 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -329,9 +329,7 @@ void OReportController::disposing() { SvtViewOptions aDlgOpt(E_WINDOW, OStringToOUString(m_pGroupsFloater->GetHelpId(), RTL_TEXTENCODING_UTF8)); aDlgOpt.SetWindowState(OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<FloatingWindow> aTemp(m_pGroupsFloater); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<FloatingWindow> aTemp(m_pGroupsFloater); m_pGroupsFloater = NULL; } @@ -2411,9 +2409,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ try { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); // fill it if ( _xSection.is() ) pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),RPTUI_ID_BRUSH)); @@ -4216,17 +4212,13 @@ void OReportController::openZoomDialog() pPool->FreezeIdRanges(); // the same try { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges)); // fill it SvxZoomItem aZoomItem( m_eZoomType, m_nZoomValue, SID_ATTR_ZOOM ); aZoomItem.SetValueSet(SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_WHOLEPAGE|SVX_ZOOM_ENABLE_PAGEWIDTH); pDescriptor->Put(aZoomItem); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) ); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) ); pDlg->SetLimits( 20, 400 ); bool bCancel = ( RET_CANCEL == pDlg->Execute() ); |