[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sd/inc sd/source sd/workben xmloff/inc
Caolán McNamara
caolanm at redhat.com
Thu Sep 17 09:01:56 PDT 2015
sc/inc/cellsuno.hxx | 4
sc/inc/chart2uno.hxx | 11 -
sc/inc/chartlis.hxx | 9
sc/inc/clipcontext.hxx | 4
sc/inc/colorscale.hxx | 18 -
sc/inc/conditio.hxx | 6
sc/inc/dbdata.hxx | 10 -
sc/inc/dociter.hxx | 7
sc/inc/document.hxx | 30 +--
sc/inc/documentstreamaccess.hxx | 4
sc/inc/dpcache.hxx | 6
sc/inc/dpfilteredcache.hxx | 4
sc/inc/dpgroup.hxx | 8
sc/inc/dpobject.hxx | 4
sc/inc/dpsave.hxx | 12 -
sc/inc/dptabsrc.hxx | 8
sc/inc/editdataarray.hxx | 6
sc/inc/externalrefmgr.hxx | 6
sc/inc/fielduno.hxx | 4
sc/inc/importfilterdata.hxx | 4
sc/inc/listenercontext.hxx | 13 -
sc/inc/pch/precompiled_sc.hxx | 2
sc/inc/pch/precompiled_scfilt.hxx | 2
sc/inc/pch/precompiled_scui.hxx | 1
sc/inc/pch/precompiled_vbaobj.hxx | 1
sc/inc/postit.hxx | 4
sc/inc/simpleformulacalc.hxx | 4
sc/inc/simplerangelist.hxx | 7
sc/inc/table.hxx | 16 -
sc/inc/tabprotection.hxx | 6
sc/qa/unit/helper/qahelper.cxx | 4
sc/qa/unit/helper/qahelper.hxx | 4
sc/qa/unit/helper/xpath.cxx | 4
sc/qa/unit/ucalc.cxx | 4
sc/qa/unit/ucalc_formula.cxx | 8
sc/qa/unit/ucalc_sharedformula.cxx | 2
sc/source/core/data/attarray.cxx | 16 -
sc/source/core/data/clipcontext.cxx | 2
sc/source/core/data/column.cxx | 14 -
sc/source/core/data/column2.cxx | 6
sc/source/core/data/column3.cxx | 4
sc/source/core/data/column4.cxx | 2
sc/source/core/data/conditio.cxx | 6
sc/source/core/data/documen2.cxx | 2
sc/source/core/data/documen3.cxx | 4
sc/source/core/data/documen4.cxx | 2
sc/source/core/data/documen8.cxx | 8
sc/source/core/data/document.cxx | 10 -
sc/source/core/data/document10.cxx | 6
sc/source/core/data/documentimport.cxx | 6
sc/source/core/data/dpgroup.cxx | 2
sc/source/core/data/dpobject.cxx | 2
sc/source/core/data/dpsave.cxx | 72 +++----
sc/source/core/data/dptabres.cxx | 6
sc/source/core/data/dptabsrc.cxx | 70 +++----
sc/source/core/data/formulacell.cxx | 8
sc/source/core/data/funcdesc.cxx | 6
sc/source/core/data/listenercontext.cxx | 4
sc/source/core/data/table1.cxx | 60 +++---
sc/source/core/data/table2.cxx | 2
sc/source/core/data/table3.cxx | 15 -
sc/source/core/data/table4.cxx | 4
sc/source/core/data/validat.cxx | 6
sc/source/core/opencl/formulagroupcl.cxx | 15 -
sc/source/core/opencl/opbase.hxx | 6
sc/source/core/tool/chartlis.cxx | 16 -
sc/source/core/tool/chgtrack.cxx | 6
sc/source/core/tool/interpr1.cxx | 2
sc/source/core/tool/interpr7.cxx | 14 -
sc/source/core/tool/rangenam.cxx | 8
sc/source/core/tool/reftokenhelper.cxx | 4
sc/source/filter/dif/difimp.cxx | 4
sc/source/filter/excel/excel.cxx | 4
sc/source/filter/excel/read.cxx | 6
sc/source/filter/excel/xechart.cxx | 4
sc/source/filter/excel/xecontent.cxx | 6
sc/source/filter/excel/xeformula.cxx | 14 -
sc/source/filter/excel/xelink.cxx | 4
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/excel/xiescher.cxx | 7
sc/source/filter/excel/xilink.cxx | 2
sc/source/filter/excel/xiname.cxx | 10 -
sc/source/filter/excel/xlpivot.cxx | 6
sc/source/filter/html/htmlpars.cxx | 33 +--
sc/source/filter/inc/autofilterbuffer.hxx | 2
sc/source/filter/inc/biffcodec.hxx | 2
sc/source/filter/inc/excelhandlers.hxx | 4
sc/source/filter/inc/formulabase.hxx | 4
sc/source/filter/inc/ftools.hxx | 1
sc/source/filter/inc/htmlexp.hxx | 4
sc/source/filter/inc/imp_op.hxx | 6
sc/source/filter/inc/ooxformulaparser.hxx | 4
sc/source/filter/inc/workbookhelper.hxx | 4
sc/source/filter/inc/worksheethelper.hxx | 2
sc/source/filter/inc/xecontent.hxx | 12 -
sc/source/filter/inc/xeformula.hxx | 4
sc/source/filter/inc/xelink.hxx | 4
sc/source/filter/inc/xename.hxx | 4
sc/source/filter/inc/xestream.hxx | 2
sc/source/filter/inc/xestyle.hxx | 21 +-
sc/source/filter/inc/xichart.hxx | 68 +++---
sc/source/filter/inc/xiescher.hxx | 49 ++---
sc/source/filter/inc/xiformula.hxx | 4
sc/source/filter/inc/xihelper.hxx | 4
sc/source/filter/inc/xiname.hxx | 4
sc/source/filter/inc/xiroot.hxx | 50 ++---
sc/source/filter/inc/xistream.hxx | 4
sc/source/filter/inc/xistyle.hxx | 4
sc/source/filter/inc/xlformula.hxx | 6
sc/source/filter/inc/xlpivot.hxx | 4
sc/source/filter/inc/xlroot.hxx | 18 -
sc/source/filter/inc/xlview.hxx | 6
sc/source/filter/oox/formulabuffer.cxx | 6
sc/source/filter/oox/revisionfragment.cxx | 4
sc/source/filter/oox/stylesbuffer.cxx | 2
sc/source/filter/oox/workbookfragment.cxx | 6
sc/source/filter/oox/workbookhelper.cxx | 6
sc/source/filter/orcus/interface.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 6
sc/source/filter/xml/XMLExportIterator.hxx | 4
sc/source/filter/xml/XMLStylesImportHelper.hxx | 20 +-
sc/source/filter/xml/xmlbodyi.cxx | 4
sc/source/filter/xml/xmlcelli.cxx | 4
sc/source/filter/xml/xmlcelli.hxx | 4
sc/source/filter/xml/xmldpimp.hxx | 2
sc/source/filter/xml/xmldrani.hxx | 4
sc/source/filter/xml/xmlexprt.cxx | 6
sc/source/filter/xml/xmlexprt.hxx | 8
sc/source/filter/xml/xmlimprt.cxx | 2
sc/source/filter/xml/xmlimprt.hxx | 12 -
sc/source/filter/xml/xmlnexpi.hxx | 4
sc/source/filter/xml/xmlsubti.cxx | 6
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 2
sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx | 2
sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx | 2
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 4
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/app/uiitems.cxx | 20 +-
sc/source/ui/cctrl/checklistmenu.cxx | 46 ++--
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 2
sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 2
sc/source/ui/dbgui/pvfundlg.cxx | 1
sc/source/ui/docshell/docfunc.cxx | 14 -
sc/source/ui/docshell/docfuncutil.cxx | 2
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/docsh3.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 10 -
sc/source/ui/docshell/documentlinkmgr.cxx | 8
sc/source/ui/docshell/externalrefmgr.cxx | 6
sc/source/ui/docshell/impex.cxx | 8
sc/source/ui/drawfunc/drawsh.cxx | 16 -
sc/source/ui/drawfunc/drawsh5.cxx | 6
sc/source/ui/drawfunc/drtxtob.cxx | 4
sc/source/ui/drawfunc/drtxtob1.cxx | 8
sc/source/ui/drawfunc/fuins2.cxx | 4
sc/source/ui/drawfunc/mediash.cxx | 4
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/inc/checklistmenu.hxx | 16 -
sc/source/ui/inc/condformatdlgentry.hxx | 2
sc/source/ui/inc/datastream.hxx | 1
sc/source/ui/inc/docfuncutil.hxx | 4
sc/source/ui/inc/docsh.hxx | 4
sc/source/ui/inc/filtdlg.hxx | 1
sc/source/ui/inc/pvfundlg.hxx | 8
sc/source/ui/inc/retypepassdlg.hxx | 6
sc/source/ui/inc/tabview.hxx | 1
sc/source/ui/inc/uiitems.hxx | 4
sc/source/ui/inc/undoblk.hxx | 13 -
sc/source/ui/inc/undocell.hxx | 11 -
sc/source/ui/inc/undodat.hxx | 4
sc/source/ui/inc/undotab.hxx | 19 -
sc/source/ui/inc/viewdata.hxx | 4
sc/source/ui/inc/xmlsourcedlg.hxx | 4
sc/source/ui/miscdlgs/anyrefdg.cxx | 4
sc/source/ui/miscdlgs/scuiautofmt.cxx | 1
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 2
sc/source/ui/pagedlg/scuitphfedit.cxx | 12 -
sc/source/ui/pagedlg/tphf.cxx | 4
sc/source/ui/pagedlg/tphfedit.cxx | 4
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 8
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 6
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1
sc/source/ui/undo/undoblk.cxx | 4
sc/source/ui/undo/undoblk3.cxx | 2
sc/source/ui/undo/undocell.cxx | 2
sc/source/ui/undo/undotab.cxx | 8
sc/source/ui/unoobj/cellsuno.cxx | 21 +-
sc/source/ui/unoobj/chart2uno.cxx | 58 ++---
sc/source/ui/unoobj/condformatuno.cxx | 4
sc/source/ui/unoobj/fielduno.cxx | 20 +-
sc/source/ui/unoobj/filtuno.cxx | 10 -
sc/source/ui/vba/vbaname.cxx | 4
sc/source/ui/vba/vbanames.cxx | 4
sc/source/ui/vba/vbarange.cxx | 6
sc/source/ui/view/cellsh1.cxx | 98 +++++-----
sc/source/ui/view/cellsh2.cxx | 10 -
sc/source/ui/view/cellsh3.cxx | 20 +-
sc/source/ui/view/dbfunc3.cxx | 10 -
sc/source/ui/view/editsh.cxx | 8
sc/source/ui/view/formatsh.cxx | 14 -
sc/source/ui/view/gridwin.cxx | 10 -
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/output.cxx | 8
sc/source/ui/view/output2.cxx | 8
sc/source/ui/view/pivotsh.cxx | 4
sc/source/ui/view/preview.cxx | 4
sc/source/ui/view/prevwsh.cxx | 4
sc/source/ui/view/printfun.cxx | 8
sc/source/ui/view/scextopt.cxx | 6
sc/source/ui/view/spelleng.cxx | 6
sc/source/ui/view/tabvwsh3.cxx | 6
sc/source/ui/view/tabvwsha.cxx | 10 -
sc/source/ui/view/tabvwshf.cxx | 20 +-
sc/source/ui/view/tabvwshh.cxx | 2
sc/source/ui/view/viewfun2.cxx | 11 -
sc/source/ui/view/viewfun3.cxx | 8
sc/source/ui/view/viewfun4.cxx | 18 -
sc/source/ui/view/viewfun5.cxx | 10 -
sc/source/ui/view/viewfunc.cxx | 6
sc/source/ui/view/viewutil.cxx | 4
sd/inc/CustomAnimationEffect.hxx | 13 -
sd/inc/CustomAnimationPreset.hxx | 6
sd/inc/Outliner.hxx | 6
sd/inc/OutlinerIterator.hxx | 8
sd/inc/TransitionPreset.hxx | 4
sd/inc/pch/precompiled_sd.hxx | 5
sd/inc/pch/precompiled_sdui.hxx | 1
sd/inc/sdpage.hxx | 14 -
sd/inc/stlsheet.hxx | 4
sd/inc/undoanim.hxx | 8
sd/source/core/EffectMigration.cxx | 4
sd/source/core/stlsheet.cxx | 4
sd/source/core/undoanim.cxx | 4
sd/source/filter/eppt/epptooxml.hxx | 2
sd/source/filter/eppt/pptexanimations.hxx | 4
sd/source/filter/eppt/text.hxx | 4
sd/source/filter/html/HtmlOptionsDialog.cxx | 4
sd/source/filter/html/buttonset.cxx | 6
sd/source/filter/html/htmlex.hxx | 4
sd/source/filter/ppt/pptin.hxx | 4
sd/source/filter/ppt/pptinanimations.cxx | 5
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 8
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 10 -
sd/source/ui/annotations/annotationwindow.cxx | 4
sd/source/ui/app/sdmod1.cxx | 13 -
sd/source/ui/app/sdxfer.cxx | 6
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 10 -
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 10 -
sd/source/ui/dlg/sdpreslt.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/docshell/docshel3.cxx | 4
sd/source/ui/docshell/docshel4.cxx | 2
sd/source/ui/docshell/docshell.cxx | 2
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 2
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx | 6
sd/source/ui/framework/configuration/ConfigurationController.cxx | 14 -
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 4
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx | 10 -
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 8
sd/source/ui/framework/configuration/ConfigurationUpdater.hxx | 12 -
sd/source/ui/framework/factories/BasicPaneFactory.hxx | 5
sd/source/ui/framework/factories/BasicViewFactory.cxx | 32 +--
sd/source/ui/framework/factories/BasicViewFactory.hxx | 19 -
sd/source/ui/framework/factories/FullScreenPane.hxx | 2
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 4
sd/source/ui/framework/module/CenterViewFocusModule.cxx | 2
sd/source/ui/framework/module/ResourceManager.hxx | 4
sd/source/ui/framework/module/ShellStackGuard.hxx | 4
sd/source/ui/framework/module/ToolBarModule.cxx | 6
sd/source/ui/framework/module/ToolBarModule.hxx | 4
sd/source/ui/framework/tools/FrameworkHelper.cxx | 26 +-
sd/source/ui/func/fuarea.cxx | 4
sd/source/ui/func/fubullet.cxx | 4
sd/source/ui/func/fuchar.cxx | 4
sd/source/ui/func/fuconbez.cxx | 2
sd/source/ui/func/fuconnct.cxx | 4
sd/source/ui/func/fucopy.cxx | 6
sd/source/ui/func/fucushow.cxx | 4
sd/source/ui/func/fuinsert.cxx | 6
sd/source/ui/func/fuinsfil.cxx | 12 -
sd/source/ui/func/fuline.cxx | 6
sd/source/ui/func/fulinend.cxx | 4
sd/source/ui/func/fulink.cxx | 4
sd/source/ui/func/fumeasur.cxx | 4
sd/source/ui/func/fumorph.cxx | 4
sd/source/ui/func/fuoaprms.cxx | 4
sd/source/ui/func/fuolbull.cxx | 8
sd/source/ui/func/fuoltext.cxx | 4
sd/source/ui/func/fupage.cxx | 6
sd/source/ui/func/fuparagr.cxx | 4
sd/source/ui/func/fuprlout.cxx | 6
sd/source/ui/func/fuprobjs.cxx | 4
sd/source/ui/func/fuscale.cxx | 6
sd/source/ui/func/fusldlg.cxx | 4
sd/source/ui/func/fusnapln.cxx | 4
sd/source/ui/func/futempl.cxx | 6
sd/source/ui/func/futransf.cxx | 6
sd/source/ui/func/futxtatt.cxx | 4
sd/source/ui/func/fuvect.cxx | 4
sd/source/ui/inc/DocumentRenderer.hxx | 4
sd/source/ui/inc/OutlinerIteratorImpl.hxx | 16 -
sd/source/ui/inc/PaneDockingWindow.hxx | 3
sd/source/ui/inc/RemoteServer.hxx | 11 -
sd/source/ui/inc/SlideSorter.hxx | 21 +-
sd/source/ui/inc/SlideSorterViewShell.hxx | 14 -
sd/source/ui/inc/TemplateScanner.hxx | 13 -
sd/source/ui/inc/ToolBarManager.hxx | 18 -
sd/source/ui/inc/ViewShell.hxx | 1
sd/source/ui/inc/ViewShellBase.hxx | 15 -
sd/source/ui/inc/ViewShellImplementation.hxx | 12 -
sd/source/ui/inc/ViewShellManager.hxx | 7
sd/source/ui/inc/ViewTabBar.hxx | 3
sd/source/ui/inc/framework/Configuration.hxx | 4
sd/source/ui/inc/framework/ConfigurationController.hxx | 5
sd/source/ui/inc/framework/FrameworkHelper.hxx | 17 -
sd/source/ui/inc/framework/ModuleController.hxx | 6
sd/source/ui/inc/framework/Pane.hxx | 3
sd/source/ui/inc/framework/PresentationFactory.hxx | 3
sd/source/ui/inc/framework/ResourceId.hxx | 4
sd/source/ui/inc/framework/ViewShellWrapper.hxx | 10 -
sd/source/ui/inc/pubdlg.hxx | 4
sd/source/ui/inc/sdtreelb.hxx | 2
sd/source/ui/inc/sdxfer.hxx | 6
sd/source/ui/inc/slideshow.hxx | 4
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 7
sd/source/ui/inc/tools/PropertySet.hxx | 4
sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx | 3
sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx | 16 -
sd/source/ui/presenter/CanvasUpdateRequester.cxx | 4
sd/source/ui/presenter/CanvasUpdateRequester.hxx | 6
sd/source/ui/presenter/PresenterCanvas.hxx | 4
sd/source/ui/presenter/PresenterPreviewCache.cxx | 6
sd/source/ui/presenter/PresenterPreviewCache.hxx | 6
sd/source/ui/presenter/PresenterTextView.hxx | 4
sd/source/ui/remotecontrol/BluetoothServer.cxx | 7
sd/source/ui/remotecontrol/BluetoothServer.hxx | 5
sd/source/ui/remotecontrol/Server.cxx | 14 -
sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 4
sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 2
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 12 -
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 2
sd/source/ui/sidebar/DocumentHelper.cxx | 4
sd/source/ui/sidebar/DocumentHelper.hxx | 6
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/sidebar/MasterPageContainer.cxx | 85 ++++----
sd/source/ui/sidebar/MasterPageContainer.hxx | 8
sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 10 -
sd/source/ui/sidebar/MasterPageContainerQueue.cxx | 6
sd/source/ui/sidebar/MasterPageContainerQueue.hxx | 11 -
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 6
sd/source/ui/sidebar/MasterPageDescriptor.hxx | 12 -
sd/source/ui/sidebar/MasterPagesSelector.cxx | 4
sd/source/ui/sidebar/MasterPagesSelector.hxx | 4
sd/source/ui/sidebar/PanelBase.hxx | 2
sd/source/ui/sidebar/PanelFactory.hxx | 5
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 6
sd/source/ui/sidebar/RecentMasterPagesSelector.hxx | 4
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 6
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 2
sd/source/ui/slideshow/SlideShowRestarter.cxx | 2
sd/source/ui/slideshow/SlideShowRestarter.hxx | 6
sd/source/ui/slideshow/slideshow.cxx | 12 -
sd/source/ui/slideshow/slideshowimpl.hxx | 4
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 10 -
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 7
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 16 -
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx | 12 -
sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx | 2
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 8
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 8
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx | 7
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 2
sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx | 6
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 40 ++--
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 4
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 6
sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx | 2
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 4
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 14 -
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 2
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 27 +-
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 4
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 2
sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 4
sd/source/ui/slidesorter/controller/SlsListener.cxx | 2
sd/source/ui/slidesorter/controller/SlsListener.hxx | 4
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 10 -
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 22 +-
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 14 -
sd/source/ui/slidesorter/controller/SlsTransferableData.cxx | 10 -
sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 6
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 4
sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx | 25 +-
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 32 +--
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 8
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 2
sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx | 10 -
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 6
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 6
sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 4
sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx | 2
sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx | 4
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 19 -
sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx | 6
sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx | 4
sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx | 7
sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 6
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx | 2
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx | 16 -
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 9
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 12 -
sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 7
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 34 +--
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 12 -
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 28 +-
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 14 -
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 6
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx | 8
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 16 -
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 6
sd/source/ui/slidesorter/view/SlsTheme.cxx | 8
sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx | 4
sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx | 2
sd/source/ui/table/TableDesignPane.cxx | 12 -
sd/source/ui/table/TableDesignPane.hxx | 2
sd/source/ui/table/tablefunction.cxx | 4
sd/source/ui/table/tableobjectbar.cxx | 4
sd/source/ui/tools/PreviewRenderer.cxx | 4
sd/source/ui/tools/SdGlobalResourceContainer.cxx | 4
sd/source/ui/tools/TimerBasedTaskExecution.cxx | 18 -
sd/source/ui/unoidl/DrawController.cxx | 10 -
sd/source/ui/unoidl/facreg.cxx | 8
sd/source/ui/view/DocumentRenderer.cxx | 72 +++----
sd/source/ui/view/MediaObjectBar.cxx | 6
sd/source/ui/view/Outliner.cxx | 74 +++----
sd/source/ui/view/OutlinerIterator.cxx | 30 +--
sd/source/ui/view/ToolBarManager.cxx | 42 ++--
sd/source/ui/view/ViewShellBase.cxx | 38 +--
sd/source/ui/view/ViewShellImplementation.cxx | 10 -
sd/source/ui/view/drtxtob1.cxx | 8
sd/source/ui/view/drviews2.cxx | 26 +-
sd/source/ui/view/drviews3.cxx | 6
sd/source/ui/view/drviews4.cxx | 6
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/drviews9.cxx | 4
sd/source/ui/view/drviewsa.cxx | 4
sd/source/ui/view/drviewsf.cxx | 6
sd/source/ui/view/outlnvs2.cxx | 12 -
sd/source/ui/view/outlnvsh.cxx | 6
sd/source/ui/view/sdview.cxx | 8
sd/source/ui/view/sdview2.cxx | 4
sd/source/ui/view/sdview3.cxx | 6
sd/source/ui/view/viewoverlaymanager.cxx | 2
sd/source/ui/view/viewshel.cxx | 4
sd/workben/custompanel/ctp_panel.hxx | 2
xmloff/inc/pch/precompiled_xo.hxx | 1
464 files changed, 1958 insertions(+), 2062 deletions(-)
New commits:
commit 6f495a195b794257e8b1302d384148be43c04cee
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 17 15:41:33 2015 +0100
boost->std
Change-Id: I1e6a7fd66f90e6acd803c6cd464f1d73252f7bcb
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index d721b29..f36c3cf 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -89,8 +89,8 @@
#include <com/sun/star/sheet/XExternalSheetName.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <cppuhelper/implbase.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <vector>
class ScDocShell;
@@ -506,7 +506,7 @@ class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase,
{
private:
struct Impl;
- ::boost::scoped_ptr<Impl> m_pImpl;
+ std::unique_ptr<Impl> m_pImpl;
ScCellRangeObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const;
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 68387a6..54cfd98 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -47,11 +47,10 @@
#include <svl/itemprop.hxx>
#include <list>
+#include <memory>
#include <unordered_set>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
class ScDocument;
@@ -453,9 +452,9 @@ private:
bool m_bIncludeHiddenCells;
// internals
- typedef boost::scoped_ptr<std::vector<ScTokenRef> > TokenListPtr;
- typedef boost::scoped_ptr<std::vector<sal_uInt32> > RangeIndexMapPtr;
- typedef boost::scoped_ptr<ExternalRefListener> ExtRefListenerPtr;
+ typedef std::unique_ptr<std::vector<ScTokenRef> > TokenListPtr;
+ typedef std::unique_ptr<std::vector<sal_uInt32> > RangeIndexMapPtr;
+ typedef std::unique_ptr<ExternalRefListener> ExtRefListenerPtr;
sal_Int64 m_nObjectId;
ScDocument* m_pDocument;
@@ -465,7 +464,7 @@ private:
com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider;
SfxItemPropertySet m_aPropSet;
- boost::scoped_ptr<HiddenRangeListener> m_pHiddenListener;
+ std::unique_ptr<HiddenRangeListener> m_pHiddenListener;
ScLinkListener* m_pValueListener;
XModifyListenerArr_Impl m_aValueListeners;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 8b29b99..b634b91 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -27,12 +27,11 @@
#include "token.hxx"
#include "externalrefmgr.hxx"
-#include <vector>
-
-#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
+#include <memory>
#include <unordered_map>
#include <unordered_set>
+#include <vector>
class ScDocument;
class ScChartUnoData;
@@ -62,8 +61,8 @@ public:
private:
- boost::scoped_ptr<ExternalRefListener> mpExtRefListener;
- boost::scoped_ptr<std::vector<ScTokenRef> > mpTokens;
+ std::unique_ptr<ExternalRefListener> mpExtRefListener;
+ std::unique_ptr<std::vector<ScTokenRef> > mpTokens;
OUString maName;
ScChartUnoData* pUnoData;
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 787b964..783c6bd 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -14,9 +14,9 @@
#include "cellvalue.hxx"
#include <celltextattr.hxx>
+#include <memory>
#include <vector>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
class ScDocument;
class ScColumn;
@@ -31,7 +31,7 @@ class ColumnBlockPositionSet;
class ClipContextBase : boost::noncopyable
{
- boost::scoped_ptr<ColumnBlockPositionSet> mpSet;
+ std::unique_ptr<ColumnBlockPositionSet> mpSet;
ClipContextBase(); // disabled
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 5514e02..e0884c7 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_SC_INC_COLORSCALE_HXX
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_ptr.hpp>
#include <formula/grammar.hxx>
#include <tools/color.hxx>
#include "rangelst.hxx"
@@ -20,6 +19,7 @@
#include <svl/listener.hxx>
#include <svl/broadcast.hxx>
+#include <memory>
#include <vector>
//TODO: merge this with conditio.hxx
@@ -50,8 +50,8 @@ class SC_DLLPUBLIC ScColorScaleEntry
private:
double mnVal;
Color maColor;
- boost::scoped_ptr<ScFormulaCell> mpCell;
- boost::scoped_ptr<ScFormulaListener> mpListener;
+ std::unique_ptr<ScFormulaCell> mpCell;
+ std::unique_ptr<ScFormulaListener> mpListener;
ScColorScaleEntryType meType;
public:
@@ -133,7 +133,7 @@ struct SC_DLLPUBLIC ScDataBarFormatData
*
* Default color is 0xFF0000, this value is not set
*/
- boost::scoped_ptr<Color> mpNegativeColor;
+ std::unique_ptr<Color> mpNegativeColor;
/**
* Color of the axis if used
* Default color is black
@@ -177,8 +177,8 @@ struct SC_DLLPUBLIC ScDataBarFormatData
*/
bool mbOnlyBar;
- boost::scoped_ptr<ScColorScaleEntry> mpUpperLimit;
- boost::scoped_ptr<ScColorScaleEntry> mpLowerLimit;
+ std::unique_ptr<ScColorScaleEntry> mpUpperLimit;
+ std::unique_ptr<ScColorScaleEntry> mpLowerLimit;
};
enum ScIconSetType
@@ -242,7 +242,7 @@ private:
{
std::vector<double> maValues;
};
- mutable boost::scoped_ptr<ScColorFormatCache> mpCache;
+ mutable std::unique_ptr<ScColorFormatCache> mpCache;
};
typedef std::vector<std::unique_ptr<ScColorScaleEntry>> ScColorScaleEntries;
@@ -323,7 +323,7 @@ private:
double getMin(double nMin, double nMax) const;
double getMax(double nMin, double nMax) const;
- boost::scoped_ptr<ScDataBarFormatData> mpFormatData;
+ std::unique_ptr<ScDataBarFormatData> mpFormatData;
};
struct ScIconSetFormatData
@@ -396,7 +396,7 @@ private:
double GetMaxValue() const;
double CalcValue(double nMin, double nMax, ScIconSetFormat::const_iterator& itr) const;
- boost::scoped_ptr<ScIconSetFormatData> mpFormatData;
+ std::unique_ptr<ScIconSetFormatData> mpFormatData;
};
#endif
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 5893585..839c5b0 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -32,10 +32,10 @@
#include <tools/date.hxx>
#include <map>
+#include <memory>
#include <set>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
class ScFormulaCell;
class ScTokenArray;
@@ -280,7 +280,7 @@ private:
nValueItems(0) {}
};
- mutable boost::scoped_ptr<ScConditionEntryCache> mpCache;
+ mutable std::unique_ptr<ScConditionEntryCache> mpCache;
};
// single condition entry for conditional formatting
@@ -370,7 +370,7 @@ public:
private:
condformat::ScCondFormatDateType meType;
- mutable boost::scoped_ptr<Date> mpCache;
+ mutable std::unique_ptr<Date> mpCache;
OUString maStyleName;
};
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 1f825e7..8d13641 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -28,8 +28,6 @@
#include <svl/listener.hxx>
-#include <boost/scoped_ptr.hpp>
-
#include <memory>
#include <set>
#include <vector>
@@ -65,10 +63,10 @@ protected:
class ScDBData : public SvtListener, public ScRefreshTimer
{
private:
- boost::scoped_ptr<ScSortParam> mpSortParam;
- boost::scoped_ptr<ScQueryParam> mpQueryParam;
- boost::scoped_ptr<ScSubTotalParam> mpSubTotal;
- boost::scoped_ptr<ScImportParam> mpImportParam;
+ std::unique_ptr<ScSortParam> mpSortParam;
+ std::unique_ptr<ScQueryParam> mpQueryParam;
+ std::unique_ptr<ScSubTotalParam> mpSubTotal;
+ std::unique_ptr<ScImportParam> mpImportParam;
ScDBDataContainerBase* mpContainer;
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 49a782e..013a6e2 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -30,11 +30,8 @@
#include <vcl/vclptr.hxx>
#include <memory>
-
#include <set>
#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
class ScDocument;
class ScPatternAttr;
@@ -271,7 +268,7 @@ class ScQueryCellIterator // walk through all non-empty cells in an ar
typedef sc::CellStoreType::const_position_type PositionType;
PositionType maCurPos;
- boost::scoped_ptr<ScQueryParam> mpParam;
+ std::unique_ptr<ScQueryParam> mpParam;
ScDocument* pDoc;
const ScAttrArray* pAttrArray;
sal_uLong nNumFormat;
@@ -587,7 +584,7 @@ public:
struct TabRanges
{
SCTAB mnTab;
- ::boost::shared_ptr<ScFlatBoolRowSegments> mpRanges;
+ std::shared_ptr<ScFlatBoolRowSegments> mpRanges;
TabRanges(SCTAB nTab);
};
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7016d7f8..afa2b7e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -45,8 +45,6 @@
#include <set>
#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include "markdata.hxx"
@@ -275,7 +273,7 @@ friend class sc::ColumnSpanSet;
friend class sc::EditTextIterator;
friend class sc::FormulaGroupAreaListener;
- typedef ::std::vector<ScTable*> TableContainer;
+ typedef std::vector<ScTable*> TableContainer;
public:
enum HardRecalcState
@@ -289,9 +287,9 @@ private:
rtl::Reference<ScPoolHelper> xPoolHelper;
- boost::shared_ptr<svl::SharedStringPool> mpCellStringPool;
- boost::scoped_ptr<sc::FormulaGroupContext> mpFormulaGroupCxt;
- mutable boost::scoped_ptr<sc::DocumentLinkManager> mpDocLinkMgr;
+ std::shared_ptr<svl::SharedStringPool> mpCellStringPool;
+ std::unique_ptr<sc::FormulaGroupContext> mpFormulaGroupCxt;
+ mutable std::unique_ptr<sc::DocumentLinkManager> mpDocLinkMgr;
ScCalcConfig maCalcConfig;
@@ -333,14 +331,14 @@ private:
ScFieldEditEngine* pCacheFieldEditEngine;
- ::std::unique_ptr<ScDocProtection> pDocProtection;
- ::std::unique_ptr<ScClipParam> mpClipParam;
+ std::unique_ptr<ScDocProtection> pDocProtection;
+ std::unique_ptr<ScClipParam> mpClipParam;
- ::std::unique_ptr<ScExternalRefManager> pExternalRefMgr;
- ::std::unique_ptr<ScMacroManager> mpMacroMgr;
+ std::unique_ptr<ScExternalRefManager> pExternalRefMgr;
+ std::unique_ptr<ScMacroManager> mpMacroMgr;
// mutable for lazy construction
- mutable ::std::unique_ptr< ScFormulaParserPool >
+ mutable std::unique_ptr< ScFormulaParserPool >
mxFormulaParserPool; /// Pool for all external formula parsers used by this document.
OUString aDocName; // optional: name of document
@@ -469,7 +467,7 @@ private:
sal_Int16 mnNamedRangesLockCount;
- ::std::set<ScFormulaCell*> maSubTotalCells;
+ std::set<ScFormulaCell*> maSubTotalCells;
bool mbUseEmbedFonts;
@@ -591,8 +589,8 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const OUString& rChartName );
- SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc );
- void SetChartRanges( const OUString& rChartName, const ::std::vector< ScRangeList >& rRanges );
+ SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc );
+ void SetChartRanges( const OUString& rChartName, const std::vector< ScRangeList >& rRanges );
void UpdateChartArea( const OUString& rChartName, const ScRange& rNewArea,
bool bColHeaders, bool bRowHeaders, bool bAdd );
@@ -1603,8 +1601,8 @@ public:
SC_DLLPUBLIC sal_uInt8 GetColFlags( SCCOL nCol, SCTAB nTab ) const;
SC_DLLPUBLIC sal_uInt8 GetRowFlags( SCROW nRow, SCTAB nTab ) const;
- SC_DLLPUBLIC void GetAllRowBreaks(::std::set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
- SC_DLLPUBLIC void GetAllColBreaks(::std::set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
+ SC_DLLPUBLIC void GetAllRowBreaks(std::set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
+ SC_DLLPUBLIC void GetAllColBreaks(std::set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
SC_DLLPUBLIC ScBreakType HasRowBreak(SCROW nRow, SCTAB nTab) const;
SC_DLLPUBLIC ScBreakType HasColBreak(SCCOL nCol, SCTAB nTab) const;
SC_DLLPUBLIC void SetRowBreak(SCROW nRow, SCTAB nTab, bool bPage, bool bManual);
diff --git a/sc/inc/documentstreamaccess.hxx b/sc/inc/documentstreamaccess.hxx
index 52335df..81e0fbc 100644
--- a/sc/inc/documentstreamaccess.hxx
+++ b/sc/inc/documentstreamaccess.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_SC_INC_DOCUMENTSTREAMACCESS_HXX
#include <rtl/ustring.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class ScDocument;
class ScAddress;
@@ -27,7 +27,7 @@ struct DocumentStreamAccessImpl;
*/
class DocumentStreamAccess
{
- boost::scoped_ptr<DocumentStreamAccessImpl> mpImpl;
+ std::unique_ptr<DocumentStreamAccessImpl> mpImpl;
DocumentStreamAccess();
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index b778086..799c8c3 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -25,13 +25,13 @@
#include <tools/date.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <mdds/flat_segment_tree.hpp>
+#include <memory>
+#include <set>
#include <unordered_set>
#include <vector>
-#include <set>
struct ScQueryParam;
class ScDPObject;
@@ -67,7 +67,7 @@ public:
/**
* Optional items for grouped field.
*/
- boost::scoped_ptr<GroupItems> mpGroup;
+ std::unique_ptr<GroupItems> mpGroup;
/**
* Unique values in the field, stored in ascending order.
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 8ec5f8b..857ab76 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -26,9 +26,9 @@
#include "dpitemdata.hxx"
#include "calcmacros.hxx"
+#include <memory>
#include <unordered_set>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <mdds/flat_segment_tree.hpp>
@@ -95,7 +95,7 @@ public:
struct Criterion
{
sal_Int32 mnFieldIndex;
- ::boost::shared_ptr<FilterBase> mpFilter;
+ std::shared_ptr<FilterBase> mpFilter;
Criterion();
};
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index e59b38a..805affe 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_SC_INC_DPGROUP_HXX
#define INCLUDED_SC_INC_DPGROUP_HXX
+#include <memory>
#include <unordered_set>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include "dptabdat.hxx"
#include "scdllapi.h"
@@ -121,7 +121,7 @@ class ScDPGroupTableData : public ScDPTableData
{
typedef std::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > StringHashSet;
- ::boost::shared_ptr<ScDPTableData> pSourceData;
+ std::shared_ptr<ScDPTableData> pSourceData;
long nSourceCount;
ScDPGroupDimensionVec aGroups;
ScDPNumGroupDimension* pNumGroups; // array[nSourceCount]
@@ -138,10 +138,10 @@ class ScDPGroupTableData : public ScDPTableData
public:
// takes ownership of pSource
- ScDPGroupTableData( const ::boost::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument );
+ ScDPGroupTableData( const std::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument );
virtual ~ScDPGroupTableData();
- boost::shared_ptr<ScDPTableData> GetSourceTableData() { return pSourceData;}
+ std::shared_ptr<ScDPTableData> GetSourceTableData() { return pSourceData;}
void AddGroupDimension( const ScDPGroupDimension& rGroup );
void SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup );
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index a167194..dd0a3c9 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -30,13 +30,13 @@
#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
+#include <memory>
#include <set>
#include <vector>
#include <boost/ptr_container/ptr_list.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/ptr_container/ptr_map.hpp>
-#include <boost/shared_ptr.hpp>
namespace com { namespace sun { namespace star {
@@ -92,7 +92,7 @@ private:
ScSheetSourceDesc* pSheetDesc; // for sheet data
ScImportSourceDesc* pImpDesc; // for database data
ScDPServiceDesc* pServDesc; // for external service
- ::boost::shared_ptr<ScDPTableData> mpTableData;
+ std::shared_ptr<ScDPTableData> mpTableData;
// cached data
com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource;
ScDPOutput* pOutput;
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 9973b99..c81a690 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_SC_INC_DPSAVE_HXX
#include <list>
+#include <memory>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
@@ -52,7 +52,7 @@ class ScDPSaveMember
{
private:
OUString aName;
- boost::scoped_ptr<OUString> mpLayoutName; // custom name to be displayed in the table.
+ std::unique_ptr<OUString> mpLayoutName; // custom name to be displayed in the table.
sal_uInt16 nVisibleMode;
sal_uInt16 nShowDetailsMode;
@@ -98,8 +98,8 @@ class SC_DLLPUBLIC ScDPSaveDimension
{
private:
OUString aName;
- boost::scoped_ptr<OUString> mpLayoutName;
- boost::scoped_ptr<OUString> mpSubtotalName;
+ std::unique_ptr<OUString> mpLayoutName;
+ std::unique_ptr<OUString> mpSubtotalName;
bool bIsDataLayout;
bool bDupFlag;
sal_uInt16 nOrientation;
@@ -258,8 +258,8 @@ private:
* created. */
bool mbDimensionMembersBuilt;
- boost::scoped_ptr<OUString> mpGrandTotalName;
- mutable boost::scoped_ptr<DimOrderType> mpDimOrder; // dimension order for row and column dimensions, to traverse result tree.
+ std::unique_ptr<OUString> mpGrandTotalName;
+ mutable std::unique_ptr<DimOrderType> mpDimOrder; // dimension order for row and column dimensions, to traverse result tree.
public:
SC_DLLPUBLIC ScDPSaveData();
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index cdae3af..4f63a82 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -48,8 +48,8 @@
#include "dpresfilter.hxx"
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
#include <list>
+#include <memory>
#include <unordered_map>
#include <unordered_set>
#include <vector>
@@ -319,8 +319,8 @@ class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper<
long nUsedHier;
sal_uInt16 nFunction; // enum GeneralFunction
OUString aName; // if empty, take from source
- boost::scoped_ptr<OUString> mpLayoutName;
- boost::scoped_ptr<OUString> mpSubtotalName;
+ std::unique_ptr<OUString> mpLayoutName;
+ std::unique_ptr<OUString> mpSubtotalName;
long nSourceDim; // >=0 if dup'ed
::com::sun::star::sheet::DataPilotFieldReference
aReferenceValue; // settings for "show data as" / "displayed value"
@@ -732,7 +732,7 @@ private:
long nLev;
SCROW mnDataId;
- boost::scoped_ptr<OUString> mpLayoutName;
+ std::unique_ptr<OUString> mpLayoutName;
sal_Int32 nPosition; // manual sorting
bool bVisible;
diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index e13a4b1..a917dcd 100644
--- a/sc/inc/editdataarray.hxx
+++ b/sc/inc/editdataarray.hxx
@@ -23,8 +23,8 @@
#include "address.hxx"
#include <editeng/editobj.hxx>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
class EditTextObject;
@@ -48,8 +48,8 @@ public:
Item(); // disabled
private:
- ::boost::shared_ptr<EditTextObject> mpOldData;
- ::boost::shared_ptr<EditTextObject> mpNewData;
+ std::shared_ptr<EditTextObject> mpOldData;
+ std::shared_ptr<EditTextObject> mpNewData;
SCTAB mnTab;
SCCOL mnCol;
SCROW mnRow;
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index be51351..bb8b44c 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -34,7 +34,7 @@
#include <formula/token.hxx>
#include <osl/mutex.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <unordered_map>
#include <unordered_set>
#include <vector>
@@ -91,7 +91,7 @@ class ScExternalRefCache
{
public:
typedef ::formula::FormulaTokenRef TokenRef;
- typedef ::boost::shared_ptr<ScTokenArray> TokenArrayRef;
+ typedef std::shared_ptr<ScTokenArray> TokenArrayRef;
struct TableName
{
@@ -198,7 +198,7 @@ public:
ReferencedFlag meReferenced;
};
- typedef ::boost::shared_ptr<Table> TableTypeRef;
+ typedef std::shared_ptr<Table> TableTypeRef;
typedef std::unordered_map< OUString, size_t, OUStringHash>
TableNameIndexMap;
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 905e907..ed2e72c 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -40,7 +40,7 @@
#include <osl/mutex.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class ScEditSource;
class SvxFieldItem;
@@ -207,7 +207,7 @@ class ScEditFieldObj : public cppu::WeakImplHelper<
ESelection aSelection;
sal_Int32 meType;
- boost::scoped_ptr<SvxFieldData> mpData;
+ std::unique_ptr<SvxFieldData> mpData;
com::sun::star::uno::Reference<com::sun::star::text::XTextRange> mpContent;
com::sun::star::util::DateTime maDateTime;
diff --git a/sc/inc/importfilterdata.hxx b/sc/inc/importfilterdata.hxx
index 089f427..8ea1473 100644
--- a/sc/inc/importfilterdata.hxx
+++ b/sc/inc/importfilterdata.hxx
@@ -13,7 +13,7 @@
#include "address.hxx"
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sc {
@@ -39,7 +39,7 @@ struct ImportPostProcessData : boost::noncopyable
DataStream();
};
- boost::scoped_ptr<DataStream> mpDataStream;
+ std::unique_ptr<DataStream> mpDataStream;
};
}
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 000a5be..fe40dea 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -14,8 +14,7 @@
#include "columnspanset.hxx"
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class ScDocument;
class ScTokenArray;
@@ -28,10 +27,10 @@ class ColumnBlockPositionSet;
class StartListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
- boost::shared_ptr<ColumnBlockPositionSet> mpSet;
+ std::shared_ptr<ColumnBlockPositionSet> mpSet;
public:
StartListeningContext(ScDocument& rDoc);
- StartListeningContext(ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet);
+ StartListeningContext(ScDocument& rDoc, const std::shared_ptr<ColumnBlockPositionSet>& pSet);
ScDocument& getDoc() { return mrDoc;}
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
@@ -41,13 +40,13 @@ class EndListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
ColumnSpanSet maSet;
- boost::shared_ptr<ColumnBlockPositionSet> mpPosSet;
+ std::shared_ptr<ColumnBlockPositionSet> mpPosSet;
ScTokenArray* mpOldCode;
ScAddress maPosDelta; // Add this to get the old position prior to the move.
public:
EndListeningContext(ScDocument& rDoc, ScTokenArray* pOldCode = NULL);
- EndListeningContext(ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode = NULL);
+ EndListeningContext(ScDocument& rDoc, const std::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode = NULL);
void setPositionDelta( const ScAddress& rDelta );
@@ -64,7 +63,7 @@ public:
class PurgeListenerAction : public ColumnSpanSet::Action, boost::noncopyable
{
ScDocument& mrDoc;
- boost::scoped_ptr<ColumnBlockPosition> mpBlockPos;
+ std::unique_ptr<ColumnBlockPosition> mpBlockPos;
public:
PurgeListenerAction( ScDocument& rDoc );
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 9f6258b..4a0a1e9 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -42,8 +42,6 @@
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <cassert>
#include <climits>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 32480a7..5eb13ba 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -23,8 +23,6 @@
#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <cassert>
#include <com/sun/star/awt/DeviceInfo.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index fbd83f1..4b7fd17 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -19,7 +19,6 @@
#include <basic/sbmod.hxx>
#include <basic/sbstar.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <cmath>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XDesktop2.hpp>
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 130a34c..90120f4 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -22,7 +22,6 @@
#include <basic/sbuno.hxx>
#include <basic/sbx.hxx>
#include <basic/sbxobj.hxx>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 7a376d2..98a89f7 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_SC_INC_POSTIT_HXX
#define INCLUDED_SC_INC_POSTIT_HXX
-#include <boost/shared_ptr.hpp>
#include <rtl/ustring.hxx>
#include "address.hxx"
#include "scdllapi.h"
#include <map>
+#include <memory>
class EditTextObject;
class OutlinerParaObject;
@@ -39,7 +39,7 @@ struct ScCaptionInitData;
/** Internal data for a cell annotation. */
struct SC_DLLPUBLIC ScNoteData
{
- typedef ::boost::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef;
+ typedef std::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef;
OUString maDate; /// Creation date of the note.
OUString maAuthor; /// Author of the note.
diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx
index f12e261..081823d 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_SIMPLEFORMULACALC_HXX
#define INCLUDED_SC_INC_SIMPLEFORMULACALC_HXX
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <formula/grammar.hxx>
#include "address.hxx"
@@ -26,7 +26,7 @@ private:
sal_uLong mnFormatIndex;
bool mbCalculated;
- boost::scoped_ptr<ScTokenArray> mpCode;
+ std::unique_ptr<ScTokenArray> mpCode;
ScAddress maAddr;
ScDocument* mpDoc;
ScFormulaResult maResult;
diff --git a/sc/inc/simplerangelist.hxx b/sc/inc/simplerangelist.hxx
index 1fcbefd..bf672ea 100644
--- a/sc/inc/simplerangelist.hxx
+++ b/sc/inc/simplerangelist.hxx
@@ -20,12 +20,11 @@
#ifndef INCLUDED_SC_INC_SIMPLERANGELIST_HXX
#define INCLUDED_SC_INC_SIMPLERANGELIST_HXX
-#include <boost/shared_ptr.hpp>
-
#include "address.hxx"
-#include <map>
#include <list>
+#include <map>
+#include <memory>
class ScRange;
class ScRangeList;
@@ -47,7 +46,7 @@ public:
SCROW mnRow2;
explicit Range(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
};
- typedef ::boost::shared_ptr< ::std::list<Range> > RangeListRef;
+ typedef std::shared_ptr< ::std::list<Range> > RangeListRef;
typedef ::std::map<SCTAB, RangeListRef> TabType;
ScSimpleRangeList();
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 77330b3..8a12532 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -36,7 +36,7 @@
#include <set>
#include <map>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/noncopyable.hpp>
namespace utl {
@@ -140,17 +140,17 @@ private:
SCROW nRepeatStartY;
SCROW nRepeatEndY;
- boost::scoped_ptr<ScTableProtection> pTabProtection;
+ std::unique_ptr<ScTableProtection> pTabProtection;
sal_uInt16* pColWidth;
- boost::scoped_ptr<ScFlatUInt16RowSegments> mpRowHeights;
+ std::unique_ptr<ScFlatUInt16RowSegments> mpRowHeights;
sal_uInt8* pColFlags;
ScBitMaskCompressedArray< SCROW, sal_uInt8>* pRowFlags;
- boost::scoped_ptr<ScFlatBoolColSegments> mpHiddenCols;
- boost::scoped_ptr<ScFlatBoolRowSegments> mpHiddenRows;
- boost::scoped_ptr<ScFlatBoolColSegments> mpFilteredCols;
- boost::scoped_ptr<ScFlatBoolRowSegments> mpFilteredRows;
+ std::unique_ptr<ScFlatBoolColSegments> mpHiddenCols;
+ std::unique_ptr<ScFlatBoolRowSegments> mpHiddenRows;
+ std::unique_ptr<ScFlatBoolColSegments> mpFilteredCols;
+ std::unique_ptr<ScFlatBoolRowSegments> mpFilteredRows;
::std::set<SCROW> maRowPageBreaks;
::std::set<SCROW> maRowManualBreaks;
@@ -188,7 +188,7 @@ private:
ScDBData* pDBDataNoName;
mutable ScRangeName* mpRangeName;
- boost::scoped_ptr<ScConditionalFormatList> mpCondFormatList;
+ std::unique_ptr<ScConditionalFormatList> mpCondFormatList;
bool bScenario:1;
bool bLayoutRTL:1;
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index 1458399..07aecaa 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -25,7 +25,7 @@
#include "global.hxx"
#include "rangelst.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class ScDocument;
class ScTableProtectionImpl;
@@ -103,7 +103,7 @@ public:
void setOption(Option eOption, bool bEnabled);
private:
- ::boost::scoped_ptr<ScTableProtectionImpl> mpImpl;
+ std::unique_ptr<ScTableProtectionImpl> mpImpl;
};
/** Container for the Excel EnhancedProtection feature.
@@ -195,7 +195,7 @@ public:
bool isSelectionEditable( const ScRangeList& rRangeList ) const;
private:
- ::boost::scoped_ptr<ScTableProtectionImpl> mpImpl;
+ std::unique_ptr<ScTableProtectionImpl> mpImpl;
};
#endif
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 654df89..352e38e 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -662,12 +662,12 @@ ScDocShellRef ScBootstrapFixture::saveAndReload( ScDocShell* pShell, sal_Int32 n
return xDocSh;
}
-boost::shared_ptr<utl::TempFile> ScBootstrapFixture::exportTo( ScDocShell* pShell, sal_Int32 nFormat )
+std::shared_ptr<utl::TempFile> ScBootstrapFixture::exportTo( ScDocShell* pShell, sal_Int32 nFormat )
{
OUString aFilterName(aFileFormats[nFormat].pFilterName, strlen(aFileFormats[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
OUString aFilterType(aFileFormats[nFormat].pTypeName, strlen(aFileFormats[nFormat].pTypeName), RTL_TEXTENCODING_UTF8);
- boost::shared_ptr<utl::TempFile> pTempFile(new utl::TempFile());
+ std::shared_ptr<utl::TempFile> pTempFile(new utl::TempFile());
pTempFile->EnableKillingFile();
SfxMedium aStoreMedium( pTempFile->GetURL(), STREAM_STD_WRITE );
SotClipboardFormatId nExportFormat = SotClipboardFormatId::NONE;
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 17934f6..e7a6d5f 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -32,7 +32,7 @@
#include <sal/types.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#if defined(SCQAHELPER_DLLIMPLEMENTATION)
#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
@@ -230,7 +230,7 @@ public:
ScDocShellRef saveAndReload( ScDocShell* pShell, sal_Int32 nFormat );
- static boost::shared_ptr<utl::TempFile> exportTo( ScDocShell* pShell, sal_Int32 nFormat );
+ static std::shared_ptr<utl::TempFile> exportTo( ScDocShell* pShell, sal_Int32 nFormat );
void miscRowHeightsTest( TestParam* aTestValues, unsigned int numElems );
};
diff --git a/sc/qa/unit/helper/xpath.cxx b/sc/qa/unit/helper/xpath.cxx
index c90b7c0..78b48dd 100644
--- a/sc/qa/unit/helper/xpath.cxx
+++ b/sc/qa/unit/helper/xpath.cxx
@@ -21,13 +21,13 @@
xmlDocPtr XPathHelper::parseExport(ScDocShell* pShell, uno::Reference<lang::XMultiServiceFactory> xSFactory, const OUString& rFile, sal_Int32 nFormat)
{
- boost::shared_ptr<utl::TempFile> pTempFile = ScBootstrapFixture::exportTo(pShell, nFormat);
+ std::shared_ptr<utl::TempFile> pTempFile = ScBootstrapFixture::exportTo(pShell, nFormat);
// Read the XML stream we're interested in.
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(xSFactory), pTempFile->GetURL());
uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(rFile), uno::UNO_QUERY);
CPPUNIT_ASSERT(xInputStream.is());
- boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+ std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
return XmlTestTools::parseXmlStream(pStream.get());
}
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 4a478ce..3299dd9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3256,7 +3256,7 @@ void Test::testCopyPaste()
aRange = ScRange(0,1,1,2,1,1);//target: Sheet2.A2:C2
ScDocument* pUndoDoc = new ScDocument(SCDOCMODE_UNDO);
pUndoDoc->InitUndo(m_pDoc, 1, 1, true, true);
- boost::scoped_ptr<ScUndoPaste> pUndo(createUndoPaste(getDocShell(), aRange, pUndoDoc));
+ std::unique_ptr<ScUndoPaste> pUndo(createUndoPaste(getDocShell(), aRange, pUndoDoc));
ScMarkData aMark;
aMark.SetMarkArea(aRange);
m_pDoc->CopyFromClip(aRange, aMark, IDF_ALL, NULL, &aClipDoc);
@@ -5417,7 +5417,7 @@ void Test::testCellTextWidth()
ScAddress aTopCell(0, 0, 0);
// Sheet is empty.
- boost::scoped_ptr<ScColumnTextWidthIterator> pIter(new ScColumnTextWidthIterator(*m_pDoc, aTopCell, MAXROW));
+ std::unique_ptr<ScColumnTextWidthIterator> pIter(new ScColumnTextWidthIterator(*m_pDoc, aTopCell, MAXROW));
CPPUNIT_ASSERT_MESSAGE("Column should have no text widths stored.", !pIter->hasCell());
// Sheet only has one cell.
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 5df5457..6401d4c 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -31,7 +31,7 @@
#include <formula/vectortoken.hxx>
#include <svl/broadcast.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace formula;
@@ -171,7 +171,7 @@ void Test::testFormulaCreateStringFromTokens()
};
(void) aTests;
- boost::scoped_ptr<ScTokenArray> pArray;
+ std::unique_ptr<ScTokenArray> pArray;
sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
@@ -920,7 +920,7 @@ void Test::testFormulaCompiler()
for (size_t i = 0, n = SAL_N_ELEMENTS(aTests); i < n; ++i)
{
- boost::scoped_ptr<ScTokenArray> pArray;
+ std::unique_ptr<ScTokenArray> pArray;
{
pArray.reset(compileFormula(m_pDoc, OUString::createFromAscii(aTests[i].pInput), NULL, aTests[i].eInputGram));
CPPUNIT_ASSERT_MESSAGE("Token array shouldn't be NULL!", pArray.get());
@@ -950,7 +950,7 @@ void Test::testFormulaCompilerJumpReordering()
OUString aInput("=IF(B1;12;\"text\")");
// Compile formula string first.
- boost::scoped_ptr<ScTokenArray> pCode(compileFormula(m_pDoc, aInput));
+ std::unique_ptr<ScTokenArray> pCode(compileFormula(m_pDoc, aInput));
CPPUNIT_ASSERT(pCode.get());
// Then generate RPN tokens.
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 88666a2..dc2782c7 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1318,7 +1318,7 @@ void Test::testSharedFormulasCopyPaste()
ScDocument* pUndoDoc = new ScDocument(SCDOCMODE_UNDO);
pUndoDoc->InitUndo(m_pDoc, 0, 0, true, true);
m_pDoc->CopyToDocument(aRange, IDF_CONTENTS, false, pUndoDoc);
- boost::scoped_ptr<ScUndoPaste> pUndo(createUndoPaste(getDocShell(), aRange, pUndoDoc));
+ std::unique_ptr<ScUndoPaste> pUndo(createUndoPaste(getDocShell(), aRange, pUndoDoc));
// First, make sure the formula cells are shared in the undo document.
aPos.SetCol(1);
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 65c2331..4c120df 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -45,7 +45,7 @@
#include "cellvalue.hxx"
#include "editutil.hxx"
#include <rtl/strbuf.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// STATIC DATA -----------------------------------------------------------
@@ -243,7 +243,7 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd
{
const ScPatternAttr* pPattern = GetPattern(nTempStartRow);
- boost::scoped_ptr<ScPatternAttr> pNewPattern;
+ std::unique_ptr<ScPatternAttr> pNewPattern;
if(pPattern)
{
pNewPattern.reset( new ScPatternAttr(*pPattern) );
@@ -581,7 +581,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
do
{
const ScPatternAttr* pOldPattern = pData[nPos].pPattern;
- boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pOldPattern));
+ std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pOldPattern));
pNewPattern->SetStyleSheet(pStyle);
SCROW nY1 = nStart;
SCROW nY2 = pData[nPos].nRow;
@@ -680,7 +680,7 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
if ( (SfxItemState::SET == eState) || (SfxItemState::SET == eTLBRState) || (SfxItemState::SET == eBLTRState) )
{
- boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pOldPattern));
+ std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pOldPattern));
SfxItemSet& rNewSet = pNewPattern->GetItemSet();
SCROW nY1 = nStart;
SCROW nY2 = pData[nPos].nRow;
@@ -1449,7 +1449,7 @@ bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
for (SCROW nThisRow = nThisStart; nThisRow <= nThisEnd; nThisRow++)
pDocument->ApplyAttr( nThisCol, nThisRow, nTab, *pAttr );
- boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( pDocument->GetPool() ));
+ std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( pDocument->GetPool() ));
SfxItemSet* pSet = &pNewPattern->GetItemSet();
pSet->Put( *pFlagAttr );
pDocument->ApplyPatternAreaTab( nThisCol, nThisStart, nMergeEndCol, nMergeEndRow,
@@ -1506,7 +1506,7 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
// because it would have no cell style information.
// Instead, the document's GetDefPattern is copied. Since it is passed as
// pWantedPattern, no special treatment of default is needed here anymore.
- boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( *pWantedPattern ));
+ std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( *pWantedPattern ));
SfxItemSet* pSet = &pNewPattern->GetItemSet();
pSet->Put( *pItem );
SetPatternArea( nThisRow, nAttrRow, pNewPattern.get(), true );
@@ -1736,7 +1736,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo
if (bReset)
{
- boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pData[nPos].pPattern));
+ std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pData[nPos].pPattern));
pDocument->GetPool()->Remove(*pData[nPos].pPattern);
pNewPattern->SetStyleSheet( static_cast<ScStyleSheet*>(
pDocument->GetStyleSheetPool()->
@@ -2233,7 +2233,7 @@ void ScAttrArray::CopyArea(
}
else if ( nStripFlags )
{
- boost::scoped_ptr<ScPatternAttr> pTmpPattern(new ScPatternAttr( *pOldPattern ));
+ std::unique_ptr<ScPatternAttr> pTmpPattern(new ScPatternAttr( *pOldPattern ));
sal_Int16 nNewFlags = 0;
if ( nStripFlags != SC_MF_ALL )
nNewFlags = static_cast<const ScMergeFlagAttr&>(pTmpPattern->GetItem(ATTR_MERGE_FLAG)).
diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx
index ac78dbd..4bdb0e7 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -241,7 +241,7 @@ void CopyFromClipContext::setSingleCell( const ScAddress& rSrcPos, const ScColum
// make this process simpler.
ScFieldEditEngine& rEngine = mrDestDoc.GetEditEngine();
rEngine.SetText(rSrcCell.mpFormula->GetString().getString());
- boost::scoped_ptr<EditTextObject> pObj(rEngine.CreateTextObject());
+ std::unique_ptr<EditTextObject> pObj(rEngine.CreateTextObject());
pObj->NormalizeString(mrDestDoc.GetSharedStringPool());
rSrcCell.set(*pObj);
}
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7b1e410..04eedf7 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -57,7 +57,7 @@
#include <map>
#include <cstdio>
#include <boost/checked_delete.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using ::editeng::SvxBorderLine;
using namespace formula;
@@ -549,7 +549,7 @@ void ScColumn::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd
void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle )
{
const ScPatternAttr* pPattern = pAttrArray->GetPattern(nRow);
- boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pPattern));
+ std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pPattern));
if (pNewPattern)
{
pNewPattern->SetStyleSheet(const_cast<ScStyleSheet*>(&rStyle));
@@ -702,7 +702,7 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr )
ScDocumentPool* pDocPool = pDocument->GetPool();
const ScPatternAttr* pOldPattern = pAttrArray->GetPattern( nRow );
- boost::scoped_ptr<ScPatternAttr> pTemp(new ScPatternAttr(*pOldPattern));
+ std::unique_ptr<ScPatternAttr> pTemp(new ScPatternAttr(*pOldPattern));
pTemp->GetItemSet().Put(rAttr);
const ScPatternAttr* pNewPattern = static_cast<const ScPatternAttr*>( &pDocPool->Put( *pTemp ) );
@@ -1657,7 +1657,7 @@ void ScColumn::CopyToColumn(
const ScStyleSheet* pStyle =
rColumn.pAttrArray->GetPattern( nRow )->GetStyleSheet();
const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow );
- boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( *pPattern ));
+ std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( *pPattern ));
pNewPattern->SetStyleSheet( const_cast<ScStyleSheet*>(pStyle) );
rColumn.pAttrArray->SetPattern( nRow, pNewPattern.get(), true );
}
@@ -2058,7 +2058,7 @@ class UpdateRefOnNonCopy : std::unary_function<sc::FormulaGroupEntry, void>
ScFormulaCell** ppEnd = pp + rGroup.mnLength;
ScFormulaCell* pTop = *pp;
ScTokenArray* pCode = pTop->GetCode();
- boost::scoped_ptr<ScTokenArray> pOldCode(pCode->Clone());
+ std::unique_ptr<ScTokenArray> pOldCode(pCode->Clone());
ScAddress aOldPos = pTop->aPos;
// Run this before the position gets updated.
@@ -2128,7 +2128,7 @@ class UpdateRefOnNonCopy : std::unary_function<sc::FormulaGroupEntry, void>
ScFormulaCell** ppEnd = pp + rGroup.mnLength;
ScFormulaCell* pTop = *pp;
ScTokenArray* pCode = pTop->GetCode();
- boost::scoped_ptr<ScTokenArray> pOldCode(pCode->Clone());
+ std::unique_ptr<ScTokenArray> pOldCode(pCode->Clone());
ScAddress aPos = pTop->aPos;
ScAddress aOldPos = aPos;
@@ -2164,7 +2164,7 @@ class UpdateRefOnNonCopy : std::unary_function<sc::FormulaGroupEntry, void>
// Make sure that the start and end listening contexts share the
// same block position set, else an invalid iterator may ensue.
- boost::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(
+ std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(
new sc::ColumnBlockPositionSet(mpCxt->mrDoc));
sc::StartListeningContext aStartCxt(mpCxt->mrDoc, pPosSet);
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5347082..5118e56 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -67,8 +67,8 @@
#include <formula/errorcodes.hxx>
#include <formula/vectortoken.hxx>
-#include <boost/scoped_ptr.hpp>
#include <algorithm>
+#include <memory>
// factor from font size to optimal cell height (text width)
#define SC_ROT_BREAK_FACTOR 6
@@ -368,7 +368,7 @@ long ScColumn::GetNeededSize(
SfxItemSet* pSet = new SfxItemSet( pEngine->GetEmptyItemSet() );
if ( ScStyleSheet* pPreviewStyle = pDocument->GetPreviewCellStyle( nCol, nRow, nTab ) )
{
- boost::scoped_ptr<ScPatternAttr> pPreviewPattern(new ScPatternAttr( *pPattern ));
+ std::unique_ptr<ScPatternAttr> pPreviewPattern(new ScPatternAttr( *pPattern ));
pPreviewPattern->SetStyleSheet(pPreviewStyle);
pPreviewPattern->FillEditItemSet( pSet, pCondSet );
}
@@ -1054,7 +1054,7 @@ public:
class RemoveEditAttribsHandler : public StrEntries
{
- boost::scoped_ptr<ScFieldEditEngine> mpEngine;
+ std::unique_ptr<ScFieldEditEngine> mpEngine;
public:
RemoveEditAttribsHandler(sc::CellStoreType& rCells, ScDocument* pDoc) : StrEntries(rCells, pDoc) {}
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c39c295..138b0f5 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -50,7 +50,7 @@
#include <com/sun/star/i18n/LocaleDataItem.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <mdds/flat_segment_tree.hpp>
@@ -423,7 +423,7 @@ void ScColumn::AttachNewFormulaCell(
{
case sc::ConvertToGroupListening:
{
- boost::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*pDocument));
+ std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*pDocument));
sc::StartListeningContext aStartCxt(*pDocument, pPosSet);
sc::EndListeningContext aEndCxt(*pDocument, pPosSet);
SCROW nRow = aPos.first->position + aPos.second;
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index ac09eac..bd7c60b 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -34,8 +34,6 @@
#include <vector>
#include <cassert>
-#include <boost/shared_ptr.hpp>
-
bool ScColumn::IsMerged( SCROW nRow ) const
{
return pAttrArray->IsMerged(nRow);
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 1926118..b72a5ad 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -42,7 +42,7 @@
#include "refupdatecontext.hxx"
#include <svl/sharedstring.hxx>
#include <svl/sharedstringpool.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace formula;
@@ -653,7 +653,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
// Evaluate formulas
bool bDirty = false; // 1 and 2 separate?
- boost::scoped_ptr<ScFormulaCell> pTemp1;
+ std::unique_ptr<ScFormulaCell> pTemp1;
ScFormulaCell* pEff1 = pFCell1;
if ( bRelRef1 )
{
@@ -683,7 +683,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
}
pTemp1.reset();
- boost::scoped_ptr<ScFormulaCell> pTemp2;
+ std::unique_ptr<ScFormulaCell> pTemp2;
ScFormulaCell* pEff2 = pFCell2; //@ 1!=2
if ( bRelRef2 )
{
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index a38f712..3b96fb4 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -131,7 +131,7 @@ private:
ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) :
mpCellStringPool(new svl::SharedStringPool(ScGlobal::pCharClass)),
- mpFormulaGroupCxt(NULL),
+ mpFormulaGroupCxt(nullptr),
maCalcConfig( ScInterpreter::GetGlobalConfig()),
mpUndoManager( NULL ),
pEditEngine( NULL ),
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 0e6998a..15d407a 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -73,8 +73,8 @@
#include "scopetools.hxx"
#include "globalnames.hxx"
-#include <boost/scoped_ptr.hpp>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <memory>
using namespace com::sun::star;
@@ -974,7 +974,7 @@ void ScDocument::UpdateReference(
if (!ValidRange(rCxt.maRange))
return;
- boost::scoped_ptr<sc::ExpandRefsSwitch> pExpandRefsSwitch;
+ std::unique_ptr<sc::ExpandRefsSwitch> pExpandRefsSwitch;
if (rCxt.isInserted())
pExpandRefsSwitch.reset(new sc::ExpandRefsSwitch(*this, SC_MOD()->GetInputOptions().GetExpandRefs()));
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 4d93eca..48319ba 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -339,7 +339,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
// Reference in each cell must point to the origin cell relative to the current cell.
aRefData.SetAddress(aBasePos, aPos);
*t->GetSingleRef() = aRefData;
- boost::scoped_ptr<ScTokenArray> pTokArr(aArr.Clone());
+ std::unique_ptr<ScTokenArray> pTokArr(aArr.Clone());
pCell = new ScFormulaCell(this, aPos, *pTokArr, eGram, MM_REFERENCE);
pTab->SetFormulaCell(nCol, nRow, pCell);
}
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index c51ca60..d9e9bd3 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -89,7 +89,7 @@
#include <documentlinkmgr.hxx>
#include <scopetools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -571,7 +571,7 @@ bool ScDocument::IdleCalcTextWidth() // true = try next again
// Start at specified cell position (nCol, nRow, nTab).
ScColumn* pCol = &pTab->aCol[aScope.Col()];
- boost::scoped_ptr<ScColumnTextWidthIterator> pColIter(new ScColumnTextWidthIterator(*pCol, aScope.Row(), MAXROW));
+ std::unique_ptr<ScColumnTextWidthIterator> pColIter(new ScColumnTextWidthIterator(*pCol, aScope.Row(), MAXROW));
OutputDevice* pDev = NULL;
sal_uInt16 nRestart = 0;
@@ -1205,7 +1205,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
bool bConsiderLanguage = aTransliterationWrapper.needLanguageForTheMode();
sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
- boost::scoped_ptr<ScEditEngineDefaulter> pEngine; // not using pEditEngine member because of defaults
+ std::unique_ptr<ScEditEngineDefaulter> pEngine; // not using pEditEngine member because of defaults
SCTAB nCount = GetTableCount();
ScMarkData::const_iterator itr = rMultiMark.begin(), itrEnd = rMultiMark.end();
@@ -1240,7 +1240,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
SfxItemSet* pDefaults = new SfxItemSet( pEngine->GetEmptyItemSet() );
if ( ScStyleSheet* pPreviewStyle = GetPreviewCellStyle( nCol, nRow, nTab ) )
{
- boost::scoped_ptr<ScPatternAttr> pPreviewPattern(new ScPatternAttr( *pPattern ));
+ std::unique_ptr<ScPatternAttr> pPreviewPattern(new ScPatternAttr( *pPattern ));
pPreviewPattern->SetStyleSheet(pPreviewStyle);
pPreviewPattern->FillEditItemSet( pDefaults );
}
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index f4aacca..a362a24 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -100,10 +100,10 @@
#include <formula/vectortoken.hxx>
-#include <map>
#include <limits>
+#include <map>
+#include <memory>
#include <boost/checked_delete.hpp>
-#include <boost/scoped_ptr.hpp>
#include "mtvelements.hxx"
@@ -2468,7 +2468,7 @@ void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1,
{
if (nInsFlag & IDF_CONTENTS)
{
- boost::shared_ptr<sc::ColumnBlockPositionSet> pSet(
+ std::shared_ptr<sc::ColumnBlockPositionSet> pSet(
new sc::ColumnBlockPositionSet(*this));
sc::StartListeningContext aStartCxt(*this, pSet);
@@ -3118,7 +3118,7 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark,
SCROW nStartRow = rSrcArea.aStart.Row();
SCCOL nEndCol = rSrcArea.aEnd.Col();
SCROW nEndRow = rSrcArea.aEnd.Row();
- boost::scoped_ptr<ScDocument> pMixDoc;
+ std::unique_ptr<ScDocument> pMixDoc;
bool bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS );
bool bOldAutoCalc = GetAutoCalc();
@@ -3175,7 +3175,7 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark,
if (ValidTab(nSrcTab) && nSrcTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nSrcTab])
{
- boost::scoped_ptr<ScDocument> pMixDoc;
+ std::unique_ptr<ScDocument> pMixDoc;
bool bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS );
bool bOldAutoCalc = GetAutoCalc();
diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index 46825d2..dd3572c 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -207,7 +207,7 @@ void ScDocument::SwapNonEmpty( sc::TableValues& rValues )
if (!rRange.IsValid())
return;
- boost::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*this));
+ std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*this));
sc::StartListeningContext aStartCxt(*this, pPosSet);
sc::EndListeningContext aEndCxt(*this, pPosSet);
@@ -393,7 +393,7 @@ namespace {
class StartNeededListenersHandler : std::unary_function<ScTable*, void>
{
- boost::shared_ptr<sc::StartListeningContext> mpCxt;
+ std::shared_ptr<sc::StartListeningContext> mpCxt;
public:
StartNeededListenersHandler( ScDocument& rDoc ) : mpCxt(new sc::StartListeningContext(rDoc)) {}
@@ -413,7 +413,7 @@ void ScDocument::StartNeededListeners()
void ScDocument::StartAllListeners( const ScRange& rRange )
{
- boost::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*this));
+ std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*this));
sc::StartListeningContext aStartCxt(*this, pPosSet);
sc::EndListeningContext aEndCxt(*this, pPosSet);
diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index 642bbc2..543181c 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -330,7 +330,7 @@ void ScDocumentImport::setMatrixCells(
// Reference in each cell must point to the origin cell relative to the current cell.
aRefData.SetAddress(rBasePos, aPos);
*t->GetSingleRef() = aRefData;
- boost::scoped_ptr<ScTokenArray> pTokArr(aArr.Clone());
+ std::unique_ptr<ScTokenArray> pTokArr(aArr.Clone());
pCell = new ScFormulaCell(&mpImpl->mrDoc, aPos, *pTokArr, eGram, MM_REFERENCE);
pBlockPos->miCellPos =
rCells.set(pBlockPos->miCellPos, aPos.Row(), pCell);
@@ -350,7 +350,7 @@ void ScDocumentImport::setMatrixCells(
aPos.SetRow(nRow);
aRefData.SetAddress(rBasePos, aPos);
*t->GetSingleRef() = aRefData;
- boost::scoped_ptr<ScTokenArray> pTokArr(aArr.Clone());
+ std::unique_ptr<ScTokenArray> pTokArr(aArr.Clone());
pCell = new ScFormulaCell(&mpImpl->mrDoc, aPos, *pTokArr, eGram, MM_REFERENCE);
pBlockPos->miCellPos =
rColCells.set(pBlockPos->miCellPos, aPos.Row(), pCell);
@@ -503,7 +503,7 @@ public:
mpImpl(new Impl(MAXROWCOUNT, mrDocImpl.mnDefaultScriptNumeric))
{}
- boost::shared_ptr<Impl> mpImpl;
+ std::shared_ptr<Impl> mpImpl;
void operator() (const sc::CellStoreType::value_type& node)
{
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index b9c5572..96b47b0 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -49,7 +49,7 @@ using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::std::vector;
-using ::boost::shared_ptr;
+using ::std::shared_ptr;
const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary leap year for date calculations
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index db4ccd2..757f274 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -83,7 +83,7 @@
using namespace com::sun::star;
using ::std::vector;
using ::std::unary_function;
-using ::boost::shared_ptr;
+using ::std::shared_ptr;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index fc86515..2e97565 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -68,7 +68,7 @@ static void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xPro
ScDPSaveMember::ScDPSaveMember(const OUString& rName) :
aName( rName ),
- mpLayoutName(NULL),
+ mpLayoutName(nullptr),
nVisibleMode( SC_DPSAVEMODE_DONTKNOW ),
nShowDetailsMode( SC_DPSAVEMODE_DONTKNOW )
{
@@ -76,7 +76,7 @@ ScDPSaveMember::ScDPSaveMember(const OUString& rName) :
ScDPSaveMember::ScDPSaveMember(const ScDPSaveMember& r) :
aName( r.aName ),
- mpLayoutName(NULL),
+ mpLayoutName(nullptr),
nVisibleMode( r.nVisibleMode ),
nShowDetailsMode( r.nShowDetailsMode )
{
@@ -191,8 +191,8 @@ void ScDPSaveMember::Dump(int nIndent) const
ScDPSaveDimension::ScDPSaveDimension(const OUString& rName, bool bDataLayout) :
aName( rName ),
- mpLayoutName(NULL),
- mpSubtotalName(NULL),
+ mpLayoutName(nullptr),
+ mpSubtotalName(nullptr),
bIsDataLayout( bDataLayout ),
bDupFlag( false ),
nOrientation( sheet::DataPilotFieldOrientation_HIDDEN ),
@@ -202,18 +202,18 @@ ScDPSaveDimension::ScDPSaveDimension(const OUString& rName, bool bDataLayout) :
bRepeatItemLabels( false ),
bSubTotalDefault( true ),
nSubTotalCount( 0 ),
- pSubTotalFuncs( NULL ),
- pReferenceValue( NULL ),
- pSortInfo( NULL ),
- pAutoShowInfo( NULL ),
- pLayoutInfo( NULL )
+ pSubTotalFuncs( nullptr ),
+ pReferenceValue( nullptr ),
+ pSortInfo( nullptr ),
+ pAutoShowInfo( nullptr ),
+ pLayoutInfo( nullptr )
{
}
ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
aName( r.aName ),
- mpLayoutName(NULL),
- mpSubtotalName(NULL),
+ mpLayoutName(nullptr),
+ mpSubtotalName(nullptr),
bIsDataLayout( r.bIsDataLayout ),
bDupFlag( r.bDupFlag ),
nOrientation( r.nOrientation ),
@@ -223,7 +223,7 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
bRepeatItemLabels( r.bRepeatItemLabels ),
bSubTotalDefault( r.bSubTotalDefault ),
nSubTotalCount( r.nSubTotalCount ),
- pSubTotalFuncs( NULL )
+ pSubTotalFuncs( nullptr )
{
if ( nSubTotalCount && r.pSubTotalFuncs )
{
@@ -242,19 +242,19 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
if (r.pReferenceValue)
pReferenceValue = new sheet::DataPilotFieldReference( *(r.pReferenceValue) );
else
- pReferenceValue = NULL;
+ pReferenceValue = nullptr;
if (r.pSortInfo)
pSortInfo = new sheet::DataPilotFieldSortInfo( *(r.pSortInfo) );
else
- pSortInfo = NULL;
+ pSortInfo = nullptr;
if (r.pAutoShowInfo)
pAutoShowInfo = new sheet::DataPilotFieldAutoShowInfo( *(r.pAutoShowInfo) );
else
- pAutoShowInfo = NULL;
+ pAutoShowInfo = nullptr;
if (r.pLayoutInfo)
pLayoutInfo = new sheet::DataPilotFieldLayoutInfo( *(r.pLayoutInfo) );
else
- pLayoutInfo = NULL;
+ pLayoutInfo = nullptr;
if (r.mpLayoutName)
mpLayoutName.reset(new OUString(*r.mpLayoutName));
if (r.mpSubtotalName)
@@ -383,7 +383,7 @@ void ScDPSaveDimension::SetSubTotals(long nCount, const sal_uInt16* pFuncs)
pSubTotalFuncs[i] = pFuncs[i];
}
else
- pSubTotalFuncs = NULL;
+ pSubTotalFuncs = nullptr;
bSubTotalDefault = false;
}
@@ -465,7 +465,7 @@ void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference*
if (pNew)
pReferenceValue = new sheet::DataPilotFieldReference(*pNew);
else
- pReferenceValue = NULL;
+ pReferenceValue = nullptr;
}
void ScDPSaveDimension::SetSortInfo(const sheet::DataPilotFieldSortInfo* pNew)
@@ -474,7 +474,7 @@ void ScDPSaveDimension::SetSortInfo(const sheet::DataPilotFieldSortInfo* pNew)
if (pNew)
pSortInfo = new sheet::DataPilotFieldSortInfo(*pNew);
else
- pSortInfo = NULL;
+ pSortInfo = nullptr;
}
void ScDPSaveDimension::SetAutoShowInfo(const sheet::DataPilotFieldAutoShowInfo* pNew)
@@ -483,7 +483,7 @@ void ScDPSaveDimension::SetAutoShowInfo(const sheet::DataPilotFieldAutoShowInfo*
if (pNew)
pAutoShowInfo = new sheet::DataPilotFieldAutoShowInfo(*pNew);
else
- pAutoShowInfo = NULL;
+ pAutoShowInfo = nullptr;
}
void ScDPSaveDimension::SetLayoutInfo(const sheet::DataPilotFieldLayoutInfo* pNew)
@@ -492,14 +492,14 @@ void ScDPSaveDimension::SetLayoutInfo(const sheet::DataPilotFieldLayoutInfo* pNe
if (pNew)
pLayoutInfo = new sheet::DataPilotFieldLayoutInfo(*pNew);
else
- pLayoutInfo = NULL;
+ pLayoutInfo = nullptr;
}
void ScDPSaveDimension::SetCurrentPage( const OUString* pPage )
{
// We use member's visibility attribute to filter by page dimension.
- // pPage == NULL -> all members visible.
+ // pPage == nullptr -> all members visible.
MemberList::iterator it = maMemberList.begin(), itEnd = maMemberList.end();
for (; it != itEnd; ++it)
{
@@ -527,7 +527,7 @@ ScDPSaveMember* ScDPSaveDimension::GetExistingMemberByName(const OUString& rName
MemberHash::const_iterator res = maMemberHash.find (rName);
if (res != maMemberHash.end())
return res->second;
- return NULL;
+ return nullptr;
}
ScDPSaveMember* ScDPSaveDimension::GetMemberByName(const OUString& rName)
@@ -797,7 +797,7 @@ void ScDPSaveDimension::Dump(int nIndent) const
#endif
ScDPSaveData::ScDPSaveData() :
- pDimensionData( NULL ),
+ pDimensionData( nullptr ),
nColumnGrandMode( SC_DPSAVEMODE_DONTKNOW ),
nRowGrandMode( SC_DPSAVEMODE_DONTKNOW ),
nIgnoreEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
@@ -805,7 +805,7 @@ ScDPSaveData::ScDPSaveData() :
bFilterButton( true ),
bDrillDown( true ),
mbDimensionMembersBuilt(false),
- mpGrandTotalName(NULL)
+ mpGrandTotalName(nullptr)
{
}
@@ -817,13 +817,13 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
bFilterButton( r.bFilterButton ),
bDrillDown( r.bDrillDown ),
mbDimensionMembersBuilt(r.mbDimensionMembersBuilt),
- mpGrandTotalName(NULL),
- mpDimOrder(NULL)
+ mpGrandTotalName(nullptr),
+ mpDimOrder(nullptr)
{
if ( r.pDimensionData )
pDimensionData = new ScDPDimensionSaveData( *r.pDimensionData );
else
- pDimensionData = NULL;
+ pDimensionData = nullptr;
aDimList = r.aDimList.clone();
@@ -971,7 +971,7 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const OUString& rNam
if (iter->GetName() == rName && !iter->IsDataLayout() )
return const_cast<ScDPSaveDimension*>(&(*iter));
}
- return NULL; // don't create new
+ return nullptr; // don't create new
}
ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const OUString& rName)
@@ -1003,7 +1003,7 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const
if ( iter->IsDataLayout() )
return const_cast<ScDPSaveDimension*>(&(*iter));
}
- return NULL;
+ return nullptr;
}
ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const OUString& rName)
@@ -1012,7 +1012,7 @@ ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const OUString& rName)
ScDPSaveDimension* pOld = GetExistingDimensionByName(rName);
if (!pOld)
- return NULL;
+ return nullptr;
ScDPSaveDimension* pNew = new ScDPSaveDimension( *pOld );
AddDimension(pNew);
@@ -1053,7 +1053,7 @@ ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(sal_uInt16 nOrientation)
return const_cast<ScDPSaveDimension*>(&(*iter));
}
- return NULL;
+ return nullptr;
}
ScDPSaveDimension* ScDPSaveData::GetFirstDimension(sheet::DataPilotFieldOrientation eOrientation)
@@ -1064,7 +1064,7 @@ ScDPSaveDimension* ScDPSaveData::GetFirstDimension(sheet::DataPilotFieldOrientat
if (iter->GetOrientation() == eOrientation && !iter->IsDataLayout())
return const_cast<ScDPSaveDimension*>(&(*iter));
}
- return NULL;
+ return nullptr;
}
long ScDPSaveData::GetDataDimensionCount() const
@@ -1326,7 +1326,7 @@ void ScDPSaveData::RemoveAllGroupDimensions( const OUString& rSrcDimName, std::v
{
// still get the same group dimension?
OSL_FAIL("couldn't remove group dimension");
- pExistingGroup = NULL; // avoid endless loop
+ pExistingGroup = nullptr; // avoid endless loop
}
}
}
@@ -1344,7 +1344,7 @@ void ScDPSaveData::SetDimensionData( const ScDPDimensionSaveData* pNew )
if ( pNew )
pDimensionData = new ScDPDimensionSaveData( *pNew );
else
- pDimensionData = NULL;
+ pDimensionData = nullptr;
}
void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
@@ -1495,7 +1495,7 @@ ScDPSaveDimension* ScDPSaveData::AppendNewDimension(const OUString& rName, bool
{
if (ScDPUtil::isDuplicateDimension(rName))
// This call is for original dimensions only.
- return NULL;
+ return nullptr;
ScDPSaveDimension* pNew = new ScDPSaveDimension(rName, bDataLayout);
aDimList.push_back(pNew);
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 7ccaa73..28667b5 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -37,9 +37,9 @@
#include <math.h>
#include <float.h>
#include <algorithm>
+#include <memory>
#include <unordered_map>
#include <boost/checked_delete.hpp>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/sheet/DataResultFlags.hpp>
#include <com/sun/star/sheet/MemberResultFlags.hpp>
@@ -1505,7 +1505,7 @@ void ScDPResultMember::FillDataResults(
ScDPResultFilterContext& rFilterCxt, uno::Sequence<uno::Sequence<sheet::DataResult> >& rSequence,
long nMeasure) const
{
- boost::scoped_ptr<FilterStack> pFilterStack;
+ std::unique_ptr<FilterStack> pFilterStack;
const ScDPMember* pDPMember = GetDPMember();
if (pDPMember)
{
@@ -2009,7 +2009,7 @@ void ScDPDataMember::FillDataRow(
uno::Sequence<sheet::DataResult>& rSequence, long nMeasure, bool bIsSubTotalRow,
const ScDPSubTotalState& rSubState) const
{
- boost::scoped_ptr<FilterStack> pFilterStack;
+ std::unique_ptr<FilterStack> pFilterStack;
if (pResultMember)
{
// Topmost data member (pResultMember=NULL) doesn't need to be handled
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 5a14a6f..bd9950b 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -98,17 +98,17 @@ static void lcl_SetBoolInAny( uno::Any& rAny, bool bValue )
ScDPSource::ScDPSource( ScDPTableData* pD ) :
pData( pD ),
- pDimensions( NULL ),
+ pDimensions( nullptr ),
bColumnGrand( true ), // default is true
bRowGrand( true ),
bIgnoreEmptyRows( false ),
bRepeatIfEmpty( false ),
nDupCount( 0 ),
- pResData( NULL ),
- pColResRoot( NULL ),
- pRowResRoot( NULL ),
- pColResults( NULL ),
- pRowResults( NULL ),
+ pResData( nullptr ),
+ pColResRoot( nullptr ),
+ pRowResRoot( nullptr ),
+ pColResults( nullptr ),
+ pRowResults( nullptr ),
bResultOverflow( false ),
bPageFiltered( false )
{
@@ -160,7 +160,7 @@ long ScDPSource::GetDataDimensionCount()
ScDPDimension* ScDPSource::GetDataDimension(long nIndex)
{
if (nIndex < 0 || static_cast<size_t>(nIndex) >= maDataDims.size())
- return NULL;
+ return nullptr;
long nDimIndex = maDataDims[nIndex];
return GetDimensionsObject()->getByIndex(nDimIndex);
@@ -539,8 +539,8 @@ void ScDPSource::disposeData()
DELETEZ(pResData);
delete[] pColResults;
delete[] pRowResults;
- pColResults = NULL;
- pRowResults = NULL;
+ pColResults = nullptr;
+ pRowResults = nullptr;
aColLevelList.clear();
aRowLevelList.clear();
}
@@ -548,7 +548,7 @@ void ScDPSource::disposeData()
if ( pDimensions )
{
pDimensions->release(); // ref-counted
- pDimensions = NULL; // settings have to be applied (from SaveData) again!
+ pDimensions = nullptr; // settings have to be applied (from SaveData) again!
}
SetDupCount( 0 );
@@ -999,7 +999,7 @@ void ScDPSource::FillLevelList( sal_uInt16 nOrientation, std::vector<ScDPLevel*>
{
rList.clear();
- std::vector<long>* pDimIndex = NULL;
+ std::vector<long>* pDimIndex = nullptr;
switch (nOrientation)
{
case sheet::DataPilotFieldOrientation_COLUMN:
@@ -1070,7 +1070,7 @@ void ScDPSource::FillMemberResults()
long nPos = 0;
pColResRoot->FillMemberResults( pColResults, nPos, pResData->GetColStartMeasure(),
- true, NULL, NULL );
+ true, nullptr, nullptr );
}
FillLevelList( sheet::DataPilotFieldOrientation_ROW, aRowLevelList );
@@ -1084,7 +1084,7 @@ void ScDPSource::FillMemberResults()
long nPos = 0;
pRowResRoot->FillMemberResults( pRowResults, nPos, pResData->GetRowStartMeasure(),
- true, NULL, NULL );
+ true, nullptr, nullptr );
}
}
}
@@ -1108,7 +1108,7 @@ const uno::Sequence<sheet::MemberResult>* ScDPSource::GetMemberResults( ScDPLeve
if ( pRowLevel == pLevel )
return pRowResults+i;
}
- return NULL;
+ return nullptr;
}
// XPropertySet
@@ -1211,7 +1211,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPSource )
ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) :
pSource( pSrc ),
- ppDims( NULL )
+ ppDims( nullptr )
{
//TODO: hold pSource
@@ -1245,7 +1245,7 @@ void ScDPDimensions::CountChanged()
for (i=0; i<nCopy; i++) // copy existing dims
ppNew[i] = ppDims[i];
for (i=nCopy; i<nNewCount; i++) // clear additional pointers
- ppNew[i] = NULL;
+ ppNew[i] = nullptr;
for (i=nCopy; i<nDimCount; i++) // delete old dims if count is decreased
if ( ppDims[i] )
ppDims[i]->release(); // ref-counted
@@ -1322,7 +1322,7 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const
{
const_cast<ScDPDimensions*>(this)->ppDims = new ScDPDimension*[nDimCount];
for (long i=0; i<nDimCount; i++)
- ppDims[i] = NULL;
+ ppDims[i] = nullptr;
}
if ( !ppDims[nIndex] )
{
@@ -1333,20 +1333,20 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const
return ppDims[nIndex];
}
- return NULL; //TODO: exception?
+ return nullptr; //TODO: exception?
}
ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
pSource( pSrc ),
nDim( nD ),
- pHierarchies( NULL ),
+ pHierarchies( nullptr ),
nUsedHier( 0 ),
nFunction( SUBTOTAL_FUNC_SUM ), // sum is default
- mpLayoutName(NULL),
- mpSubtotalName(NULL),
+ mpLayoutName(nullptr),
+ mpSubtotalName(nullptr),
nSourceDim( -1 ),
bHasSelectedPage( false ),
- pSelectedData( NULL ),
+ pSelectedData( nullptr ),
mbHasHiddenMember(false)
{
//TODO: hold pSource
@@ -1690,7 +1690,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPDimension )
ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) :
pSource( pSrc ),
nDim( nD ),
- ppHiers( NULL )
+ ppHiers( nullptr )
{
//TODO: hold pSource
@@ -1779,7 +1779,7 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const
{
const_cast<ScDPHierarchies*>(this)->ppHiers = new ScDPHierarchy*[nHierCount];
for (long i=0; i<nHierCount; i++)
- ppHiers[i] = NULL;
+ ppHiers[i] = nullptr;
}
if ( !ppHiers[nIndex] )
{
@@ -1790,14 +1790,14 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const
return ppHiers[nIndex];
}
- return NULL; //TODO: exception?
+ return nullptr; //TODO: exception?
}
ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) :
pSource( pSrc ),
nDim( nD ),
nHier( nH ),
- pLevels( NULL )
+ pLevels( nullptr )
{
//TODO: hold pSource
}
@@ -1856,7 +1856,7 @@ ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) :
pSource( pSrc ),
nDim( nD ),
nHier( nH ),
- ppLevs( NULL )
+ ppLevs( nullptr )
{
//TODO: hold pSource
@@ -1955,7 +1955,7 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
{
const_cast<ScDPLevels*>(this)->ppLevs = new ScDPLevel*[nLevCount];
for (long i=0; i<nLevCount; i++)
- ppLevs[i] = NULL;
+ ppLevs[i] = nullptr;
}
if ( !ppLevs[nIndex] )
{
@@ -1966,7 +1966,7 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
return ppLevs[nIndex];
}
- return NULL; //TODO: exception?
+ return nullptr; //TODO: exception?
}
class ScDPGlobalMembersOrder
@@ -2003,7 +2003,7 @@ ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) :
nDim( nD ),
nHier( nH ),
nLev( nL ),
- pMembers( NULL ),
+ pMembers( nullptr ),
aSortInfo( EMPTY_OUSTRING, sal_True, sheet::DataPilotFieldSortMode::NAME ), // default: sort by name
nSortMeasure( 0 ),
nAutoMeasure( 0 ),
@@ -2291,7 +2291,7 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) :
{
case SC_DAPI_LEVEL_YEAR:
{
- const ScDPItemData* pLastNumData = NULL;
+ const ScDPItemData* pLastNumData = nullptr;
for ( SCROW n = 0 ;n <GetSrcItemsCount() ; n-- )
{
const ScDPItemData* pData = GetSrcItemDataByIndex( n );
@@ -2534,7 +2534,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
return maMembers[nIndex].get();
}
- return NULL; //TODO: exception?
+ return nullptr; //TODO: exception?
}
ScDPMember::ScDPMember(
@@ -2544,7 +2544,7 @@ ScDPMember::ScDPMember(
nHier( nH ),
nLev( nL ),
mnDataId( nIndex ),
- mpLayoutName(NULL),
+ mpLayoutName(nullptr),
nPosition( -1 ),
bVisible( true ),
bShowDet( true )
@@ -2701,7 +2701,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPMember )
const ScDPCache* ScDPSource::GetCache()
{
OSL_ENSURE( GetData() , "empty ScDPTableData pointer");
- return ( GetData()!=NULL ) ? &GetData()->GetCacheTable().getCache() : NULL ;
+ return ( GetData()!=nullptr ) ? &GetData()->GetCacheTable().getCache() : nullptr ;
}
const ScDPItemData* ScDPMember::GetItemData() const
@@ -2725,7 +2725,7 @@ const ScDPItemData* ScDPMembers::GetSrcItemDataByIndex(SCROW nIndex)
{
const std::vector< SCROW >& memberIds = pSource->GetData()->GetColumnEntries( nDim );
if ( nIndex >= (long )(memberIds.size()) || nIndex < 0 )
- return NULL;
+ return nullptr;
SCROW nId = memberIds[ nIndex ];
return pSource->GetItemDataById( nDim, nId );
}
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 07d19a3..cb3764b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -62,7 +62,7 @@
#include <grouparealistener.hxx>
#include <officecfg/Office/Common.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <boost/ptr_container/ptr_map.hpp>
using namespace formula;
@@ -2985,7 +2985,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
// on reference update. Bail out.
return bCellStateChanged;
- boost::scoped_ptr<ScTokenArray> pOldCode;
+ std::unique_ptr<ScTokenArray> pOldCode;
if (pUndoDoc)
pOldCode.reset(pCode->Clone());
@@ -3107,7 +3107,7 @@ bool ScFormulaCell::UpdateReferenceOnMove(
return false;
bool bCellStateChanged = false;
- boost::scoped_ptr<ScTokenArray> pOldCode;
+ std::unique_ptr<ScTokenArray> pOldCode;
if (pUndoDoc)
pOldCode.reset(pCode->Clone());
@@ -3230,7 +3230,7 @@ bool ScFormulaCell::UpdateReferenceOnCopy(
// on reference update. Bail out.
return false;
- boost::scoped_ptr<ScTokenArray> pOldCode;
+ std::unique_ptr<ScTokenArray> pOldCode;
if (pUndoDoc)
pOldCode.reset(pCode->Clone());
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 39d983c..6a4ac47 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -34,8 +34,8 @@
#include <tools/resid.hxx>
#include <unotools/collatorwrapper.hxx>
+#include <memory>
#include <numeric>
-#include <boost/scoped_ptr.hpp>
class ScFuncRes : public Resource
{
@@ -395,7 +395,7 @@ ScFunctionList::ScFunctionList() :
for (sal_uInt16 k = 0; k < SAL_N_ELEMENTS(nDescBlock); ++k)
{
- boost::scoped_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) );
+ std::unique_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) );
// Browse for all possible OpCodes. This is not the fastest method, but
// otherwise the sub resources within the resource blocks and the
// resource blocks themselves would had to be ordered according to
@@ -767,7 +767,7 @@ OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
return OUString();
}
- boost::scoped_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
+ std::unique_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
return SC_RESSTR(static_cast<sal_uInt16>(_nCategoryNumber));
}
diff --git a/sc/source/core/data/listenercontext.cxx b/sc/source/core/data/listenercontext.cxx
index 2745749..75010007 100644
--- a/sc/source/core/data/listenercontext.cxx
+++ b/sc/source/core/data/listenercontext.cxx
@@ -17,7 +17,7 @@ StartListeningContext::StartListeningContext(ScDocument& rDoc) :
mrDoc(rDoc), mpSet(new ColumnBlockPositionSet(rDoc)) {}
StartListeningContext::StartListeningContext(
- ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet) :
+ ScDocument& rDoc, const std::shared_ptr<ColumnBlockPositionSet>& pSet) :
mrDoc(rDoc), mpSet(pSet) {}
ColumnBlockPosition* StartListeningContext::getBlockPosition(SCTAB nTab, SCCOL nCol)
@@ -30,7 +30,7 @@ EndListeningContext::EndListeningContext(ScDocument& rDoc, ScTokenArray* pOldCod
mpOldCode(pOldCode), maPosDelta(0,0,0) {}
EndListeningContext::EndListeningContext(
- ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode) :
+ ScDocument& rDoc, const std::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode) :
mrDoc(rDoc), maSet(false), mpPosSet(pSet),
mpOldCode(pOldCode), maPosDelta(0,0,0) {}
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 8c09165..9ddf3b5 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -67,7 +67,7 @@ ScProgress* GetProgressBar(
// if the total number of rows is less than 1000, don't even bother
// with the progress bar because drawing progress bar can be very
// expensive especially in GTK.
- return NULL;
+ return nullptr;
}
if (pOuterProgress)
@@ -77,7 +77,7 @@ ScProgress* GetProgressBar(
return new ScProgress(
pDoc->GetDocumentShell(), ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), nTotalCount);
- return NULL;
+ return nullptr;
}
void GetOptimalHeightsInColumn(
@@ -236,32 +236,32 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName,
nRepeatEndX( SCCOL_REPEAT_NONE ),
nRepeatStartY( SCROW_REPEAT_NONE ),
nRepeatEndY( SCROW_REPEAT_NONE ),
- pTabProtection( NULL ),
- pColWidth( NULL ),
- mpRowHeights( static_cast<ScFlatUInt16RowSegments*>(NULL) ),
- pColFlags( NULL ),
- pRowFlags( NULL ),
+ pTabProtection( nullptr ),
+ pColWidth( nullptr ),
+ mpRowHeights( static_cast<ScFlatUInt16RowSegments*>(nullptr) ),
+ pColFlags( nullptr ),
+ pRowFlags( nullptr ),
mpHiddenCols(new ScFlatBoolColSegments),
mpHiddenRows(new ScFlatBoolRowSegments),
mpFilteredCols(new ScFlatBoolColSegments),
mpFilteredRows(new ScFlatBoolRowSegments),
- pOutlineTable( NULL ),
- pSheetEvents( NULL ),
+ pOutlineTable( nullptr ),
+ pSheetEvents( nullptr ),
nTableAreaX( 0 ),
nTableAreaY( 0 ),
nTab( nNewTab ),
pDocument( pDoc ),
- pSearchText ( NULL ),
- pSortCollator( NULL ),
- pRepeatColRange( NULL ),
- pRepeatRowRange( NULL ),
+ pSearchText ( nullptr ),
+ pSortCollator( nullptr ),
+ pRepeatColRange( nullptr ),
+ pRepeatRowRange( nullptr ),
nLockCount( 0 ),
- pScenarioRanges( NULL ),
+ pScenarioRanges( nullptr ),
aScenarioColor( COL_LIGHTGRAY ),
aTabBgColor( COL_AUTO ),
nScenarioFlags( 0 ),
- pDBDataNoName(NULL),
- mpRangeName(NULL),
+ pDBDataNoName(nullptr),
+ mpRangeName(nullptr),
mpCondFormatList( new ScConditionalFormatList() ),
bScenario(false),
bLayoutRTL(false),
@@ -455,7 +455,7 @@ long ScTable::GetNeededSize( SCCOL nCol, SCROW nRow,
aOptions.bTotalSize = bTotalSize;
return aCol[nCol].GetNeededSize
- ( nRow, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bWidth, aOptions, NULL );
+ ( nRow, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bWidth, aOptions, nullptr );
}
bool ScTable::SetOptimalHeight(
@@ -1071,7 +1071,7 @@ SCCOL ScTable::FindNextVisibleCol( SCCOL nCol, bool bRight ) const
{
nCol++;
SCCOL nEnd = 0;
- bool bHidden = pDocument->ColHidden(nCol, nTab, NULL, &nEnd);
+ bool bHidden = pDocument->ColHidden(nCol, nTab, nullptr, &nEnd);
if(bHidden)
nCol = nEnd +1;
@@ -1081,7 +1081,7 @@ SCCOL ScTable::FindNextVisibleCol( SCCOL nCol, bool bRight ) const
{
nCol--;
SCCOL nStart = MAXCOL;
- bool bHidden = pDocument->ColHidden(nCol, nTab, &nStart, NULL);
+ bool bHidden = pDocument->ColHidden(nCol, nTab, &nStart, nullptr);
if(bHidden)
nCol = nStart - 1;
@@ -1100,7 +1100,7 @@ SCCOL ScTable::FindNextVisibleColWithContent( SCCOL nCol, bool bRight, SCROW nRo
{
nCol++;
SCCOL nEndCol = 0;
- bool bHidden = pDocument->ColHidden( nCol, nTab, NULL, &nEndCol );
+ bool bHidden = pDocument->ColHidden( nCol, nTab, nullptr, &nEndCol );
if(bHidden)
{
nCol = nEndCol +1;
@@ -1124,7 +1124,7 @@ SCCOL ScTable::FindNextVisibleColWithContent( SCCOL nCol, bool bRight, SCROW nRo
{
nCol--;
SCCOL nStartCol = MAXCOL;
- bool bHidden = pDocument->ColHidden( nCol, nTab, &nStartCol, NULL );
+ bool bHidden = pDocument->ColHidden( nCol, nTab, &nStartCol, nullptr );
if(bHidden)
{
nCol = nStartCol -1;
@@ -1571,7 +1571,7 @@ void ScTable::UpdateReference(
// updating print ranges is not necessary with multiple print ranges
if ( bRecalcPages && GetPrintRangeCount() <= 1 )
{
- UpdatePageBreaks(NULL);
+ UpdatePageBreaks(nullptr);
pDocument->RepaintRange( ScRange(0,0,nTab,MAXCOL,MAXROW,nTab) );
}
@@ -1730,7 +1730,7 @@ void ScTable::ExtendPrintArea( OutputDevice* pDev,
for (SCCOL i = 0; i <= MAXCOL; ++i)
{
SCCOL nLastCol = i;
- if (ColHidden(i, NULL, &nLastCol))
+ if (ColHidden(i, nullptr, &nLastCol))
{
// Columns are hidden in this range.
aSkipCols.setTrue(i, nLastCol);
@@ -1813,7 +1813,7 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d
Fraction aZoom(1,1);
nPixel = aCol[rCol].GetNeededSize(
- nRow, pDev, nPPTX, nPPTY, aZoom, aZoom, true, aOptions, NULL );
+ nRow, pDev, nPPTX, nPPTY, aZoom, aZoom, true, aOptions, nullptr );
aCol[rCol].SetTextWidth(nRow, static_cast<sal_uInt16>(nPixel));
}
@@ -1898,7 +1898,7 @@ void ScTable::CopyPrintRange(const ScTable& rTable)
bPrintEntireSheet = rTable.bPrintEntireSheet;
delete pRepeatColRange;
- pRepeatColRange = NULL;
+ pRepeatColRange = nullptr;
if (rTable.pRepeatColRange)
{
pRepeatColRange = new ScRange(*rTable.pRepeatColRange);
@@ -1907,7 +1907,7 @@ void ScTable::CopyPrintRange(const ScTable& rTable)
}
delete pRepeatRowRange;
- pRepeatRowRange = NULL;
+ pRepeatRowRange = nullptr;
if (rTable.pRepeatRowRange)
{
pRepeatRowRange = new ScRange(*rTable.pRepeatRowRange);
@@ -1970,7 +1970,7 @@ void ScTable::SetPrintEntireSheet()
const ScRange* ScTable::GetPrintRange(sal_uInt16 nPos) const
{
- return (nPos < GetPrintRangeCount()) ? &aPrintRanges[ nPos ] : NULL;
+ return (nPos < GetPrintRangeCount()) ? &aPrintRanges[ nPos ] : nullptr;
}
void ScTable::FillPrintSaver( ScPrintSaverTab& rSaveTab ) const
@@ -1987,7 +1987,7 @@ void ScTable::RestorePrintRanges( const ScPrintSaverTab& rSaveTab )
SetRepeatRowRange( rSaveTab.GetRepeatRow() );
InvalidatePageBreaks(); // #i117952# forget page breaks for an old print range
- UpdatePageBreaks(NULL);
+ UpdatePageBreaks(nullptr);
}
SCROW ScTable::VisibleDataCellIterator::ROW_NOT_FOUND = -1;
@@ -2203,7 +2203,7 @@ ScRefCellValue ScTable::GetRefCellValue( SCCOL nCol, SCROW nRow )
SvtBroadcaster* ScTable::GetBroadcaster( SCCOL nCol, SCROW nRow )
{
if (!ValidColRow(nCol, nRow))
- return NULL;
+ return nullptr;
return aCol[nCol].GetBroadcaster(nRow);
}
@@ -2268,7 +2268,7 @@ void ScTable::DumpFormulaGroups( SCCOL nCol ) const
const SvtBroadcaster* ScTable::GetBroadcaster( SCCOL nCol, SCROW nRow ) const
{
if (!ValidColRow(nCol, nRow))
- return NULL;
+ return nullptr;
return aCol[nCol].GetBroadcaster(nRow);
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index f28be30..3b9c02a 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -863,7 +863,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCROW nAttrRow1;
SCROW nAttrRow2;
const ScPatternAttr* pPattern;
- boost::scoped_ptr<ScAttrIterator> pAttrIter(aCol[nCol].CreateAttrIterator( nRow1, nRow2 ));
+ std::unique_ptr<ScAttrIterator> pAttrIter(aCol[nCol].CreateAttrIterator( nRow1, nRow2 ));
while ( (pPattern = pAttrIter->Next( nAttrRow1, nAttrRow2 )) != 0 )
{
if ( !IsDefaultItem( pPattern ) )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 9775e14a..706e0e5 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -67,11 +67,10 @@
#include <svl/sharedstringpool.hxx>
+#include <memory>
#include <unordered_set>
#include <vector>
#include <boost/checked_delete.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <memory>
#include <boost/noncopyable.hpp>
#include <mdds/flat_segment_tree.hpp>
@@ -252,7 +251,7 @@ public:
typedef std::vector<Row*> RowsType;
private:
- boost::scoped_ptr<RowsType> mpRows; /// row-wise data table for sort by row operation.
+ std::unique_ptr<RowsType> mpRows; /// row-wise data table for sort by row operation.
ScSortInfo*** pppInfo;
SCSIZE nCount;
@@ -869,7 +868,7 @@ class ListenerStartAction : public sc::ColumnSpanSet::ColumnAction
{
ScColumn* mpCol;
- boost::shared_ptr<sc::ColumnBlockPositionSet> mpPosSet;
+ std::shared_ptr<sc::ColumnBlockPositionSet> mpPosSet;
sc::StartListeningContext maStartCxt;
sc::EndListeningContext maEndCxt;
@@ -1708,7 +1707,7 @@ void ScTable::Sort(
if(pProgress)
pProgress->SetState( 0, nLastRow-nRow1 );
- boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nRow1, nLastRow, bKeepQuery, bUpdateRefs));
+ std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nRow1, nLastRow, bKeepQuery, bUpdateRefs));
if ( nLastRow - nRow1 > 255 )
DecoladeRow(pArray.get(), nRow1, nLastRow);
@@ -1735,7 +1734,7 @@ void ScTable::Sort(
if(pProgress)
pProgress->SetState( 0, nLastCol-nCol1 );
- boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nCol1, nLastCol, bKeepQuery, bUpdateRefs));
+ std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nCol1, nLastCol, bKeepQuery, bUpdateRefs));
QuickSort(pArray.get(), nCol1, nLastCol);
SortReorderByColumn(pArray.get(), aSortParam.nRow1, aSortParam.nRow2, aSortParam.bIncludePattern, pProgress);
@@ -1755,7 +1754,7 @@ void ScTable::Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress )
if (rParam.maOrderIndices.empty())
return;
- boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(rParam));
+ std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(rParam));
if (!pArray)
return;
@@ -2737,7 +2736,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
bSortCollatorInitialized = true;
InitSortCollator( aLocalSortParam );
}
- boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nRow1, rParam.nRow2, bGlobalKeepQuery, false));
+ std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nRow1, rParam.nRow2, bGlobalKeepQuery, false));
DecoladeRow( pArray.get(), nRow1, rParam.nRow2 );
QuickSort( pArray.get(), nRow1, rParam.nRow2 );
ScSortInfo** ppInfo = pArray->GetFirstArray();
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 5b6479c..ee1a29a 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -64,7 +64,7 @@
#include <listenercontext.hxx>
#include <math.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// STATIC DATA -----------------------------------------------------------
@@ -1178,7 +1178,7 @@ void ScTable::FillFormulaVertical(
aCol[nCol].DeleteRanges(aSpans, IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_FORMULA | IDF_OUTLINE, false);
aCol[nCol].CloneFormulaCell(rSrcCell, sc::CellTextAttr(), aSpans, NULL);
- boost::shared_ptr<sc::ColumnBlockPositionSet> pSet(new sc::ColumnBlockPositionSet(*pDocument));
+ std::shared_ptr<sc::ColumnBlockPositionSet> pSet(new sc::ColumnBlockPositionSet(*pDocument));
sc::StartListeningContext aStartCxt(*pDocument, pSet);
sc::EndListeningContext aEndCxt(*pDocument, pSet);
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 42d06a6..e168ec6 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -51,7 +51,7 @@
#include "scmatrix.hxx"
#include <math.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace formula;
@@ -812,7 +812,7 @@ bool ScValidationData::FillSelectionList(std::vector<ScTypedStrData>& rStrColl,
if( HasSelectionList() )
{
- boost::scoped_ptr<ScTokenArray> pTokArr( CreateTokenArry(0) );
+ std::unique_ptr<ScTokenArray> pTokArr( CreateTokenArry(0) );
// *** try if formula is a string list ***
@@ -865,7 +865,7 @@ bool ScValidationData::IsListValid( ScRefCellValue& rCell, const ScAddress& rPos
5) A formula resulting in a cell/range reference or matrix/array.
*/
- boost::scoped_ptr< ScTokenArray > pTokArr( CreateTokenArry( 0 ) );
+ std::unique_ptr< ScTokenArray > pTokArr( CreateTokenArry( 0 ) );
// *** try if formula is a string list ***
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index b72c317..8fab03d 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -89,7 +89,6 @@ const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
#include <rtl/digest.h>
-#include <boost/scoped_ptr.hpp>
#include <memory>
using namespace formula;
@@ -950,7 +949,7 @@ class DynamicKernelSlidingArgument : public Base
{
public:
DynamicKernelSlidingArgument( const ScCalcConfig& config, const std::string& s,
- FormulaTreeNodeRef ft, boost::shared_ptr<SlidingFunctionBase>& CodeGen,
+ FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen,
int index = 0 ) :
Base(config, s, ft, index), mpCodeGen(CodeGen), mpClmem2(NULL)
{
@@ -1126,7 +1125,7 @@ protected:
bool bIsStartFixed, bIsEndFixed;
const formula::DoubleVectorRefToken* mpDVR;
// from parent nodes
- boost::shared_ptr<SlidingFunctionBase> mpCodeGen;
+ std::shared_ptr<SlidingFunctionBase> mpCodeGen;
// controls whether to invoke the reduction kernel during marshaling or not
cl_mem mpClmem2;
};
@@ -1136,7 +1135,7 @@ class DynamicKernelMixedSlidingArgument : public VectorRef
{
public:
DynamicKernelMixedSlidingArgument( const ScCalcConfig& config, const std::string& s,
- FormulaTreeNodeRef ft, boost::shared_ptr<SlidingFunctionBase>& CodeGen,
+ FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen,
int index = 0 ) :
VectorRef(config, s, ft),
mDoubleArgument(mCalcConfig, s, ft, CodeGen, index),
@@ -1250,7 +1249,7 @@ class ParallelReductionVectorRef : public Base
{
public:
ParallelReductionVectorRef( const ScCalcConfig& config, const std::string& s,
- FormulaTreeNodeRef ft, boost::shared_ptr<SlidingFunctionBase>& CodeGen,
+ FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen,
int index = 0 ) :
Base(config, s, ft, index), mpCodeGen(CodeGen), mpClmem2(NULL)
{
@@ -1663,7 +1662,7 @@ protected:
bool bIsStartFixed, bIsEndFixed;
const formula::DoubleVectorRefToken* mpDVR;
// from parent nodes
- boost::shared_ptr<SlidingFunctionBase> mpCodeGen;
+ std::shared_ptr<SlidingFunctionBase> mpCodeGen;
// controls whether to invoke the reduction kernel during marshaling or not
cl_mem mpClmem2;
};
@@ -2540,7 +2539,7 @@ public:
private:
SubArgumentsType mvSubArguments;
- boost::shared_ptr<SlidingFunctionBase> mpCodeGen;
+ std::shared_ptr<SlidingFunctionBase> mpCodeGen;
cl_mem mpClmem2;
};
@@ -2554,7 +2553,7 @@ DynamicKernelArgumentRef SoPHelper( const ScCalcConfig& config,
template<class Base>
DynamicKernelArgument* VectorRefFactory( const ScCalcConfig& config, const std::string& s,
const FormulaTreeNodeRef& ft,
- boost::shared_ptr<SlidingFunctionBase>& pCodeGen,
+ std::shared_ptr<SlidingFunctionBase>& pCodeGen,
int index )
{
//Black lists ineligible classes here ..
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index ba08714..9a49703 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -16,8 +16,8 @@
#include <formula/token.hxx>
#include <formula/vectortoken.hxx>
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
+#include <memory>
#include <set>
#include "calcconfig.hxx"
@@ -62,7 +62,7 @@ public:
int mLineNumber;
};
-typedef boost::shared_ptr<FormulaTreeNode> FormulaTreeNodeRef;
+typedef std::shared_ptr<FormulaTreeNode> FormulaTreeNodeRef;
class FormulaTreeNode
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list