summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/inc/cellsuno.hxx4
-rw-r--r--sc/inc/chart2uno.hxx11
-rw-r--r--sc/inc/chartlis.hxx9
-rw-r--r--sc/inc/clipcontext.hxx4
-rw-r--r--sc/inc/colorscale.hxx18
-rw-r--r--sc/inc/conditio.hxx6
-rw-r--r--sc/inc/dbdata.hxx10
-rw-r--r--sc/inc/dociter.hxx7
-rw-r--r--sc/inc/document.hxx30
-rw-r--r--sc/inc/documentstreamaccess.hxx4
-rw-r--r--sc/inc/dpcache.hxx6
-rw-r--r--sc/inc/dpfilteredcache.hxx4
-rw-r--r--sc/inc/dpgroup.hxx8
-rw-r--r--sc/inc/dpobject.hxx4
-rw-r--r--sc/inc/dpsave.hxx12
-rw-r--r--sc/inc/dptabsrc.hxx8
-rw-r--r--sc/inc/editdataarray.hxx6
-rw-r--r--sc/inc/externalrefmgr.hxx6
-rw-r--r--sc/inc/fielduno.hxx4
-rw-r--r--sc/inc/importfilterdata.hxx4
-rw-r--r--sc/inc/listenercontext.hxx13
-rw-r--r--sc/inc/pch/precompiled_sc.hxx2
-rw-r--r--sc/inc/pch/precompiled_scfilt.hxx2
-rw-r--r--sc/inc/pch/precompiled_scui.hxx1
-rw-r--r--sc/inc/pch/precompiled_vbaobj.hxx1
-rw-r--r--sc/inc/postit.hxx4
-rw-r--r--sc/inc/simpleformulacalc.hxx4
-rw-r--r--sc/inc/simplerangelist.hxx7
-rw-r--r--sc/inc/table.hxx16
-rw-r--r--sc/inc/tabprotection.hxx6
-rw-r--r--sc/qa/unit/helper/qahelper.cxx4
-rw-r--r--sc/qa/unit/helper/qahelper.hxx4
-rw-r--r--sc/qa/unit/helper/xpath.cxx4
-rw-r--r--sc/qa/unit/ucalc.cxx4
-rw-r--r--sc/qa/unit/ucalc_formula.cxx8
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx2
-rw-r--r--sc/source/core/data/attarray.cxx16
-rw-r--r--sc/source/core/data/clipcontext.cxx2
-rw-r--r--sc/source/core/data/column.cxx14
-rw-r--r--sc/source/core/data/column2.cxx6
-rw-r--r--sc/source/core/data/column3.cxx4
-rw-r--r--sc/source/core/data/column4.cxx2
-rw-r--r--sc/source/core/data/conditio.cxx6
-rw-r--r--sc/source/core/data/documen2.cxx2
-rw-r--r--sc/source/core/data/documen3.cxx4
-rw-r--r--sc/source/core/data/documen4.cxx2
-rw-r--r--sc/source/core/data/documen8.cxx8
-rw-r--r--sc/source/core/data/document.cxx10
-rw-r--r--sc/source/core/data/document10.cxx6
-rw-r--r--sc/source/core/data/documentimport.cxx6
-rw-r--r--sc/source/core/data/dpgroup.cxx2
-rw-r--r--sc/source/core/data/dpobject.cxx2
-rw-r--r--sc/source/core/data/dpsave.cxx72
-rw-r--r--sc/source/core/data/dptabres.cxx6
-rw-r--r--sc/source/core/data/dptabsrc.cxx70
-rw-r--r--sc/source/core/data/formulacell.cxx8
-rw-r--r--sc/source/core/data/funcdesc.cxx6
-rw-r--r--sc/source/core/data/listenercontext.cxx4
-rw-r--r--sc/source/core/data/table1.cxx60
-rw-r--r--sc/source/core/data/table2.cxx2
-rw-r--r--sc/source/core/data/table3.cxx15
-rw-r--r--sc/source/core/data/table4.cxx4
-rw-r--r--sc/source/core/data/validat.cxx6
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx15
-rw-r--r--sc/source/core/opencl/opbase.hxx6
-rw-r--r--sc/source/core/tool/chartlis.cxx16
-rw-r--r--sc/source/core/tool/chgtrack.cxx6
-rw-r--r--sc/source/core/tool/interpr1.cxx2
-rw-r--r--sc/source/core/tool/interpr7.cxx14
-rw-r--r--sc/source/core/tool/rangenam.cxx8
-rw-r--r--sc/source/core/tool/reftokenhelper.cxx4
-rw-r--r--sc/source/filter/dif/difimp.cxx4
-rw-r--r--sc/source/filter/excel/excel.cxx4
-rw-r--r--sc/source/filter/excel/read.cxx6
-rw-r--r--sc/source/filter/excel/xechart.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx6
-rw-r--r--sc/source/filter/excel/xeformula.cxx14
-rw-r--r--sc/source/filter/excel/xelink.cxx4
-rw-r--r--sc/source/filter/excel/xestyle.cxx2
-rw-r--r--sc/source/filter/excel/xichart.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx7
-rw-r--r--sc/source/filter/excel/xilink.cxx2
-rw-r--r--sc/source/filter/excel/xiname.cxx10
-rw-r--r--sc/source/filter/excel/xlpivot.cxx6
-rw-r--r--sc/source/filter/html/htmlpars.cxx33
-rw-r--r--sc/source/filter/inc/autofilterbuffer.hxx2
-rw-r--r--sc/source/filter/inc/biffcodec.hxx2
-rw-r--r--sc/source/filter/inc/excelhandlers.hxx4
-rw-r--r--sc/source/filter/inc/formulabase.hxx4
-rw-r--r--sc/source/filter/inc/ftools.hxx1
-rw-r--r--sc/source/filter/inc/htmlexp.hxx4
-rw-r--r--sc/source/filter/inc/imp_op.hxx6
-rw-r--r--sc/source/filter/inc/ooxformulaparser.hxx4
-rw-r--r--sc/source/filter/inc/workbookhelper.hxx4
-rw-r--r--sc/source/filter/inc/worksheethelper.hxx2
-rw-r--r--sc/source/filter/inc/xecontent.hxx12
-rw-r--r--sc/source/filter/inc/xeformula.hxx4
-rw-r--r--sc/source/filter/inc/xelink.hxx4
-rw-r--r--sc/source/filter/inc/xename.hxx4
-rw-r--r--sc/source/filter/inc/xestream.hxx2
-rw-r--r--sc/source/filter/inc/xestyle.hxx21
-rw-r--r--sc/source/filter/inc/xichart.hxx68
-rw-r--r--sc/source/filter/inc/xiescher.hxx49
-rw-r--r--sc/source/filter/inc/xiformula.hxx4
-rw-r--r--sc/source/filter/inc/xihelper.hxx4
-rw-r--r--sc/source/filter/inc/xiname.hxx4
-rw-r--r--sc/source/filter/inc/xiroot.hxx50
-rw-r--r--sc/source/filter/inc/xistream.hxx4
-rw-r--r--sc/source/filter/inc/xistyle.hxx4
-rw-r--r--sc/source/filter/inc/xlformula.hxx6
-rw-r--r--sc/source/filter/inc/xlpage.hxx3
-rw-r--r--sc/source/filter/inc/xlpivot.hxx4
-rw-r--r--sc/source/filter/inc/xlroot.hxx18
-rw-r--r--sc/source/filter/inc/xlview.hxx6
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx6
-rw-r--r--sc/source/filter/oox/revisionfragment.cxx4
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx2
-rw-r--r--sc/source/filter/oox/workbookfragment.cxx6
-rw-r--r--sc/source/filter/oox/workbookhelper.cxx6
-rw-r--r--sc/source/filter/orcus/interface.cxx2
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx6
-rw-r--r--sc/source/filter/xml/XMLExportIterator.hxx4
-rw-r--r--sc/source/filter/xml/XMLStylesImportHelper.hxx20
-rw-r--r--sc/source/filter/xml/xmlbodyi.cxx4
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx4
-rw-r--r--sc/source/filter/xml/xmlcelli.hxx4
-rw-r--r--sc/source/filter/xml/xmldpimp.hxx2
-rw-r--r--sc/source/filter/xml/xmldrani.hxx4
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx6
-rw-r--r--sc/source/filter/xml/xmlexprt.hxx8
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx12
-rw-r--r--sc/source/filter/xml/xmlnexpi.hxx4
-rw-r--r--sc/source/filter/xml/xmlsubti.cxx6
-rw-r--r--sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx4
-rw-r--r--sc/source/ui/app/inputhdl.cxx2
-rw-r--r--sc/source/ui/app/uiitems.cxx20
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx46
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx2
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeList.cxx2
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeListData.cxx2
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx1
-rw-r--r--sc/source/ui/docshell/docfunc.cxx14
-rw-r--r--sc/source/ui/docshell/docfuncutil.cxx2
-rw-r--r--sc/source/ui/docshell/docsh.cxx4
-rw-r--r--sc/source/ui/docshell/docsh3.cxx4
-rw-r--r--sc/source/ui/docshell/docsh4.cxx10
-rw-r--r--sc/source/ui/docshell/documentlinkmgr.cxx8
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx6
-rw-r--r--sc/source/ui/docshell/impex.cxx8
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx16
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx6
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx4
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx8
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx4
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx4
-rw-r--r--sc/source/ui/formdlg/formula.cxx2
-rw-r--r--sc/source/ui/inc/checklistmenu.hxx16
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx2
-rw-r--r--sc/source/ui/inc/datastream.hxx1
-rw-r--r--sc/source/ui/inc/docfuncutil.hxx4
-rw-r--r--sc/source/ui/inc/docsh.hxx4
-rw-r--r--sc/source/ui/inc/filtdlg.hxx1
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx8
-rw-r--r--sc/source/ui/inc/retypepassdlg.hxx6
-rw-r--r--sc/source/ui/inc/tabview.hxx1
-rw-r--r--sc/source/ui/inc/uiitems.hxx4
-rw-r--r--sc/source/ui/inc/undoblk.hxx13
-rw-r--r--sc/source/ui/inc/undocell.hxx11
-rw-r--r--sc/source/ui/inc/undodat.hxx4
-rw-r--r--sc/source/ui/inc/undotab.hxx19
-rw-r--r--sc/source/ui/inc/viewdata.hxx4
-rw-r--r--sc/source/ui/inc/xmlsourcedlg.hxx4
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx1
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx2
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx12
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx4
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx4
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx8
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.cxx6
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx1
-rw-r--r--sc/source/ui/undo/undoblk.cxx4
-rw-r--r--sc/source/ui/undo/undoblk3.cxx2
-rw-r--r--sc/source/ui/undo/undocell.cxx2
-rw-r--r--sc/source/ui/undo/undotab.cxx8
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx21
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx58
-rw-r--r--sc/source/ui/unoobj/condformatuno.cxx4
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx20
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx10
-rw-r--r--sc/source/ui/vba/vbaname.cxx4
-rw-r--r--sc/source/ui/vba/vbanames.cxx4
-rw-r--r--sc/source/ui/vba/vbarange.cxx6
-rw-r--r--sc/source/ui/view/cellsh1.cxx98
-rw-r--r--sc/source/ui/view/cellsh2.cxx10
-rw-r--r--sc/source/ui/view/cellsh3.cxx20
-rw-r--r--sc/source/ui/view/dbfunc3.cxx10
-rw-r--r--sc/source/ui/view/editsh.cxx8
-rw-r--r--sc/source/ui/view/formatsh.cxx14
-rw-r--r--sc/source/ui/view/gridwin.cxx10
-rw-r--r--sc/source/ui/view/gridwin4.cxx2
-rw-r--r--sc/source/ui/view/output.cxx8
-rw-r--r--sc/source/ui/view/output2.cxx8
-rw-r--r--sc/source/ui/view/pivotsh.cxx4
-rw-r--r--sc/source/ui/view/preview.cxx4
-rw-r--r--sc/source/ui/view/prevwsh.cxx4
-rw-r--r--sc/source/ui/view/printfun.cxx8
-rw-r--r--sc/source/ui/view/scextopt.cxx6
-rw-r--r--sc/source/ui/view/spelleng.cxx6
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx6
-rw-r--r--sc/source/ui/view/tabvwsha.cxx10
-rw-r--r--sc/source/ui/view/tabvwshf.cxx20
-rw-r--r--sc/source/ui/view/tabvwshh.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx11
-rw-r--r--sc/source/ui/view/viewfun3.cxx8
-rw-r--r--sc/source/ui/view/viewfun4.cxx18
-rw-r--r--sc/source/ui/view/viewfun5.cxx10
-rw-r--r--sc/source/ui/view/viewfunc.cxx6
-rw-r--r--sc/source/ui/view/viewutil.cxx4
-rw-r--r--sd/inc/CustomAnimationEffect.hxx13
-rw-r--r--sd/inc/CustomAnimationPreset.hxx6
-rw-r--r--sd/inc/Outliner.hxx6
-rw-r--r--sd/inc/OutlinerIterator.hxx8
-rw-r--r--sd/inc/TransitionPreset.hxx4
-rw-r--r--sd/inc/pch/precompiled_sd.hxx5
-rw-r--r--sd/inc/pch/precompiled_sdui.hxx1
-rw-r--r--sd/inc/sdpage.hxx14
-rw-r--r--sd/inc/stlsheet.hxx4
-rw-r--r--sd/inc/undoanim.hxx8
-rw-r--r--sd/source/core/EffectMigration.cxx4
-rw-r--r--sd/source/core/stlsheet.cxx4
-rw-r--r--sd/source/core/undoanim.cxx4
-rw-r--r--sd/source/filter/eppt/epptooxml.hxx2
-rw-r--r--sd/source/filter/eppt/pptexanimations.hxx4
-rw-r--r--sd/source/filter/eppt/text.hxx4
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx4
-rw-r--r--sd/source/filter/html/buttonset.cxx6
-rw-r--r--sd/source/filter/html/htmlex.hxx4
-rw-r--r--sd/source/filter/ppt/pptin.hxx4
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx5
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx8
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx10
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx4
-rw-r--r--sd/source/ui/app/sdmod1.cxx13
-rw-r--r--sd/source/ui/app/sdxfer.cxx6
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx10
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.hxx10
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx2
-rw-r--r--sd/source/ui/docshell/docshel3.cxx4
-rw-r--r--sd/source/ui/docshell/docshel4.cxx2
-rw-r--r--sd/source/ui/docshell/docshell.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx6
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx14
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx10
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx8
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.hxx12
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.hxx5
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx32
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.hxx19
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.hxx2
-rw-r--r--sd/source/ui/framework/factories/ViewShellWrapper.cxx4
-rw-r--r--sd/source/ui/framework/module/CenterViewFocusModule.cxx2
-rw-r--r--sd/source/ui/framework/module/ResourceManager.hxx4
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.hxx4
-rw-r--r--sd/source/ui/framework/module/ToolBarModule.cxx6
-rw-r--r--sd/source/ui/framework/module/ToolBarModule.hxx4
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx26
-rw-r--r--sd/source/ui/func/fuarea.cxx4
-rw-r--r--sd/source/ui/func/fubullet.cxx4
-rw-r--r--sd/source/ui/func/fuchar.cxx4
-rw-r--r--sd/source/ui/func/fuconbez.cxx2
-rw-r--r--sd/source/ui/func/fuconnct.cxx4
-rw-r--r--sd/source/ui/func/fucopy.cxx6
-rw-r--r--sd/source/ui/func/fucushow.cxx4
-rw-r--r--sd/source/ui/func/fuinsert.cxx6
-rw-r--r--sd/source/ui/func/fuinsfil.cxx12
-rw-r--r--sd/source/ui/func/fuline.cxx6
-rw-r--r--sd/source/ui/func/fulinend.cxx4
-rw-r--r--sd/source/ui/func/fulink.cxx4
-rw-r--r--sd/source/ui/func/fumeasur.cxx4
-rw-r--r--sd/source/ui/func/fumorph.cxx4
-rw-r--r--sd/source/ui/func/fuoaprms.cxx4
-rw-r--r--sd/source/ui/func/fuolbull.cxx8
-rw-r--r--sd/source/ui/func/fuoltext.cxx4
-rw-r--r--sd/source/ui/func/fupage.cxx6
-rw-r--r--sd/source/ui/func/fuparagr.cxx4
-rw-r--r--sd/source/ui/func/fuprlout.cxx6
-rw-r--r--sd/source/ui/func/fuprobjs.cxx4
-rw-r--r--sd/source/ui/func/fuscale.cxx6
-rw-r--r--sd/source/ui/func/fusldlg.cxx4
-rw-r--r--sd/source/ui/func/fusnapln.cxx4
-rw-r--r--sd/source/ui/func/futempl.cxx6
-rw-r--r--sd/source/ui/func/futransf.cxx6
-rw-r--r--sd/source/ui/func/futxtatt.cxx4
-rw-r--r--sd/source/ui/func/fuvect.cxx4
-rw-r--r--sd/source/ui/inc/DocumentRenderer.hxx4
-rw-r--r--sd/source/ui/inc/OutlinerIteratorImpl.hxx16
-rw-r--r--sd/source/ui/inc/PaneDockingWindow.hxx3
-rw-r--r--sd/source/ui/inc/RemoteServer.hxx11
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx21
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx14
-rw-r--r--sd/source/ui/inc/TemplateScanner.hxx13
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx18
-rw-r--r--sd/source/ui/inc/ViewShell.hxx1
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx15
-rw-r--r--sd/source/ui/inc/ViewShellImplementation.hxx12
-rw-r--r--sd/source/ui/inc/ViewShellManager.hxx7
-rw-r--r--sd/source/ui/inc/ViewTabBar.hxx3
-rw-r--r--sd/source/ui/inc/framework/Configuration.hxx4
-rw-r--r--sd/source/ui/inc/framework/ConfigurationController.hxx5
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx17
-rw-r--r--sd/source/ui/inc/framework/ModuleController.hxx6
-rw-r--r--sd/source/ui/inc/framework/Pane.hxx3
-rw-r--r--sd/source/ui/inc/framework/PresentationFactory.hxx3
-rw-r--r--sd/source/ui/inc/framework/ResourceId.hxx4
-rw-r--r--sd/source/ui/inc/framework/ViewShellWrapper.hxx10
-rw-r--r--sd/source/ui/inc/pubdlg.hxx4
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx2
-rw-r--r--sd/source/ui/inc/sdxfer.hxx6
-rw-r--r--sd/source/ui/inc/slideshow.hxx4
-rw-r--r--sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx7
-rw-r--r--sd/source/ui/inc/tools/PropertySet.hxx4
-rw-r--r--sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx3
-rw-r--r--sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx16
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.cxx4
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.hxx4
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.cxx6
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.hxx6
-rw-r--r--sd/source/ui/presenter/PresenterTextView.hxx4
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.cxx7
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.hxx5
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx14
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.hxx2
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx12
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx2
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx4
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.hxx6
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx85
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.hxx8
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerFiller.cxx10
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx6
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.hxx11
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.cxx6
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.hxx12
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/sidebar/PanelBase.hxx2
-rw-r--r--sd/source/ui/sidebar/PanelFactory.hxx5
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.cxx6
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx6
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx2
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.cxx2
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.hxx6
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx12
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx10
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx7
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx16
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx12
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx8
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx8
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx7
-rw-r--r--sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx40
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx14
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx27
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.hxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsPageSelector.cxx10
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx22
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx14
-rw-r--r--sd/source/ui/slidesorter/controller/SlsTransferableData.cxx10
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx25
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx32
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx10
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx19
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx7
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx16
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsTheme.hxx9
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorter.cxx12
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.hxx7
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx34
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx12
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx28
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx14
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx8
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayouter.cxx16
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlsTheme.cxx8
-rw-r--r--sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx2
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx12
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx2
-rw-r--r--sd/source/ui/table/tablefunction.cxx4
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx4
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx4
-rw-r--r--sd/source/ui/tools/SdGlobalResourceContainer.cxx4
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx18
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx10
-rw-r--r--sd/source/ui/unoidl/facreg.cxx8
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx72
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx6
-rw-r--r--sd/source/ui/view/Outliner.cxx74
-rw-r--r--sd/source/ui/view/OutlinerIterator.cxx30
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx42
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx38
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx10
-rw-r--r--sd/source/ui/view/drtxtob1.cxx8
-rw-r--r--sd/source/ui/view/drviews2.cxx26
-rw-r--r--sd/source/ui/view/drviews3.cxx6
-rw-r--r--sd/source/ui/view/drviews4.cxx6
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--sd/source/ui/view/drviews9.cxx4
-rw-r--r--sd/source/ui/view/drviewsa.cxx4
-rw-r--r--sd/source/ui/view/drviewsf.cxx6
-rw-r--r--sd/source/ui/view/outlnvs2.cxx12
-rw-r--r--sd/source/ui/view/outlnvsh.cxx6
-rw-r--r--sd/source/ui/view/sdview.cxx8
-rw-r--r--sd/source/ui/view/sdview2.cxx4
-rw-r--r--sd/source/ui/view/sdview3.cxx6
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx4
-rw-r--r--sd/workben/custompanel/ctp_panel.hxx2
-rw-r--r--svx/inc/GalleryControl.hxx2
-rw-r--r--svx/inc/pch/precompiled_svx.hxx2
-rw-r--r--svx/inc/pch/precompiled_svxcore.hxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx1
-rw-r--r--svx/source/dialog/docrecovery.cxx1
-rw-r--r--svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx1
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/styles/StylesPropertyPanel.hxx1
-rw-r--r--svx/source/table/tablelayouter.hxx1
-rw-r--r--svx/source/unodraw/recoveryui.cxx1
-rw-r--r--xmloff/inc/pch/precompiled_xo.hxx1
478 files changed, 2079 insertions, 1960 deletions
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index f36c3cf751ae..d721b29b092d 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;
- std::unique_ptr<Impl> m_pImpl;
+ ::boost::scoped_ptr<Impl> m_pImpl;
ScCellRangeObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const;
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 54cfd98f5fac..68387a608f53 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -47,10 +47,11 @@
#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;
@@ -452,9 +453,9 @@ private:
bool m_bIncludeHiddenCells;
// internals
- typedef std::unique_ptr<std::vector<ScTokenRef> > TokenListPtr;
- typedef std::unique_ptr<std::vector<sal_uInt32> > RangeIndexMapPtr;
- typedef std::unique_ptr<ExternalRefListener> ExtRefListenerPtr;
+ typedef boost::scoped_ptr<std::vector<ScTokenRef> > TokenListPtr;
+ typedef boost::scoped_ptr<std::vector<sal_uInt32> > RangeIndexMapPtr;
+ typedef boost::scoped_ptr<ExternalRefListener> ExtRefListenerPtr;
sal_Int64 m_nObjectId;
ScDocument* m_pDocument;
@@ -464,7 +465,7 @@ private:
com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider;
SfxItemPropertySet m_aPropSet;
- std::unique_ptr<HiddenRangeListener> m_pHiddenListener;
+ boost::scoped_ptr<HiddenRangeListener> m_pHiddenListener;
ScLinkListener* m_pValueListener;
XModifyListenerArr_Impl m_aValueListeners;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index b634b91602e9..8b29b9933d26 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -27,11 +27,12 @@
#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;
@@ -61,8 +62,8 @@ public:
private:
- std::unique_ptr<ExternalRefListener> mpExtRefListener;
- std::unique_ptr<std::vector<ScTokenRef> > mpTokens;
+ boost::scoped_ptr<ExternalRefListener> mpExtRefListener;
+ boost::scoped_ptr<std::vector<ScTokenRef> > mpTokens;
OUString maName;
ScChartUnoData* pUnoData;
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 783c6bd49728..787b964a699b 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
{
- std::unique_ptr<ColumnBlockPositionSet> mpSet;
+ boost::scoped_ptr<ColumnBlockPositionSet> mpSet;
ClipContextBase(); // disabled
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index e0884c757b6d..5514e0269016 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -11,6 +11,7 @@
#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"
@@ -19,7 +20,6 @@
#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;
- std::unique_ptr<ScFormulaCell> mpCell;
- std::unique_ptr<ScFormulaListener> mpListener;
+ boost::scoped_ptr<ScFormulaCell> mpCell;
+ boost::scoped_ptr<ScFormulaListener> mpListener;
ScColorScaleEntryType meType;
public:
@@ -133,7 +133,7 @@ struct SC_DLLPUBLIC ScDataBarFormatData
*
* Default color is 0xFF0000, this value is not set
*/
- std::unique_ptr<Color> mpNegativeColor;
+ boost::scoped_ptr<Color> mpNegativeColor;
/**
* Color of the axis if used
* Default color is black
@@ -177,8 +177,8 @@ struct SC_DLLPUBLIC ScDataBarFormatData
*/
bool mbOnlyBar;
- std::unique_ptr<ScColorScaleEntry> mpUpperLimit;
- std::unique_ptr<ScColorScaleEntry> mpLowerLimit;
+ boost::scoped_ptr<ScColorScaleEntry> mpUpperLimit;
+ boost::scoped_ptr<ScColorScaleEntry> mpLowerLimit;
};
enum ScIconSetType
@@ -242,7 +242,7 @@ private:
{
std::vector<double> maValues;
};
- mutable std::unique_ptr<ScColorFormatCache> mpCache;
+ mutable boost::scoped_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;
- std::unique_ptr<ScDataBarFormatData> mpFormatData;
+ boost::scoped_ptr<ScDataBarFormatData> mpFormatData;
};
struct ScIconSetFormatData
@@ -396,7 +396,7 @@ private:
double GetMaxValue() const;
double CalcValue(double nMin, double nMax, ScIconSetFormat::const_iterator& itr) const;
- std::unique_ptr<ScIconSetFormatData> mpFormatData;
+ boost::scoped_ptr<ScIconSetFormatData> mpFormatData;
};
#endif
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 839c5b0080ae..5893585bb0da 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 std::unique_ptr<ScConditionEntryCache> mpCache;
+ mutable boost::scoped_ptr<ScConditionEntryCache> mpCache;
};
// single condition entry for conditional formatting
@@ -370,7 +370,7 @@ public:
private:
condformat::ScCondFormatDateType meType;
- mutable std::unique_ptr<Date> mpCache;
+ mutable boost::scoped_ptr<Date> mpCache;
OUString maStyleName;
};
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 8d136411dfe5..1f825e75e956 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -28,6 +28,8 @@
#include <svl/listener.hxx>
+#include <boost/scoped_ptr.hpp>
+
#include <memory>
#include <set>
#include <vector>
@@ -63,10 +65,10 @@ protected:
class ScDBData : public SvtListener, public ScRefreshTimer
{
private:
- std::unique_ptr<ScSortParam> mpSortParam;
- std::unique_ptr<ScQueryParam> mpQueryParam;
- std::unique_ptr<ScSubTotalParam> mpSubTotal;
- std::unique_ptr<ScImportParam> mpImportParam;
+ boost::scoped_ptr<ScSortParam> mpSortParam;
+ boost::scoped_ptr<ScQueryParam> mpQueryParam;
+ boost::scoped_ptr<ScSubTotalParam> mpSubTotal;
+ boost::scoped_ptr<ScImportParam> mpImportParam;
ScDBDataContainerBase* mpContainer;
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 013a6e290956..49a782e3fe3c 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -30,8 +30,11 @@
#include <vcl/vclptr.hxx>
#include <memory>
+
#include <set>
#include <vector>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
class ScDocument;
class ScPatternAttr;
@@ -268,7 +271,7 @@ class ScQueryCellIterator // walk through all non-empty cells in an ar
typedef sc::CellStoreType::const_position_type PositionType;
PositionType maCurPos;
- std::unique_ptr<ScQueryParam> mpParam;
+ boost::scoped_ptr<ScQueryParam> mpParam;
ScDocument* pDoc;
const ScAttrArray* pAttrArray;
sal_uLong nNumFormat;
@@ -584,7 +587,7 @@ public:
struct TabRanges
{
SCTAB mnTab;
- std::shared_ptr<ScFlatBoolRowSegments> mpRanges;
+ ::boost::shared_ptr<ScFlatBoolRowSegments> mpRanges;
TabRanges(SCTAB nTab);
};
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index afa2b7eaebd3..7016d7f88911 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -45,6 +45,8 @@
#include <set>
#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include "markdata.hxx"
@@ -273,7 +275,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
@@ -287,9 +289,9 @@ private:
rtl::Reference<ScPoolHelper> xPoolHelper;
- std::shared_ptr<svl::SharedStringPool> mpCellStringPool;
- std::unique_ptr<sc::FormulaGroupContext> mpFormulaGroupCxt;
- mutable std::unique_ptr<sc::DocumentLinkManager> mpDocLinkMgr;
+ boost::shared_ptr<svl::SharedStringPool> mpCellStringPool;
+ boost::scoped_ptr<sc::FormulaGroupContext> mpFormulaGroupCxt;
+ mutable boost::scoped_ptr<sc::DocumentLinkManager> mpDocLinkMgr;
ScCalcConfig maCalcConfig;
@@ -331,14 +333,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
@@ -467,7 +469,7 @@ private:
sal_Int16 mnNamedRangesLockCount;
- std::set<ScFormulaCell*> maSubTotalCells;
+ ::std::set<ScFormulaCell*> maSubTotalCells;
bool mbUseEmbedFonts;
@@ -589,8 +591,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 );
@@ -1601,8 +1603,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 81e0fbca728c..52335df7735b 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 <memory>
+#include <boost/scoped_ptr.hpp>
class ScDocument;
class ScAddress;
@@ -27,7 +27,7 @@ struct DocumentStreamAccessImpl;
*/
class DocumentStreamAccess
{
- std::unique_ptr<DocumentStreamAccessImpl> mpImpl;
+ boost::scoped_ptr<DocumentStreamAccessImpl> mpImpl;
DocumentStreamAccess();
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 799c8c34b110..b778086bee77 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.
*/
- std::unique_ptr<GroupItems> mpGroup;
+ boost::scoped_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 857ab7661d27..8ec5f8bd19fc 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;
- std::shared_ptr<FilterBase> mpFilter;
+ ::boost::shared_ptr<FilterBase> mpFilter;
Criterion();
};
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 805affeff6cb..e59b38a44a4c 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;
- std::shared_ptr<ScDPTableData> pSourceData;
+ ::boost::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 std::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument );
+ ScDPGroupTableData( const ::boost::shared_ptr<ScDPTableData>& pSource, ScDocument* pDocument );
virtual ~ScDPGroupTableData();
- std::shared_ptr<ScDPTableData> GetSourceTableData() { return pSourceData;}
+ boost::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 dd0a3c973962..a167194683a2 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
- std::shared_ptr<ScDPTableData> mpTableData;
+ ::boost::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 c81a690f78cf..9973b991faee 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;
- std::unique_ptr<OUString> mpLayoutName; // custom name to be displayed in the table.
+ boost::scoped_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;
- std::unique_ptr<OUString> mpLayoutName;
- std::unique_ptr<OUString> mpSubtotalName;
+ boost::scoped_ptr<OUString> mpLayoutName;
+ boost::scoped_ptr<OUString> mpSubtotalName;
bool bIsDataLayout;
bool bDupFlag;
sal_uInt16 nOrientation;
@@ -258,8 +258,8 @@ private:
* created. */
bool mbDimensionMembersBuilt;
- std::unique_ptr<OUString> mpGrandTotalName;
- mutable std::unique_ptr<DimOrderType> mpDimOrder; // dimension order for row and column dimensions, to traverse result tree.
+ boost::scoped_ptr<OUString> mpGrandTotalName;
+ mutable boost::scoped_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 4f63a8258861..cdae3af4f413 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
- std::unique_ptr<OUString> mpLayoutName;
- std::unique_ptr<OUString> mpSubtotalName;
+ boost::scoped_ptr<OUString> mpLayoutName;
+ boost::scoped_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;
- std::unique_ptr<OUString> mpLayoutName;
+ boost::scoped_ptr<OUString> mpLayoutName;
sal_Int32 nPosition; // manual sorting
bool bVisible;
diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index a917dcdbb640..e13a4b1c6f20 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:
- std::shared_ptr<EditTextObject> mpOldData;
- std::shared_ptr<EditTextObject> mpNewData;
+ ::boost::shared_ptr<EditTextObject> mpOldData;
+ ::boost::shared_ptr<EditTextObject> mpNewData;
SCTAB mnTab;
SCCOL mnCol;
SCROW mnRow;
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index bb8b44cba0b5..be513510ac6d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -34,7 +34,7 @@
#include <formula/token.hxx>
#include <osl/mutex.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <unordered_map>
#include <unordered_set>
#include <vector>
@@ -91,7 +91,7 @@ class ScExternalRefCache
{
public:
typedef ::formula::FormulaTokenRef TokenRef;
- typedef std::shared_ptr<ScTokenArray> TokenArrayRef;
+ typedef ::boost::shared_ptr<ScTokenArray> TokenArrayRef;
struct TableName
{
@@ -198,7 +198,7 @@ public:
ReferencedFlag meReferenced;
};
- typedef std::shared_ptr<Table> TableTypeRef;
+ typedef ::boost::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 ed2e72c961e8..905e907953f5 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -40,7 +40,7 @@
#include <osl/mutex.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class ScEditSource;
class SvxFieldItem;
@@ -207,7 +207,7 @@ class ScEditFieldObj : public cppu::WeakImplHelper<
ESelection aSelection;
sal_Int32 meType;
- std::unique_ptr<SvxFieldData> mpData;
+ boost::scoped_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 8ea1473114f8..089f427d2bfc 100644
--- a/sc/inc/importfilterdata.hxx
+++ b/sc/inc/importfilterdata.hxx
@@ -13,7 +13,7 @@
#include "address.hxx"
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sc {
@@ -39,7 +39,7 @@ struct ImportPostProcessData : boost::noncopyable
DataStream();
};
- std::unique_ptr<DataStream> mpDataStream;
+ boost::scoped_ptr<DataStream> mpDataStream;
};
}
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index fe40dea10127..000a5beca7e7 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -14,7 +14,8 @@
#include "columnspanset.hxx"
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
class ScDocument;
class ScTokenArray;
@@ -27,10 +28,10 @@ class ColumnBlockPositionSet;
class StartListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
- std::shared_ptr<ColumnBlockPositionSet> mpSet;
+ boost::shared_ptr<ColumnBlockPositionSet> mpSet;
public:
StartListeningContext(ScDocument& rDoc);
- StartListeningContext(ScDocument& rDoc, const std::shared_ptr<ColumnBlockPositionSet>& pSet);
+ StartListeningContext(ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet);
ScDocument& getDoc() { return mrDoc;}
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
@@ -40,13 +41,13 @@ class EndListeningContext : boost::noncopyable
{
ScDocument& mrDoc;
ColumnSpanSet maSet;
- std::shared_ptr<ColumnBlockPositionSet> mpPosSet;
+ boost::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 std::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode = NULL);
+ EndListeningContext(ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode = NULL);
void setPositionDelta( const ScAddress& rDelta );
@@ -63,7 +64,7 @@ public:
class PurgeListenerAction : public ColumnSpanSet::Action, boost::noncopyable
{
ScDocument& mrDoc;
- std::unique_ptr<ColumnBlockPosition> mpBlockPos;
+ boost::scoped_ptr<ColumnBlockPosition> mpBlockPos;
public:
PurgeListenerAction( ScDocument& rDoc );
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 4a0a1e9e4025..9f6258bca087 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -42,6 +42,8 @@
#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 5eb13baa217b..32480a7c3ef2 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -23,6 +23,8 @@
#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 4b7fd177bb42..fbd83f1a8c0a 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -19,6 +19,7 @@
#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 90120f43e004..130a34cf90fc 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -22,6 +22,7 @@
#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 98a89f7329c5..7a376d22e064 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 std::shared_ptr< ScCaptionInitData > ScCaptionInitDataRef;
+ typedef ::boost::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 081823de12ce..f12e26165eba 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 <memory>
+#include <boost/scoped_ptr.hpp>
#include <formula/grammar.hxx>
#include "address.hxx"
@@ -26,7 +26,7 @@ private:
sal_uLong mnFormatIndex;
bool mbCalculated;
- std::unique_ptr<ScTokenArray> mpCode;
+ boost::scoped_ptr<ScTokenArray> mpCode;
ScAddress maAddr;
ScDocument* mpDoc;
ScFormulaResult maResult;
diff --git a/sc/inc/simplerangelist.hxx b/sc/inc/simplerangelist.hxx
index bf672ea19f12..1fcbefd9d832 100644
--- a/sc/inc/simplerangelist.hxx
+++ b/sc/inc/simplerangelist.hxx
@@ -20,11 +20,12 @@
#ifndef INCLUDED_SC_INC_SIMPLERANGELIST_HXX
#define INCLUDED_SC_INC_SIMPLERANGELIST_HXX
+#include <boost/shared_ptr.hpp>
+
#include "address.hxx"
-#include <list>
#include <map>
-#include <memory>
+#include <list>
class ScRange;
class ScRangeList;
@@ -46,7 +47,7 @@ public:
SCROW mnRow2;
explicit Range(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
};
- typedef std::shared_ptr< ::std::list<Range> > RangeListRef;
+ typedef ::boost::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 8a12532f1f86..77330b3d4367 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -36,7 +36,7 @@
#include <set>
#include <map>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
namespace utl {
@@ -140,17 +140,17 @@ private:
SCROW nRepeatStartY;
SCROW nRepeatEndY;
- std::unique_ptr<ScTableProtection> pTabProtection;
+ boost::scoped_ptr<ScTableProtection> pTabProtection;
sal_uInt16* pColWidth;
- std::unique_ptr<ScFlatUInt16RowSegments> mpRowHeights;
+ boost::scoped_ptr<ScFlatUInt16RowSegments> mpRowHeights;
sal_uInt8* pColFlags;
ScBitMaskCompressedArray< SCROW, sal_uInt8>* pRowFlags;
- std::unique_ptr<ScFlatBoolColSegments> mpHiddenCols;
- std::unique_ptr<ScFlatBoolRowSegments> mpHiddenRows;
- std::unique_ptr<ScFlatBoolColSegments> mpFilteredCols;
- std::unique_ptr<ScFlatBoolRowSegments> mpFilteredRows;
+ boost::scoped_ptr<ScFlatBoolColSegments> mpHiddenCols;
+ boost::scoped_ptr<ScFlatBoolRowSegments> mpHiddenRows;
+ boost::scoped_ptr<ScFlatBoolColSegments> mpFilteredCols;
+ boost::scoped_ptr<ScFlatBoolRowSegments> mpFilteredRows;
::std::set<SCROW> maRowPageBreaks;
::std::set<SCROW> maRowManualBreaks;
@@ -188,7 +188,7 @@ private:
ScDBData* pDBDataNoName;
mutable ScRangeName* mpRangeName;
- std::unique_ptr<ScConditionalFormatList> mpCondFormatList;
+ boost::scoped_ptr<ScConditionalFormatList> mpCondFormatList;
bool bScenario:1;
bool bLayoutRTL:1;
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index 07aecaa7dcad..1458399fd9c2 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -25,7 +25,7 @@
#include "global.hxx"
#include "rangelst.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class ScDocument;
class ScTableProtectionImpl;
@@ -103,7 +103,7 @@ public:
void setOption(Option eOption, bool bEnabled);
private:
- std::unique_ptr<ScTableProtectionImpl> mpImpl;
+ ::boost::scoped_ptr<ScTableProtectionImpl> mpImpl;
};
/** Container for the Excel EnhancedProtection feature.
@@ -195,7 +195,7 @@ public:
bool isSelectionEditable( const ScRangeList& rRangeList ) const;
private:
- std::unique_ptr<ScTableProtectionImpl> mpImpl;
+ ::boost::scoped_ptr<ScTableProtectionImpl> mpImpl;
};
#endif
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 352e38e4bf90..654df89b0308 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;
}
-std::shared_ptr<utl::TempFile> ScBootstrapFixture::exportTo( ScDocShell* pShell, sal_Int32 nFormat )
+boost::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);
- std::shared_ptr<utl::TempFile> pTempFile(new utl::TempFile());
+ boost::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 e7a6d5f75040..17934f6a5441 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -32,7 +32,7 @@
#include <sal/types.h>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#if defined(SCQAHELPER_DLLIMPLEMENTATION)
#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
@@ -230,7 +230,7 @@ public:
ScDocShellRef saveAndReload( ScDocShell* pShell, sal_Int32 nFormat );
- static std::shared_ptr<utl::TempFile> exportTo( ScDocShell* pShell, sal_Int32 nFormat );
+ static boost::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 78b48ddb6b5c..c90b7c0b74b1 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)
{
- std::shared_ptr<utl::TempFile> pTempFile = ScBootstrapFixture::exportTo(pShell, nFormat);
+ boost::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());
- std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+ boost::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 3299dd975dab..4a478ce14ebd 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);
- std::unique_ptr<ScUndoPaste> pUndo(createUndoPaste(getDocShell(), aRange, pUndoDoc));
+ boost::scoped_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.
- std::unique_ptr<ScColumnTextWidthIterator> pIter(new ScColumnTextWidthIterator(*m_pDoc, aTopCell, MAXROW));
+ boost::scoped_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 6401d4cf5d8a..5df54572101d 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 <memory>
+#include <boost/scoped_ptr.hpp>
using namespace formula;
@@ -171,7 +171,7 @@ void Test::testFormulaCreateStringFromTokens()
};
(void) aTests;
- std::unique_ptr<ScTokenArray> pArray;
+ boost::scoped_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)
{
- std::unique_ptr<ScTokenArray> pArray;
+ boost::scoped_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.
- std::unique_ptr<ScTokenArray> pCode(compileFormula(m_pDoc, aInput));
+ boost::scoped_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 dc2782c70bea..88666a299503 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);
- std::unique_ptr<ScUndoPaste> pUndo(createUndoPaste(getDocShell(), aRange, pUndoDoc));
+ boost::scoped_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 4c120dfadcb1..65c2331eb00b 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 <memory>
+#include <boost/scoped_ptr.hpp>
// STATIC DATA -----------------------------------------------------------
@@ -243,7 +243,7 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd
{
const ScPatternAttr* pPattern = GetPattern(nTempStartRow);
- std::unique_ptr<ScPatternAttr> pNewPattern;
+ boost::scoped_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;
- std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pOldPattern));
+ boost::scoped_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) )
{
- std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pOldPattern));
+ boost::scoped_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 );
- std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( pDocument->GetPool() ));
+ boost::scoped_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.
- std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( *pWantedPattern ));
+ boost::scoped_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)
{
- std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pData[nPos].pPattern));
+ boost::scoped_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 )
{
- std::unique_ptr<ScPatternAttr> pTmpPattern(new ScPatternAttr( *pOldPattern ));
+ boost::scoped_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 4bdb0e766687..ac78dbd6941b 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());
- std::unique_ptr<EditTextObject> pObj(rEngine.CreateTextObject());
+ boost::scoped_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 04eedf75b24b..7b1e410e17a8 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 <memory>
+#include <boost/scoped_ptr.hpp>
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);
- std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pPattern));
+ boost::scoped_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 );
- std::unique_ptr<ScPatternAttr> pTemp(new ScPatternAttr(*pOldPattern));
+ boost::scoped_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 );
- std::unique_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr( *pPattern ));
+ boost::scoped_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();
- std::unique_ptr<ScTokenArray> pOldCode(pCode->Clone());
+ boost::scoped_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();
- std::unique_ptr<ScTokenArray> pOldCode(pCode->Clone());
+ boost::scoped_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.
- std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(
+ boost::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 5118e568c712..534708289918 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 ) )
{
- std::unique_ptr<ScPatternAttr> pPreviewPattern(new ScPatternAttr( *pPattern ));
+ boost::scoped_ptr<ScPatternAttr> pPreviewPattern(new ScPatternAttr( *pPattern ));
pPreviewPattern->SetStyleSheet(pPreviewStyle);
pPreviewPattern->FillEditItemSet( pSet, pCondSet );
}
@@ -1054,7 +1054,7 @@ public:
class RemoveEditAttribsHandler : public StrEntries
{
- std::unique_ptr<ScFieldEditEngine> mpEngine;
+ boost::scoped_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 138b0f52e879..c39c295eae06 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 <memory>
+#include <boost/scoped_ptr.hpp>
#include <mdds/flat_segment_tree.hpp>
@@ -423,7 +423,7 @@ void ScColumn::AttachNewFormulaCell(
{
case sc::ConvertToGroupListening:
{
- std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*pDocument));
+ boost::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 bd7c60bf7d4d..ac09eac472ce 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -34,6 +34,8 @@
#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 b72a5adf83e6..192611851b41 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 <memory>
+#include <boost/scoped_ptr.hpp>
using namespace formula;
@@ -653,7 +653,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
// Evaluate formulas
bool bDirty = false; // 1 and 2 separate?
- std::unique_ptr<ScFormulaCell> pTemp1;
+ boost::scoped_ptr<ScFormulaCell> pTemp1;
ScFormulaCell* pEff1 = pFCell1;
if ( bRelRef1 )
{
@@ -683,7 +683,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
}
pTemp1.reset();
- std::unique_ptr<ScFormulaCell> pTemp2;
+ boost::scoped_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 3b96fb4e6b9f..a38f7121bb86 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(nullptr),
+ mpFormulaGroupCxt(NULL),
maCalcConfig( ScInterpreter::GetGlobalConfig()),
mpUndoManager( NULL ),
pEditEngine( NULL ),
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 15d407a9f324..0e6998a07caf 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;
- std::unique_ptr<sc::ExpandRefsSwitch> pExpandRefsSwitch;
+ boost::scoped_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 48319bad94a8..4d93eca06538 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;
- std::unique_ptr<ScTokenArray> pTokArr(aArr.Clone());
+ boost::scoped_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 d9e9bd376ebd..c51ca60dab64 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 <memory>
+#include <boost/scoped_ptr.hpp>
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()];
- std::unique_ptr<ScColumnTextWidthIterator> pColIter(new ScColumnTextWidthIterator(*pCol, aScope.Row(), MAXROW));
+ boost::scoped_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;
- std::unique_ptr<ScEditEngineDefaulter> pEngine; // not using pEditEngine member because of defaults
+ boost::scoped_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 ) )
{
- std::unique_ptr<ScPatternAttr> pPreviewPattern(new ScPatternAttr( *pPattern ));
+ boost::scoped_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 a362a24f82dc..f4aacca7caaf 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -100,10 +100,10 @@
#include <formula/vectortoken.hxx>
-#include <limits>
#include <map>
-#include <memory>
+#include <limits>
#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)
{
- std::shared_ptr<sc::ColumnBlockPositionSet> pSet(
+ boost::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();
- std::unique_ptr<ScDocument> pMixDoc;
+ boost::scoped_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])
{
- std::unique_ptr<ScDocument> pMixDoc;
+ boost::scoped_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 dd3572ca1ef2..46825d25f5f9 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;
- std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*this));
+ boost::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>
{
- std::shared_ptr<sc::StartListeningContext> mpCxt;
+ boost::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 )
{
- std::shared_ptr<sc::ColumnBlockPositionSet> pPosSet(new sc::ColumnBlockPositionSet(*this));
+ boost::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 543181cacbf1..642bbc2df3d4 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;
- std::unique_ptr<ScTokenArray> pTokArr(aArr.Clone());
+ boost::scoped_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;
- std::unique_ptr<ScTokenArray> pTokArr(aArr.Clone());
+ boost::scoped_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))
{}
- std::shared_ptr<Impl> mpImpl;
+ boost::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 96b47b089f34..b9c557233826 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 ::std::shared_ptr;
+using ::boost::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 757f274956ff..db4ccd294fe2 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 ::std::shared_ptr;
+using ::boost::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 2e97565dc54f..fc8651536825 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(nullptr),
+ mpLayoutName(NULL),
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(nullptr),
+ mpLayoutName(NULL),
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(nullptr),
- mpSubtotalName(nullptr),
+ mpLayoutName(NULL),
+ mpSubtotalName(NULL),
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( nullptr ),
- pReferenceValue( nullptr ),
- pSortInfo( nullptr ),
- pAutoShowInfo( nullptr ),
- pLayoutInfo( nullptr )
+ pSubTotalFuncs( NULL ),
+ pReferenceValue( NULL ),
+ pSortInfo( NULL ),
+ pAutoShowInfo( NULL ),
+ pLayoutInfo( NULL )
{
}
ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
aName( r.aName ),
- mpLayoutName(nullptr),
- mpSubtotalName(nullptr),
+ mpLayoutName(NULL),
+ mpSubtotalName(NULL),
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( nullptr )
+ pSubTotalFuncs( NULL )
{
if ( nSubTotalCount && r.pSubTotalFuncs )
{
@@ -242,19 +242,19 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
if (r.pReferenceValue)
pReferenceValue = new sheet::DataPilotFieldReference( *(r.pReferenceValue) );
else
- pReferenceValue = nullptr;
+ pReferenceValue = NULL;
if (r.pSortInfo)
pSortInfo = new sheet::DataPilotFieldSortInfo( *(r.pSortInfo) );
else
- pSortInfo = nullptr;
+ pSortInfo = NULL;
if (r.pAutoShowInfo)
pAutoShowInfo = new sheet::DataPilotFieldAutoShowInfo( *(r.pAutoShowInfo) );
else
- pAutoShowInfo = nullptr;
+ pAutoShowInfo = NULL;
if (r.pLayoutInfo)
pLayoutInfo = new sheet::DataPilotFieldLayoutInfo( *(r.pLayoutInfo) );
else
- pLayoutInfo = nullptr;
+ pLayoutInfo = NULL;
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 = nullptr;
+ pSubTotalFuncs = NULL;
bSubTotalDefault = false;
}
@@ -465,7 +465,7 @@ void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference*
if (pNew)
pReferenceValue = new sheet::DataPilotFieldReference(*pNew);
else
- pReferenceValue = nullptr;
+ pReferenceValue = NULL;
}
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 = nullptr;
+ pSortInfo = NULL;
}
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 = nullptr;
+ pAutoShowInfo = NULL;
}
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 = nullptr;
+ pLayoutInfo = NULL;
}
void ScDPSaveDimension::SetCurrentPage( const OUString* pPage )
{
// We use member's visibility attribute to filter by page dimension.
- // pPage == nullptr -> all members visible.
+ // pPage == NULL -> 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 nullptr;
+ return NULL;
}
ScDPSaveMember* ScDPSaveDimension::GetMemberByName(const OUString& rName)
@@ -797,7 +797,7 @@ void ScDPSaveDimension::Dump(int nIndent) const
#endif
ScDPSaveData::ScDPSaveData() :
- pDimensionData( nullptr ),
+ pDimensionData( NULL ),
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(nullptr)
+ mpGrandTotalName(NULL)
{
}
@@ -817,13 +817,13 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
bFilterButton( r.bFilterButton ),
bDrillDown( r.bDrillDown ),
mbDimensionMembersBuilt(r.mbDimensionMembersBuilt),
- mpGrandTotalName(nullptr),
- mpDimOrder(nullptr)
+ mpGrandTotalName(NULL),
+ mpDimOrder(NULL)
{
if ( r.pDimensionData )
pDimensionData = new ScDPDimensionSaveData( *r.pDimensionData );
else
- pDimensionData = nullptr;
+ pDimensionData = NULL;
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 nullptr; // don't create new
+ return NULL; // 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 nullptr;
+ return NULL;
}
ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const OUString& rName)
@@ -1012,7 +1012,7 @@ ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const OUString& rName)
ScDPSaveDimension* pOld = GetExistingDimensionByName(rName);
if (!pOld)
- return nullptr;
+ return NULL;
ScDPSaveDimension* pNew = new ScDPSaveDimension( *pOld );
AddDimension(pNew);
@@ -1053,7 +1053,7 @@ ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(sal_uInt16 nOrientation)
return const_cast<ScDPSaveDimension*>(&(*iter));
}
- return nullptr;
+ return NULL;
}
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 nullptr;
+ return NULL;
}
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 = nullptr; // avoid endless loop
+ pExistingGroup = NULL; // avoid endless loop
}
}
}
@@ -1344,7 +1344,7 @@ void ScDPSaveData::SetDimensionData( const ScDPDimensionSaveData* pNew )
if ( pNew )
pDimensionData = new ScDPDimensionSaveData( *pNew );
else
- pDimensionData = nullptr;
+ pDimensionData = NULL;
}
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 nullptr;
+ return NULL;
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 28667b54d920..7ccaa7300021 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
{
- std::unique_ptr<FilterStack> pFilterStack;
+ boost::scoped_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
{
- std::unique_ptr<FilterStack> pFilterStack;
+ boost::scoped_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 bd9950bb6552..5a14a6f23e53 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( nullptr ),
+ pDimensions( NULL ),
bColumnGrand( true ), // default is true
bRowGrand( true ),
bIgnoreEmptyRows( false ),
bRepeatIfEmpty( false ),
nDupCount( 0 ),
- pResData( nullptr ),
- pColResRoot( nullptr ),
- pRowResRoot( nullptr ),
- pColResults( nullptr ),
- pRowResults( nullptr ),
+ pResData( NULL ),
+ pColResRoot( NULL ),
+ pRowResRoot( NULL ),
+ pColResults( NULL ),
+ pRowResults( NULL ),
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 nullptr;
+ return NULL;
long nDimIndex = maDataDims[nIndex];
return GetDimensionsObject()->getByIndex(nDimIndex);
@@ -539,8 +539,8 @@ void ScDPSource::disposeData()
DELETEZ(pResData);
delete[] pColResults;
delete[] pRowResults;
- pColResults = nullptr;
- pRowResults = nullptr;
+ pColResults = NULL;
+ pRowResults = NULL;
aColLevelList.clear();
aRowLevelList.clear();
}
@@ -548,7 +548,7 @@ void ScDPSource::disposeData()
if ( pDimensions )
{
pDimensions->release(); // ref-counted
- pDimensions = nullptr; // settings have to be applied (from SaveData) again!
+ pDimensions = NULL; // 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 = nullptr;
+ std::vector<long>* pDimIndex = NULL;
switch (nOrientation)
{
case sheet::DataPilotFieldOrientation_COLUMN:
@@ -1070,7 +1070,7 @@ void ScDPSource::FillMemberResults()
long nPos = 0;
pColResRoot->FillMemberResults( pColResults, nPos, pResData->GetColStartMeasure(),
- true, nullptr, nullptr );
+ true, NULL, NULL );
}
FillLevelList( sheet::DataPilotFieldOrientation_ROW, aRowLevelList );
@@ -1084,7 +1084,7 @@ void ScDPSource::FillMemberResults()
long nPos = 0;
pRowResRoot->FillMemberResults( pRowResults, nPos, pResData->GetRowStartMeasure(),
- true, nullptr, nullptr );
+ true, NULL, NULL );
}
}
}
@@ -1108,7 +1108,7 @@ const uno::Sequence<sheet::MemberResult>* ScDPSource::GetMemberResults( ScDPLeve
if ( pRowLevel == pLevel )
return pRowResults+i;
}
- return nullptr;
+ return NULL;
}
// XPropertySet
@@ -1211,7 +1211,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPSource )
ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) :
pSource( pSrc ),
- ppDims( nullptr )
+ ppDims( NULL )
{
//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] = nullptr;
+ ppNew[i] = NULL;
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] = nullptr;
+ ppDims[i] = NULL;
}
if ( !ppDims[nIndex] )
{
@@ -1333,20 +1333,20 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const
return ppDims[nIndex];
}
- return nullptr; //TODO: exception?
+ return NULL; //TODO: exception?
}
ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
pSource( pSrc ),
nDim( nD ),
- pHierarchies( nullptr ),
+ pHierarchies( NULL ),
nUsedHier( 0 ),
nFunction( SUBTOTAL_FUNC_SUM ), // sum is default
- mpLayoutName(nullptr),
- mpSubtotalName(nullptr),
+ mpLayoutName(NULL),
+ mpSubtotalName(NULL),
nSourceDim( -1 ),
bHasSelectedPage( false ),
- pSelectedData( nullptr ),
+ pSelectedData( NULL ),
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( nullptr )
+ ppHiers( NULL )
{
//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] = nullptr;
+ ppHiers[i] = NULL;
}
if ( !ppHiers[nIndex] )
{
@@ -1790,14 +1790,14 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const
return ppHiers[nIndex];
}
- return nullptr; //TODO: exception?
+ return NULL; //TODO: exception?
}
ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) :
pSource( pSrc ),
nDim( nD ),
nHier( nH ),
- pLevels( nullptr )
+ pLevels( NULL )
{
//TODO: hold pSource
}
@@ -1856,7 +1856,7 @@ ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) :
pSource( pSrc ),
nDim( nD ),
nHier( nH ),
- ppLevs( nullptr )
+ ppLevs( NULL )
{
//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] = nullptr;
+ ppLevs[i] = NULL;
}
if ( !ppLevs[nIndex] )
{
@@ -1966,7 +1966,7 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
return ppLevs[nIndex];
}
- return nullptr; //TODO: exception?
+ return NULL; //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( nullptr ),
+ pMembers( NULL ),
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 = nullptr;
+ const ScDPItemData* pLastNumData = NULL;
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 nullptr; //TODO: exception?
+ return NULL; //TODO: exception?
}
ScDPMember::ScDPMember(
@@ -2544,7 +2544,7 @@ ScDPMember::ScDPMember(
nHier( nH ),
nLev( nL ),
mnDataId( nIndex ),
- mpLayoutName(nullptr),
+ mpLayoutName(NULL),
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()!=nullptr ) ? &GetData()->GetCacheTable().getCache() : nullptr ;
+ return ( GetData()!=NULL ) ? &GetData()->GetCacheTable().getCache() : NULL ;
}
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 nullptr;
+ return NULL;
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 cb3764b9577b..07d19a394387 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 <memory>
+#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
using namespace formula;
@@ -2985,7 +2985,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
// on reference update. Bail out.
return bCellStateChanged;
- std::unique_ptr<ScTokenArray> pOldCode;
+ boost::scoped_ptr<ScTokenArray> pOldCode;
if (pUndoDoc)
pOldCode.reset(pCode->Clone());
@@ -3107,7 +3107,7 @@ bool ScFormulaCell::UpdateReferenceOnMove(
return false;
bool bCellStateChanged = false;
- std::unique_ptr<ScTokenArray> pOldCode;
+ boost::scoped_ptr<ScTokenArray> pOldCode;
if (pUndoDoc)
pOldCode.reset(pCode->Clone());
@@ -3230,7 +3230,7 @@ bool ScFormulaCell::UpdateReferenceOnCopy(
// on reference update. Bail out.
return false;
- std::unique_ptr<ScTokenArray> pOldCode;
+ boost::scoped_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 6a4ac4773533..39d983c3e316 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)
{
- std::unique_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) );
+ boost::scoped_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();
}
- std::unique_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
+ boost::scoped_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 75010007d506..2745749e18c4 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 std::shared_ptr<ColumnBlockPositionSet>& pSet) :
+ ScDocument& rDoc, const boost::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 std::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode) :
+ ScDocument& rDoc, const boost::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 9ddf3b598b57..8c0916563c22 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 nullptr;
+ return NULL;
}
if (pOuterProgress)
@@ -77,7 +77,7 @@ ScProgress* GetProgressBar(
return new ScProgress(
pDoc->GetDocumentShell(), ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), nTotalCount);
- return nullptr;
+ return NULL;
}
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( nullptr ),
- pColWidth( nullptr ),
- mpRowHeights( static_cast<ScFlatUInt16RowSegments*>(nullptr) ),
- pColFlags( nullptr ),
- pRowFlags( nullptr ),
+ pTabProtection( NULL ),
+ pColWidth( NULL ),
+ mpRowHeights( static_cast<ScFlatUInt16RowSegments*>(NULL) ),
+ pColFlags( NULL ),
+ pRowFlags( NULL ),
mpHiddenCols(new ScFlatBoolColSegments),
mpHiddenRows(new ScFlatBoolRowSegments),
mpFilteredCols(new ScFlatBoolColSegments),
mpFilteredRows(new ScFlatBoolRowSegments),
- pOutlineTable( nullptr ),
- pSheetEvents( nullptr ),
+ pOutlineTable( NULL ),
+ pSheetEvents( NULL ),
nTableAreaX( 0 ),
nTableAreaY( 0 ),
nTab( nNewTab ),
pDocument( pDoc ),
- pSearchText ( nullptr ),
- pSortCollator( nullptr ),
- pRepeatColRange( nullptr ),
- pRepeatRowRange( nullptr ),
+ pSearchText ( NULL ),
+ pSortCollator( NULL ),
+ pRepeatColRange( NULL ),
+ pRepeatRowRange( NULL ),
nLockCount( 0 ),
- pScenarioRanges( nullptr ),
+ pScenarioRanges( NULL ),
aScenarioColor( COL_LIGHTGRAY ),
aTabBgColor( COL_AUTO ),
nScenarioFlags( 0 ),
- pDBDataNoName(nullptr),
- mpRangeName(nullptr),
+ pDBDataNoName(NULL),
+ mpRangeName(NULL),
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, nullptr );
+ ( nRow, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bWidth, aOptions, NULL );
}
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, nullptr, &nEnd);
+ bool bHidden = pDocument->ColHidden(nCol, nTab, NULL, &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, nullptr);
+ bool bHidden = pDocument->ColHidden(nCol, nTab, &nStart, NULL);
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, nullptr, &nEndCol );
+ bool bHidden = pDocument->ColHidden( nCol, nTab, NULL, &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, nullptr );
+ bool bHidden = pDocument->ColHidden( nCol, nTab, &nStartCol, NULL );
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(nullptr);
+ UpdatePageBreaks(NULL);
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, nullptr, &nLastCol))
+ if (ColHidden(i, NULL, &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, nullptr );
+ nRow, pDev, nPPTX, nPPTY, aZoom, aZoom, true, aOptions, NULL );
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 = nullptr;
+ pRepeatColRange = NULL;
if (rTable.pRepeatColRange)
{
pRepeatColRange = new ScRange(*rTable.pRepeatColRange);
@@ -1907,7 +1907,7 @@ void ScTable::CopyPrintRange(const ScTable& rTable)
}
delete pRepeatRowRange;
- pRepeatRowRange = nullptr;
+ pRepeatRowRange = NULL;
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 ] : nullptr;
+ return (nPos < GetPrintRangeCount()) ? &aPrintRanges[ nPos ] : NULL;
}
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(nullptr);
+ UpdatePageBreaks(NULL);
}
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 nullptr;
+ return NULL;
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 nullptr;
+ return NULL;
return aCol[nCol].GetBroadcaster(nRow);
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 3b9c02a71d54..f28be30d1d6d 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;
- std::unique_ptr<ScAttrIterator> pAttrIter(aCol[nCol].CreateAttrIterator( nRow1, nRow2 ));
+ boost::scoped_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 706e0e593ab5..9775e14ab9f7 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -67,10 +67,11 @@
#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>
@@ -251,7 +252,7 @@ public:
typedef std::vector<Row*> RowsType;
private:
- std::unique_ptr<RowsType> mpRows; /// row-wise data table for sort by row operation.
+ boost::scoped_ptr<RowsType> mpRows; /// row-wise data table for sort by row operation.
ScSortInfo*** pppInfo;
SCSIZE nCount;
@@ -868,7 +869,7 @@ class ListenerStartAction : public sc::ColumnSpanSet::ColumnAction
{
ScColumn* mpCol;
- std::shared_ptr<sc::ColumnBlockPositionSet> mpPosSet;
+ boost::shared_ptr<sc::ColumnBlockPositionSet> mpPosSet;
sc::StartListeningContext maStartCxt;
sc::EndListeningContext maEndCxt;
@@ -1707,7 +1708,7 @@ void ScTable::Sort(
if(pProgress)
pProgress->SetState( 0, nLastRow-nRow1 );
- std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nRow1, nLastRow, bKeepQuery, bUpdateRefs));
+ boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nRow1, nLastRow, bKeepQuery, bUpdateRefs));
if ( nLastRow - nRow1 > 255 )
DecoladeRow(pArray.get(), nRow1, nLastRow);
@@ -1734,7 +1735,7 @@ void ScTable::Sort(
if(pProgress)
pProgress->SetState( 0, nLastCol-nCol1 );
- std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nCol1, nLastCol, bKeepQuery, bUpdateRefs));
+ boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nCol1, nLastCol, bKeepQuery, bUpdateRefs));
QuickSort(pArray.get(), nCol1, nLastCol);
SortReorderByColumn(pArray.get(), aSortParam.nRow1, aSortParam.nRow2, aSortParam.bIncludePattern, pProgress);
@@ -1754,7 +1755,7 @@ void ScTable::Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress )
if (rParam.maOrderIndices.empty())
return;
- std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(rParam));
+ boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(rParam));
if (!pArray)
return;
@@ -2736,7 +2737,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
bSortCollatorInitialized = true;
InitSortCollator( aLocalSortParam );
}
- std::unique_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(aSortParam, nRow1, rParam.nRow2, bGlobalKeepQuery, false));
+ boost::scoped_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 ee1a29a99f72..5b6479cb95be 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 <memory>
+#include <boost/scoped_ptr.hpp>
// 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);
- std::shared_ptr<sc::ColumnBlockPositionSet> pSet(new sc::ColumnBlockPositionSet(*pDocument));
+ boost::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 e168ec6110f1..42d06a623edf 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 <memory>
+#include <boost/scoped_ptr.hpp>
using namespace formula;
@@ -812,7 +812,7 @@ bool ScValidationData::FillSelectionList(std::vector<ScTypedStrData>& rStrColl,
if( HasSelectionList() )
{
- std::unique_ptr<ScTokenArray> pTokArr( CreateTokenArry(0) );
+ boost::scoped_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.
*/
- std::unique_ptr< ScTokenArray > pTokArr( CreateTokenArry( 0 ) );
+ boost::scoped_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 8fab03dbbf47..b72c3177d0ec 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -89,6 +89,7 @@ const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
#include <rtl/digest.h>
+#include <boost/scoped_ptr.hpp>
#include <memory>
using namespace formula;
@@ -949,7 +950,7 @@ class DynamicKernelSlidingArgument : public Base
{
public:
DynamicKernelSlidingArgument( const ScCalcConfig& config, const std::string& s,
- FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen,
+ FormulaTreeNodeRef ft, boost::shared_ptr<SlidingFunctionBase>& CodeGen,
int index = 0 ) :
Base(config, s, ft, index), mpCodeGen(CodeGen), mpClmem2(NULL)
{
@@ -1125,7 +1126,7 @@ protected:
bool bIsStartFixed, bIsEndFixed;
const formula::DoubleVectorRefToken* mpDVR;
// from parent nodes
- std::shared_ptr<SlidingFunctionBase> mpCodeGen;
+ boost::shared_ptr<SlidingFunctionBase> mpCodeGen;
// controls whether to invoke the reduction kernel during marshaling or not
cl_mem mpClmem2;
};
@@ -1135,7 +1136,7 @@ class DynamicKernelMixedSlidingArgument : public VectorRef
{
public:
DynamicKernelMixedSlidingArgument( const ScCalcConfig& config, const std::string& s,
- FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen,
+ FormulaTreeNodeRef ft, boost::shared_ptr<SlidingFunctionBase>& CodeGen,
int index = 0 ) :
VectorRef(config, s, ft),
mDoubleArgument(mCalcConfig, s, ft, CodeGen, index),
@@ -1249,7 +1250,7 @@ class ParallelReductionVectorRef : public Base
{
public:
ParallelReductionVectorRef( const ScCalcConfig& config, const std::string& s,
- FormulaTreeNodeRef ft, std::shared_ptr<SlidingFunctionBase>& CodeGen,
+ FormulaTreeNodeRef ft, boost::shared_ptr<SlidingFunctionBase>& CodeGen,
int index = 0 ) :
Base(config, s, ft, index), mpCodeGen(CodeGen), mpClmem2(NULL)
{
@@ -1662,7 +1663,7 @@ protected:
bool bIsStartFixed, bIsEndFixed;
const formula::DoubleVectorRefToken* mpDVR;
// from parent nodes
- std::shared_ptr<SlidingFunctionBase> mpCodeGen;
+ boost::shared_ptr<SlidingFunctionBase> mpCodeGen;
// controls whether to invoke the reduction kernel during marshaling or not
cl_mem mpClmem2;
};
@@ -2539,7 +2540,7 @@ public:
private:
SubArgumentsType mvSubArguments;
- std::shared_ptr<SlidingFunctionBase> mpCodeGen;
+ boost::shared_ptr<SlidingFunctionBase> mpCodeGen;
cl_mem mpClmem2;
};
@@ -2553,7 +2554,7 @@ DynamicKernelArgumentRef SoPHelper( const ScCalcConfig& config,
template<class Base>
DynamicKernelArgument* VectorRefFactory( const ScCalcConfig& config, const std::string& s,
const FormulaTreeNodeRef& ft,
- std::shared_ptr<SlidingFunctionBase>& pCodeGen,
+ boost::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 9a49703f7532..ba087149262a 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 std::shared_ptr<FormulaTreeNode> FormulaTreeNodeRef;
+typedef boost::shared_ptr<FormulaTreeNode> FormulaTreeNodeRef;
class FormulaTreeNode
{
@@ -129,7 +129,7 @@ protected:
FormulaTreeNodeRef mFormulaTree;
};
-typedef std::shared_ptr<DynamicKernelArgument> DynamicKernelArgumentRef;
+typedef boost::shared_ptr<DynamicKernelArgument> DynamicKernelArgumentRef;
/// Holds an input (read-only) argument reference to a SingleVectorRef.
/// or a DoubleVectorRef for non-sliding-window argument of complex functions
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 398fd78ffb61..a7ddf3a58e72 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -96,10 +96,10 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId)
ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP,
const ScRangeListRef& rRangeList ) :
SvtListener(),
- mpExtRefListener(nullptr),
+ mpExtRefListener(NULL),
mpTokens(new vector<ScTokenRef>),
maName(rName),
- pUnoData( nullptr ),
+ pUnoData( NULL ),
mpDoc( pDocP ),
bUsed( false ),
bDirty( false ),
@@ -110,10 +110,10 @@ ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP,
ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, vector<ScTokenRef>* pTokens ) :
SvtListener(),
- mpExtRefListener(nullptr),
+ mpExtRefListener(NULL),
mpTokens(pTokens),
maName(rName),
- pUnoData( nullptr ),
+ pUnoData( NULL ),
mpDoc( pDocP ),
bUsed( false ),
bDirty( false ),
@@ -123,10 +123,10 @@ ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, vect
ScChartListener::ScChartListener( const ScChartListener& r ) :
SvtListener(),
- mpExtRefListener(nullptr),
+ mpExtRefListener(NULL),
mpTokens(new vector<ScTokenRef>(*r.mpTokens)),
maName(r.maName),
- pUnoData( nullptr ),
+ pUnoData( NULL ),
mpDoc( r.mpDoc ),
bUsed( false ),
bDirty( r.bDirty ),
@@ -451,13 +451,13 @@ void ScChartListenerCollection::removeByName(const OUString& rName)
ScChartListener* ScChartListenerCollection::findByName(const OUString& rName)
{
ListenersType::iterator it = maListeners.find(rName);
- return it == maListeners.end() ? nullptr : it->second;
+ return it == maListeners.end() ? NULL : it->second;
}
const ScChartListener* ScChartListenerCollection::findByName(const OUString& rName) const
{
ListenersType::const_iterator it = maListeners.find(rName);
- return it == maListeners.end() ? nullptr : it->second;
+ return it == maListeners.end() ? NULL : it->second;
}
bool ScChartListenerCollection::hasListeners() const
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index c5a4b0895d39..3517f26f6cef 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -43,7 +43,7 @@
#include <sfx2/app.hxx>
#include <unotools/useroptions.hxx>
#include <sfx2/sfxsids.hrc>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry )
IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry )
@@ -1803,7 +1803,7 @@ void ScChangeActionContent::GetFormulaString(
else
{
OSL_FAIL( "ScChangeActionContent::GetFormulaString: aPos != pCell->aPos" );
- std::unique_ptr<ScFormulaCell> pNew(new ScFormulaCell( *pCell, *pCell->GetDocument(), aPos ));
+ boost::scoped_ptr<ScFormulaCell> pNew(new ScFormulaCell( *pCell, *pCell->GetDocument(), aPos ));
pNew->GetFormula( rStr );
}
}
@@ -4209,7 +4209,7 @@ bool ScChangeTrack::Reject( ScChangeAction* pAct, bool bShared )
if ( !pAct->IsRejectable() )
return false;
- std::unique_ptr<ScChangeActionMap> pMap;
+ boost::scoped_ptr<ScChangeActionMap> pMap;
if ( pAct->HasDependent() )
{
pMap.reset(new ScChangeActionMap);
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8dfd0db84852..a9f877253bdd 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7204,7 +7204,7 @@ void ScInterpreter::ScIndirect()
ScCompiler aComp( pDok, aPos);
aComp.SetGrammar( pDok->GetGrammar());
aComp.SetRefConvention( eConv); // must be after grammar
- std::unique_ptr<ScTokenArray> pArr( aComp.CompileString( sRefStr));
+ boost::scoped_ptr<ScTokenArray> pArr( aComp.CompileString( sRefStr));
// Whatever.. use only the specific case.
if (!pArr->HasOpCode( ocTableRef))
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 027c40391583..822e9e2d3d50 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -21,8 +21,8 @@
#include <dpobject.hxx>
#include <document.hxx>
+#include <boost/shared_ptr.hpp>
#include <cstring>
-#include <memory>
using namespace com::sun::star;
@@ -46,10 +46,10 @@ void ScInterpreter::ScFilterXML()
OString aOString = OUStringToOString( aString, RTL_TEXTENCODING_UTF8 );
const char* pXML = aOString.getStr();
- std::shared_ptr<xmlParserCtxt> pContext(
+ boost::shared_ptr<xmlParserCtxt> pContext(
xmlNewParserCtxt(), xmlFreeParserCtxt );
- std::shared_ptr<xmlDoc> pDoc( xmlParseMemory( pXML, aOString.getLength() ),
+ boost::shared_ptr<xmlDoc> pDoc( xmlParseMemory( pXML, aOString.getLength() ),
xmlFreeDoc );
if(!pDoc)
@@ -58,10 +58,10 @@ void ScInterpreter::ScFilterXML()
return;
}
- std::shared_ptr<xmlXPathContext> pXPathCtx( xmlXPathNewContext(pDoc.get()),
+ boost::shared_ptr<xmlXPathContext> pXPathCtx( xmlXPathNewContext(pDoc.get()),
xmlXPathFreeContext );
- std::shared_ptr<xmlXPathObject> pXPathObj( xmlXPathEvalExpression(BAD_CAST(pXPathExpr), pXPathCtx.get()),
+ boost::shared_ptr<xmlXPathObject> pXPathObj( xmlXPathEvalExpression(BAD_CAST(pXPathExpr), pXPathCtx.get()),
xmlXPathFreeObject );
if(!pXPathObj)
@@ -92,13 +92,13 @@ void ScInterpreter::ScFilterXML()
{
xmlNsPtr ns = reinterpret_cast<xmlNsPtr>(pNodeSet->nodeTab[0]);
xmlNodePtr cur = reinterpret_cast<xmlNodePtr>(ns->next);
- std::shared_ptr<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree);
+ boost::shared_ptr<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree);
aResult = OStringToOUString(OString(reinterpret_cast<char*>(pChar2.get())), RTL_TEXTENCODING_UTF8);
}
else
{
xmlNodePtr cur = pNodeSet->nodeTab[0];
- std::shared_ptr<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree);
+ boost::shared_ptr<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree);
aResult = OStringToOUString(OString(reinterpret_cast<char*>(pChar2.get())), RTL_TEXTENCODING_UTF8);
}
}
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index f861fb5b5345..ebad87338d13 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -18,7 +18,7 @@
*/
#include <string.h>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <unotools/collatorwrapper.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
@@ -161,7 +161,7 @@ void ScRangeData::CompileRangeData( const OUString& rSymbol, bool bSetError )
if (bSetError)
aComp.SetExtendedErrorDetection( ScCompiler::EXTENDED_ERROR_DETECTION_NAME_NO_BREAK);
ScTokenArray* pNewCode = aComp.CompileString( rSymbol );
- std::unique_ptr<ScTokenArray> pOldCode( pCode); // old pCode will be deleted
+ boost::scoped_ptr<ScTokenArray> pOldCode( pCode); // old pCode will be deleted
pCode = pNewCode;
pCode->SetFromRangeName(true);
if( !pCode->GetCodeError() )
@@ -270,7 +270,7 @@ void ScRangeData::GetSymbol( OUString& rSymbol, const ScAddress& rPos, const For
void ScRangeData::UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress& rPos,
const FormulaGrammar::Grammar eGrammar )
{
- std::unique_ptr<ScTokenArray> pTemp( pCode->Clone() );
+ boost::scoped_ptr<ScTokenArray> pTemp( pCode->Clone() );
ScCompiler aComp( pDoc, rPos, *pTemp.get());
aComp.SetGrammar(eGrammar);
aComp.MoveRelWrap(GetMaxCol(), GetMaxRow());
@@ -622,7 +622,7 @@ void ScRangeData::ValidateTabRefs()
void ScRangeData::SetCode( ScTokenArray& rArr )
{
- std::unique_ptr<ScTokenArray> pOldCode( pCode); // old pCode will be deleted
+ boost::scoped_ptr<ScTokenArray> pOldCode( pCode); // old pCode will be deleted
pCode = new ScTokenArray( rArr );
pCode->SetFromRangeName(true);
InitCode();
diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index 70b2faa0e3a1..4c7371a35343 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -27,7 +27,7 @@
#include <formula/grammar.hxx>
#include <formula/token.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace formula;
@@ -53,7 +53,7 @@ void ScRefTokenHelper::compileRangeRepresentation(
ScCompiler aCompiler(pDoc, ScAddress(0,0,0));
aCompiler.SetGrammar(eGrammar);
- std::unique_ptr<ScTokenArray> pArray(aCompiler.CompileString(aToken));
+ boost::scoped_ptr<ScTokenArray> pArray(aCompiler.CompileString(aToken));
// There MUST be exactly one reference per range token and nothing
// else, and it MUST be a valid reference, not some #REF!
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 4bf44983add4..f46d25c8d324 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -32,7 +32,7 @@
#include "scerrors.hxx"
#include "scitems.hxx"
#include "stringutil.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
const sal_Unicode pKeyTABLE[] = { 'T', 'A', 'B', 'L', 'E', 0 };
const sal_Unicode pKeyVECTORS[] = { 'V', 'E', 'C', 'T', 'O', 'R', 'S', 0 };
@@ -938,7 +938,7 @@ void DifAttrCache::Apply( ScDocument& rDoc, SCTAB nTab )
{
if( bPlain )
{
- std::unique_ptr<ScPatternAttr> pPatt;
+ boost::scoped_ptr<ScPatternAttr> pPatt;
for( SCCOL nCol = 0 ; nCol <= MAXCOL ; nCol++ )
{
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index d193bb5a5154..6230384ce5c9 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -41,7 +41,7 @@
#include "excimp8.hxx"
#include "exp_op.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPFORMAT eFormat )
{
@@ -120,7 +120,7 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
pBookStrm->SetBufferSize( 0x8000 ); // still needed?
XclImpRootData aImpData( eBiff, rMedium, xRootStrg, *pDocument, RTL_TEXTENCODING_MS_1252 );
- std::unique_ptr< ImportExcel > xFilter;
+ boost::scoped_ptr< ImportExcel > xFilter;
switch( eBiff )
{
case EXC_BIFF2:
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index fae3ffd45184..ac2bf887ca8a 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -39,7 +39,7 @@
#include "imp_op.hxx"
#include "excimp8.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
FltError ImportExcel::Read()
{
@@ -81,7 +81,7 @@ FltError ImportExcel::Read()
OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): No Stream - what happened?!" );
- std::unique_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
+ boost::scoped_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
/* #i104057# Need to track a base position for progress bar calculation,
@@ -811,7 +811,7 @@ FltError ImportExcel8::Read()
FltError eLastErr = eERR_OK;
- std::unique_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
+ boost::scoped_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
/* #i104057# Need to track a base position for progress bar calculation,
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 1cc23139673e..c981c3d2a716 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -69,7 +69,7 @@
#include "xepage.hxx"
#include "xestyle.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
@@ -898,7 +898,7 @@ sal_uInt16 XclExpChSourceLink::ConvertDataSequence( Reference< XDataSequence > x
OUString aRangeRepr = xDataSeq->getSourceRangeRepresentation();
ScCompiler aComp( &GetDocRef(), ScAddress() );
aComp.SetGrammar( GetDocRef().GetGrammar() );
- std::unique_ptr<ScTokenArray> pArray(aComp.CompileString(aRangeRepr));
+ boost::scoped_ptr<ScTokenArray> pArray(aComp.CompileString(aRangeRepr));
if( !pArray )
return nDefCount;
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 0c7fb513aab0..e5860a87984b 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -674,7 +674,7 @@ XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rF
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
- std::unique_ptr< ScTokenArray > xScTokArr( mrFormatEntry.CreateTokenArry( 0 ) );
+ boost::scoped_ptr< ScTokenArray > xScTokArr( mrFormatEntry.CreateTokenArry( 0 ) );
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_CONDFMT, *xScTokArr );
if( bFmla2 )
@@ -920,7 +920,7 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
// we need to write the text without quotes
// we have to actually get the string from
// the token array for that
- std::unique_ptr<ScTokenArray> pTokenArray(mrFormatEntry.CreateTokenArry(0));
+ boost::scoped_ptr<ScTokenArray> pTokenArray(mrFormatEntry.CreateTokenArry(0));
if(pTokenArray->GetLen())
aText = XclXmlUtils::ToOString(pTokenArray->First()->GetString().getString());
}
@@ -1592,7 +1592,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
// formulas
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
- std::unique_ptr< ScTokenArray > xScTokArr;
+ boost::scoped_ptr< ScTokenArray > xScTokArr;
// first formula
xScTokArr.reset( pValData->CreateTokenArry( 0 ) );
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 90c1a1452bfd..511c6435e3a2 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -81,7 +81,7 @@ struct XclExpTokenConvInfo
/** Vector of token position and conversion for all operands of an operator,
or for all parameters of a function. */
-struct XclExpOperandList : public std::vector< XclExpTokenConvInfo >
+struct XclExpOperandList : public ::std::vector< XclExpTokenConvInfo >
{
inline explicit XclExpOperandList() { reserve( 2 ); }
void AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eConv, bool bValType );
@@ -96,8 +96,8 @@ void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eCon
rConvInfo.mbValType = bValType;
}
-typedef std::shared_ptr< XclExpOperandList > XclExpOperandListRef;
-typedef std::vector< XclExpOperandListRef > XclExpOperandListVector;
+typedef boost::shared_ptr< XclExpOperandList > XclExpOperandListRef;
+typedef ::std::vector< XclExpOperandListRef > XclExpOperandListVector;
/** Encapsulates all data needed for a call to an external function (macro, add-in). */
struct XclExpExtFuncData
@@ -256,7 +256,7 @@ static const XclExpCompConfig spConfigTable[] =
/** Working data of the formula compiler. Used to push onto a stack for recursive calls. */
struct XclExpCompData
{
- typedef std::shared_ptr< ScTokenArray > ScTokenArrayRef;
+ typedef boost::shared_ptr< ScTokenArray > ScTokenArrayRef;
const XclExpCompConfig& mrCfg; /// Configuration for current formula type.
ScTokenArrayRef mxOwnScTokArr; /// Own clone of a Calc token array.
@@ -449,9 +449,9 @@ private:
void AppendExt( const OUString& rString );
private:
- typedef std::map< XclFormulaType, XclExpCompConfig > XclExpCompConfigMap;
- typedef std::shared_ptr< XclExpCompData > XclExpCompDataRef;
- typedef std::vector< XclExpCompDataRef > XclExpCompDataVector;
+ typedef ::std::map< XclFormulaType, XclExpCompConfig > XclExpCompConfigMap;
+ typedef boost::shared_ptr< XclExpCompData > XclExpCompDataRef;
+ typedef ::std::vector< XclExpCompDataRef > XclExpCompDataVector;
XclExpCompConfigMap maCfgMap; /// Compiler configuration map for all formula types.
XclFunctionProvider maFuncProv; /// Excel function data provider.
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index e52a185ff979..a936f457c61d 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -91,7 +91,7 @@ private:
virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE;
private:
- typedef std::shared_ptr< XclExpCachedMatrix > XclExpCachedMatRef;
+ typedef boost::shared_ptr< XclExpCachedMatrix > XclExpCachedMatRef;
XclExpCachedMatRef mxMatrix; /// Cached results of the DDE link.
};
@@ -245,7 +245,7 @@ protected:
void WriteExtNameBufferXml( XclExpXmlStream& rStrm );
protected:
- typedef std::shared_ptr< XclExpExtNameBuffer > XclExpExtNameBfrRef;
+ typedef boost::shared_ptr< XclExpExtNameBuffer > XclExpExtNameBfrRef;
XclExpExtNameBfrRef mxExtNameBfr; /// List of EXTERNNAME records.
};
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 5a5c1305ce66..3f3e372e6f47 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -300,7 +300,7 @@ private:
private:
typedef boost::ptr_vector< XclListColor > XclListColorList;
- typedef std::shared_ptr< XclListColorList > XclListColorListRef;
+ typedef boost::shared_ptr< XclListColorList > XclListColorListRef;
typedef ::std::vector< XclColorIdData > XclColorIdDataVec;
typedef ::std::vector< XclPaletteColor > XclPaletteColorVec;
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 6283f8022139..9be0c5592098 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -122,7 +122,7 @@ using ::com::sun::star::chart2::data::LabeledDataSequence;
using ::formula::FormulaToken;
using ::formula::StackVar;
-using ::std::shared_ptr;
+using ::boost::shared_ptr;
using ::std::pair;
using ::std::unique_ptr;
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 2bab340dcf6f..148e7b71b1c3 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -106,8 +106,9 @@
#include "scextopt.hxx"
#include "namebuff.hxx"
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <sfx2/docfile.hxx>
-#include <memory>
using namespace com::sun::star;
using ::com::sun::star::uno::makeAny;
@@ -1460,7 +1461,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
if( maTextData.mxString->IsRich() )
{
// rich text
- std::unique_ptr< EditTextObject > xEditObj(
+ boost::scoped_ptr< EditTextObject > xEditObj(
XclImpStringHelper::CreateTextObject( GetRoot(), *maTextData.mxString ) );
OutlinerParaObject* pOutlineObj = new OutlinerParaObject( *xEditObj );
pOutlineObj->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT );
@@ -4114,7 +4115,7 @@ void XclImpSheetDrawing::ReadNote( XclImpStream& rStrm )
void XclImpSheetDrawing::ReadTabChart( XclImpStream& rStrm )
{
OSL_ENSURE_BIFF( GetBiff() >= EXC_BIFF5 );
- std::shared_ptr< XclImpChartObj > xChartObj( new XclImpChartObj( GetRoot(), true ) );
+ boost::shared_ptr< XclImpChartObj > xChartObj( new XclImpChartObj( GetRoot(), true ) );
xChartObj->ReadChartSubStream( rStrm );
// insert the chart as raw object without connected DFF data
AppendRawObject( xChartObj );
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 0f84a562da39..1232b97de518 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -75,7 +75,7 @@ public:
void LoadCachedValues(ScExternalRefCache::TableTypeRef pCacheTable);
private:
- typedef std::shared_ptr< XclImpCrn > XclImpCrnRef;
+ typedef boost::shared_ptr< XclImpCrn > XclImpCrnRef;
typedef std::vector< XclImpCrnRef > XclImpCrnList;
XclImpCrnList maCrnList; /// List of CRN records (cached cell values).
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index c5340bc8092f..bb93e8865904 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -40,7 +40,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
mnNameIndex( nXclNameIdx ),
mbVBName( false ),
mbMacro( false ),
- mpTokensData( nullptr )
+ mpTokensData( NULL )
{
ExcelToSc& rFmlaConv = GetOldFmlaConverter();
@@ -218,7 +218,7 @@ void XclImpName::ConvertTokens()
ExcelToSc& rFmlaConv = GetOldFmlaConverter();
rFmlaConv.Reset();
- const ScTokenArray* pArray = nullptr;
+ const ScTokenArray* pArray = NULL;
XclImpStreamPos aOldPos;
XclImpStream& rStrm = mpTokensData->mrStrm;
@@ -242,7 +242,7 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
if (mnXclTab == EXC_NAME_GLOBAL)
{
if (!GetDoc().GetRangeName()->insert(pData))
- pData = nullptr;
+ pData = NULL;
}
else
{
@@ -250,7 +250,7 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
if (pLocalNames)
{
if (!pLocalNames->insert(pData))
- pData = nullptr;
+ pData = NULL;
}
if (GetBiff() == EXC_BIFF8 && pData)
@@ -299,7 +299,7 @@ const XclImpName* XclImpNameManager::FindName( const OUString& rXclName, SCTAB n
const XclImpName* XclImpNameManager::GetName( sal_uInt16 nXclNameIdx ) const
{
OSL_ENSURE( nXclNameIdx > 0, "XclImpNameManager::GetName - index must be >0" );
- return ( nXclNameIdx <= 0 || nXclNameIdx > maNameList.size() ) ? nullptr : &(maNameList.at( nXclNameIdx - 1 ));
+ return ( nXclNameIdx <= 0 || nXclNameIdx > maNameList.size() ) ? NULL : &(maNameList.at( nXclNameIdx - 1 ));
}
void XclImpNameManager::ConvertAllTokens()
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index cb2116af615e..432ff5d3f7d3 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -89,7 +89,7 @@ void XclPCItem::SetError( sal_uInt16 nError )
mnError = nError;
switch( nError )
{
- case 0x00: maText = "#nullptr!"; break;
+ case 0x00: maText = "#NULL!"; break;
case 0x07: maText = "#DIV/0!"; break;
case 0x0F: maText = "#VALUE!"; break;
case 0x17: maText = "#REF!"; break;
@@ -132,7 +132,7 @@ bool XclPCItem::IsEmpty() const
const OUString* XclPCItem::GetText() const
{
- return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : nullptr;
+ return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : NULL;
}
const double* XclPCItem::GetDouble() const
@@ -567,7 +567,7 @@ XclPTFieldExtInfo::XclPTFieldExtInfo() :
mnSortField( EXC_SXVDEX_SORT_OWN ),
mnShowField( EXC_SXVDEX_SHOW_NONE ),
mnNumFmt(0),
- mpFieldTotalName(nullptr)
+ mpFieldTotalName(NULL)
{
}
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index e5dfeae8ae79..53067062f9d0 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -19,6 +19,9 @@
#include <sal/config.h>
+#include <utility>
+
+#include <boost/shared_ptr.hpp>
#include <comphelper/string.hxx>
#include <o3tl/ptr_container.hxx>
@@ -65,7 +68,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <utility>
+#include <memory>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -488,7 +491,7 @@ void ScHTMLLayoutParser::Adjust()
{
xLockedList->RemoveAll();
- std::stack< ScHTMLAdjustStackEntry* > aStack;
+ ::std::stack< ScHTMLAdjustStackEntry* > aStack;
ScHTMLAdjustStackEntry* pS = NULL;
sal_uInt16 nTab = 0;
SCCOL nLastCol = SCCOL_MAX;
@@ -639,7 +642,7 @@ sal_uInt16 ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE )
{
if ( pE->nWidth )
return pE->nWidth;
- sal_Int32 nTmp = std::min( static_cast<sal_Int32>( pE->nCol -
+ sal_Int32 nTmp = ::std::min( static_cast<sal_Int32>( pE->nCol -
nColCntStart + pE->nColOverlap),
static_cast<sal_Int32>( pLocalColOffset->size() - 1));
SCCOL nPos = (nTmp < 0 ? 0 : static_cast<SCCOL>(nTmp));
@@ -1715,7 +1718,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
template< typename Type >
inline Type getLimitedValue( const Type& rValue, const Type& rMin, const Type& rMax )
-{ return std::max( std::min( rValue, rMax ), rMin ); }
+{ return ::std::max( ::std::min( rValue, rMax ), rMin ); }
ScHTMLEntry::ScHTMLEntry( const SfxItemSet& rItemSet, ScHTMLTableId nTableId ) :
ScEEParseEntry( rItemSet ),
@@ -1779,8 +1782,8 @@ void ScHTMLEntry::Strip( const EditEngine& rEditEngine )
class ScHTMLTableMap
{
private:
- typedef std::shared_ptr< ScHTMLTable > ScHTMLTablePtr;
- typedef std::map< ScHTMLTableId, ScHTMLTablePtr > ScHTMLTableStdMap;
+ typedef ::boost::shared_ptr< ScHTMLTable > ScHTMLTablePtr;
+ typedef ::std::map< ScHTMLTableId, ScHTMLTablePtr > ScHTMLTableStdMap;
public:
typedef ScHTMLTableStdMap::iterator iterator;
@@ -1937,7 +1940,7 @@ ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bo
ScHTMLTable::ScHTMLTable(
SfxItemPool& rPool,
EditEngine& rEditEngine,
- std::vector< ScEEParseEntry* >& rEEParseList,
+ ::std::vector< ScEEParseEntry* >& rEEParseList,
ScHTMLTableId& rnUnusedId, ScHTMLParser* pParser
) :
mpParentTable( 0 ),
@@ -2137,7 +2140,7 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo )
{
// read needed options from the <td> tag
ScHTMLSize aSpanSize( 1, 1 );
- std::unique_ptr<OUString> pValStr, pNumStr;
+ ::std::unique_ptr<OUString> pValStr, pNumStr;
const HTMLOptions& rOptions = static_cast<HTMLParser*>(rInfo.pParser)->GetOptions();
HTMLOptions::const_iterator itr = rOptions.begin(), itrEnd = rOptions.end();
sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
@@ -2260,8 +2263,8 @@ SCCOLROW ScHTMLTable::GetDocSize( ScHTMLOrient eOrient, SCCOLROW nCellPos ) cons
SCCOLROW ScHTMLTable::GetDocSize( ScHTMLOrient eOrient, SCCOLROW nCellBegin, SCCOLROW nCellEnd ) const
{
const ScSizeVec& rSizes = maCumSizes[ eOrient ];
- size_t nBeginIdx = static_cast< size_t >( std::max< SCCOLROW >( nCellBegin, 0 ) );
- size_t nEndIdx = static_cast< size_t >( std::min< SCCOLROW >( nCellEnd, static_cast< SCCOLROW >( rSizes.size() ) ) );
+ size_t nBeginIdx = static_cast< size_t >( ::std::max< SCCOLROW >( nCellBegin, 0 ) );
+ size_t nEndIdx = static_cast< size_t >( ::std::min< SCCOLROW >( nCellEnd, static_cast< SCCOLROW >( rSizes.size() ) ) );
if (nBeginIdx >= nEndIdx ) return 0;
return rSizes[ nEndIdx - 1 ] - ((nBeginIdx == 0) ? 0 : rSizes[ nBeginIdx - 1 ]);
}
@@ -2496,8 +2499,8 @@ void ScHTMLTable::InsertNewCell( const ScHTMLSize& rSpanSize )
}
// adjust table size
- maSize.mnCols = std::max< SCCOL >( maSize.mnCols, aNewRange.aEnd.Col() + 1 );
- maSize.mnRows = std::max< SCROW >( maSize.mnRows, aNewRange.aEnd.Row() + 1 );
+ maSize.mnCols = ::std::max< SCCOL >( maSize.mnCols, aNewRange.aEnd.Col() + 1 );
+ maSize.mnRows = ::std::max< SCROW >( maSize.mnRows, aNewRange.aEnd.Row() + 1 );
}
void ScHTMLTable::ImplRowOn()
@@ -2629,7 +2632,7 @@ void ScHTMLTable::CalcNeededDocSize(
++nCellPos;
}
// set remaining needed size to last column/row
- nRealDocSize -= std::min< SCCOLROW >( nRealDocSize - 1, nDiffSize );
+ nRealDocSize -= ::std::min< SCCOLROW >( nRealDocSize - 1, nDiffSize );
SetDocSize( eOrient, nCellPos, nRealDocSize );
}
@@ -2707,7 +2710,7 @@ void ScHTMLTable::RecalcDocSize()
ScHTMLTable* pTable = GetExistingTable( (*aListIter)->GetTableId() );
// find entry with maximum width
if( bProcessColWidth && pTable )
- aDocSize.mnCols = std::max( aDocSize.mnCols, static_cast< SCCOL >( pTable->GetDocSize( tdCol ) ) );
+ aDocSize.mnCols = ::std::max( aDocSize.mnCols, static_cast< SCCOL >( pTable->GetDocSize( tdCol ) ) );
// add up height of each entry
if( bProcessRowHeight )
aDocSize.mnRows += pTable ? pTable->GetDocSize( tdRow ) : 1;
@@ -2808,7 +2811,7 @@ void ScHTMLTable::RecalcDocPos( const ScHTMLPos& rBasePos )
ScHTMLGlobalTable::ScHTMLGlobalTable(
SfxItemPool& rPool,
EditEngine& rEditEngine,
- std::vector< ScEEParseEntry* >& rEEParseList,
+ ::std::vector< ScEEParseEntry* >& rEEParseList,
ScHTMLTableId& rnUnusedId,
ScHTMLParser* pParser
) :
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index a23cbda61789..1a3450feb9e7 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -176,7 +176,7 @@ public:
ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
private:
- std::shared_ptr< FilterSettingsBase >
+ ::boost::shared_ptr< FilterSettingsBase >
mxSettings;
sal_Int32 mnColId;
bool mbHiddenButton;
diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index f541ef9d7b8a..475e2eaf48ce 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -74,7 +74,7 @@ private:
bool mbValid; /// True = decoder is correctly initialized.
};
-typedef std::shared_ptr< BiffDecoderBase > BiffDecoderRef;
+typedef ::boost::shared_ptr< BiffDecoderBase > BiffDecoderRef;
/** Decodes BIFF stream contents that are encoded using the old XOR algorithm. */
class BiffDecoder_XOR : public BiffDecoderBase
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 97980b500b52..094dca7905ef 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -142,8 +142,8 @@ protected:
bool skipFragment();
private:
- typedef std::shared_ptr< BinaryXInputStream > XInputStreamRef;
- typedef std::shared_ptr< BiffInputStream > BiffInputStreamRef;
+ typedef ::boost::shared_ptr< BinaryXInputStream > XInputStreamRef;
+ typedef ::boost::shared_ptr< BiffInputStream > BiffInputStreamRef;
XInputStreamRef mxXInStrm;
BiffInputStreamRef mxBiffStrm;
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 39a051e93341..ec96e5898b47 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -584,7 +584,7 @@ protected:
const FunctionInfoVector& getFuncs() const;
private:
- typedef std::shared_ptr< FunctionProviderImpl > FunctionProviderImplRef;
+ typedef ::boost::shared_ptr< FunctionProviderImpl > FunctionProviderImplRef;
FunctionProviderImplRef mxFuncImpl; /// Shared implementation between all copies of the provider.
};
@@ -616,7 +616,7 @@ public:
getOoxParserMap() const;
private:
- typedef std::shared_ptr< OpCodeProviderImpl > OpCodeProviderImplRef;
+ typedef ::boost::shared_ptr< OpCodeProviderImpl > OpCodeProviderImplRef;
OpCodeProviderImplRef mxOpCodeImpl; /// Shared implementation between all copies of the provider.
};
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 2a0194a75fa1..09d7efe37e16 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -26,6 +26,7 @@
#include <sal/macros.h>
#include <sot/storage.hxx>
#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
#include <oox/helper/helper.hxx>
#include "filter.hxx"
#include "scdllapi.h"
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index ea56fb5d39d7..65a4cec69103 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -25,7 +25,7 @@
#include <tools/gen.hxx>
#include <tools/color.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include "expbase.hxx"
@@ -101,7 +101,7 @@ class ScHTMLExport : public ScExportBase
static const sal_uInt16 nCellSpacing;
static const sal_Char sIndentSource[];
- typedef std::unique_ptr<std::map<OUString, OUString> > FileNameMapPtr;
+ typedef boost::scoped_ptr<std::map<OUString, OUString> > FileNameMapPtr;
typedef boost::ptr_vector<ScHTMLGraphEntry> GraphEntryList;
GraphEntryList aGraphList;
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 090189df385a..87fd1446ecf6 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -32,8 +32,8 @@
#include "excdefs.hxx"
#include <rtl/ref.hxx>
+#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <memory>
#include <unordered_map>
class SvStream;
@@ -68,8 +68,8 @@ public:
void Convert();
private:
- typedef std::shared_ptr< XclImpOutlineBuffer > XclImpOutlineBfrRef;
- typedef std::shared_ptr< XclImpColRowSettings > XclImpColRowSettRef;
+ typedef boost::shared_ptr< XclImpOutlineBuffer > XclImpOutlineBfrRef;
+ typedef boost::shared_ptr< XclImpColRowSettings > XclImpColRowSettRef;
XclImpOutlineBfrRef mxColOutlineBuff;
XclImpOutlineBfrRef mxRowOutlineBuff;
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index c70e277a22cf..0432abd2c166 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_OOXFORMULAPARSER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_OOXFORMULAPARSER_HXX
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -84,7 +84,7 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
- typedef std::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef;
+ typedef ::boost::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxComponent;
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 9609b2428608..f4a82eaf818d 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_WORKBOOKHELPER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_WORKBOOKHELPER_HXX
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <rtl/ref.hxx>
#include <oox/helper/storagebase.hxx>
#include <oox/drawingml/chart/chartconverter.hxx>
@@ -103,7 +103,7 @@ class WorksheetBuffer;
class FormulaBuffer;
class WorkbookGlobals;
-typedef std::shared_ptr< WorkbookGlobals > WorkbookGlobalsRef;
+typedef ::boost::shared_ptr< WorkbookGlobals > WorkbookGlobalsRef;
/** Helper class to provice access to global workbook data.
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index 41d86dedd3bc..0d614377aaa1 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -164,7 +164,7 @@ struct ValidationModel
};
class WorksheetGlobals;
-typedef std::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef;
+typedef ::boost::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef;
class IWorksheetProgress {
public:
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 5567dc1119ff..3fdf8dd839a1 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -64,7 +64,7 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
private:
- typedef std::unique_ptr< XclExpSstImpl > XclExpSstImplPtr;
+ typedef boost::scoped_ptr< XclExpSstImpl > XclExpSstImplPtr;
XclExpSstImplPtr mxImpl;
};
@@ -123,7 +123,7 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE;
private:
- typedef std::unique_ptr< SvStream > SvStreamPtr;
+ typedef boost::scoped_ptr< SvStream > SvStreamPtr;
ScAddress maScPos; /// Position of the hyperlink.
OUString m_Repr; /// Cell representation text.
@@ -180,7 +180,7 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE;
private:
- typedef std::unique_ptr< XclExpCFImpl > XclExpCFImplPtr;
+ typedef boost::scoped_ptr< XclExpCFImpl > XclExpCFImplPtr;
XclExpCFImplPtr mxImpl;
};
@@ -272,9 +272,9 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
private:
- std::unique_ptr<XclExpCfvo> mpCfvoLowerLimit;
- std::unique_ptr<XclExpCfvo> mpCfvoUpperLimit;
- std::unique_ptr<XclExpColScaleCol> mpCol;
+ boost::scoped_ptr<XclExpCfvo> mpCfvoLowerLimit;
+ boost::scoped_ptr<XclExpCfvo> mpCfvoUpperLimit;
+ boost::scoped_ptr<XclExpColScaleCol> mpCol;
const ScDataBarFormat& mrFormat;
sal_Int32 mnPriority;
diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx
index f42d2b4c6397..e04f2dfaa5b4 100644
--- a/sc/source/filter/inc/xeformula.hxx
+++ b/sc/source/filter/inc/xeformula.hxx
@@ -22,7 +22,7 @@
#include "xlformula.hxx"
#include "xeroot.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
// External reference log =====================================================
@@ -83,7 +83,7 @@ public:
bool IsRef2D( const ScComplexRefData& rRefData ) const;
private:
- typedef std::shared_ptr< XclExpFmlaCompImpl > XclExpFmlaCompImplRef;
+ typedef boost::shared_ptr< XclExpFmlaCompImpl > XclExpFmlaCompImplRef;
XclExpFmlaCompImplRef mxImpl;
};
diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx
index fd3a8374d2d7..9209b7e9a977 100644
--- a/sc/source/filter/inc/xelink.hxx
+++ b/sc/source/filter/inc/xelink.hxx
@@ -26,7 +26,7 @@
#include "xehelper.hxx"
#include "xeformula.hxx"
#include "externalrefmgr.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
struct ScSingleRefData;
struct ScComplexRefData;
@@ -204,7 +204,7 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
private:
- typedef std::shared_ptr< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr;
+ typedef boost::shared_ptr< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr;
XclExpLinkMgrImplPtr mxImpl;
};
diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx
index 48188dbfc6e7..9d2844ae1c04 100644
--- a/sc/source/filter/inc/xename.hxx
+++ b/sc/source/filter/inc/xename.hxx
@@ -24,7 +24,7 @@
#include "xlname.hxx"
#include "xlformula.hxx"
#include "xeroot.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
class ScRangeList;
class XclExpNameManagerImpl;
@@ -68,7 +68,7 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
private:
- typedef std::shared_ptr< XclExpNameManagerImpl > XclExpNameMgrImplRef;
+ typedef boost::shared_ptr< XclExpNameManagerImpl > XclExpNameMgrImplRef;
XclExpNameMgrImplRef mxImpl;
};
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index a4177dc70df1..56dc6ec4808b 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -45,7 +45,7 @@ Output stream class for Excel export
class XclExpRoot;
class XclExpBiff8Encrypter;
-typedef std::shared_ptr< XclExpBiff8Encrypter > XclExpEncrypterRef;
+typedef boost::shared_ptr< XclExpBiff8Encrypter > XclExpEncrypterRef;
/** This class is used to export Excel record streams.
@descr An instance is constructed with an SvStream and the maximum size of Excel
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index f08b71c61e61..9e2c2151faec 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -30,7 +30,8 @@
#include "xeroot.hxx"
#include "conditio.hxx"
#include "fonthelper.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
/* ============================================================================
@@ -118,7 +119,7 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE;
private:
- typedef std::shared_ptr< XclExpPaletteImpl > XclExpPaletteImplRef;
+ typedef boost::shared_ptr< XclExpPaletteImpl > XclExpPaletteImplRef;
XclExpPaletteImplRef mxImpl;
};
@@ -313,7 +314,7 @@ private:
SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion.
XclExpNumFmtVec maFormatMap; /// Maps core formats to Excel indexes.
- std::unique_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table.
+ boost::scoped_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table.
sal_uLong mnStdFmt; /// Key for standard number format.
sal_uInt16 mnXclOffset; /// Offset to first user defined format.
};
@@ -717,12 +718,12 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
private:
- std::unique_ptr<XclExpCellAlign> mpAlign;
- std::unique_ptr<XclExpCellBorder> mpBorder;
- std::unique_ptr<XclExpDxfFont> mpFont;
- std::unique_ptr<XclExpNumFmt> mpNumberFmt;
- std::unique_ptr<XclExpCellProt> mpProt;
- std::unique_ptr<XclExpColor> mpColor;
+ boost::scoped_ptr<XclExpCellAlign> mpAlign;
+ boost::scoped_ptr<XclExpCellBorder> mpBorder;
+ boost::scoped_ptr<XclExpDxfFont> mpFont;
+ boost::scoped_ptr<XclExpNumFmt> mpNumberFmt;
+ boost::scoped_ptr<XclExpCellProt> mpProt;
+ boost::scoped_ptr<XclExpColor> mpColor;
};
class XclExpDxfs : public XclExpRecordBase, protected XclExpRoot
@@ -739,7 +740,7 @@ private:
std::map<OUString, sal_Int32> maStyleNameToDxfId;
DxfContainer maDxf;
SvNumberFormatterPtr mxFormatter; /// Special number formatter for conversion.
- std::unique_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table.
+ boost::scoped_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table.
};
class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 9d1dfff38453..cc1522fb939d 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -20,11 +20,10 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_XICHART_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_XICHART_HXX
+#include <vector>
+#include <map>
#include <set>
#include <list>
-#include <map>
-#include <memory>
-#include <vector>
#include <svl/itemset.hxx>
@@ -34,6 +33,7 @@
#include "xlstyle.hxx"
#include "xiescher.hxx"
#include "xistring.hxx"
+#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
namespace com { namespace sun { namespace star {
@@ -166,7 +166,7 @@ public:
sal_uInt16 nAngle );
private:
- typedef std::shared_ptr< XclImpChRootData > XclImpChRootDataRef;
+ typedef boost::shared_ptr< XclImpChRootData > XclImpChRootDataRef;
XclImpChRootDataRef mxChData; /// Reference to the root data object.
};
@@ -211,7 +211,7 @@ private:
XclChFramePos maData; /// Position of the frame.
};
-typedef std::shared_ptr< XclImpChFramePos > XclImpChFramePosRef;
+typedef boost::shared_ptr< XclImpChFramePos > XclImpChFramePosRef;
/** The CHLINEFORMAT record containing line formatting data. */
class XclImpChLineFormat
@@ -243,7 +243,7 @@ private:
XclChLineFormat maData; /// Contents of the CHLINEFORMAT record.
};
-typedef std::shared_ptr< XclImpChLineFormat > XclImpChLineFormatRef;
+typedef boost::shared_ptr< XclImpChLineFormat > XclImpChLineFormatRef;
/** The CHAREAFORMAT record containing simple area formatting data (solid or patterns). */
class XclImpChAreaFormat
@@ -271,7 +271,7 @@ private:
XclChAreaFormat maData; /// Contents of the CHAREAFORMAT record.
};
-typedef std::shared_ptr< XclImpChAreaFormat > XclImpChAreaFormatRef;
+typedef boost::shared_ptr< XclImpChAreaFormat > XclImpChAreaFormatRef;
/** The CHESCHERFORMAT record containing complex area formatting data (bitmaps, hatches). */
class XclImpChEscherFormat : public XclImpChGroupBase
@@ -294,7 +294,7 @@ private:
sal_uInt32 mnDffFillType; /// Fill type imported from the DFF property set.
};
-typedef std::shared_ptr< XclImpChEscherFormat > XclImpChEscherFormatRef;
+typedef boost::shared_ptr< XclImpChEscherFormat > XclImpChEscherFormatRef;
/** Base class for record groups containing frame formatting.
@@ -370,7 +370,7 @@ private:
XclChObjectType meObjType; /// Type of the represented object.
};
-typedef std::shared_ptr< XclImpChFrame > XclImpChFrameRef;
+typedef boost::shared_ptr< XclImpChFrame > XclImpChFrameRef;
// Source links ===============================================================
@@ -415,10 +415,10 @@ public:
private:
XclChSourceLink maData; /// Contents of the CHSOURCELINK record.
XclImpStringRef mxString; /// Text data (CHSTRING record).
- std::shared_ptr< ScTokenArray> mxTokenArray; /// Token array representing the data ranges.
+ boost::shared_ptr< ScTokenArray> mxTokenArray; /// Token array representing the data ranges.
};
-typedef std::shared_ptr< XclImpChSourceLink > XclImpChSourceLinkRef;
+typedef boost::shared_ptr< XclImpChSourceLink > XclImpChSourceLinkRef;
// Text =======================================================================
@@ -456,7 +456,7 @@ private:
sal_uInt16 mnFontIdx; /// Index into font buffer.
};
-typedef std::shared_ptr< XclImpChFont > XclImpChFontRef;
+typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef;
/** Represents the CHTEXT record group containing text object properties.
@@ -519,7 +519,7 @@ private:
void ReadChFrLabelProps( XclImpStream& rStrm );
private:
- typedef std::shared_ptr< XclChFrLabelProps > XclChFrLabelPropsRef;
+ typedef boost::shared_ptr< XclChFrLabelProps > XclChFrLabelPropsRef;
XclChText maData; /// Contents of the CHTEXT record.
XclChObjectLink maObjLink; /// Link target for this text object.
@@ -531,7 +531,7 @@ private:
XclChFrLabelPropsRef mxLabelProps; /// Extended data label properties (CHFRLABELPROPS record).
};
-typedef std::shared_ptr< XclImpChText > XclImpChTextRef;
+typedef boost::shared_ptr< XclImpChText > XclImpChTextRef;
// Data series ================================================================
@@ -556,7 +556,7 @@ private:
XclChMarkerFormat maData; /// Contents of the CHMARKERFORMAT record.
};
-typedef std::shared_ptr< XclImpChMarkerFormat > XclImpChMarkerFormatRef;
+typedef boost::shared_ptr< XclImpChMarkerFormat > XclImpChMarkerFormatRef;
/** The CHPIEFORMAT record containing data point formatting data for pie segments. */
class XclImpChPieFormat
@@ -572,7 +572,7 @@ private:
sal_uInt16 mnPieDist; /// Pie distance to diagram center.
};
-typedef std::shared_ptr< XclImpChPieFormat > XclImpChPieFormatRef;
+typedef boost::shared_ptr< XclImpChPieFormat > XclImpChPieFormatRef;
/** The CHSERIESFORMAT record containing additional settings for a data series. */
class XclImpChSeriesFormat
@@ -588,7 +588,7 @@ private:
sal_uInt16 mnFlags; /// Additional flags.
};
-typedef std::shared_ptr< XclImpChSeriesFormat > XclImpChSeriesFormatRef;
+typedef boost::shared_ptr< XclImpChSeriesFormat > XclImpChSeriesFormatRef;
/** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */
class XclImpCh3dDataFormat
@@ -603,7 +603,7 @@ private:
XclCh3dDataFormat maData; /// Contents of the CH3DDATAFORMAT record.
};
-typedef std::shared_ptr< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef;
+typedef boost::shared_ptr< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef;
/** The CHATTACHEDLABEL record that contains the type of a data point label. */
class XclImpChAttachedLabel : protected XclImpChRoot
@@ -619,7 +619,7 @@ private:
sal_uInt16 mnFlags; /// Additional flags.
};
-typedef std::shared_ptr< XclImpChAttachedLabel > XclImpChAttLabelRef;
+typedef boost::shared_ptr< XclImpChAttachedLabel > XclImpChAttLabelRef;
/** Represents the CHDATAFORMAT record group containing data point properties.
@@ -685,7 +685,7 @@ private:
XclImpChTextRef mxLabel; /// Data point label formatting (CHTEXT group).
};
-typedef std::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef;
+typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef;
/** Represents the CHSERTRENDLINE record containing settings for a trend line. */
class XclImpChSerTrendLine : protected XclImpChRoot
@@ -710,7 +710,7 @@ private:
XclImpChDataFormatRef mxDataFmt; /// Formatting settings of the trend line.
};
-typedef std::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef;
+typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef;
/** Represents the CHSERERRORBAR record containing settings for error bars. */
class XclImpChSerErrorBar : protected XclImpChRoot
@@ -743,7 +743,7 @@ private:
XclImpChDataFormatRef mxDataFmt; /// Formatting settings of the error bars.
};
-typedef std::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
+typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
/** Represents the CHSERIES record group describing a data series in a chart.
@@ -838,7 +838,7 @@ private:
sal_uInt16 mnParentIdx; /// 0-based index of parent series (trend lines and error bars).
};
-typedef std::shared_ptr< XclImpChSeries > XclImpChSeriesRef;
+typedef boost::shared_ptr< XclImpChSeries > XclImpChSeriesRef;
// Chart type groups ==========================================================
@@ -891,7 +891,7 @@ private:
XclChChart3d maData; /// Contents of the CHCHART3D record.
};
-typedef std::shared_ptr< XclImpChChart3d > XclImpChChart3dRef;
+typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef;
/** Represents the CHLEGEND record group describing the chart legend.
@@ -921,7 +921,7 @@ private:
XclImpChFrameRef mxFrame; /// Legend frame format (CHFRAME group).
};
-typedef std::shared_ptr< XclImpChLegend > XclImpChLegendRef;
+typedef boost::shared_ptr< XclImpChLegend > XclImpChLegendRef;
/** Represents the CHDROPBAR record group describing pos/neg bars in line charts.
@@ -944,7 +944,7 @@ private:
sal_uInt16 mnBarDist; /// Distance between bars (CHDROPBAR record).
};
-typedef std::shared_ptr< XclImpChDropBar > XclImpChDropBarRef;
+typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef;
/** Represents the CHTYPEGROUP record group describing a group of series.
@@ -1056,7 +1056,7 @@ private:
UInt16Set maUnusedFormats; /// Contains unused format indexes for automatic colors.
};
-typedef std::shared_ptr< XclImpChTypeGroup > XclImpChTypeGroupRef;
+typedef boost::shared_ptr< XclImpChTypeGroup > XclImpChTypeGroupRef;
// Axes =======================================================================
@@ -1078,7 +1078,7 @@ private:
XclChDateRange maDateData; /// Contents of the CHDATERANGE record.
};
-typedef std::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef;
+typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef;
class XclImpChValueRange : protected XclImpChRoot
{
@@ -1095,7 +1095,7 @@ private:
XclChValueRange maData; /// Contents of the CHVALUERANGE record.
};
-typedef std::shared_ptr< XclImpChValueRange > XclImpChValueRangeRef;
+typedef boost::shared_ptr< XclImpChValueRange > XclImpChValueRangeRef;
class XclImpChTick : protected XclImpChRoot
{
@@ -1118,7 +1118,7 @@ private:
XclChTick maData; /// Contents of the CHTICK record.
};
-typedef std::shared_ptr< XclImpChTick > XclImpChTickRef;
+typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef;
/** Represents the CHAXIS record group describing an entire chart axis.
@@ -1185,7 +1185,7 @@ private:
sal_uInt16 mnNumFmtIdx; /// Index into number format buffer (CHFORMAT record).
};
-typedef std::shared_ptr< XclImpChAxis > XclImpChAxisRef;
+typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef;
/** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes).
@@ -1266,7 +1266,7 @@ private:
XclImpChTypeGroupMap maTypeGroups; /// Chart type groups (CHTYPEGROUP group).
};
-typedef std::shared_ptr< XclImpChAxesSet > XclImpChAxesSetRef;
+typedef boost::shared_ptr< XclImpChAxesSet > XclImpChAxesSetRef;
// The chart object ===========================================================
@@ -1351,7 +1351,7 @@ private:
XclImpChLegendRef mxLegend; /// Chart legend (CHLEGEND group).
};
-typedef std::shared_ptr< XclImpChChart > XclImpChChartRef;
+typedef boost::shared_ptr< XclImpChChart > XclImpChChartRef;
/** Drawing container of a chart. */
class XclImpChartDrawing : public XclImpDrawing
@@ -1409,7 +1409,7 @@ private:
void ReadChChart( XclImpStream& rStrm );
private:
- typedef std::shared_ptr< XclImpChartDrawing > XclImpChartDrawingRef;
+ typedef boost::shared_ptr< XclImpChartDrawing > XclImpChartDrawingRef;
XclImpChChartRef mxChartData; /// The chart data (CHCHART group).
XclImpChartDrawingRef mxChartDrawing; /// Drawing container for embedded shapes.
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index df48ba8e4dac..e123a14031c2 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -20,16 +20,17 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_XIESCHER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_XIESCHER_HXX
+#include <vector>
+#include <map>
#include <filter/msfilter/msdffimp.hxx>
#include <vcl/graph.hxx>
#include "xlescher.hxx"
#include "xiroot.hxx"
#include "xistring.hxx"
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
#include <oox/ole/olehelper.hxx>
#include <rtl/ustring.hxx>
-#include <map>
-#include <memory>
-#include <vector>
namespace com { namespace sun { namespace star {
namespace drawing { class XShape; }
@@ -47,7 +48,7 @@ class XclImpDrawing;
// Drawing objects ============================================================
class XclImpDrawObjBase;
-typedef std::shared_ptr< XclImpDrawObjBase > XclImpDrawObjRef;
+typedef boost::shared_ptr< XclImpDrawObjBase > XclImpDrawObjRef;
/** Base class for drawing objects (OBJ records). */
class XclImpDrawObjBase : protected XclImpRoot
@@ -205,13 +206,13 @@ private:
class XclImpDrawObjVector
{
private:
- std::vector< XclImpDrawObjRef > mObjs;
+ ::std::vector< XclImpDrawObjRef > mObjs;
public:
inline explicit XclImpDrawObjVector() : mObjs() {}
- std::vector< XclImpDrawObjRef >::const_iterator begin() const { return mObjs.begin(); }
- std::vector< XclImpDrawObjRef >::const_iterator end() const { return mObjs.end(); }
+ ::std::vector< XclImpDrawObjRef >::const_iterator begin() const { return mObjs.begin(); }
+ ::std::vector< XclImpDrawObjRef >::const_iterator end() const { return mObjs.end(); }
void push_back(const XclImpDrawObjRef& rObj) { mObjs.push_back(rObj); }
/** Tries to insert the passed object into the last group or appends it. */
@@ -355,7 +356,7 @@ protected:
virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE;
protected:
- typedef std::vector< Point > PointVector;
+ typedef ::std::vector< Point > PointVector;
PointVector maCoords; /// Coordinates relative to bounding rectangle.
sal_uInt16 mnPolyFlags; /// Additional flags.
sal_uInt16 mnPointCount; /// Polygon point count.
@@ -428,7 +429,7 @@ private:
void FinalizeTabChart();
private:
- typedef std::shared_ptr< XclImpChart > XclImpChartRef;
+ typedef boost::shared_ptr< XclImpChart > XclImpChartRef;
XclImpChartRef mxChart; /// The chart itself (BOF/EOF substream data).
bool mbOwnTab; /// true = own sheet; false = embedded object.
@@ -482,7 +483,7 @@ protected:
void ApplySheetLinkProps() const;
mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
mxShape; /// The UNO wrapper of the control shape.
- std::shared_ptr< ScAddress > mxCellLink; /// Linked cell in the Calc document.
+ boost::shared_ptr< ScAddress > mxCellLink; /// Linked cell in the Calc document.
private:
/** Reads a list of cell ranges from a formula at the current stream position. */
void ReadRangeList( ScRangeList& rScRanges, XclImpStream& rStrm );
@@ -491,7 +492,7 @@ private:
private:
const XclImpRoot& mrRoot; /// Not derived from XclImpRoot to allow multiple inheritance.
- std::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document.
+ boost::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document.
XclCtrlBindMode meBindMode; /// Value binding mode.
};
@@ -897,8 +898,8 @@ private:
inline void Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags )
{ mpSdrObj = pSdrObj; mnDffFlags = nDffFlags; }
};
- typedef std::map< sal_uInt32, XclImpSdrInfo > XclImpSdrInfoMap;
- typedef std::map< SdrObject*, sal_uInt32 > XclImpSdrObjMap;
+ typedef ::std::map< sal_uInt32, XclImpSdrInfo > XclImpSdrInfoMap;
+ typedef ::std::map< SdrObject*, sal_uInt32 > XclImpSdrObjMap;
XclImpSdrInfoMap maSdrInfoMap; /// Maps shape IDs to SdrObjects and flags.
XclImpSdrObjMap maSdrObjMap; /// Maps SdrObjects to shape IDs.
@@ -1025,9 +1026,9 @@ private:
void InitControlForm();
private:
- typedef std::shared_ptr< ScfProgressBar > ScfProgressBarRef;
- typedef std::shared_ptr< XclImpDffConvData > XclImpDffConvDataRef;
- typedef std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack;
+ typedef boost::shared_ptr< ScfProgressBar > ScfProgressBarRef;
+ typedef boost::shared_ptr< XclImpDffConvData > XclImpDffConvDataRef;
+ typedef ::std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack;
const OUString maStdFormName; /// Standard name of control forms.
tools::SvRef<SotStorageStream> mxCtlsStrm; /// The 'Ctls' stream for OCX form controls.
@@ -1094,10 +1095,10 @@ private:
void ReadTxo( XclImpStream& rStrm );
private:
- typedef std::map< sal_Size, XclImpDrawObjRef > XclImpObjMap;
- typedef std::map< sal_uInt16, XclImpDrawObjRef > XclImpObjMapById;
- typedef std::shared_ptr< XclImpObjTextData > XclImpObjTextRef;
- typedef std::map< sal_Size, XclImpObjTextRef > XclImpObjTextMap;
+ typedef ::std::map< sal_Size, XclImpDrawObjRef > XclImpObjMap;
+ typedef ::std::map< sal_uInt16, XclImpDrawObjRef > XclImpObjMapById;
+ typedef boost::shared_ptr< XclImpObjTextData > XclImpObjTextRef;
+ typedef ::std::map< sal_Size, XclImpObjTextRef > XclImpObjTextMap;
XclImpDrawObjVector maRawObjs; /// BIFF5 objects without DFF data.
SvMemoryStream maDffStrm; /// Copy of the DFF page stream in memory.
@@ -1169,9 +1170,9 @@ public:
OUString GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId );
private:
- typedef std::map< sal_uInt16, OUString > DefObjNameMap;
- typedef std::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef;
- typedef std::map< SCTAB, XclImpSheetDrawingRef > XclImpSheetDrawingMap;
+ typedef ::std::map< sal_uInt16, OUString > DefObjNameMap;
+ typedef boost::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef;
+ typedef ::std::map< SCTAB, XclImpSheetDrawingRef > XclImpSheetDrawingMap;
com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxOleCtrlNameOverride;
DefObjNameMap maDefObjNames; /// Default base names for all object types.
@@ -1202,7 +1203,7 @@ public:
void FillToItemSet( SfxItemSet& rItemSet ) const;
private:
- typedef std::unique_ptr<SvMemoryStream> SvMemoryStreamPtr;
+ typedef ::boost::scoped_ptr<SvMemoryStream> SvMemoryStreamPtr;
SvMemoryStream maDummyStrm; /// Dummy DGG stream for DFF manager.
XclImpSimpleDffConverter maDffConv; /// DFF converter used to resolve palette colors.
diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx
index 56729e88336a..4c8b70e2b3d1 100644
--- a/sc/source/filter/inc/xiformula.hxx
+++ b/sc/source/filter/inc/xiformula.hxx
@@ -22,7 +22,7 @@
#include "xlformula.hxx"
#include "xiroot.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
// Formula compiler ===========================================================
@@ -51,7 +51,7 @@ public:
const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr );
private:
- typedef std::shared_ptr< XclImpFmlaCompImpl > XclImpFmlaCompImplRef;
+ typedef boost::shared_ptr< XclImpFmlaCompImpl > XclImpFmlaCompImplRef;
XclImpFmlaCompImplRef mxImpl;
};
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index b8f12e8c2395..3e54efe7dc0f 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -22,12 +22,12 @@
#include <editeng/editdata.hxx>
#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include "types.hxx"
#include "xladdress.hxx"
#include "xiroot.hxx"
#include "xistring.hxx"
-#include <memory>
class ScRangeList;
@@ -185,7 +185,7 @@ private: // types
/** Contains all information about a header/footer portion. */
struct XclImpHFPortionInfo
{
- typedef std::shared_ptr< EditTextObject > EditTextObjectRef;
+ typedef boost::shared_ptr< EditTextObject > EditTextObjectRef;
EditTextObjectRef mxObj; /// Edit engine text object.
ESelection maSel; /// Edit engine selection.
sal_Int32 mnHeight; /// Height of previous lines in twips.
diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx
index 4cc53b581a71..75a5936b9b22 100644
--- a/sc/source/filter/inc/xiname.hxx
+++ b/sc/source/filter/inc/xiname.hxx
@@ -28,7 +28,7 @@
#include "rangenam.hxx"
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class ScRangeData;
class ScTokenArray;
@@ -72,7 +72,7 @@ private:
bool mbVBName:1; /// true = Visual Basic procedure or function.
bool mbMacro:1; /// Whether it's a user-defined macro.
- std::unique_ptr<TokenStrmData> mpTokensData; /// For later conversion of token array.
+ boost::scoped_ptr<TokenStrmData> mpTokensData; /// For later conversion of token array.
};
/** This buffer contains all internal defined names of the document.
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index 099d885ebfeb..818c7b7714e4 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -21,14 +21,14 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_XIROOT_HXX
#include "xlroot.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
// Forward declarations of objects in public use ==============================
class XclImpStream;
class XclImpString;
-typedef std::shared_ptr< XclImpString > XclImpStringRef;
+typedef boost::shared_ptr< XclImpString > XclImpStringRef;
// Global data ================================================================
@@ -63,28 +63,28 @@ class ScDocumentImport;
/** Stores global buffers and data needed for Excel import filter. */
struct XclImpRootData : public XclRootData
{
- typedef std::shared_ptr< XclImpAddressConverter > XclImpAddrConvRef;
- typedef std::shared_ptr< XclImpFormulaCompiler > XclImpFmlaCompRef;
-
- typedef std::shared_ptr< XclImpSst > XclImpSstRef;
- typedef std::shared_ptr< XclImpPalette > XclImpPaletteRef;
- typedef std::shared_ptr< XclImpFontBuffer > XclImpFontBfrRef;
- typedef std::shared_ptr< XclImpNumFmtBuffer > XclImpNumFmtBfrRef;
- typedef std::shared_ptr< XclImpXFBuffer > XclImpXFBfrRef;
- typedef std::shared_ptr< XclImpXFRangeBuffer > XclImpXFRangeBfrRef;
- typedef std::shared_ptr< XclImpTabInfo > XclImpTabInfoRef;
- typedef std::shared_ptr< XclImpNameManager > XclImpNameMgrRef;
- typedef std::shared_ptr< XclImpLinkManager > XclImpLinkMgrRef;
- typedef std::shared_ptr< XclImpObjectManager > XclImpObjectMgrRef;
- typedef std::shared_ptr< XclImpCondFormatManager > XclImpCondFmtMgrRef;
- typedef std::shared_ptr< XclImpValidationManager > XclImpValidationMgrRef;
- typedef std::shared_ptr< XclImpWebQueryBuffer > XclImpWebQueryBfrRef;
- typedef std::shared_ptr< XclImpPivotTableManager > XclImpPTableMgrRef;
- typedef std::shared_ptr< XclImpPageSettings > XclImpPageSettRef;
- typedef std::shared_ptr< XclImpDocViewSettings > XclImpDocViewSettRef;
- typedef std::shared_ptr< XclImpTabViewSettings > XclImpTabViewSettRef;
- typedef std::shared_ptr< XclImpSheetProtectBuffer > XclImpTabProtectRef;
- typedef std::shared_ptr< XclImpDocProtectBuffer > XclImpDocProtectRef;
+ typedef boost::shared_ptr< XclImpAddressConverter > XclImpAddrConvRef;
+ typedef boost::shared_ptr< XclImpFormulaCompiler > XclImpFmlaCompRef;
+
+ typedef boost::shared_ptr< XclImpSst > XclImpSstRef;
+ typedef boost::shared_ptr< XclImpPalette > XclImpPaletteRef;
+ typedef boost::shared_ptr< XclImpFontBuffer > XclImpFontBfrRef;
+ typedef boost::shared_ptr< XclImpNumFmtBuffer > XclImpNumFmtBfrRef;
+ typedef boost::shared_ptr< XclImpXFBuffer > XclImpXFBfrRef;
+ typedef boost::shared_ptr< XclImpXFRangeBuffer > XclImpXFRangeBfrRef;
+ typedef boost::shared_ptr< XclImpTabInfo > XclImpTabInfoRef;
+ typedef boost::shared_ptr< XclImpNameManager > XclImpNameMgrRef;
+ typedef boost::shared_ptr< XclImpLinkManager > XclImpLinkMgrRef;
+ typedef boost::shared_ptr< XclImpObjectManager > XclImpObjectMgrRef;
+ typedef boost::shared_ptr< XclImpCondFormatManager > XclImpCondFmtMgrRef;
+ typedef boost::shared_ptr< XclImpValidationManager > XclImpValidationMgrRef;
+ typedef boost::shared_ptr< XclImpWebQueryBuffer > XclImpWebQueryBfrRef;
+ typedef boost::shared_ptr< XclImpPivotTableManager > XclImpPTableMgrRef;
+ typedef boost::shared_ptr< XclImpPageSettings > XclImpPageSettRef;
+ typedef boost::shared_ptr< XclImpDocViewSettings > XclImpDocViewSettRef;
+ typedef boost::shared_ptr< XclImpTabViewSettings > XclImpTabViewSettRef;
+ typedef boost::shared_ptr< XclImpSheetProtectBuffer > XclImpTabProtectRef;
+ typedef boost::shared_ptr< XclImpDocProtectBuffer > XclImpDocProtectRef;
XclImpAddrConvRef mxAddrConv; /// The address converter.
XclImpFmlaCompRef mxFmlaComp; /// The formula compiler.
@@ -112,7 +112,7 @@ struct XclImpRootData : public XclRootData
XclImpTabProtectRef mxTabProtect; /// Sheet protection options for current sheet.
XclImpDocProtectRef mxDocProtect; /// Document protection options.
- std::shared_ptr<ScDocumentImport> mxDocImport;
+ boost::shared_ptr<ScDocumentImport> mxDocImport;
bool mbHasCodePage; /// true = CODEPAGE record exists.
bool mbHasBasic; /// true = document contains VB project.
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index 0843cd187b3b..45a916550118 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -22,7 +22,7 @@
#include <comphelper/docpasswordhelper.hxx>
#include <filter/msfilter/mscodec.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include "xlstream.hxx"
#include "xlconst.hxx"
@@ -37,7 +37,7 @@ Input stream class for Excel import
// Decryption
class XclImpDecrypter;
-typedef std::shared_ptr< XclImpDecrypter > XclImpDecrypterRef;
+typedef boost::shared_ptr< XclImpDecrypter > XclImpDecrypterRef;
/** Base class for BIFF stream decryption. */
class XclImpDecrypter : public ::comphelper::IDocPasswordVerifier
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index f4dc557c9c32..9a767fe853ff 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_XISTYLE_HXX
#include <list>
-#include <memory>
#include <tools/mempool.hxx>
#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include "rangelst.hxx"
#include "patattr.hxx"
@@ -649,7 +649,7 @@ private:
void SetBorderLine( const ScRange& rRange, SCTAB nScTab, SvxBoxItemLine nLine );
private:
- typedef std::shared_ptr< XclImpXFRangeColumn > XclImpXFRangeColumnRef;
+ typedef boost::shared_ptr< XclImpXFRangeColumn > XclImpXFRangeColumnRef;
typedef ::std::vector< XclImpXFRangeColumnRef > XclImpXFRangeColumnVec;
typedef ::std::pair< XclRange, OUString > XclImpHyperlinkRange;
typedef ::std::list< XclImpHyperlinkRange > XclImpHyperlinkList;
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index d93c2ebb50ed..2f10c3da4b4d 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_XLFORMULA_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_XLFORMULA_HXX
+#include <map>
#include <osl/diagnose.h>
#include <formula/opcode.hxx>
#include "address.hxx"
#include "ftools.hxx"
-#include <map>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace svl {
@@ -414,7 +414,7 @@ private:
bool mbVolatile; /// True = Formula contains volatile function.
};
-typedef std::shared_ptr< XclTokenArray > XclTokenArrayRef;
+typedef boost::shared_ptr< XclTokenArray > XclTokenArrayRef;
/** Calls the Read() function at the passed token array. */
XclImpStream& operator>>( XclImpStream& rStrm, XclTokenArray& rTokArr );
diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx
index b60d21a3f4a9..f5333b96fcbf 100644
--- a/sc/source/filter/inc/xlpage.hxx
+++ b/sc/source/filter/inc/xlpage.hxx
@@ -23,7 +23,6 @@
#include <tools/gen.hxx>
#include <boost/noncopyable.hpp>
#include "xltools.hxx"
-#include <memory>
// Constants and Enumerations =================================================
@@ -92,7 +91,7 @@ class SvxBrushItem;
/** Contains all page (print) settings for a single sheet. */
struct XclPageData : private boost::noncopyable
{
- typedef std::unique_ptr< SvxBrushItem > SvxBrushItemPtr;
+ typedef ::std::unique_ptr< SvxBrushItem > SvxBrushItemPtr;
ScfUInt16Vec maHorPageBreaks; /// Horizontal page breaks.
ScfUInt16Vec maVerPageBreaks; /// Vertical page breaks.
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index b0afc1a9363a..601cd2f7c9a7 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -32,7 +32,7 @@
#include "xladdress.hxx"
#include "dpobject.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class XclImpStream;
class XclExpStream;
@@ -618,7 +618,7 @@ struct XclPTFieldExtInfo
sal_uInt16 mnSortField; /// Index to data field sorting bases on.
sal_uInt16 mnShowField; /// Index to data field AutoShow bases on.
sal_uInt16 mnNumFmt;
- std::unique_ptr<OUString> mpFieldTotalName;
+ boost::scoped_ptr<OUString> mpFieldTotalName;
explicit XclPTFieldExtInfo();
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 645fe797db82..b47043bbda90 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -27,7 +27,7 @@
#include "xlconst.hxx"
#include "xltools.hxx"
#include <documentimport.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace comphelper { class IDocPasswordVerifier; }
@@ -67,14 +67,14 @@ struct XclRootData
: public XclDebugObjCounter
#endif
{
- typedef std::shared_ptr< ScEditEngineDefaulter > ScEEDefaulterRef;
- typedef std::shared_ptr< ScHeaderEditEngine > ScHeaderEERef;
- typedef std::shared_ptr< EditEngine > EditEngineRef;
- typedef std::shared_ptr< XclFontPropSetHelper > XclFontPropSetHlpRef;
- typedef std::shared_ptr< XclChPropSetHelper > XclChPropSetHlpRef;
- typedef std::shared_ptr< ScExtDocOptions > ScExtDocOptRef;
- typedef std::shared_ptr< XclTracer > XclTracerRef;
- typedef std::shared_ptr< RootData > RootDataRef;
+ typedef boost::shared_ptr< ScEditEngineDefaulter > ScEEDefaulterRef;
+ typedef boost::shared_ptr< ScHeaderEditEngine > ScHeaderEERef;
+ typedef boost::shared_ptr< EditEngine > EditEngineRef;
+ typedef boost::shared_ptr< XclFontPropSetHelper > XclFontPropSetHlpRef;
+ typedef boost::shared_ptr< XclChPropSetHelper > XclChPropSetHlpRef;
+ typedef boost::shared_ptr< ScExtDocOptions > ScExtDocOptRef;
+ typedef boost::shared_ptr< XclTracer > XclTracerRef;
+ typedef boost::shared_ptr< RootData > RootDataRef;
XclBiff meBiff; /// Current BIFF version.
XclOutput meOutput; /// Current Output format.
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 5bdd68d0665e..37d88d0cf5f3 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -20,11 +20,11 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_XLVIEW_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_XLVIEW_HXX
+#include <map>
#include <tools/color.hxx>
#include "ftools.hxx"
#include "xladdress.hxx"
-#include <map>
-#include <memory>
+#include <boost/shared_ptr.hpp>
// Constants and enumerations =================================================
@@ -112,7 +112,7 @@ struct XclSelectionData
inline explicit XclSelectionData() : mnCursorIdx( 0 ) {}
};
-typedef std::shared_ptr< XclSelectionData > XclSelectionDataRef;
+typedef boost::shared_ptr< XclSelectionData > XclSelectionDataRef;
/** Contains all view settings for a single sheet. */
struct XclTabViewData
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 293551cb2c45..39a7d3e4b7fe 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -36,8 +36,8 @@ using namespace ::com::sun::star::table;
using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::container;
+#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
-#include <memory>
namespace oox { namespace xls {
@@ -250,7 +250,7 @@ void applyArrayFormulas(
ScCompiler aComp(&rDoc.getDoc(), aPos);
aComp.SetNumberFormatter(&rFormatter);
aComp.SetGrammar(formula::FormulaGrammar::GRAM_OOXML);
- std::unique_ptr<ScTokenArray> pArray(aComp.CompileString(it->maTokenAndAddress.maTokenStr));
+ boost::scoped_ptr<ScTokenArray> pArray(aComp.CompileString(it->maTokenAndAddress.maTokenStr));
if (pArray)
rDoc.setMatrixCells(aRange, *pArray, formula::FormulaGrammar::GRAM_OOXML);
}
@@ -318,7 +318,7 @@ class WorkerThread: public salhelper::Thread, private boost::noncopyable
{
ScDocumentImport& mrDoc;
FormulaBuffer::SheetItem& mrItem;
- std::unique_ptr<SvNumberFormatter> mpFormatter;
+ boost::scoped_ptr<SvNumberFormatter> mpFormatter;
const uno::Sequence<sheet::ExternalLinkInfo>& mrExternalLinks;
public:
diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx
index 14fb06f471ba..e4ca60819958 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -27,7 +27,7 @@
#include <chgviset.hxx>
#include <richstringcontext.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/util/DateTime.hpp>
@@ -266,7 +266,7 @@ void RevisionHeadersFragment::finalizeImport()
const RevisionMetadata& rData = it->second;
pCT->SetUser(rData.maUserName);
pCT->SetFixDateTimeLocal(rData.maDateTime);
- std::unique_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
+ boost::scoped_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
rtl::Reference<oox::core::FragmentHandler> xFragment(new RevisionLogFragment(*this, aPath, *pCT));
importOoxFragment(xFragment, *xParser);
}
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index a3c126730c44..bf63786e9725 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2273,7 +2273,7 @@ void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRan
}
}
- std::unique_ptr<ScPatternAttr> pAttr(new ScPatternAttr(rDoc.getDoc().GetPool()));
+ boost::scoped_ptr<ScPatternAttr> pAttr(new ScPatternAttr(rDoc.getDoc().GetPool()));
{
SvxRotateMode eRotateMode = SVX_ROTATE_MODE_STANDARD;
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 681883f9f222..0560ad52bc8e 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -64,7 +64,7 @@
#include <algorithm>
#include <queue>
#include <thread>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <oox/ole/vbaproject.hxx>
@@ -235,7 +235,7 @@ public:
SolarMutexGuard maGuard;
SAL_INFO( "sc.filter", "got solar\n" );
- std::unique_ptr<oox::core::FastParser> xParser(
+ boost::scoped_ptr<oox::core::FastParser> xParser(
mrWorkbookHandler.getOoxFilter().createParser() );
SAL_INFO( "sc.filter", "start import\n" );
@@ -503,7 +503,7 @@ void WorkbookFragment::finalizeImport()
OUString aRevHeadersPath = getFragmentPathFromFirstType(CREATE_OFFICEDOC_RELATION_TYPE("revisionHeaders"));
if (!aRevHeadersPath.isEmpty())
{
- std::unique_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
+ boost::scoped_ptr<oox::core::FastParser> xParser(getOoxFilter().createParser());
rtl::Reference<oox::core::FragmentHandler> xFragment(new RevisionHeadersFragment(*this, aRevHeadersPath));
importOoxFragment(xFragment, *xParser);
}
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 250a129ae623..883a58d1a7ab 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -86,7 +86,7 @@
#include <officecfg/Office/Calc.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace oox {
namespace xls {
@@ -247,7 +247,7 @@ private:
typedef ::std::unique_ptr< WorkbookSettings > WorkbookSettPtr;
typedef ::std::unique_ptr< ViewSettings > ViewSettingsPtr;
typedef ::std::unique_ptr< WorksheetBuffer > WorksheetBfrPtr;
- typedef ::std::shared_ptr< ThemeBuffer > ThemeBfrRef;
+ typedef ::boost::shared_ptr< ThemeBuffer > ThemeBfrRef;
typedef ::std::unique_ptr< StylesBuffer > StylesBfrPtr;
typedef ::std::unique_ptr< SharedStringsBuffer > SharedStrBfrPtr;
typedef ::std::unique_ptr< ExternalLinkBuffer > ExtLinkBfrPtr;
@@ -312,7 +312,7 @@ private:
bool mbHasCodePage; /// True = CODEPAGE record exists in imported stream.
ScDocument* mpDoc;
ScDocShell* mpDocShell;
- std::unique_ptr<ScDocumentImport> mxDocImport;
+ boost::scoped_ptr<ScDocumentImport> mxDocImport;
};
WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) :
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 25d1475c5d14..ee04869f93d7 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -663,7 +663,7 @@ void ScOrcusSheet::set_array_formula(
ScCompiler aComp(&mrDoc.getDoc(), aRange.aStart);
aComp.SetGrammar(eGrammar);
- std::unique_ptr<ScTokenArray> pArray(aComp.CompileString(aFormula));
+ boost::scoped_ptr<ScTokenArray> pArray(aComp.CompileString(aFormula));
if (!pArray)
return;
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index d988d365dbe8..341dbf79daad 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -56,7 +56,7 @@
#include "globstr.hrc"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange& rRange ) :
maRange( rRange ),
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index c64a78837afa..d4085ef455ea 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -80,7 +80,7 @@
#include <oox/export/vmlexport.hxx>
#include <boost/checked_delete.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -374,7 +374,7 @@ void XclObj::ImplWriteAnchor( const XclExpRoot& /*rRoot*/, const SdrObject* pSdr
}
else if( pSdrObj )
{
- std::unique_ptr< XclExpDffAnchorBase > xDffAnchor( mrEscherEx.CreateDffAnchor( *pSdrObj ) );
+ boost::scoped_ptr< XclExpDffAnchorBase > xDffAnchor( mrEscherEx.CreateDffAnchor( *pSdrObj ) );
xDffAnchor->WriteDffData( mrEscherEx );
}
}
@@ -427,7 +427,7 @@ void XclObj::WriteBody( XclExpStream& rStrm )
// create a substream to be able to create subrecords
SvMemoryStream aMemStrm;
- std::unique_ptr< XclExpStream > pXclStrm( new XclExpStream( aMemStrm, rStrm.GetRoot() ) );
+ boost::scoped_ptr< XclExpStream > pXclStrm( new XclExpStream( aMemStrm, rStrm.GetRoot() ) );
// write the ftCmo subrecord
pXclStrm->StartRecord( EXC_ID_OBJCMO, 18 );
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 12225c2d116f..d0e5a65888e8 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -37,7 +37,7 @@
#include "cellvalue.hxx"
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class ScHorizontalCellIterator;
struct ScMyCell;
@@ -330,7 +330,7 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable
ScMyDetectiveOpContainer* pDetectiveOp;
ScXMLExport& rExport;
- std::unique_ptr<ScHorizontalCellIterator> mpCellItr;
+ boost::scoped_ptr<ScHorizontalCellIterator> mpCellItr;
SCCOL nCellCol;
SCROW nCellRow;
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index 8d701654d0ff..b4f5e74de5ea 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -24,10 +24,10 @@
#include "simplerangelist.hxx"
#include <rtl/ustring.hxx>
-#include <list>
-#include <memory>
#include <set>
#include <vector>
+#include <list>
+#include <boost/shared_ptr.hpp>
class ScXMLImport;
@@ -65,7 +65,7 @@ public:
struct ScMyCurrencyStyle
{
OUString sCurrency;
- std::shared_ptr<ScSimpleRangeList> mpRanges;
+ ::boost::shared_ptr<ScSimpleRangeList> mpRanges;
ScMyCurrencyStyle() :
mpRanges(new ScSimpleRangeList)
@@ -85,13 +85,13 @@ typedef std::set<ScMyCurrencyStyle, LessCurrencyStyle> ScMyCurrencyStylesSet;
class ScMyStyleRanges : public SvRefBase
{
- std::shared_ptr<ScSimpleRangeList> mpTextList;
- std::shared_ptr<ScSimpleRangeList> mpNumberList;
- std::shared_ptr<ScSimpleRangeList> mpTimeList;
- std::shared_ptr<ScSimpleRangeList> mpDateTimeList;
- std::shared_ptr<ScSimpleRangeList> mpPercentList;
- std::shared_ptr<ScSimpleRangeList> mpLogicalList;
- std::shared_ptr<ScSimpleRangeList> mpUndefinedList;
+ ::boost::shared_ptr<ScSimpleRangeList> mpTextList;
+ ::boost::shared_ptr<ScSimpleRangeList> mpNumberList;
+ ::boost::shared_ptr<ScSimpleRangeList> mpTimeList;
+ ::boost::shared_ptr<ScSimpleRangeList> mpDateTimeList;
+ ::boost::shared_ptr<ScSimpleRangeList> mpPercentList;
+ ::boost::shared_ptr<ScSimpleRangeList> mpLogicalList;
+ ::boost::shared_ptr<ScSimpleRangeList> mpUndefinedList;
ScMyCurrencyStylesSet* pCurrencyList;
static void SetStylesToRanges(const ::std::list<ScRange>& rList,
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index c2b4b00f1ada..24e0860257fb 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -51,7 +51,7 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <sal/types.h>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
using namespace xmloff::token;
@@ -268,7 +268,7 @@ void ScXMLBodyContext::EndElement()
// #i37959# handle document protection after the sheet settings
if (bProtected)
{
- std::unique_ptr<ScDocProtection> pProtection(new ScDocProtection);
+ boost::scoped_ptr<ScDocProtection> pProtection(new ScDocProtection);
pProtection->setProtected(true);
uno::Sequence<sal_Int8> aPass;
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 601d71e559c5..7712e528d2b2 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -415,7 +415,7 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons
ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos();
pSheetData->AddTextStyle(rStyleName, aCellPos, rFmt.maSelection);
- std::unique_ptr<SfxPoolItem> pPoolItem;
+ boost::scoped_ptr<SfxPoolItem> pPoolItem;
sal_uInt16 nLastItemID = EE_CHAR_END + 1;
std::vector<XMLPropertyState>::const_iterator it = rProps.begin(), itEnd = rProps.end();
@@ -1369,7 +1369,7 @@ void ScXMLTableRowCellContext::PutFormulaCell( const ScAddress& rCellPos )
OUString aText = maFormula->first;
- std::unique_ptr<ScExternalRefManager::ApiGuard> pExtRefGuard (
+ ::boost::scoped_ptr<ScExternalRefManager::ApiGuard> pExtRefGuard (
new ScExternalRefManager::ApiGuard(pDoc));
if ( !aText.isEmpty() )
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 14f605e790b9..c9ed567b9f64 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -28,9 +28,9 @@
#include <editeng/flditem.hxx>
#include <boost/optional.hpp>
+#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/noncopyable.hpp>
-#include <memory>
class ScXMLImport;
class ScFormulaCell;
@@ -72,7 +72,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
ParaFormatsType maFormats;
FieldsType maFields;
- std::unique_ptr< ScXMLAnnotationData > mxAnnotationData;
+ boost::scoped_ptr< ScXMLAnnotationData > mxAnnotationData;
ScMyImpDetectiveObjVec* pDetectiveObjVec;
ScMyImpCellRangeSource* pCellRangeSource;
double fValue;
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 809453655170..47f039301afb 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -81,7 +81,7 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
};
ScDocument* pDoc;
ScDPObject* pDPObject;
- std::unique_ptr<ScDPSaveData> pDPSave;
+ boost::scoped_ptr<ScDPSaveData> pDPSave;
ScDPDimensionSaveData* pDPDimSaveData;
GrandTotalItem maRowGrandTotal;
GrandTotalItem maColGrandTotal;
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index 58e3ec15aa67..d66c9be840eb 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -33,7 +33,7 @@
#include "dbdata.hxx"
#include "xmlimprt.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class ScDBData;
struct ScQueryParam;
@@ -68,7 +68,7 @@ struct ScSubTotalRule
class ScXMLDatabaseRangeContext : public SvXMLImportContext
{
- std::unique_ptr<ScQueryParam> mpQueryParam;
+ boost::scoped_ptr<ScQueryParam> mpQueryParam;
ScRange maRange;
OUString sDatabaseRangeName;
OUString sConnectionResource;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index a72459b1d2e7..04a273c8964a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -163,9 +163,9 @@
#include <sfx2/linkmgr.hxx>
#include <sfx2/objsh.hxx>
-#include <memory>
#include <vector>
#include <vbahelper/vbaaccesshelper.hxx>
+#include <boost/scoped_ptr.hpp>
//! not found in unonames.hxx
#define SC_LAYERID "LayerID"
@@ -2934,7 +2934,7 @@ namespace {
void writeContent(
ScXMLExport& rExport, const OUString& rStyleName, const OUString& rContent, const SvxFieldData* pField )
{
- std::unique_ptr<SvXMLElementExport> pElem;
+ boost::scoped_ptr<SvXMLElementExport> pElem;
if (!rStyleName.isEmpty())
{
// Formatted section with automatic style.
@@ -3394,7 +3394,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
// no hyperlink property
}
- std::unique_ptr< SvXMLElementExport > pDrawA;
+ boost::scoped_ptr< SvXMLElementExport > pDrawA;
// enclose shapes with <draw:a> element only if sHlink contains something
if ( !sHlink.isEmpty() )
{
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index c2ca5f5c2f6d..0c26018f26b7 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star {
namespace beans { class XPropertySet; }
} } }
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <unordered_map>
class ScOutlineArray;
@@ -79,9 +79,9 @@ class ScXMLExport : public SvXMLExport
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream;
sal_Int32 nSourceStreamPos;
- mutable std::unique_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
- std::unique_ptr<ScMyNotEmptyCellsIterator> mpCellsItr;
- std::unique_ptr<sc::CompileFormulaContext> mpCompileFormulaCxt;
+ mutable boost::scoped_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
+ boost::scoped_ptr<ScMyNotEmptyCellsIterator> mpCellsItr;
+ boost::scoped_ptr<sc::CompileFormulaContext> mpCompileFormulaCxt;
rtl::Reference < XMLPropertyHandlerFactory > xScPropHdlFactory;
rtl::Reference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
rtl::Reference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 10dade62d3da..94072269aebb 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2457,7 +2457,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
{
ScXMLImport::MutexGuard aGuard(*this);
sal_Int16 nTemp16(0);
- std::unique_ptr<ScChangeViewSettings> pViewSettings(new ScChangeViewSettings());
+ boost::scoped_ptr<ScChangeViewSettings> pViewSettings(new ScChangeViewSettings());
for (sal_Int32 i = 0; i < nCount; ++i)
{
OUString sName(rChangeProps[i].Name);
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 81a9520891e3..ae5ffe1747f9 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -42,12 +42,12 @@
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
-#include <memory>
#include <unordered_map>
#include <vector>
#include <boost/ptr_container/ptr_list.hpp>
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
class ScMyStyleNumberFormats;
class XMLNumberFormatAttributesExportHelper;
@@ -828,12 +828,12 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
CellTypeMap aCellTypeMap;
ScDocument* pDoc;
- std::unique_ptr<ScDocumentImport> mpDocImport;
- std::unique_ptr<ScCompiler> mpComp; // For error-checking of cached string cell values.
- std::unique_ptr<ScEditEngineDefaulter> mpEditEngine;
- std::unique_ptr<sc::PivotTableSources> mpPivotSources;
+ boost::scoped_ptr<ScDocumentImport> mpDocImport;
+ boost::scoped_ptr<ScCompiler> mpComp; // For error-checking of cached string cell values.
+ boost::scoped_ptr<ScEditEngineDefaulter> mpEditEngine;
+ boost::scoped_ptr<sc::PivotTableSources> mpPivotSources;
- mutable std::unique_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
+ mutable boost::scoped_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
std::list<SvXMLImportContext*> aViewContextList;
ScMyStylesImportHelper* pStylesImportHelper;
diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx
index 46925b125a86..cce47678b4dc 100644
--- a/sc/source/filter/xml/xmlnexpi.hxx
+++ b/sc/source/filter/xml/xmlnexpi.hxx
@@ -24,7 +24,7 @@
#include "address.hxx"
#include "xmlimprt.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
struct ScMyNamedExpression;
class ScRangeName;
@@ -87,7 +87,7 @@ public:
virtual void EndElement() SAL_OVERRIDE;
private:
- std::shared_ptr<Inserter> mpInserter;
+ ::boost::shared_ptr<Inserter> mpInserter;
};
class ScXMLNamedRangeContext : public SvXMLImportContext
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index 88b3ede5fad7..f8da27fb556c 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/util/XProtectable.hpp>
#include <com/sun/star/sheet/XArrayFormulaRange.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -205,7 +205,7 @@ void ScMyTables::DeleteTable()
uno::Sequence<sal_Int8> aHash;
::sax::Converter::decodeBase64(aHash, maProtectionData.maPassword);
- std::unique_ptr<ScTableProtection> pProtect(new ScTableProtection);
+ boost::scoped_ptr<ScTableProtection> pProtect(new ScTableProtection);
pProtect->setProtected(maProtectionData.mbProtected);
pProtect->setPasswordHash(aHash, maProtectionData.meHash1, maProtectionData.meHash2);
pProtect->setOption(ScTableProtection::SELECT_LOCKED_CELLS, maProtectionData.mbSelectProtectedCells);
@@ -278,7 +278,7 @@ void ScMyTables::AddMatrixRange(
maMatrixRangeList.Append(aScRange);
ScDocumentImport& rDoc = rImport.GetDoc();
- std::unique_ptr<ScTokenArray> pCode(new ScTokenArray);
+ boost::scoped_ptr<ScTokenArray> pCode(new ScTokenArray);
pCode->AddStringXML( rFormula );
if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL) && !rFormulaNmsp.isEmpty() )
pCode->AddStringXML( rFormulaNmsp );
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 1a3420650edb..3eb3ba010983 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -79,7 +79,7 @@ OUString lclCreateMultiParameterFormula(
void lclMakeSubRangesList(ScRangeList& rRangeList, ScRange& rInputRange, ScStatisticsInputOutputDialog::GroupedBy aGroupedBy)
{
- std::unique_ptr<DataRangeIterator> pIterator;
+ boost::scoped_ptr<DataRangeIterator> pIterator;
if (aGroupedBy == ScStatisticsInputOutputDialog::BY_COLUMN)
pIterator.reset(new DataRangeByColumnIterator(rInputRange));
else
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index e023d45accf9..9acf9ed6f1d7 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -78,7 +78,7 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
// Exponential Smoothing
output.push();
- std::unique_ptr<DataRangeIterator> pIterator;
+ boost::scoped_ptr<DataRangeIterator> pIterator;
if (mGroupedBy == BY_COLUMN)
pIterator.reset(new DataRangeByColumnIterator(mInputRange));
else
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index 4bebec6c547b..8514dfc1342b 100644
--- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
@@ -63,7 +63,7 @@ ScRange ScMovingAverageDialog::ApplyOutput(ScDocShell* pDocShell)
formula::FormulaGrammar::mergeToGrammar( formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
FormulaTemplate aTemplate(mDocument);
- std::unique_ptr<DataRangeIterator> pIterator;
+ boost::scoped_ptr<DataRangeIterator> pIterator;
if (mGroupedBy == BY_COLUMN)
pIterator.reset(new DataRangeByColumnIterator(mInputRange));
else
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index fe746d92c26d..b7128e277560 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -8,7 +8,7 @@
*
*/
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <editeng/editobj.hxx>
#include <editeng/wghtitem.hxx>
@@ -192,7 +192,7 @@ void AddressWalkerWriter::writeBoldString(const OUString& aString)
SvxWeightItem aWeight(WEIGHT_BOLD, EE_CHAR_WEIGHT);
aItemSet.Put(aWeight);
rEngine.QuickSetAttribs(aItemSet, ESelection(0, 0, 0, aString.getLength()) );
- std::unique_ptr<EditTextObject> pEditText(rEngine.CreateTextObject());
+ boost::scoped_ptr<EditTextObject> pEditText(rEngine.CreateTextObject());
mpDocShell->GetDocFunc().SetEditCell(mCurrentAddress, *pEditText, true);
}
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 9e4b8ac749ab..6bb0d37b9fa4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1247,7 +1247,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const
if(rFormula.isEmpty())
return OUString();
- std::unique_ptr<ScSimpleFormulaCalculator> pCalc( new ScSimpleFormulaCalculator( pDoc, rPos, rFormula ) );
+ boost::scoped_ptr<ScSimpleFormulaCalculator> pCalc( new ScSimpleFormulaCalculator( pDoc, rPos, rFormula ) );
// FIXME: HACK! In order to not get a #REF! for ColRowNames, if a name is actually inserted as a Range
// into the whole Formula, but is interpreted as a single cell reference when displaying it on its own
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index a1c9b242fdae..08144fc4e857 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -50,8 +50,8 @@ ScInputStatusItem::ScInputStatusItem(
aStartPos ( rStartPos ),
aEndPos ( rEndPos ),
aString ( rString ),
- pEditData ( pData ? pData->Clone() : nullptr ),
- mpMisspellRanges(nullptr)
+ pEditData ( pData ? pData->Clone() : NULL ),
+ mpMisspellRanges(NULL)
{
}
@@ -61,7 +61,7 @@ ScInputStatusItem::ScInputStatusItem( const ScInputStatusItem& rItem ) :
aStartPos ( rItem.aStartPos ),
aEndPos ( rItem.aEndPos ),
aString ( rItem.aString ),
- pEditData ( rItem.pEditData ? rItem.pEditData->Clone() : nullptr ),
+ pEditData ( rItem.pEditData ? rItem.pEditData->Clone() : NULL ),
mpMisspellRanges(rItem.mpMisspellRanges)
{
}
@@ -146,7 +146,7 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP,
ScSortItem::ScSortItem( sal_uInt16 nWhichP,
const ScSortParam* pSortData ) :
SfxPoolItem ( nWhichP ),
- pViewData ( nullptr )
+ pViewData ( NULL )
{
if ( pSortData ) theSortData = *pSortData;
}
@@ -191,7 +191,7 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP,
ScViewData* ptrViewData,
const ScQueryParam* pQueryData ) :
SfxPoolItem ( nWhichP ),
- mpQueryData(nullptr),
+ mpQueryData(NULL),
pViewData ( ptrViewData ),
bIsAdvanced ( false )
{
@@ -204,8 +204,8 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP,
ScQueryItem::ScQueryItem( sal_uInt16 nWhichP,
const ScQueryParam* pQueryData ) :
SfxPoolItem ( nWhichP ),
- mpQueryData(nullptr),
- pViewData ( nullptr ),
+ mpQueryData(NULL),
+ pViewData ( NULL ),
bIsAdvanced ( false )
{
if (pQueryData)
@@ -281,7 +281,7 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP,
ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP,
const ScSubTotalParam* pSubTotalData ) :
SfxPoolItem ( nWhichP ),
- pViewData ( nullptr )
+ pViewData ( NULL )
{
if ( pSubTotalData ) theSubTotalData = *pSubTotalData;
}
@@ -324,7 +324,7 @@ bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nM
*/
ScUserListItem::ScUserListItem( sal_uInt16 nWhichP )
: SfxPoolItem ( nWhichP ),
- pUserList ( nullptr )
+ pUserList ( NULL )
{
}
@@ -334,7 +334,7 @@ ScUserListItem::ScUserListItem( const ScUserListItem& rItem )
if ( rItem.pUserList )
pUserList = new ScUserList( *(rItem.pUserList) );
else
- pUserList = nullptr;
+ pUserList = NULL;
}
ScUserListItem::~ScUserListItem()
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 75daa6ab295e..9911d3b8c9ae 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -43,13 +43,13 @@ using ::std::vector;
ScMenuFloatingWindow::MenuItemData::MenuItemData() :
mbEnabled(true), mbSeparator(false),
- mpAction(static_cast<ScCheckListMenuWindow::Action*>(nullptr)),
- mpSubMenuWin(static_cast<ScMenuFloatingWindow*>(nullptr))
+ mpAction(static_cast<ScCheckListMenuWindow::Action*>(NULL)),
+ mpSubMenuWin(static_cast<ScMenuFloatingWindow*>(NULL))
{
}
ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pParent) :
- mpSubMenu(nullptr),
+ mpSubMenu(NULL),
mnMenuPos(MENU_NOT_SELECTED),
mpParent(pParent)
{
@@ -59,7 +59,7 @@ ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pPa
void ScMenuFloatingWindow::SubMenuItemData::reset()
{
- mpSubMenu = nullptr;
+ mpSubMenu = NULL;
mnMenuPos = MENU_NOT_SELECTED;
maTimer.Stop();
}
@@ -491,7 +491,7 @@ void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer)
if (maCloseTimer.mpSubMenu)
{
maCloseTimer.mpSubMenu->EndPopupMode();
- maCloseTimer.mpSubMenu = nullptr;
+ maCloseTimer.mpSubMenu = NULL;
maCloseTimer.maTimer.Stop();
}
@@ -502,10 +502,10 @@ void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer)
// end submenu.
if (maCloseTimer.mpSubMenu)
{
- maOpenTimer.mpSubMenu = nullptr;
+ maOpenTimer.mpSubMenu = NULL;
maCloseTimer.mpSubMenu->EndPopupMode();
- maCloseTimer.mpSubMenu = nullptr;
+ maCloseTimer.mpSubMenu = NULL;
Invalidate();
maOpenTimer.mnMenuPos = MENU_NOT_SELECTED;
@@ -647,7 +647,7 @@ void ScMenuFloatingWindow::clearSelectedMenuItem()
ScMenuFloatingWindow* ScMenuFloatingWindow::getSubMenuWindow(size_t nPos) const
{
if (maMenuItems.size() <= nPos)
- return nullptr;
+ return NULL;
return maMenuItems[nPos].mpSubMenuWin.get();
}
@@ -849,7 +849,7 @@ ScCheckListMenuWindow::Member::Member()
: mbVisible(true)
, mbDate(false)
, mbLeaf(false)
- , mpParent(nullptr)
+ , mpParent(NULL)
{
}
@@ -883,9 +883,9 @@ ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* p
maBtnOk(VclPtr<OKButton>::Create(this)),
maBtnCancel(VclPtr<CancelButton>::Create(this)),
mnCurTabStop(0),
- mpExtendedData(nullptr),
- mpOKAction(nullptr),
- mpPopupEndAction(nullptr),
+ mpExtendedData(NULL),
+ mpOKAction(NULL),
+ mpPopupEndAction(NULL),
maWndSize(),
mePrevToggleAllState(TRISTATE_INDET)
{
@@ -1397,17 +1397,17 @@ void ScCheckListMenuWindow::addDateMember(const OUString& rsName, double nVal, b
maChecks->SetUpdateMode(false);
- SvTreeListEntry* pYearEntry = maChecks->FindEntry(nullptr, aYearName);
+ SvTreeListEntry* pYearEntry = maChecks->FindEntry(NULL, aYearName);
if (!pYearEntry)
{
- pYearEntry = maChecks->InsertEntry(aYearName, nullptr, true);
+ pYearEntry = maChecks->InsertEntry(aYearName, NULL, true);
Member aMemYear;
aMemYear.maName = aYearName;
aMemYear.maRealName = rsName;
aMemYear.mbDate = true;
aMemYear.mbLeaf = false;
aMemYear.mbVisible = bVisible;
- aMemYear.mpParent = nullptr;
+ aMemYear.mpParent = NULL;
maMembers.push_back(aMemYear);
}
@@ -1449,12 +1449,12 @@ void ScCheckListMenuWindow::addMember(const OUString& rName, bool bVisible)
aMember.mbDate = false;
aMember.mbLeaf = true;
aMember.mbVisible = bVisible;
- aMember.mpParent = nullptr;
+ aMember.mpParent = NULL;
maMembers.push_back(aMember);
}
ScCheckListBox::ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle )
- : SvTreeListBox( pParent, nWinStyle ), mpCheckButton( nullptr )
+ : SvTreeListBox( pParent, nWinStyle ), mpCheckButton( NULL )
{
Init();
}
@@ -1470,7 +1470,7 @@ SvTreeListEntry* ScCheckListBox::FindEntry( SvTreeListEntry* pParent, const OUSt
pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
}
- return nullptr;
+ return NULL;
}
void ScCheckListBox::Init()
@@ -1554,7 +1554,7 @@ void ScCheckListBox::ShowCheckEntry( const OUString& sName, SvTreeListEntry* pPa
if ( !pEntry )
{
pEntry = InsertEntry(
- sName, nullptr, false, TREELIST_APPEND, nullptr,
+ sName, NULL, false, TREELIST_APPEND, NULL,
SvLBoxButtonKind_enabledCheckbox);
SetCheckButtonState(
@@ -1578,13 +1578,13 @@ SvTreeListEntry* ScCheckListBox::CountCheckedEntries( SvTreeListEntry* pParent,
CountCheckedEntries( pEntry, nCount );
pEntry = NextSibling( pEntry );
}
- return nullptr;
+ return NULL;
}
sal_uInt16 ScCheckListBox::GetCheckedEntryCount() const
{
sal_uLong nCount = 0;
- CountCheckedEntries( nullptr, nCount );
+ CountCheckedEntries( NULL, nCount );
return nCount;
}
@@ -1636,7 +1636,7 @@ void ScCheckListMenuWindow::initMembers()
// Expand first node of checked dates
if (!maMembers[i].mpParent && maChecks->IsChecked(maMembers[i].maName, maMembers[i].mpParent))
{
- SvTreeListEntry* pEntry = maChecks->FindEntry(nullptr, maMembers[i].maName);
+ SvTreeListEntry* pEntry = maChecks->FindEntry(NULL, maMembers[i].maName);
if (pEntry)
maChecks->Expand(pEntry);
}
@@ -1647,7 +1647,7 @@ void ScCheckListMenuWindow::initMembers()
if (aLabel.isEmpty())
aLabel = ScGlobal::GetRscString(STR_EMPTYDATA);
SvTreeListEntry* pEntry = maChecks->InsertEntry(
- aLabel, nullptr, false, TREELIST_APPEND, nullptr,
+ aLabel, NULL, false, TREELIST_APPEND, NULL,
SvLBoxButtonKind_enabledCheckbox);
maChecks->SetCheckButtonState(
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 46c764e5b209..3d9d0b9428c1 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -308,7 +308,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
ScCompiler aComp( mpDoc, maPos );
aComp.SetGrammar( mpDoc->GetGrammar() );
- std::unique_ptr<ScTokenArray> ta(aComp.CompileString(aFormula));
+ boost::scoped_ptr<ScTokenArray> ta(aComp.CompileString(aFormula));
// Error, warn the user
if( ta->GetCodeError() || ( ta->GetLen() == 0 ) )
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 3b6dc553cf8f..30c42c5c65b8 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -56,7 +56,7 @@ bool ScPivotLayoutTreeList::DoubleClickHdl()
vector<ScDPName> aDataFieldNames;
mpParent->PushDataFieldNames(aDataFieldNames);
- std::unique_ptr<AbstractScDPSubtotalDlg> pDialog(
+ boost::scoped_ptr<AbstractScDPSubtotalDlg> pDialog(
pFactory->CreateScDPSubtotalDlg(this, mpParent->maPivotTableObject, rCurrentLabelData, rCurrentFunctionData, aDataFieldNames, true));
if (pDialog->Execute() == RET_OK)
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index 5f9a2fb720c9..a45b650135ef 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -81,7 +81,7 @@ bool ScPivotLayoutTreeListData::DoubleClickHdl()
ScAbstractDialogFactory* pFactory = ScAbstractDialogFactory::Create();
- std::unique_ptr<AbstractScDPFunctionDlg> pDialog(
+ boost::scoped_ptr<AbstractScDPFunctionDlg> pDialog(
pFactory->CreateScDPFunctionDlg(this, mpParent->GetLabelDataVector(), rCurrentLabelData, rCurrentFunctionData));
if (pDialog->Execute() == RET_OK)
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index e54cc5ce619b..1df27049e7d1 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -39,6 +39,7 @@
#include "dputil.hxx"
#include <vector>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::sheet;
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 0ff11a59c12a..e8d6a7832847 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -91,7 +91,7 @@
#include <memory>
#include <utility>
#include <basic/basmgr.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <set>
#include <vector>
@@ -618,7 +618,7 @@ bool ScDocFunc::DeleteContents(
}
// To keep track of all non-empty cells within the deleted area.
- std::shared_ptr<ScSimpleUndo::DataSpansType> pDataSpans;
+ boost::shared_ptr<ScSimpleUndo::DataSpansType> pDataSpans;
if ( bRecord )
{
@@ -686,7 +686,7 @@ bool ScDocFunc::DeleteCell(
rDoc.DeleteObjectsInArea(rPos.Col(), rPos.Row(), rPos.Col(), rPos.Row(), rMark);
// To keep track of all non-empty cells within the deleted area.
- std::shared_ptr<ScSimpleUndo::DataSpansType> pDataSpans;
+ boost::shared_ptr<ScSimpleUndo::DataSpansType> pDataSpans;
ScDocument* pUndoDoc = NULL;
if (bRecord)
@@ -978,7 +978,7 @@ bool ScDocFunc::SetStringOrEditCell( const ScAddress& rPos, const OUString& rStr
{
ScFieldEditEngine& rEngine = rDoc.GetEditEngine();
rEngine.SetText(rStr);
- std::unique_ptr<EditTextObject> pEditText(rEngine.CreateTextObject());
+ boost::scoped_ptr<EditTextObject> pEditText(rEngine.CreateTextObject());
return SetEditCell(rPos, *pEditText, bInteraction);
}
else
@@ -1106,7 +1106,7 @@ bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
}
// A copy of pNewData will be stored in the cell.
- std::unique_ptr<EditTextObject> pNewData(rEngine.CreateTextObject());
+ boost::scoped_ptr<EditTextObject> pNewData(rEngine.CreateTextObject());
bRet = SetEditCell(rPos, *pNewData, !bApi);
// Set the paragraph attributes back to the EditEngine.
@@ -1177,7 +1177,7 @@ bool ScDocFunc::SetCellText(
{
ScDocument& rDoc = rDocShell.GetDocument();
- ::std::unique_ptr<ScExternalRefManager::ApiGuard> pExtRefGuard;
+ ::boost::scoped_ptr<ScExternalRefManager::ApiGuard> pExtRefGuard;
if (bApi)
pExtRefGuard.reset(new ScExternalRefManager::ApiGuard(&rDoc));
@@ -5320,7 +5320,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor
IDF_ALL, false, pUndoDoc );
}
- std::unique_ptr<ScRange> pRepaintRange;
+ boost::scoped_ptr<ScRange> pRepaintRange;
if(nOldFormat)
{
ScConditionalFormat* pOldFormat = rDoc.GetCondFormList(nTab)->GetFormat(nOldFormat);
diff --git a/sc/source/ui/docshell/docfuncutil.cxx b/sc/source/ui/docshell/docfuncutil.cxx
index 63f1f1caca7f..1adb1355d556 100644
--- a/sc/source/ui/docshell/docfuncutil.cxx
+++ b/sc/source/ui/docshell/docfuncutil.cxx
@@ -74,7 +74,7 @@ ScDocument* DocFuncUtil::createDeleteContentsUndoDoc(
void DocFuncUtil::addDeleteContentsUndo(
svl::IUndoManager* pUndoMgr, ScDocShell* pDocSh, const ScMarkData& rMark,
const ScRange& rRange, ScDocument* pUndoDoc, InsertDeleteFlags nFlags,
- const std::shared_ptr<ScSimpleUndo::DataSpansType>& pSpans,
+ const boost::shared_ptr<ScSimpleUndo::DataSpansType>& pSpans,
bool bMulti, bool bDrawUndo )
{
std::unique_ptr<ScUndoDeleteContents> pUndo(
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e724f6811ac3..18add14fadfc 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -129,14 +129,14 @@
#include "sccollaboration.hxx"
#endif
-#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
using namespace com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::lang::XMultiServiceFactory;
-using std::shared_ptr;
+using ::boost::shared_ptr;
using ::std::vector;
// STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 0671e754a2fb..392435475f0c 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -61,7 +61,7 @@
#include "conflictsdlg.hxx"
#include "globstr.hrc"
#include "markdata.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// Redraw - Benachrichtigungen
@@ -642,7 +642,7 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, vcl::Windo
aSet.Put( SvxPostItAuthorItem( aAuthor, SID_ATTR_POSTIT_AUTHOR ) );
aSet.Put( SvxPostItDateItem ( aDate, SID_ATTR_POSTIT_DATE ) );
- std::unique_ptr<ScRedComDialog> pDlg(new ScRedComDialog( pParent, aSet,this,pAction,bPrevNext));
+ boost::scoped_ptr<ScRedComDialog> pDlg(new ScRedComDialog( pParent, aSet,this,pAction,bPrevNext));
pDlg->Execute();
}
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 1b74471c2cdc..b422a5150163 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -98,7 +98,7 @@ using namespace ::com::sun::star;
#include "conditio.hxx"
#include "sheetevents.hxx"
#include <documentlinkmgr.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#define IS_SHARE_HEADER(set) \
static_cast<const SfxBoolItem&>( \
@@ -326,7 +326,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScColRowLabelDlg> pDlg(pFact->CreateScColRowLabelDlg(pParent, bRowHeaders, bColHeaders));
+ boost::scoped_ptr<AbstractScColRowLabelDlg> pDlg(pFact->CreateScColRowLabelDlg(pParent, bRowHeaders, bColHeaders));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
@@ -872,7 +872,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScNewScenarioDlg> pNewDlg(pFact->CreateScNewScenarioDlg(GetActiveDialogParent(), aName, true, bSheetProtected));
+ boost::scoped_ptr<AbstractScNewScenarioDlg> pNewDlg(pFact->CreateScNewScenarioDlg(GetActiveDialogParent(), aName, true, bSheetProtected));
OSL_ENSURE(pNewDlg, "Dialog create fail!");
pNewDlg->SetScenarioData( aName, aComment, aColor, nFlags );
if ( pNewDlg->Execute() == RET_OK )
@@ -1551,7 +1551,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScStyleDlg( GetActiveDialogParent(), *pStyleSheet, RID_SCDLG_STYLES_PAGE, RID_SCDLG_STYLES_PAGE ));
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScStyleDlg( GetActiveDialogParent(), *pStyleSheet, RID_SCDLG_STYLES_PAGE, RID_SCDLG_STYLES_PAGE ));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
@@ -1706,7 +1706,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg( SfxViewFrame::Current(),
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg( SfxViewFrame::Current(),
GetActiveDialogParent(),
rStyleSet,
aStr,
diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx
index 19a8f0953768..75c2da638bd3 100644
--- a/sc/source/ui/docshell/documentlinkmgr.cxx
+++ b/sc/source/ui/docshell/documentlinkmgr.cxx
@@ -27,7 +27,7 @@
#include <vcl/layout.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sc {
@@ -35,11 +35,11 @@ struct DocumentLinkManagerImpl : boost::noncopyable
{
ScDocument& mrDoc;
SfxObjectShell* mpShell;
- std::unique_ptr<DataStream> mpDataStream;
- std::unique_ptr<sfx2::LinkManager> mpLinkManager;
+ boost::scoped_ptr<DataStream> mpDataStream;
+ boost::scoped_ptr<sfx2::LinkManager> mpLinkManager;
DocumentLinkManagerImpl( ScDocument& rDoc, SfxObjectShell* pShell ) :
- mrDoc(rDoc), mpShell(pShell), mpDataStream(nullptr), mpLinkManager(nullptr) {}
+ mrDoc(rDoc), mpShell(pShell), mpDataStream(NULL), mpLinkManager(NULL) {}
~DocumentLinkManagerImpl()
{
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 5b7dcb5a79c3..96d174308807 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -59,6 +59,8 @@
#include <memory>
#include <algorithm>
+#include <boost/scoped_ptr.hpp>
+
using ::std::unique_ptr;
using ::com::sun::star::uno::Any;
using ::std::vector;
@@ -597,7 +599,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefCache::getCellRangeData(
// Cache hit!
return itrRange->second;
- std::unique_ptr<ScRange> pNewRange;
+ ::boost::scoped_ptr<ScRange> pNewRange;
TokenArrayRef pArray;
bool bFirstTab = true;
for (size_t nTab = nTabFirstId; nTab <= nTabLastId; ++nTab)
@@ -1466,7 +1468,7 @@ static ScTokenArray* convertToTokenArray(
// range to it.
return NULL;
- std::unique_ptr<ScRange> pUsedRange;
+ ::boost::scoped_ptr<ScRange> pUsedRange;
unique_ptr<ScTokenArray> pArray(new ScTokenArray);
bool bFirstTab = true;
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 4feaccc3af15..da82e0b5df16 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -54,7 +54,7 @@
#include "globstr.hrc"
#include <vcl/svapp.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// We don't want to end up with 2GB read in one line just because of malformed
// multiline fields, so chop it _somewhere_, which is twice supported columns
@@ -1266,7 +1266,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
sal_uInt64 const nOldPos = rStrm.Tell();
sal_uInt64 const nRemaining = rStrm.remainingSize();
- std::unique_ptr<ScProgress> xProgress( new ScProgress( pDocSh,
+ boost::scoped_ptr<ScProgress> xProgress( new ScProgress( pDocSh,
ScGlobal::GetRscString( STR_LOAD_DOC ), nRemaining ));
rStrm.StartReadingUnicodeText( rStrm.GetStreamCharSet() );
@@ -1295,8 +1295,8 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
CalendarWrapper aCalendar( comphelper::getProcessComponentContext() );
aCalendar.loadDefaultCalendar(
LanguageTag::convertToLocale( eDocLang ) );
- std::unique_ptr< ::utl::TransliterationWrapper > pEnglishTransliteration;
- std::unique_ptr< CalendarWrapper > pEnglishCalendar;
+ boost::scoped_ptr< ::utl::TransliterationWrapper > pEnglishTransliteration;
+ boost::scoped_ptr< CalendarWrapper > pEnglishCalendar;
if ( eDocLang != LANGUAGE_ENGLISH_US )
{
pEnglishTransliteration.reset(new ::utl::TransliterationWrapper (
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index dd8303e809e8..3958b3745709 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -58,7 +58,7 @@
#include <sfx2/viewsh.hxx>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
TYPEINIT1( ScDrawShell, SfxShell );
@@ -263,7 +263,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateCaptionDialog( pWin, pView ));
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateCaptionDialog( pWin, pView ));
const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -285,7 +285,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView ));
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if (pDlg->Execute() == RET_OK)
{
@@ -334,7 +334,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin )
}
// create empty itemset for macro-dlg
- std::unique_ptr<SfxItemSet> pItemSet(new SfxItemSet(SfxGetpApp()->GetPool(), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 ));
+ boost::scoped_ptr<SfxItemSet> pItemSet(new SfxItemSet(SfxGetpApp()->GetPool(), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 ));
pItemSet->Put ( aItem, SID_ATTR_MACROITEM );
SfxEventNamesItem aNamesItem(SID_EVENTCONFIG);
@@ -346,7 +346,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin )
xFrame = GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( pWin, *pItemSet, xFrame, SID_EVENTCONFIG ));
+ boost::scoped_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( pWin, *pItemSet, xFrame, SID_EVENTCONFIG ));
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK )
{
const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
@@ -391,7 +391,7 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
&aNewAttr,
pViewData->GetDocument()->GetDrawLayer(),
pObj,
@@ -422,7 +422,7 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
pView->MergeAttrFromMarked( aNewAttr, false );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(
+ boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(
pViewData->GetDialogParent(), &aNewAttr,
pViewData->GetDocument()->GetDrawLayer(), true));
@@ -451,7 +451,7 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 /* nTabPage *
pView->MergeAttrFromMarked( aNewAttr, false );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, pView ));
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, pView ));
sal_uInt16 nResult = pDlg->Execute();
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index d3f2dad76446..772dabbed720 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -56,7 +56,7 @@
#include "userdat.hxx"
#include "postit.hxx"
#include "drtxtob.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include "sc.hrc"
@@ -487,7 +487,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
+ boost::scoped_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, ScDrawShell, NameObjectHdl));
@@ -556,7 +556,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
+ boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 04b9d34dc68c..e74c17fca932 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -79,7 +79,7 @@
#define ScDrawTextObjectBar
#include "scslots.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -876,7 +876,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
case SID_DRAWTEXT_ATTR_DLG:
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aEditAttr, pView ));
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aEditAttr, pView ));
bDone = ( RET_OK == pDlg->Execute() );
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 1c066228c92b..1c03ba30758d 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -39,7 +39,7 @@
#include <gridwin.hxx>
#include "scabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
SfxItemSet& rOutSet , sal_uInt16 nSlot)
@@ -47,7 +47,7 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
assert(pFact && "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
pViewData->GetDialogParent(), &rArgs,
pViewData->GetSfxDocShell()));
assert(pDlg && "Dialog create fail!");
@@ -94,7 +94,7 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScParagraphDlg(
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScParagraphDlg(
pViewData->GetDialogParent(), &aNewAttr));
OSL_ENSURE(pDlg, "Dialog create fail!");
bool bRet = ( pDlg->Execute() == RET_OK );
@@ -114,7 +114,7 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ )
SdrView* pView = pViewData->GetScDrawView();
OutlinerView* pOutView = pView->GetTextEditOutlinerView();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( pViewData->GetDialogParent() ));
+ boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( pViewData->GetDialogParent() ));
pDlg->Insert( SotClipboardFormatId::STRING, EMPTY_OUSTRING );
pDlg->Insert( SotClipboardFormatId::RTF, EMPTY_OUSTRING );
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 02c5ecca76fb..03c8720b94e5 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -80,7 +80,7 @@ using namespace ::com::sun::star;
#include "drawview.hxx"
#include "markdata.hxx"
#include "gridwin.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace {
@@ -242,7 +242,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView*
case SID_INSERT_FLOATINGFRAME :
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractInsertObjectDialog> pDlg(
+ boost::scoped_ptr<SfxAbstractInsertObjectDialog> pDlg(
pFact->CreateInsertObjectDialog( pViewShell->GetWindow(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommandString(),
xStorage, &aServerLst ));
if ( pDlg )
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 17d3dd569e43..13cd9597749e 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -71,7 +71,7 @@ void ScMediaShell::GetMediaState( SfxItemSet& rSet )
{
if( SID_AVMEDIA_TOOLBOX == nWhich )
{
- std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( pView->GetMarkedObjectList() ));
+ boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( pView->GetMarkedObjectList() ));
bool bDisable = true;
if( 1 == pMarkList->GetMarkCount() )
@@ -111,7 +111,7 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq )
if( pItem )
{
- std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( pView->GetMarkedObjectList() ));
+ boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( pView->GetMarkedObjectList() ));
if( 1 == pMarkList->GetMarkCount() )
{
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index b2ae1297d81e..ba871d415bb3 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -308,7 +308,7 @@ bool ScFormulaDlg::Close()
bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult )
{
- std::unique_ptr<ScSimpleFormulaCalculator> pFCell( new ScSimpleFormulaCalculator( pDoc, aCursorPos, rStrExp ) );
+ boost::scoped_ptr<ScSimpleFormulaCalculator> pFCell( new ScSimpleFormulaCalculator( pDoc, aCursorPos, rStrExp ) );
pFCell->SetLimitString(true);
// HACK! to avoid neither #REF! from ColRowNames
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index d7e5c798c916..f3289aa2e640 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -17,7 +17,7 @@
#include <vcl/timer.hxx>
#include <svx/checklbx.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <unordered_map>
namespace com { namespace sun { namespace star {
@@ -150,13 +150,13 @@ private:
bool mbEnabled:1;
bool mbSeparator:1;
- std::shared_ptr<Action> mpAction;
+ ::boost::shared_ptr<Action> mpAction;
VclPtr<ScMenuFloatingWindow> mpSubMenuWin;
MenuItemData();
};
- std::vector<MenuItemData> maMenuItems;
+ ::std::vector<MenuItemData> maMenuItems;
struct SubMenuItemData
{
@@ -345,13 +345,13 @@ private:
VclPtr<OKButton> maBtnOk;
VclPtr<CancelButton> maBtnCancel;
- std::vector<VclPtr<vcl::Window> > maTabStopCtrls;
+ ::std::vector<VclPtr<vcl::Window> > maTabStopCtrls;
size_t mnCurTabStop;
- std::vector<Member> maMembers;
- std::unique_ptr<ExtendedData> mpExtendedData;
- std::unique_ptr<Action> mpOKAction;
- std::unique_ptr<Action> mpPopupEndAction;
+ ::std::vector<Member> maMembers;
+ boost::scoped_ptr<ExtendedData> mpExtendedData;
+ boost::scoped_ptr<Action> mpOKAction;
+ boost::scoped_ptr<Action> mpPopupEndAction;
Config maConfig;
Size maWndSize; /// whole window size.
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 3fd588dee14f..814e366f9598 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -235,7 +235,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry
VclPtr<PushButton> maBtOptions;
- std::unique_ptr<ScDataBarFormatData> mpDataBarData;
+ boost::scoped_ptr<ScDataBarFormatData> mpDataBarData;
ScFormatEntry* createDatabarEntry() const;
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index 48323642f207..e962b61aa78c 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -18,6 +18,7 @@
#include <address.hxx>
#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
#include <vector>
#include <documentstreamaccess.hxx>
diff --git a/sc/source/ui/inc/docfuncutil.hxx b/sc/source/ui/inc/docfuncutil.hxx
index e1db8ce58c35..65bf820526be 100644
--- a/sc/source/ui/inc/docfuncutil.hxx
+++ b/sc/source/ui/inc/docfuncutil.hxx
@@ -10,7 +10,7 @@
#include <undobase.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
class ScDocument;
class ScMarkData;
@@ -32,7 +32,7 @@ public:
static void addDeleteContentsUndo(
svl::IUndoManager* pUndoMgr, ScDocShell* pDocSh, const ScMarkData& rMark,
const ScRange& rRange, ScDocument* pUndoDoc, InsertDeleteFlags nFlags,
- const std::shared_ptr<ScSimpleUndo::DataSpansType>& pSpans,
+ const boost::shared_ptr<ScSimpleUndo::DataSpansType>& pSpans,
bool bMulti, bool bDrawUndo );
static ScSimpleUndo::DataSpansType* getNonEmptyCellSpans(
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 0b5fdcdecc95..5d6b5b87d1bb 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -35,8 +35,8 @@
#include "optutil.hxx"
#include "docuno.hxx"
+#include <boost/scoped_ptr.hpp>
#include <config_telepathy.h>
-#include <memory>
#include <unordered_map>
class ScRefreshTimerProtector;
@@ -453,7 +453,7 @@ typedef tools::SvRef<ScDocShell> ScDocShellRef;
class SC_DLLPUBLIC ScDocShellModificator
{
ScDocShell& rDocShell;
- std::unique_ptr<ScRefreshTimerProtector> mpProtector;
+ boost::scoped_ptr<ScRefreshTimerProtector> mpProtector;
bool bAutoCalcShellDisabled;
bool bIdleEnabled;
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index f01e1feeda5a..92ed9bba988e 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -36,6 +36,7 @@
#include <map>
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
class ScFilterOptionsMgr;
class ScViewData;
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index ce2b8b6cbe68..83350a8fb948 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -35,7 +35,7 @@
#include <sfx2/itemconnect.hxx>
#include "pivot.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <unordered_map>
typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper;
@@ -90,7 +90,7 @@ private:
NameMapType maBaseFieldNameMap; // cache for base field display -> original name.
NameMapType maBaseItemNameMap; // cache for base item display -> original name.
- std::unique_ptr<ScDPListBoxWrapper> mxLbTypeWrp; /// Wrapper for direct usage of API constants.
+ boost::scoped_ptr<ScDPListBoxWrapper> mxLbTypeWrp; /// Wrapper for direct usage of API constants.
const ScDPLabelDataVector& mrLabelVec; /// Data of all labels.
bool mbEmptyItem; /// true = Empty base item in listbox.
@@ -176,8 +176,8 @@ private:
VclPtr<FixedText> m_pFtHierarchy;
VclPtr<ListBox> m_pLbHierarchy;
- std::unique_ptr<ScDPListBoxWrapper> m_xLbLayoutWrp; /// Wrapper for direct usage of API constants.
- std::unique_ptr<ScDPListBoxWrapper> m_xLbShowFromWrp; /// Wrapper for direct usage of API constants.
+ boost::scoped_ptr<ScDPListBoxWrapper> m_xLbLayoutWrp; /// Wrapper for direct usage of API constants.
+ boost::scoped_ptr<ScDPListBoxWrapper> m_xLbShowFromWrp; /// Wrapper for direct usage of API constants.
ScDPObject& mrDPObj; /// The DataPilot object (for member names).
ScDPLabelData maLabelData; /// Cache for members data.
diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index 93a895c4c68f..19cc33ebec57 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -31,7 +31,7 @@
#include "tabprotection.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace vcl { class Window; }
class ScDocProtection;
@@ -41,8 +41,8 @@ class ScDocument;
class ScRetypePassDlg : public ModalDialog
{
public:
- typedef std::shared_ptr<ScDocProtection> DocProtectionPtr;
- typedef std::shared_ptr<ScTableProtection> TabProtectionPtr;
+ typedef ::boost::shared_ptr<ScDocProtection> DocProtectionPtr;
+ typedef ::boost::shared_ptr<ScTableProtection> TabProtectionPtr;
explicit ScRetypePassDlg(vcl::Window* pParent);
virtual ~ScRetypePassDlg();
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index e207569c49a0..5e3ea93c2cd5 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -30,6 +30,7 @@
#include "drawview.hxx"
#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
namespace editeng {
struct MisspellRanges;
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 56b70aa13037..779375140ce3 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -27,8 +27,8 @@
#include "paramisc.hxx"
#include <svl/poolitem.hxx>
-#include <memory>
#include <vector>
+#include <boost/scoped_ptr.hpp>
namespace editeng {
struct MisspellRanges;
@@ -177,7 +177,7 @@ public:
void SetAdvancedQuerySource(const ScRange* pSource);
private:
- std::unique_ptr<ScQueryParam> mpQueryData;
+ boost::scoped_ptr<ScQueryParam> mpQueryData;
ScViewData* pViewData;
ScRange aAdvSource;
bool bIsAdvanced;
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 53111f41f997..e19ade3db28c 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -26,7 +26,8 @@
#include "cellmergeoption.hxx"
#include "paramisc.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
class ScDocShell;
class ScDocument;
@@ -266,10 +267,10 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
- void SetDataSpans( const std::shared_ptr<DataSpansType>& pSpans );
+ void SetDataSpans( const boost::shared_ptr<DataSpansType>& pSpans );
private:
- std::shared_ptr<DataSpansType> mpDataSpans; // Spans of non-empty cells.
+ boost::shared_ptr<DataSpansType> mpDataSpans; // Spans of non-empty cells.
ScRange aRange;
ScMarkData aMarkData;
@@ -345,7 +346,7 @@ public:
private:
ScMarkData aMarkData;
ScRange aRange;
- std::unique_ptr<ScEditDataArray> mpDataArray;
+ boost::scoped_ptr<ScEditDataArray> mpDataArray;
ScDocument* pUndoDoc;
bool bMulti;
ScPatternAttr* pApplyPattern;
@@ -640,8 +641,8 @@ public:
private:
void DoChange(ScDocument* pDoc);
- std::unique_ptr<ScDocument> mpUndoDoc;
- std::unique_ptr<ScDocument> mpRedoDoc;
+ boost::scoped_ptr<ScDocument> mpUndoDoc;
+ boost::scoped_ptr<ScDocument> mpRedoDoc;
ScRange maRange;
};
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 1f55708cbdfb..edce6bc1f22b 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -25,7 +25,8 @@
#include "cellvalue.hxx"
#include <cellvalues.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
class ScDocShell;
class ScPatternAttr;
@@ -71,11 +72,11 @@ private:
ScPatternAttr* pOldPattern;
ScPatternAttr* pNewPattern;
ScPatternAttr* pApplyPattern;
- std::shared_ptr<EditTextObject> pOldEditData;
- std::shared_ptr<EditTextObject> pNewEditData;
+ ::boost::shared_ptr<EditTextObject> pOldEditData;
+ ::boost::shared_ptr<EditTextObject> pNewEditData;
bool bIsAutomatic;
- void DoChange( const ScPatternAttr* pWhichPattern, const std::shared_ptr<EditTextObject>& pEditData ) const;
+ void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const;
};
class ScUndoEnterData: public ScSimpleUndo
@@ -112,7 +113,7 @@ private:
ValuesType maOldValues;
OUString maNewString;
- std::unique_ptr<EditTextObject> mpNewEditData;
+ boost::scoped_ptr<EditTextObject> mpNewEditData;
sal_uLong mnEndChangeAction;
ScAddress maPos;
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 0bfa865a5707..c9c3060afb0f 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -28,7 +28,7 @@
#include "subtotalparam.hxx"
#include "pivot.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class ScDocShell;
class ScDocument;
@@ -469,7 +469,7 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- std::unique_ptr<ScMarkData> mpMarkData;
+ boost::scoped_ptr<ScMarkData> mpMarkData;
ScDocument* pUndoDoc;
ScDocument* pRedoDoc;
InsertDeleteFlags nFlags;
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index e5234961177e..fe43d95b16e3 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -27,7 +27,8 @@
#include <com/sun/star/uno/Sequence.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
#include <memory>
#include <vector>
@@ -170,10 +171,10 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- std::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
- std::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
- std::shared_ptr< ::std::vector< OUString> > mpOldNames;
- std::shared_ptr< ::std::vector< OUString> > mpNewNames;
+ ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
+ ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
+ ::boost::shared_ptr< ::std::vector< OUString> > mpOldNames;
+ ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames;
void DoChange( bool bUndo ) const;
};
@@ -198,9 +199,9 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- std::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
- std::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
- std::shared_ptr< ::std::vector< OUString> > mpNewNames;
+ ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs;
+ ::boost::shared_ptr< ::std::vector<SCTAB> > mpNewTabs;
+ ::boost::shared_ptr< ::std::vector< OUString> > mpNewNames;
SdrUndoAction* pDrawUndo;
void DoChange() const;
@@ -253,7 +254,7 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- std::unique_ptr<ScMarkData> mpMarkData;
+ boost::scoped_ptr<ScMarkData> mpMarkData;
SCTAB nSrcTab;
SCTAB nDestTab;
OUString aName;
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 3cecc6eea274..39fb5b2e151d 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -25,7 +25,7 @@
#include "viewopti.hxx"
#include "docsh.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#define SC_SIZE_NONE 65535
const SCCOL SC_TABSTART_NONE = SCCOL_MAX;
@@ -157,7 +157,7 @@ private:
double nPPTX, nPPTY; // Scaling factors
::std::vector<ScViewDataTable*> maTabData;
- std::unique_ptr<ScMarkData> mpMarkData;
+ boost::scoped_ptr<ScMarkData> mpMarkData;
ScViewDataTable* pThisTab; // Data of the displayed sheet
ScDocShell* pDocShell;
ScDocument* pDoc;
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 6c5e4f0aed33..540c5a2ad49c 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -19,8 +19,8 @@
#include "orcusxml.hxx"
#include <set>
-#include <memory>
#include <vector>
+#include <boost/scoped_ptr.hpp>
class ScDocument;
class ScRange;
@@ -47,7 +47,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg
std::set<const SvTreeListEntry*> maRangeLinks;
std::vector<SvTreeListEntry*> maHighlightedEntries;
SvTreeListEntry* mpCurRefEntry;
- std::unique_ptr<ScOrcusXMLContext> mpXMLContext;
+ boost::scoped_ptr<ScOrcusXMLContext> mpXMLContext;
ScDocument* mpDoc;
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 93232fde5e22..28ec44d1b46d 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -42,7 +42,7 @@
#include "rangeutl.hxx"
#include "tokenarray.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings)
: m_pDlg(_pDlg)
@@ -200,7 +200,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr)
SCTAB nTab = pViewData->GetTabNo();
ScAddress aPos( nCol, nRow, nTab );
- std::unique_ptr<ScTokenArray> pScTokA(pRefComp->CompileString(rStr));
+ boost::scoped_ptr<ScTokenArray> pScTokA(pRefComp->CompileString(rStr));
if (pTabViewShell && pScTokA)
{
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 73ea8a542b18..13e01eee1988 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -47,6 +47,7 @@
#include "scuiautofmt.hxx"
#include "scresid.hxx"
#include "document.hxx"
+#include <boost/scoped_ptr.hpp>
// AutoFormat-Dialog:
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 60b1d6d9751d..fc2373ed8675 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -33,6 +33,8 @@
#include <editeng/eerdll.hxx>
#include <vcl/builderfactory.hxx>
+#include <boost/scoped_ptr.hpp>
+
#define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl)
ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle,
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index b043dc4ba9cd..ccd9167799ad 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -47,7 +47,7 @@
#include "AccessibleEditObject.hxx"
#include "scuitphfedit.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// STATIC DATA -----------------------------------------------------------
@@ -327,9 +327,9 @@ void ScHFEditPage::SetSelectDefinedList()
// default to customized
ScHFEntryId eSelectEntry = eEntryCount;
- std::unique_ptr< EditTextObject > pLeftObj;
- std::unique_ptr< EditTextObject > pCenterObj;
- std::unique_ptr< EditTextObject > pRightObj;
+ boost::scoped_ptr< EditTextObject > pLeftObj;
+ boost::scoped_ptr< EditTextObject > pCenterObj;
+ boost::scoped_ptr< EditTextObject > pRightObj;
OUString aLeftEntry;
OUString aCenterEntry;
@@ -524,7 +524,7 @@ bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj)
{
aSel.nStartPos = aSel.nEndPos;
aSel.nEndPos++;
- std::unique_ptr< EditTextObject > pPageObj;
+ boost::scoped_ptr< EditTextObject > pPageObj;
pPageObj.reset(pEngine->CreateTextObject(aSel));
if(pPageObj.get() && pPageObj->IsFieldObject() )
{
@@ -582,7 +582,7 @@ bool ScHFEditPage::IsExtFileNameEntry(EditTextObject* pTextObj)
void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
SvtUserOptions aUserOpt;
- std::unique_ptr< EditTextObject > pTextObj;
+ boost::scoped_ptr< EditTextObject > pTextObj;
switch(eSel)
{
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index b8bb332aeee4..f629e8bc5bc9 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -36,7 +36,7 @@
#include "styledlg.hxx"
#include "scresid.hxx"
#include "scuitphfedit.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// class ScHFPage
@@ -186,7 +186,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void)
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg(
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg(
pViewSh->GetViewFrame(), this, aDataSet, aStrPageStyle, nResId));
OSL_ENSURE(pDlg, "Dialog create fail!");
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 968886e1f1d7..4d907e0c2230 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -45,7 +45,7 @@
#include "AccessibleEditObject.hxx"
#include "scabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// STATIC DATA -----------------------------------------------------------
static VclPtr<ScEditWindow> pActiveEdWnd = NULL;
@@ -205,7 +205,7 @@ void ScEditWindow::SetCharAttributes()
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
GetParent(), &aSet, pDocSh));
OSL_ENSURE(pDlg, "Dialog create fail!");
pDlg->SetText( ScGlobal::GetRscString( STR_TEXTATTRS ) );
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index a8ccd98798d7..fba7cc26c311 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -22,7 +22,7 @@
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <svx/sidebar/PanelLayout.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class FixedText;
namespace svx { namespace sidebar {
@@ -83,7 +83,7 @@ private:
VclPtr<ToolBox> mpTBCellBorder;
VclPtr<ToolBox> mpTBLineStyle;
VclPtr<ToolBox> mpTBLineColor;
- std::unique_ptr< CellBorderUpdater > mpCellBorderUpdater;
+ ::boost::scoped_ptr< CellBorderUpdater > mpCellBorderUpdater;
::sfx2::sidebar::ControllerItem maLineStyleControl;
::sfx2::sidebar::ControllerItem maBorderOuterControl;
@@ -133,8 +133,8 @@ private:
bool mbBLTR : 1;
// popups
- std::unique_ptr< CellLineStylePopup > mpCellLineStylePopup;
- std::unique_ptr< CellBorderStylePopup > mpCellBorderStylePopup;
+ ::boost::scoped_ptr< CellLineStylePopup > mpCellLineStylePopup;
+ ::boost::scoped_ptr< CellBorderStylePopup > mpCellBorderStylePopup;
css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 7bcb01f535fd..8a80d4086d3f 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -29,7 +29,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <editeng/lineitem.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sc { namespace sidebar {
@@ -291,8 +291,8 @@ IMPL_LINK_TYPED(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void)
SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER );
SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER );
- std::unique_ptr<editeng::SvxBorderLine> pTop;
- std::unique_ptr<editeng::SvxBorderLine> pBottom;
+ boost::scoped_ptr<editeng::SvxBorderLine> pTop;
+ boost::scoped_ptr<editeng::SvxBorderLine> pBottom;
sal_uInt8 nValidFlags = 0;
using namespace ::com::sun::star::table::BorderLineStyle;
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index efda9627f322..0a9545936606 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -22,6 +22,7 @@
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <svx/sidebar/PanelLayout.hxx>
+#include <boost/scoped_ptr.hpp>
class FixedText;
class ListBox;
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 73346abf6ec2..8748a7b473c5 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -55,8 +55,8 @@
#include <gridwin.hxx>
#include <svl/listener.hxx>
-#include <memory>
#include <set>
+#include <boost/scoped_ptr.hpp>
// STATIC DATA -----------------------------------------------------------
@@ -1360,7 +1360,7 @@ void ScUndoDragDrop::Redo()
BeginRedo();
ScDocument& rDoc = pDocShell->GetDocument();
- std::unique_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
+ boost::scoped_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
EnableDrawAdjust( &rDoc, false ); //! include in ScBlockUndo?
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index b5cc16c67838..3d84110e6ed1 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -106,7 +106,7 @@ OUString ScUndoDeleteContents::GetComment() const
return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Delete"
}
-void ScUndoDeleteContents::SetDataSpans( const std::shared_ptr<DataSpansType>& pSpans )
+void ScUndoDeleteContents::SetDataSpans( const boost::shared_ptr<DataSpansType>& pSpans )
{
mpDataSpans = pSpans;
}
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index e90875be756c..0f260972908c 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -45,7 +45,7 @@
#include "docuno.hxx"
#include "stringutil.hxx"
-using std::shared_ptr;
+using ::boost::shared_ptr;
namespace HelperNotifyChanges
{
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 64dd3dd75632..f18acd2af3e8 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -47,9 +47,9 @@
#include "drwlayer.hxx"
#include "scresid.hxx"
-#include <memory>
#include <utility>
#include <vector>
+#include <boost/scoped_ptr.hpp>
extern bool bDrawIsInUndo; // somewhere as member!
@@ -57,7 +57,7 @@ using namespace com::sun::star;
using ::com::sun::star::uno::Sequence;
using ::std::unique_ptr;
using ::std::vector;
-using std::shared_ptr;
+using ::boost::shared_ptr;
TYPEINIT1(ScUndoInsertTab, SfxUndoAction);
TYPEINIT1(ScUndoInsertTables, SfxUndoAction);
@@ -514,7 +514,7 @@ void ScUndoMoveTab::DoChange( bool bUndo ) const
if (bUndo) // UnDo
{
size_t i = mpNewTabs->size();
- std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB),
+ boost::scoped_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB),
i * rDoc.GetCodeCount()));
for (; i > 0; --i)
{
@@ -536,7 +536,7 @@ void ScUndoMoveTab::DoChange( bool bUndo ) const
else
{
size_t n = mpNewTabs->size();
- std::unique_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB),
+ boost::scoped_ptr<ScProgress> pProgress(new ScProgress(pDocShell , ScGlobal::GetRscString(STR_UNDO_MOVE_TAB),
n * rDoc.GetCodeCount()));
for (size_t i = 0; i < n; ++i)
{
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 527c7811ed2b..02638438b5f5 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -131,6 +131,7 @@
#include <list>
#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -1565,7 +1566,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
const ScUpdateRefHint& rRef = static_cast<const ScUpdateRefHint&>(rHint);
ScDocument& rDoc = pDocShell->GetDocument();
- std::unique_ptr<ScRangeList> pUndoRanges;
+ boost::scoped_ptr<ScRangeList> pUndoRanges;
if ( rDoc.HasUnoRefUndo() )
pUndoRanges.reset(new ScRangeList( aRanges ));
@@ -2447,7 +2448,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
formula::FormulaGrammar::GRAM_UNSPECIFIED :
formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
- std::unique_ptr<ScValidationData> pNewData(
+ boost::scoped_ptr<ScValidationData> pNewData(
pValidObj->CreateValidationData( &rDoc, eGrammar ));
sal_uLong nIndex = rDoc.AddValidationEntry( *pNewData );
pNewData.reset();
@@ -2714,8 +2715,8 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString
}
ScDocument& rDoc = pDocShell->GetDocument();
- std::unique_ptr<ScPatternAttr> pOldPattern;
- std::unique_ptr<ScPatternAttr> pNewPattern;
+ boost::scoped_ptr<ScPatternAttr> pOldPattern;
+ boost::scoped_ptr<ScPatternAttr> pNewPattern;
for(i = 0; i < nCount; i++)
{
@@ -2857,8 +2858,8 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
}
ScDocument& rDoc = pDocShell->GetDocument();
- std::unique_ptr<ScPatternAttr> pOldPattern;
- std::unique_ptr<ScPatternAttr> pNewPattern;
+ boost::scoped_ptr<ScPatternAttr> pOldPattern;
+ boost::scoped_ptr<ScPatternAttr> pNewPattern;
sal_Int32 nFailed(0);
for(i = 0; i < nCount; i++)
@@ -3079,7 +3080,7 @@ uno::Sequence< uno::Sequence<double> > SAL_CALL ScCellRangesBase::getData()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
+ boost::scoped_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
if ( pMemChart )
{
sal_Int32 nColCount = pMemChart->GetColCount();
@@ -3193,7 +3194,7 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
+ boost::scoped_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
if ( pMemChart )
{
sal_Int32 nRowCount = static_cast<sal_Int32>(pMemChart->GetRowCount());
@@ -3264,7 +3265,7 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions()
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
+ boost::scoped_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
if ( pMemChart )
{
sal_Int32 nColCount = pMemChart->GetColCount();
@@ -4087,7 +4088,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
for (; itr != itrEnd && *itr < nTabCount; ++itr)
if ( *itr != nTab && bUndo)
pUndoDoc->AddUndoTab( *itr, *itr );
- std::unique_ptr<ScMarkData> pUndoMark;
+ boost::scoped_ptr<ScMarkData> pUndoMark;
if (bUndo)
pUndoMark.reset(new ScMarkData(aMark));
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 6335ce6f362a..a2b870c3470f 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -77,7 +77,7 @@ using ::std::vector;
using ::std::list;
using ::std::distance;
using ::std::unary_function;
-using ::std::shared_ptr;
+using ::boost::shared_ptr;
namespace
{
@@ -187,9 +187,9 @@ struct TokenTable : boost::noncopyable
vector<ScTokenRef>* TokenTable::getColRanges(SCCOL nCol) const
{
if (nCol >= mnColCount)
- return nullptr;
+ return NULL;
if( mnRowCount<=0 )
- return nullptr;
+ return NULL;
unique_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>);
sal_uInt32 nLast = getIndex(nCol, mnRowCount-1);
@@ -208,9 +208,9 @@ vector<ScTokenRef>* TokenTable::getColRanges(SCCOL nCol) const
vector<ScTokenRef>* TokenTable::getRowRanges(SCROW nRow) const
{
if (nRow >= mnRowCount)
- return nullptr;
+ return NULL;
if( mnColCount<=0 )
- return nullptr;
+ return NULL;
unique_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>);
sal_uInt32 nLast = getIndex(mnColCount-1, nRow);
@@ -367,7 +367,7 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount, SCROW nAllRowCount,
FormulaTokenMap::const_iterator it2 = pCol->begin();
for (SCROW nRow = 0; nRow < nAllRowCount; ++nRow)
{
- FormulaToken* pToken = nullptr;
+ FormulaToken* pToken = NULL;
if (it2 != pCol->end())
{
pToken = it2->second;
@@ -448,7 +448,7 @@ class Chart2Positioner : boost::noncopyable
public:
Chart2Positioner(ScDocument* pDoc, const vector<ScTokenRef>& rRefTokens) :
mrRefTokens(rRefTokens),
- mpPositionMap(nullptr),
+ mpPositionMap(NULL),
meGlue(GLUETYPE_NA),
mnStartCol(0),
mnStartRow(0),
@@ -483,7 +483,7 @@ private:
private:
const vector<ScTokenRef>& mrRefTokens;
- std::unique_ptr<Chart2PositionMap> mpPositionMap;
+ boost::scoped_ptr<Chart2PositionMap> mpPositionMap;
GlueType meGlue;
SCCOL mnStartCol;
SCROW mnStartRow;
@@ -714,7 +714,7 @@ void Chart2Positioner::createPositionMap()
bool bNoGlue = (meGlue == GLUETYPE_NONE);
unique_ptr<FormulaTokenMapMap> pCols(new FormulaTokenMapMap);
- FormulaTokenMap* pCol = nullptr;
+ FormulaTokenMap* pCol = NULL;
SCROW nNoGlueRow = 0;
for (vector<ScTokenRef>::const_iterator itr = mrRefTokens.begin(), itrEnd = mrRefTokens.end();
itr != itrEnd; ++itr)
@@ -791,7 +791,7 @@ void Chart2Positioner::createPositionMap()
pCol = pCols->begin()->second;
if (mbDummyUpperLeft)
if (pCol->find(0) == pCol->end())
- (*pCol)[ 0 ] = nullptr; // Dummy fuer Beschriftung
+ (*pCol)[ 0 ] = NULL; // Dummy fuer Beschriftung
nAllRowCount = static_cast<SCSIZE>(pCol->size());
}
@@ -807,7 +807,7 @@ void Chart2Positioner::createPositionMap()
{
pCol = it2->second;
if (pCol->find(nKey) == pCol->end())
- (*pCol)[ nKey ] = nullptr;
+ (*pCol)[ nKey ] = NULL;
}
}
}
@@ -1020,7 +1020,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- m_pDocument = nullptr;
+ m_pDocument = NULL;
}
}
@@ -1521,7 +1521,7 @@ ScChart2DataProvider::createDataSource(
// No chart position map instance. Bail out.
return xResult;
- ScChart2DataSource* pDS = nullptr;
+ ScChart2DataSource* pDS = NULL;
::std::list< Reference< chart2::data::XLabeledDataSequence > > aSeqs;
// Fill Categories
@@ -2415,7 +2415,7 @@ void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING )
{
- m_pDocument = nullptr;
+ m_pDocument = NULL;
}
}
@@ -2475,12 +2475,12 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc,
, m_nObjectId( 0 )
, m_pDocument( pDoc)
, m_pTokens(pTokens)
- , m_pRangeIndices(nullptr)
- , m_pExtRefListener(nullptr)
+ , m_pRangeIndices(NULL)
+ , m_pExtRefListener(NULL)
, m_xDataProvider( xDP)
, m_aPropSet(lcl_GetDataSequencePropertyMap())
- , m_pHiddenListener(nullptr)
- , m_pValueListener( nullptr )
+ , m_pHiddenListener(NULL)
+ , m_pValueListener( NULL )
, m_bGotDataChangedHint(false)
, m_bExtDataRebuildQueued(false)
, mbTimeBased(false)
@@ -2535,7 +2535,7 @@ void ScChart2DataSequence::RefChanged()
if( m_pDocument )
{
- ScChartListenerCollection* pCLC = nullptr;
+ ScChartListenerCollection* pCLC = NULL;
if (m_pHiddenListener.get())
{
pCLC = m_pDocument->GetChartListenerCollection();
@@ -2567,7 +2567,7 @@ void ScChart2DataSequence::BuildDataCache()
if (!m_pTokens.get())
{
- OSL_FAIL("m_pTokens == nullptr! Something is wrong.");
+ OSL_FAIL("m_pTokens == NULL! Something is wrong.");
return;
}
@@ -2598,8 +2598,8 @@ void ScChart2DataSequence::BuildDataCache()
{
for (SCROW nRow = aRange.aStart.Row(); nRow <= aRange.aEnd.Row(); ++nRow)
{
- bool bColHidden = m_pDocument->ColHidden(nCol, nTab, nullptr, &nLastCol);
- bool bRowHidden = m_pDocument->RowHidden(nRow, nTab, nullptr, &nLastRow);
+ bool bColHidden = m_pDocument->ColHidden(nCol, nTab, NULL, &nLastCol);
+ bool bRowHidden = m_pDocument->RowHidden(nRow, nTab, NULL, &nLastRow);
if (bColHidden || bRowHidden)
{
@@ -2686,7 +2686,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke
sal_uInt16 nFileId = pToken->GetIndex();
OUString aTabName = pToken->GetString().getString();
- ScExternalRefCache::TokenArrayRef pArray = pRefMgr->getDoubleRefTokens(nFileId, aTabName, aRange, nullptr);
+ ScExternalRefCache::TokenArrayRef pArray = pRefMgr->getDoubleRefTokens(nFileId, aTabName, aRange, NULL);
if (!pArray)
// no external data exists for this range.
return 0;
@@ -2696,7 +2696,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke
pRefMgr->addLinkListener(nFileId, pExtRefListener);
pExtRefListener->addFileId(nFileId);
- ScExternalRefCache::TableTypeRef pTable = pRefMgr->getCacheTable(nFileId, aTabName, false, nullptr);
+ ScExternalRefCache::TableTypeRef pTable = pRefMgr->getCacheTable(nFileId, aTabName, false, NULL);
sal_Int32 nDataCount = 0;
for (FormulaToken* p = pArray->First(); p; p = pArray->Next())
{
@@ -2729,7 +2729,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke
if (pFormatter)
{
const double fVal = aItem.mfValue;
- Color* pColor = nullptr;
+ Color* pColor = NULL;
sal_uInt32 nFmt = 0;
if (pTable)
{
@@ -2769,7 +2769,7 @@ void ScChart2DataSequence::UpdateTokensFromRanges(const ScRangeList& rRanges)
{
ScTokenRef pToken;
const ScRange* pRange = rRanges[i];
- OSL_ENSURE(pRange, "range object is nullptr.");
+ OSL_ENSURE(pRange, "range object is NULL.");
ScRefTokenHelper::getTokenFromRange(pToken, *pRange);
sal_uInt32 nOrigPos = (*m_pRangeIndices)[i];
@@ -2809,7 +2809,7 @@ void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)
{
if (!m_pDocument)
{
- OSL_FAIL("document instance is nullptr!?");
+ OSL_FAIL("document instance is NULL!?");
return;
}
@@ -2847,7 +2847,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
sal_uLong nId = pSimpleHint->GetId();
if ( nId ==SFX_HINT_DYING )
{
- m_pDocument = nullptr;
+ m_pDocument = NULL;
}
else if ( nId == SFX_HINT_DATACHANGED )
{
@@ -3179,7 +3179,7 @@ public:
OUString aString = ScGlobal::GetRscString(STR_COLUMN);
aString += " ";
ScAddress aPos( nCol, 0, 0 );
- OUString aColStr(aPos.Format(SCA_VALID_COL, nullptr));
+ OUString aColStr(aPos.Format(SCA_VALID_COL, NULL));
aString += aColStr;
pArr[mnCount] = aString;
}
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 2626c74c52ab..da35ab69644b 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -748,7 +748,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue(
if ((aValue >>= aFormula) && !aFormula.isEmpty())
{
ScCompiler aComp(&mpDocShell->GetDocument(), getCoreObject()->GetSrcPos());
- std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula));
+ boost::scoped_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula));
getCoreObject()->SetFormula1(*pArr);
}
}
@@ -759,7 +759,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue(
if ((aValue >>= aFormula) && !aFormula.isEmpty())
{
ScCompiler aComp(&mpDocShell->GetDocument(), getCoreObject()->GetSrcPos());
- std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula));
+ boost::scoped_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula));
getCoreObject()->SetFormula2(*pArr);
}
}
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index a899d101cfc8..94c29dcc50dd 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -192,7 +192,7 @@ ScUnoEditEngine::ScUnoEditEngine(ScEditEngineDefaulter* pSource)
, eMode(SC_UNO_COLLECT_NONE)
, nFieldCount(0)
, mnFieldType(text::textfield::Type::UNSPECIFIED)
- , pFound(nullptr)
+ , pFound(NULL)
, nFieldPar(0)
, nFieldPos(0)
, nFieldIndex(0)
@@ -280,7 +280,7 @@ ScCellFieldsObj::ScCellFieldsObj(
mxContent(xContent),
pDocShell( pDocSh ),
aCellPos( rPos ),
- mpRefreshListeners( nullptr )
+ mpRefreshListeners( NULL )
{
pDocShell->GetDocument().AddUnoObject(*this);
@@ -320,7 +320,7 @@ void ScCellFieldsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) &&
static_cast<const SfxSimpleHint&>(rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
// EditSource hat sich selber als Listener angemeldet
@@ -467,7 +467,7 @@ void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util:
ScHeaderFieldsObj::ScHeaderFieldsObj(ScHeaderFooterTextData& rData) :
mrData(rData),
- mpRefreshListeners( nullptr )
+ mpRefreshListeners( NULL )
{
mpEditSource = new ScHeaderFooterEditSource(rData);
}
@@ -501,7 +501,7 @@ uno::Reference<text::XTextField> ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In
SvxFieldData* pData = aTempEngine.FindByIndex(static_cast<sal_uInt16>(Index));
if (!pData)
- return nullptr;
+ return NULL;
// Get the parent text range instance.
uno::Reference<text::XTextRange> xTextRange;
@@ -855,7 +855,7 @@ uno::Any ScEditFieldObj::getPropertyValueFile(const OUString& rName)
if (rName == SC_UNONAME_FILEFORM)
{
SvxFileFormat eFormat = SVXFILEFORMAT_NAME_EXT;
- const SvxFieldData* pField = nullptr;
+ const SvxFieldData* pField = NULL;
if (mpEditSource)
{
ScEditEngineDefaulter* pEditEngine = mpEditSource->GetEditEngine();
@@ -1134,10 +1134,10 @@ ScEditFieldObj::ScEditFieldObj(
const uno::Reference<text::XTextRange>& rContent,
ScEditSource* pEditSrc, sal_Int32 eType, const ESelection& rSel) :
OComponentHelper(getMutex()),
- pPropSet(nullptr),
+ pPropSet(NULL),
mpEditSource(pEditSrc),
aSelection(rSel),
- meType(eType), mpData(nullptr), mpContent(rContent), mnNumFormat(0), mbIsDate(false), mbIsFixed(false)
+ meType(eType), mpData(NULL), mpContent(rContent), mnNumFormat(0), mbIsDate(false), mbIsFixed(false)
{
switch (meType)
{
@@ -1205,7 +1205,7 @@ void ScEditFieldObj::DeleteField()
bool ScEditFieldObj::IsInserted() const
{
- return mpEditSource != nullptr;
+ return mpEditSource != NULL;
}
// XTextField
@@ -1411,7 +1411,7 @@ const uno::Sequence<sal_Int8>& ScEditFieldObj::getUnoTunnelId()
ScEditFieldObj* ScEditFieldObj::getImplementation(const uno::Reference<text::XTextContent>& xObj)
{
- ScEditFieldObj* pRet = nullptr;
+ ScEditFieldObj* pRet = NULL;
uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
if (xUT.is())
pRet = reinterpret_cast<ScEditFieldObj*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId())));
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 69336affb287..2246df755328 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -39,7 +39,7 @@
#include <optutil.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -176,11 +176,11 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
INetURLObject aURL( aFileName );
OUString aPrivDatName(aURL.getName());
- std::unique_ptr<SvStream> pInStream;
+ boost::scoped_ptr<SvStream> pInStream;
if ( xInputStream.is() )
pInStream.reset(utl::UcbStreamHelper::CreateStream( xInputStream ));
- std::unique_ptr<AbstractScImportAsciiDlg> pDlg(pFact->CreateScImportAsciiDlg( NULL, aPrivDatName, pInStream.get(), SC_IMPORTFILE));
+ boost::scoped_ptr<AbstractScImportAsciiDlg> pDlg(pFact->CreateScImportAsciiDlg( NULL, aPrivDatName, pInStream.get(), SC_IMPORTFILE));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
@@ -198,7 +198,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
else
{
// HTML import.
- std::unique_ptr<AbstractScTextImportOptionsDlg> pDlg(
+ boost::scoped_ptr<AbstractScTextImportOptionsDlg> pDlg(
pFact->CreateScTextImportOptionsDlg(NULL));
if (pDlg->Execute() == RET_OK)
@@ -281,7 +281,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
ScImportOptions aOptions( cAsciiDel, cStrDel, eEncoding);
- std::unique_ptr<AbstractScImportOptionsDlg> pDlg(pFact->CreateScImportOptionsDlg(NULL,
+ boost::scoped_ptr<AbstractScImportOptionsDlg> pDlg(pFact->CreateScImportOptionsDlg(NULL,
bAscii, &aOptions, &aTitle, bMultiByte, bDBEnc,
!bExport));
OSL_ENSURE(pDlg, "Dialog create fail!");
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 07aff0901ef2..4b0531a2e70a 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -34,7 +34,7 @@
#include "compiler.hxx"
#include "tokenarray.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -130,7 +130,7 @@ void ScVbaName::setContent( const OUString& rContent, const formula::FormulaGra
// Shorter way of doing this ?
ScCompiler aComp( &rDoc, pOldData->GetPos() );
aComp.SetGrammar( eGrammar );
- std::unique_ptr<ScTokenArray> pArray(aComp.CompileString(sContent));
+ boost::scoped_ptr<ScTokenArray> pArray(aComp.CompileString(sContent));
pOldData->SetCode(*pArray);
}
}
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 53faccf0becb..4d64a43bcf55 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -34,7 +34,7 @@
#include "tokenarray.hxx"
#include "cellsuno.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -156,7 +156,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
ScAddress aBlank;
ScCompiler aComp( getScDocument(), aBlank );
aComp.SetGrammar( eGram );
- std::unique_ptr<ScTokenArray> pTokens(aComp.CompileString(sFormula));
+ boost::scoped_ptr<ScTokenArray> pTokens(aComp.CompileString(sFormula));
if ( pTokens )
{
ScRange aRange;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 913de30eb7d9..004f0286aaab 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -175,7 +175,7 @@
#include "tokenuno.hxx"
#include <columnspanset.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -894,7 +894,7 @@ protected:
ScCompiler aCompiler( m_pDoc, aCellRanges.front()->aStart );
aCompiler.SetGrammar(m_eGrammar);
// compile the string in the format passed in
- std::unique_ptr<ScTokenArray> pArray(aCompiler.CompileString(sFormula));
+ boost::scoped_ptr<ScTokenArray> pArray(aCompiler.CompileString(sFormula));
// set desired convention to that of the document
aCompiler.SetGrammar( formula::FormulaGrammar::GRAM_PODF_A1 );
OUString sConverted;
@@ -937,7 +937,7 @@ public:
ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
ScCompiler aCompiler( m_pDoc, aCellRanges.front()->aStart );
aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_DEFAULT);
- std::unique_ptr<ScTokenArray> pArray(aCompiler.CompileString(sVal));
+ boost::scoped_ptr<ScTokenArray> pArray(aCompiler.CompileString(sVal));
// set desired convention
aCompiler.SetGrammar( m_eGrammar );
OUString sConverted;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index b0484f9c77c8..64aa830826e3 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -97,7 +97,7 @@
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -215,12 +215,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
else
{
ScDocument* pDoc = GetViewData()->GetDocument();
- bool bTheFlag=(pDoc->GetChangeTrack()!=nullptr);
+ bool bTheFlag=(pDoc->GetChangeTrack()!=NULL);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScInsertCellDlg> pDlg(pFact->CreateScInsertCellDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_INSCELL, bTheFlag));
+ boost::scoped_ptr<AbstractScInsertCellDlg> pDlg(pFact->CreateScInsertCellDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_INSCELL, bTheFlag));
OSL_ENSURE(pDlg, "Dialog create fail!");
if (pDlg->Execute() == RET_OK)
eCmd = pDlg->GetInsCellCmd();
@@ -287,12 +287,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScDocument* pDoc = GetViewData()->GetDocument();
bool bTheFlag=GetViewData()->IsMultiMarked() ||
(GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE_FILTERED) ||
- (pDoc->GetChangeTrack() != nullptr);
+ (pDoc->GetChangeTrack() != NULL);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScDeleteCellDlg> pDlg(pFact->CreateScDeleteCellDlg( pTabViewShell->GetDialogParent(), bTheFlag ));
+ boost::scoped_ptr<AbstractScDeleteCellDlg> pDlg(pFact->CreateScDeleteCellDlg( pTabViewShell->GetDialogParent(), bTheFlag ));
OSL_ENSURE(pDlg, "Dialog create fail!");
if (pDlg->Execute() == RET_OK)
@@ -337,7 +337,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
InsertDeleteFlags nFlags = IDF_NONE;
- if ( pReqArgs!=nullptr && pTabViewShell->SelectionEditable() )
+ if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
{
const SfxPoolItem* pItem;
OUString aFlags('A');
@@ -374,7 +374,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScDeleteContentsDlg> pDlg(pFact->CreateScDeleteContentsDlg(pTabViewShell->GetDialogParent()));
+ boost::scoped_ptr<AbstractScDeleteContentsDlg> pDlg(pFact->CreateScDeleteContentsDlg(pTabViewShell->GetDialogParent()));
OSL_ENSURE(pDlg, "Dialog create fail!");
ScDocument* pDoc = GetViewData()->GetDocument();
SCTAB nTab = GetViewData()->GetTabNo();
@@ -448,7 +448,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bool bSkipEmpty = false;
bool bAsLink = false;
- if ( pReqArgs!=nullptr && pTabViewShell->SelectionEditable() )
+ if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
{
const SfxPoolItem* pItem;
OUString aFlags('A');
@@ -481,7 +481,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScInsertContentsDlg> pDlg(pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
+ boost::scoped_ptr<AbstractScInsertContentsDlg> pDlg(pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
IDF_NONE, /* nCheckDefaults */
&ScGlobal::GetRscString(STR_FILL_TAB)));
OSL_ENSURE(pDlg, "Dialog create fail!");
@@ -627,7 +627,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bDoIt = true;
}
- else // (pReqArgs == nullptr) => raise Dialog
+ else // (pReqArgs == NULL) => raise Dialog
{
sal_uInt32 nPrivFormat;
CellType eCellType;
@@ -711,7 +711,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScFillSeriesDlg> pDlg(pFact->CreateScFillSeriesDlg( pTabViewShell->GetDialogParent(),
+ boost::scoped_ptr<AbstractScFillSeriesDlg> pDlg(pFact->CreateScFillSeriesDlg( pTabViewShell->GetDialogParent(),
*pDoc,
eFillDir, eFillCmd, eFillDateCmd,
aStartStr, fIncVal, fMaxVal,
@@ -814,7 +814,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
SCROW nFillRow = GetViewData()->GetRefEndY();
ScDocument* pDoc = GetViewData()->GetDocument();
- if( pReqArgs != nullptr )
+ if( pReqArgs != NULL )
{
const SfxPoolItem* pItem;
@@ -1028,7 +1028,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case SID_SEARCH_RESULTS_DIALOG:
{
- const SfxPoolItem* pItem = nullptr;
+ const SfxPoolItem* pItem = NULL;
if (pReqArgs && pReqArgs->HasItem(SID_SEARCH_RESULTS_DIALOG, &pItem))
{
bool bVisible = static_cast<const SfxBoolItem*>(pItem)->GetValue();
@@ -1132,7 +1132,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bOk = false;
}
- else if( pReqArgs != nullptr )
+ else if( pReqArgs != NULL )
{
const SfxPoolItem* pItem;
bOk = false;
@@ -1160,7 +1160,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent(), false));
+ boost::scoped_ptr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent(), false));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
bColumns = pDlg->GetColsChecked();
@@ -1193,7 +1193,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
pTabViewShell->UngroupDataPilot();
bOk = false;
}
- else if( pReqArgs != nullptr )
+ else if( pReqArgs != NULL )
{
const SfxPoolItem* pItem;
bOk = false;
@@ -1219,7 +1219,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent(), true));
+ boost::scoped_ptr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent(), true));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
bColumns = pDlg->GetColsChecked();
@@ -1252,7 +1252,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case SID_COPY: // for graphs in DrawShell
{
WaitObject aWait( GetViewData()->GetDialogParent() );
- pTabViewShell->CopyToClip( nullptr, false, false, true );
+ pTabViewShell->CopyToClip( NULL, false, false, true );
rReq.Done();
GetViewData()->SetPasteMode( (ScPasteFlags) (SC_PASTE_MODE | SC_PASTE_BORDER) );
pTabViewShell->ShowCursor();
@@ -1263,7 +1263,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case SID_CUT: // for graphs in DrawShell
{
WaitObject aWait( GetViewData()->GetDialogParent() );
- pTabViewShell->CutToClip( nullptr, true );
+ pTabViewShell->CutToClip( NULL, true );
rReq.Done();
GetViewData()->SetPasteMode( (ScPasteFlags)(SC_PASTE_MODE | SC_PASTE_BORDER));
pTabViewShell->ShowCursor();
@@ -1294,8 +1294,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( nFormat != SotClipboardFormatId::NONE )
{
vcl::Window* pWin = GetViewData()->GetActiveWin();
- bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != nullptr );
- bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != nullptr );
+ bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != NULL );
+ bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
bool bOle = ( nFormat == SotClipboardFormatId::EMBED_SOURCE );
if ( bCells && bOle )
@@ -1331,7 +1331,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
// keep a reference in case the clipboard is changed during dialog or PasteFromClip
uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip );
- if ( pReqArgs!=nullptr && pTabViewShell->SelectionEditable() )
+ if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
{
const SfxPoolItem* pItem;
OUString aFlags('A');
@@ -1383,11 +1383,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScInsertContentsDlg> pDlg(pFact->CreateScInsertContentsDlg(pTabViewShell->GetDialogParent()));
+ boost::scoped_ptr<AbstractScInsertContentsDlg> pDlg(pFact->CreateScInsertContentsDlg(pTabViewShell->GetDialogParent()));
OSL_ENSURE(pDlg, "Dialog create fail!");
pDlg->SetOtherDoc( bOtherDoc );
// if ChangeTrack MoveMode disable
- pDlg->SetChangeTrack( pDoc->GetChangeTrack() != nullptr );
+ pDlg->SetChangeTrack( pDoc->GetChangeTrack() != NULL );
// fdo#56098 disable shift if necessary
if ( !bOtherDoc && pOwnClip )
{
@@ -1538,7 +1538,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
vcl::Window* pWin = GetViewData()->GetActiveWin();
// Clipboard-ID given as parameter? Basic "PasteSpecial(Format)"
- const SfxPoolItem* pItem=nullptr;
+ const SfxPoolItem* pItem=NULL;
if ( pReqArgs &&
pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET &&
pItem->ISA(SfxUInt32Item) )
@@ -1547,7 +1547,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bool bRet=true;
{
WaitObject aWait( GetViewData()->GetDialogParent() );
- bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != nullptr );
+ bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
if ( bDraw && nFormat == SotClipboardFormatId::EMBED_SOURCE )
pTabViewShell->PasteDraw();
else
@@ -1561,7 +1561,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
// if format is not available -> fallback to request without parameters
- pItem = nullptr;
+ pItem = NULL;
}
if ( !pItem )
@@ -1574,7 +1574,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else // draw objects or external data
{
- bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != nullptr );
+ bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
GetPossibleClipboardFormats( aFormats );
@@ -1583,7 +1583,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( nFormatCount )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( pTabViewShell->GetDialogParent() ));
+ boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( pTabViewShell->GetDialogParent() ));
if ( pDlg )
{
for (sal_uInt16 i=0; i<nFormatCount; i++)
@@ -1817,7 +1817,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScNameCreateDlg> pDlg(pFact->CreateScNameCreateDlg(pTabViewShell->GetDialogParent(), nFlags));
+ boost::scoped_ptr<AbstractScNameCreateDlg> pDlg(pFact->CreateScNameCreateDlg(pTabViewShell->GetDialogParent(), nFlags));
OSL_ENSURE(pDlg, "Dialog create fail!");
if( pDlg->Execute() )
@@ -1865,7 +1865,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else // CANCEL
{
- pScMod->ActivateInputWindow( nullptr );
+ pScMod->ActivateInputWindow( NULL );
}
rReq.Ignore(); // only SID_ENTER_STRING is recorded
}
@@ -1926,11 +1926,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bool bManaged = false;
// Get the pool item stored it by Conditional Format Manager Dialog.
- const SfxPoolItem* pItem = nullptr;
+ const SfxPoolItem* pItem = NULL;
sal_uInt32 nItems(pTabViewShell->GetPool().GetItemCount2( SCITEM_STRING ));
for( sal_uInt32 nIter = 0; nIter < nItems; ++nIter )
{
- if( nullptr != (pItem = pTabViewShell->GetPool().GetItem2( SCITEM_STRING, nIter ) ) )
+ if( NULL != (pItem = pTabViewShell->GetPool().GetItem2( SCITEM_STRING, nIter ) ) )
{
if ( ScCondFormatDlg::ParseXmlString(
static_cast<const SfxStringItem*>(pItem)->GetValue(),
@@ -1969,7 +1969,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
aRangeList.push_back(pRange);
}
- const ScConditionalFormat* pCondFormat = nullptr;
+ const ScConditionalFormat* pCondFormat = NULL;
const ScPatternAttr* pPattern = pDoc->GetPattern(aPos.Col(), aPos.Row(), aPos.Tab());
const std::vector<sal_uInt32>& rCondFormats = static_cast<const ScCondFormatItem&>(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData();
bool bContainsCondFormat = !rCondFormats.empty();
@@ -2139,7 +2139,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScNamePasteDlg> pDlg(pFact->CreateScNamePasteDlg( pTabViewShell->GetDialogParent(), GetViewData()->GetDocShell() ));
+ boost::scoped_ptr<AbstractScNamePasteDlg> pDlg(pFact->CreateScNamePasteDlg( pTabViewShell->GetDialogParent(), GetViewData()->GetDocShell() ));
OSL_ENSURE(pDlg, "Dialog create fail!");
switch( pDlg->Execute() )
{
@@ -2300,7 +2300,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
case SID_CHARMAP:
- if( pReqArgs != nullptr )
+ if( pReqArgs != NULL )
{
OUString aChars, aFontName;
const SfxItemSet *pArgs = rReq.GetArgs();
@@ -2312,7 +2312,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
const SfxStringItem* pStringItem = PTR_CAST( SfxStringItem, pItem );
if ( pStringItem )
aChars = pStringItem->GetValue();
- const SfxPoolItem* pFtItem = nullptr;
+ const SfxPoolItem* pFtItem = NULL;
pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
@@ -2322,7 +2322,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( !aChars.isEmpty() )
{
vcl::Font aFont;
- pTabViewShell->GetSelectionPattern()->GetFont( aFont, SC_AUTOCOL_BLACK, nullptr, nullptr, nullptr,
+ pTabViewShell->GetSelectionPattern()->GetFont( aFont, SC_AUTOCOL_BLACK, NULL, NULL, NULL,
pTabViewShell->GetSelectionScriptType() );
if ( !aFontName.isEmpty() )
aFont = vcl::Font( aFontName, Size(1,1) );
@@ -2337,14 +2337,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
// font color doesn't matter here
vcl::Font aCurFont;
- pTabViewShell->GetSelectionPattern()->GetFont( aCurFont, SC_AUTOCOL_BLACK, nullptr, nullptr, nullptr,
+ pTabViewShell->GetSelectionPattern()->GetFont( aCurFont, SC_AUTOCOL_BLACK, NULL, NULL, NULL,
pTabViewShell->GetSelectionScriptType() );
SfxAllItemSet aSet( GetPool() );
aSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), GetPool().GetWhich(SID_ATTR_CHAR_FONT) ) );
- std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( pTabViewShell->GetDialogParent(), aSet,
+ boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( pTabViewShell->GetDialogParent(), aSet,
pTabViewShell->GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
if ( pDlg->Execute() == RET_OK )
@@ -2384,7 +2384,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
- OSL_FAIL("nullptr");
+ OSL_FAIL("NULL");
}
}
}
@@ -2427,7 +2427,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAddress aPos(pData->GetCurX(), pData->GetCurY(), pData->GetTabNo());
ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() );
- std::unique_ptr<AbstractScCondFormatManagerDlg> pDlg(pFact->CreateScCondFormatMgrDlg(
+ boost::scoped_ptr<AbstractScCondFormatManagerDlg> pDlg(pFact->CreateScCondFormatMgrDlg(
pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER));
short nRet = pDlg->Execute();
if(nRet == RET_OK && pDlg->CondFormatsChanged())
@@ -2572,7 +2572,7 @@ bool isDPSourceValid(const ScDPObject& rDPObj)
return false;
const ScDPSaveData* pSaveData = rDPObj.GetSaveData();
- const ScDPDimensionSaveData* pDimData = nullptr;
+ const ScDPDimensionSaveData* pDimData = NULL;
if (pSaveData)
pDimData = pSaveData->GetExistingDimensionData();
@@ -2593,7 +2593,7 @@ void ScCellShell::ExecuteDataPilotDialog()
ScViewData* pData = GetViewData();
ScDocument* pDoc = pData->GetDocument();
- std::unique_ptr<ScDPObject> pNewDPObject(nullptr);
+ ::boost::scoped_ptr<ScDPObject> pNewDPObject(NULL);
// ScPivot is no longer used...
ScDPObject* pDPObj = pDoc->GetDPAtCursor(
@@ -2625,7 +2625,7 @@ void ScCellShell::ExecuteDataPilotDialog()
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScDataPilotSourceTypeDlg> pTypeDlg(
+ ::boost::scoped_ptr<AbstractScDataPilotSourceTypeDlg> pTypeDlg(
pFact->CreateScDataPilotSourceTypeDlg(
pTabViewShell->GetDialogParent(), bEnableExt));
@@ -2644,7 +2644,7 @@ void ScCellShell::ExecuteDataPilotDialog()
if ( pTypeDlg->IsExternal() )
{
uno::Sequence<OUString> aSources = ScDPObject::GetRegisteredSources();
- std::unique_ptr<AbstractScDataPilotServiceDlg> pServDlg(
+ ::boost::scoped_ptr<AbstractScDataPilotServiceDlg> pServDlg(
pFact->CreateScDataPilotServiceDlg(
pTabViewShell->GetDialogParent(), aSources, RID_SCDLG_DAPISERVICE));
@@ -2665,7 +2665,7 @@ void ScCellShell::ExecuteDataPilotDialog()
{
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScDataPilotDatabaseDlg> pDataDlg(
+ ::boost::scoped_ptr<AbstractScDataPilotDatabaseDlg> pDataDlg(
pFact->CreateScDataPilotDatabaseDlg(
pTabViewShell->GetDialogParent()));
@@ -2796,7 +2796,7 @@ void ScCellShell::ExecuteSubtotals(SfxRequest& rReq)
return;
}
- std::unique_ptr<SfxAbstractTabDialog> pDlg;
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
ScSubTotalParam aSubTotalParam;
SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA );
@@ -2827,7 +2827,7 @@ void ScCellShell::ExecuteSubtotals(SfxRequest& rReq)
if ( (bResult == RET_OK) || (bResult == SCRET_REMOVE) )
{
- const SfxItemSet* pOutSet = nullptr;
+ const SfxItemSet* pOutSet = NULL;
if ( bResult == RET_OK )
{
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index fb3e6b796292..2e0f7f2f604a 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -66,7 +66,7 @@
#include <config_orcus.h>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -162,7 +162,7 @@ static bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScSortWarningDlg> pWarningDlg(pFact->CreateScSortWarningDlg( pTabViewShell->GetDialogParent(), aExtendStr, aCurrentStr ));
+ boost::scoped_ptr<AbstractScSortWarningDlg> pWarningDlg(pFact->CreateScSortWarningDlg( pTabViewShell->GetDialogParent(), aExtendStr, aCurrentStr ));
OSL_ENSURE(pWarningDlg, "Dialog create fail!");
short bResult = pWarningDlg->Execute();
if( bResult == BTN_EXTEND_RANGE || bResult == BTN_CURRENT_SELECTION )
@@ -482,7 +482,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
assert(pFact); //ScAbstractFactory create fail!
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScSortDlg(pTabViewShell->GetDialogParent(), &aArgSet));
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScSortDlg(pTabViewShell->GetDialogParent(), &aArgSet));
assert(pDlg); //Dialog create fail!
pDlg->SetCurPageId("criteria"); // 1=sort field tab 2=sort options tab
@@ -723,7 +723,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScSelEntryDlg> pDlg(pFact->CreateScSelEntryDlg( pTabViewShell->GetDialogParent(),
+ boost::scoped_ptr<AbstractScSelEntryDlg> pDlg(pFact->CreateScSelEntryDlg( pTabViewShell->GetDialogParent(),
aList ));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
@@ -975,7 +975,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE( pFact, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pFact is null!" );
- std::unique_ptr<AbstractScImportAsciiDlg> pDlg(pFact->CreateScImportAsciiDlg(
+ boost::scoped_ptr<AbstractScImportAsciiDlg> pDlg(pFact->CreateScImportAsciiDlg(
NULL, OUString(), &aStream, SC_TEXTTOCOLUMNS));
OSL_ENSURE( pDlg, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pDlg is null!" );
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index b5667e6ac3d9..0df3ad943b1f 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -48,7 +48,7 @@
#include "sccollaboration.hxx"
#endif
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
@@ -321,12 +321,12 @@ void ScCellShell::Execute( SfxRequest& rReq )
// set cell attribute without dialog:
- std::unique_ptr<SfxItemSet> pEmptySet(
+ boost::scoped_ptr<SfxItemSet> pEmptySet(
new SfxItemSet( *pReqArgs->GetPool(),
ATTR_PATTERN_START,
ATTR_PATTERN_END ));
- std::unique_ptr<SfxItemSet> pNewSet(
+ boost::scoped_ptr<SfxItemSet> pNewSet(
new SfxItemSet( *pReqArgs->GetPool(),
ATTR_PATTERN_START,
ATTR_PATTERN_END ));
@@ -489,7 +489,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScNewScenarioDlg> pNewDlg(pFact->CreateScNewScenarioDlg(pTabViewShell->GetDialogParent(), aName, false, bSheetProtected));
+ boost::scoped_ptr<AbstractScNewScenarioDlg> pNewDlg(pFact->CreateScNewScenarioDlg(pTabViewShell->GetDialogParent(), aName, false, bSheetProtected));
OSL_ENSURE(pNewDlg, "Dialog create fail!");
if ( pNewDlg->Execute() == RET_OK )
{
@@ -539,7 +539,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
assert(pFact); //ScAbstractFactory create fail!
- std::unique_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
+ boost::scoped_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetDialogParent(), "RowHeightDialog",
nCurHeight, ScGlobal::nStdRowHeight,
eMetric, 2, MAX_ROW_HEIGHT));
@@ -580,7 +580,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
assert(pFact); //ScAbstractFactory create fail!
- std::unique_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
+ boost::scoped_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetDialogParent(), "OptimalRowHeightDialog",
ScGlobal::nLastRowHeightExtra, 0, eMetric, 1, MAX_EXTRA_HEIGHT));
assert(pDlg); //Dialog create fail!
@@ -622,7 +622,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
assert(pFact); //ScAbstractFactory create fail!
- std::unique_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
+ boost::scoped_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetDialogParent(), "ColWidthDialog", nCurHeight,
STD_COL_WIDTH, eMetric, 2, MAX_COL_WIDTH));
assert(pDlg); //Dialog create fail!
@@ -662,7 +662,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
assert(pFact); //ScAbstractFactory create fail!
- std::unique_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
+ boost::scoped_ptr<AbstractScMetricInputDlg> pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetDialogParent(), "OptimalColWidthDialog",
ScGlobal::nLastColWidthExtra, STD_EXTRA_WIDTH, eMetric, 1, MAX_EXTRA_WIDTH));
assert(pDlg); //Dialog create fail!
@@ -809,11 +809,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
else
{
ScGlobal::ClearAutoFormat();
- std::unique_ptr<ScAutoFormatData> pNewEntry(pTabViewShell->CreateAutoFormatData());
+ boost::scoped_ptr<ScAutoFormatData> pNewEntry(pTabViewShell->CreateAutoFormatData());
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScAutoFormatDlg> pDlg(pFact->CreateScAutoFormatDlg(pDlgParent, ScGlobal::GetOrCreateAutoFormat(), pNewEntry.get(), GetViewData()));
+ boost::scoped_ptr<AbstractScAutoFormatDlg> pDlg(pFact->CreateScAutoFormatDlg(pDlgParent, ScGlobal::GetOrCreateAutoFormat(), pNewEntry.get(), GetViewData()));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 268c2168413e..367b5caf668b 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -67,8 +67,8 @@
#include "markdata.hxx"
#include "stringutil.hxx"
+#include <boost/scoped_ptr.hpp>
#include <list>
-#include <memory>
#include <unordered_set>
#include <unordered_map>
#include <vector>
@@ -1744,7 +1744,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
// Update the datapilot with the newly sorted field members.
- std::unique_ptr<ScDPObject> pNewObj(new ScDPObject(*pDPObj));
+ boost::scoped_ptr<ScDPObject> pNewObj(new ScDPObject(*pDPObj));
pNewObj->SetSaveData(aNewSaveData);
ScDBDocFunc aFunc(*GetViewData().GetDocShell());
@@ -1832,7 +1832,7 @@ bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
// apply changes
ScDBDocFunc aFunc( *GetViewData().GetDocShell() );
- std::unique_ptr<ScDPObject> pNewObj(new ScDPObject( *pDPObj ));
+ boost::scoped_ptr<ScDPObject> pNewObj(new ScDPObject( *pDPObj ));
pNewObj->SetSaveData( aData );
aFunc.DataPilotUpdate( pDPObj, pNewObj.get(), true, false ); //! bApi for drag&drop?
pNewObj.reset();
@@ -1961,7 +1961,7 @@ void ScDBFunc::SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName
// apply changes
ScDBDocFunc aFunc( *GetViewData().GetDocShell() );
- std::unique_ptr<ScDPObject> pNewObj(new ScDPObject( *pDPObj ));
+ boost::scoped_ptr<ScDPObject> pNewObj(new ScDPObject( *pDPObj ));
pNewObj->SetSaveData( aData );
aFunc.DataPilotUpdate( pDPObj, pNewObj.get(), true, false );
pNewObj.reset();
@@ -1998,7 +1998,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
SCTAB nNewTab = GetViewData().GetTabNo();
- std::unique_ptr<ScDocument> pInsDoc(new ScDocument(SCDOCMODE_CLIP));
+ boost::scoped_ptr<ScDocument> pInsDoc(new ScDocument(SCDOCMODE_CLIP));
pInsDoc->ResetClip( pDoc, nNewTab );
for (SCROW nRow = 0; nRow < nRowSize; ++nRow)
{
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 9b1d2b0aaa5c..c95251e0d115 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -78,7 +78,7 @@
#include "scui_def.hxx"
#include "scabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -274,7 +274,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
case SID_PASTE_SPECIAL:
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( pViewData->GetDialogParent() ));
+ boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( pViewData->GetDialogParent() ));
SotClipboardFormatId nFormat = SotClipboardFormatId::NONE;
if ( pDlg )
{
@@ -455,7 +455,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScNamePasteDlg> pDlg(pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pViewData->GetDocShell(), false ));
+ boost::scoped_ptr<AbstractScNamePasteDlg> pDlg(pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pViewData->GetDocShell(), false ));
OSL_ENSURE(pDlg, "Dialog create fail!");
short nRet = pDlg->Execute();
// pDlg is needed below
@@ -497,7 +497,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
pViewData->GetDialogParent(), &aAttrs, pObjSh));
OSL_ENSURE(pDlg, "Dialog create fail!");
if (nSlot == SID_CHAR_DLG_EFFECT)
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index f3f735127da9..3fdbf69520d8 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -82,7 +82,7 @@
#include "scabstdlg.hxx"
#include <editeng/fontitem.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -779,7 +779,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
if ( pStyleSheet )
{
SfxStyleFamily eFam = pStyleSheet->GetFamily();
- std::unique_ptr<SfxAbstractTabDialog> pDlg;
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
sal_uInt16 nRsc = 0;
// Store old Items from the style
@@ -819,7 +819,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
}
}
- std::unique_ptr<SvxNumberInfoItem> pNumberInfoItem(
+ boost::scoped_ptr<SvxNumberInfoItem> pNumberInfoItem(
ScTabViewShell::MakeNumberInfoItem(&rDoc, GetViewData()));
pDocSh->PutItem( *pNumberInfoItem );
@@ -1792,12 +1792,12 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
{
::editeng::SvxBorderLine* pDefLine = pTabViewShell->GetDefaultFrameLine();
const ScPatternAttr* pOldAttrs = pTabViewShell->GetSelectionPattern();
- std::unique_ptr<SfxItemSet> pOldSet(
+ boost::scoped_ptr<SfxItemSet> pOldSet(
new SfxItemSet(
*(pDoc->GetPool()),
ATTR_PATTERN_START,
ATTR_PATTERN_END ));
- std::unique_ptr<SfxItemSet> pNewSet(
+ boost::scoped_ptr<SfxItemSet> pNewSet(
new SfxItemSet(
*(pDoc->GetPool()),
ATTR_PATTERN_START,
@@ -1858,8 +1858,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
case SID_ATTR_BORDER_DIAG_BLTR:
{
const ScPatternAttr* pOldAttrs = pTabViewShell->GetSelectionPattern();
- std::unique_ptr<SfxItemSet> pOldSet(new SfxItemSet(pOldAttrs->GetItemSet()));
- std::unique_ptr<SfxItemSet> pNewSet(new SfxItemSet(pOldAttrs->GetItemSet()));
+ boost::scoped_ptr<SfxItemSet> pOldSet(new SfxItemSet(pOldAttrs->GetItemSet()));
+ boost::scoped_ptr<SfxItemSet> pNewSet(new SfxItemSet(pOldAttrs->GetItemSet()));
const SfxPoolItem* pItem = 0;
if(SID_ATTR_BORDER_DIAG_TLBR == nSlot)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5200b85eb0be..006c00c2a385 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -138,8 +138,8 @@
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
using namespace css;
using namespace css::uno;
@@ -5292,11 +5292,11 @@ SvxAdjust toSvxAdjust( const ScPatternAttr& rPat )
return eSvxAdjust;
}
-std::shared_ptr<ScFieldEditEngine> createEditEngine( ScDocShell* pDocSh, const ScPatternAttr& rPat )
+boost::shared_ptr<ScFieldEditEngine> createEditEngine( ScDocShell* pDocSh, const ScPatternAttr& rPat )
{
ScDocument& rDoc = pDocSh->GetDocument();
- std::shared_ptr<ScFieldEditEngine> pEngine(new ScFieldEditEngine(&rDoc, rDoc.GetEditPool()));
+ boost::shared_ptr<ScFieldEditEngine> pEngine(new ScFieldEditEngine(&rDoc, rDoc.GetEditPool()));
ScSizeDeviceProvider aProv(pDocSh);
pEngine->SetRefDevice(aProv.GetDevice());
pEngine->SetRefMapMode(MAP_100TH_MM);
@@ -5375,7 +5375,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
// EditEngine
- std::shared_ptr<ScFieldEditEngine> pEngine = createEditEngine(pDocSh, *pPattern);
+ boost::shared_ptr<ScFieldEditEngine> pEngine = createEditEngine(pDocSh, *pPattern);
MapMode aEditMode = pViewData->GetLogicMode(eWhich); // without draw scaleing
Rectangle aLogicEdit = PixelToLogic( aEditRect, aEditMode );
@@ -5481,7 +5481,7 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow
if (rPos.Y() < aEditRect.Top())
return false;
- std::shared_ptr<ScFieldEditEngine> pEngine = createEditEngine(pDocSh, *pPattern);
+ boost::shared_ptr<ScFieldEditEngine> pEngine = createEditEngine(pDocSh, *pPattern);
Size aPaperSize = Size(1000000, 1000000);
pEngine->SetPaperSize(aPaperSize);
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 6faf516234ff..f82668a4058d 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -983,7 +983,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
// setup the SdrPage so that drawinglayer works correctly
ScDrawLayer* pModel = pDoc->GetDrawLayer();
- std::unique_ptr<FmFormView> pDrawView;
+ boost::scoped_ptr<FmFormView> pDrawView;
if (pModel)
{
pDrawView.reset(new FmFormView(pModel, &rDevice));
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 0668a5f1cf65..f1432c4fdf0e 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -66,10 +66,10 @@
#include "colorscale.hxx"
#include <math.h>
-#include <iostream>
#include <map>
-#include <memory>
#include <utility>
+#include <iostream>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -1424,7 +1424,7 @@ void ScOutputData::DrawFrame(vcl::RenderContext& rRenderContext)
// draw only rows with set RowInfo::bChanged flag
size_t nRow1 = nFirstRow;
- std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(CreateProcessor2D());
+ boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(CreateProcessor2D());
if (!pProcessor)
return;
@@ -1546,7 +1546,7 @@ void ScOutputData::DrawRotatedFrame(vcl::RenderContext& rRenderContext, const Co
rRenderContext.SetClipRegion( vcl::Region( aClipRect ) );
svx::frame::Array& rArray = mrTabInfo.maArray;
- std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(CreateProcessor2D( ));
+ boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(CreateProcessor2D( ));
long nPosY = nScrY;
for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++)
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index b2e04d01f53e..bbdd147350ab 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -67,7 +67,7 @@
#include <comphelper/string.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <math.h>
@@ -4442,7 +4442,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam)
void ScOutputData::DrawEdit(bool bPixelToLogic)
{
- std::unique_ptr<ScFieldEditEngine> pEngine;
+ boost::scoped_ptr<ScFieldEditEngine> pEngine;
bool bHyphenatorSet = false;
const ScPatternAttr* pOldPattern = NULL;
const SfxItemSet* pOldCondSet = NULL;
@@ -4474,7 +4474,7 @@ void ScOutputData::DrawEdit(bool bPixelToLogic)
long nPosX = 0;
for (SCCOL nX=0; nX<=nX2; nX++) // due to overflow
{
- std::unique_ptr< ScPatternAttr > pPreviewPattr;
+ boost::scoped_ptr< ScPatternAttr > pPreviewPattr;
if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
@@ -4644,7 +4644,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic)
bool bCellContrast = mbUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
- std::unique_ptr<ScFieldEditEngine> pEngine;
+ boost::scoped_ptr<ScFieldEditEngine> pEngine;
bool bHyphenatorSet = false;
const ScPatternAttr* pPattern;
const SfxItemSet* pCondSet;
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 55ade8b614ab..613484adea69 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -41,7 +41,7 @@
#define ScPivotShell
#include "scslots.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
TYPEINIT1( ScPivotShell, SfxShell );
@@ -108,7 +108,7 @@ void ScPivotShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScPivotFilterDlg> pDlg(pFact->CreateScPivotFilterDlg(
+ boost::scoped_ptr<AbstractScPivotFilterDlg> pDlg(pFact->CreateScPivotFilterDlg(
pViewShell->GetDialogParent(), aArgSet, nSrcTab));
OSL_ENSURE(pDlg, "Dialog create fail!");
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 6bf5469e81a4..9d4b150ffd2a 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -64,7 +64,7 @@
#include <docpool.hxx>
#include <patattr.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// STATIC DATA -----------------------------------------------------------
@@ -507,7 +507,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
static_cast<const ScPatternAttr&>(
rDoc.GetPool()->GetDefaultItem(ATTR_PATTERN));
- std::unique_ptr<ScEditEngineDefaulter> pEditEng(
+ boost::scoped_ptr<ScEditEngineDefaulter> pEditEng(
new ScEditEngineDefaulter(EditEngine::CreatePool(), true));
pEditEng->SetRefMapMode(aMMMode);
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index f9a0c9b3f80c..47abf1b8740e 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -81,7 +81,7 @@ using namespace com::sun::star;
#define ScPreviewShell
#include "scslots.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
TYPEINIT1( ScPreviewShell, SfxViewShell );
@@ -645,7 +645,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractSvxZoomDialog> pDlg(pFact->CreateSvxZoomDialog(NULL, aSet));
+ boost::scoped_ptr<AbstractSvxZoomDialog> pDlg(pFact->CreateSvxZoomDialog(NULL, aSet));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetLimits( 20, 400 );
pDlg->HideButton( ZoomButtonId::OPTIMAL );
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 02a9d5d2351f..e6e6f7b3160c 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -70,7 +70,7 @@
#include <vcl/lineinfo.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#define ZOOM_MIN 10
@@ -517,7 +517,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
// #114135#
ScDrawLayer* pModel = pDoc->GetDrawLayer();
- std::unique_ptr<FmFormView> pDrawView;
+ boost::scoped_ptr<FmFormView> pDrawView;
if( pModel )
{
@@ -1330,7 +1330,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
if (pBorderData)
{
- std::unique_ptr<ScDocument> pBorderDoc(new ScDocument( SCDOCMODE_UNDO ));
+ boost::scoped_ptr<ScDocument> pBorderDoc(new ScDocument( SCDOCMODE_UNDO ));
pBorderDoc->InitUndo( pDoc, 0,0, true,true );
if (pBorderData)
pBorderDoc->ApplyAttr( 0,0,0, *pBorderData );
@@ -3028,7 +3028,7 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages fr
SCROW nPageStartRow = nStartRow;
SCROW nLastVisibleRow = -1;
- std::unique_ptr<ScRowBreakIterator> pRowBreakIter(pDoc->GetRowBreakIterator(nPrintTab));
+ ::boost::scoped_ptr<ScRowBreakIterator> pRowBreakIter(pDoc->GetRowBreakIterator(nPrintTab));
SCROW nNextPageBreak = pRowBreakIter->first();
while (nNextPageBreak != ScRowBreakIterator::NOT_FOUND && nNextPageBreak < nStartRow)
// Skip until the page break position is at the start row or greater.
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index dea6e14a6d1b..47be2d29991a 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -21,9 +21,9 @@
#include <osl/diagnose.h>
-#include <map>
-#include <memory>
#include <vector>
+#include <map>
+#include <boost/shared_ptr.hpp>
ScExtDocSettings::ScExtDocSettings() :
mfTabBarWidth( -1.0 ),
@@ -67,7 +67,7 @@ public:
SCTAB GetLastTab() const;
private:
- typedef std::shared_ptr< ScExtTabSettings > ScExtTabSettingsRef;
+ typedef ::boost::shared_ptr< ScExtTabSettings > ScExtTabSettingsRef;
typedef ::std::map< SCTAB, ScExtTabSettingsRef > ScExtTabSettingsMap;
/** Makes a deep copy of all objects in the passed map. */
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index dc838e234db5..4621b6984deb 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -40,7 +40,7 @@
#include "globstr.hrc"
#include "markdata.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -82,7 +82,7 @@ bool ScConversionEngineBase::FindNextConversionCell()
const ScPatternAttr* pPattern = NULL;
const ScPatternAttr* pLastPattern = NULL;
- std::unique_ptr<SfxItemSet> pEditDefaults(new SfxItemSet(GetEmptyItemSet()));
+ boost::scoped_ptr<SfxItemSet> pEditDefaults(new SfxItemSet(GetEmptyItemSet()));
if( IsModified() )
{
@@ -112,7 +112,7 @@ bool ScConversionEngineBase::FindNextConversionCell()
if (eCellType == CELLTYPE_EDIT)
{
- std::unique_ptr<EditTextObject> pEditObj(CreateTextObject());
+ boost::scoped_ptr<EditTextObject> pEditObj(CreateTextObject());
mrDoc.SetEditText(aPos, *pEditObj, GetEditTextObjectPool());
}
else
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 569f578cbdb9..436f569414ed 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -67,7 +67,7 @@
#include <comphelper/string.hxx>
#include "scabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
static sal_uInt16 lcl_ParseRange(ScRange& rScRange, const OUString& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */)
{
@@ -659,7 +659,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
- std::unique_ptr<AbstractSvxZoomDialog> pDlg;
+ boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
ScMarkData& rMark = GetViewData().GetMarkData();
SvxZoomEnableFlags nBtnFlags = SvxZoomEnableFlags::N50
| SvxZoomEnableFlags::N75
@@ -802,7 +802,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent()));
+ boost::scoped_ptr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent()));
OSL_ENSURE(pDlg, "Dialog create fail!");
pDlg->SetDescription(
OUString( ScResId( STR_DLG_SELECTTABLES_TITLE ) ),
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index f6ac626e1679..e8e7ca5d2587 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -57,7 +57,7 @@
#include <com/sun/star/table/BorderLineStyle.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -457,9 +457,9 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
const ScPatternAttr* pOldAttrs = GetSelectionPattern();
- std::unique_ptr<SfxAbstractTabDialog> pDlg;
- std::unique_ptr<SfxItemSet> pOldSet(new SfxItemSet(pOldAttrs->GetItemSet()));
- std::unique_ptr<SvxNumberInfoItem> pNumberInfoItem;
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
+ boost::scoped_ptr<SfxItemSet> pOldSet(new SfxItemSet(pOldAttrs->GetItemSet()));
+ boost::scoped_ptr<SvxNumberInfoItem> pNumberInfoItem;
pOldSet->MergeRange(SID_ATTR_BORDER_STYLES, SID_ATTR_BORDER_DEFAULT_WIDTH);
@@ -565,7 +565,7 @@ bool ScTabViewShell::IsRefInputMode() const
ScCompiler aComp( pDoc, aPos );
aComp.SetGrammar(pDoc->GetGrammar());
aComp.SetCloseBrackets( false );
- std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aString));
+ boost::scoped_ptr<ScTokenArray> pArr(aComp.CompileString(aString));
if ( pArr && pArr->MayReferenceFollow() )
{
return true;
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index c3959c606434..337531d58077 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -19,7 +19,7 @@
#include <config_features.h>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include "scitems.hxx"
#include <sfx2/request.hxx>
@@ -53,7 +53,7 @@
#include <vector>
-using std::unique_ptr;
+using ::boost::scoped_ptr;
using namespace com::sun::star;
void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
@@ -132,7 +132,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent()));
+ boost::scoped_ptr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent()));
OSL_ENSURE(pDlg, "Dialog create fail!");
OUString aTabName;
@@ -200,7 +200,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScInsertTableDlg> pDlg(pFact->CreateScInsertTableDlg(GetDialogParent(), rViewData,
+ boost::scoped_ptr<AbstractScInsertTableDlg> pDlg(pFact->CreateScInsertTableDlg(GetDialogParent(), rViewData,
nTabSelCount, nSlot == FID_INS_TABLE_EXT));
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( RET_OK == pDlg->Execute() )
@@ -372,7 +372,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScStringInputDlg> pDlg(pFact->CreateScStringInputDlg(
+ boost::scoped_ptr<AbstractScStringInputDlg> pDlg(pFact->CreateScStringInputDlg(
GetDialogParent(), aDlgTitle, OUString(ScResId(SCSTR_NAME)),
aName, GetStaticInterface()->GetSlot(nSlot)->GetCommand(),
pHelpId));
@@ -497,7 +497,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScMoveTableDlg> pDlg(pFact->CreateScMoveTableDlg(GetDialogParent(),
+ boost::scoped_ptr<AbstractScMoveTableDlg> pDlg(pFact->CreateScMoveTableDlg(GetDialogParent(),
aDefaultName));
OSL_ENSURE(pDlg, "Dialog create fail!");
@@ -664,7 +664,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if ( nTabSelCount > 1 )
{
- std::unique_ptr<ScUndoTabColorInfo::List>
+ scoped_ptr<ScUndoTabColorInfo::List>
pTabColorList(new ScUndoTabColorInfo::List);
ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
for (; itr != itrEnd; ++itr)
@@ -696,7 +696,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
aTabBgColor = pDoc->GetTabBgColor( nCurrentTab );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<AbstractScTabBgColorDlg> pDlg(pFact->CreateScTabBgColorDlg(
+ boost::scoped_ptr<AbstractScTabBgColorDlg> pDlg(pFact->CreateScTabBgColorDlg(
GetDialogParent(),
OUString(ScResId(SCSTR_SET_TAB_BG_COLOR)),
OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)),
@@ -709,7 +709,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
{
Color aSelectedColor;
pDlg->GetSelectedColor(aSelectedColor);
- std::unique_ptr<ScUndoTabColorInfo::List>
+ scoped_ptr<ScUndoTabColorInfo::List>
pTabColorList(new ScUndoTabColorInfo::List);
if ( nTabSelCount > 1 )
{
@@ -757,7 +757,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
SvxAbstractDialogFactory* pDlgFactory = SvxAbstractDialogFactory::Create();
if (pDlgFactory)
{
- std::unique_ptr<VclAbstractDialog> pDialog( pDlgFactory->CreateSvxMacroAssignDlg(
+ boost::scoped_ptr<VclAbstractDialog> pDialog( pDlgFactory->CreateSvxMacroAssignDlg(
GetDialogParent(), xFrame, false, xEvents, 0 ) );
if ( pDialog.get() && pDialog->Execute() == RET_OK )
{
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index a2ca96ec6883..4d32414b5db1 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -38,6 +38,8 @@
#include "retypepassdlg.hxx"
#include "tabprotection.hxx"
+#include <boost/scoped_ptr.hpp>
+
using namespace com::sun::star;
void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ )
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index bc1488f8aed2..8aa822e0a3d4 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -86,6 +86,7 @@
#include <rowheightcontext.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <boost/scoped_ptr.hpp>
#include <vector>
#include <memory>
@@ -688,7 +689,7 @@ OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSub
{
ScViewData& rViewData = GetViewData();
ScDocument* pDoc = rViewData.GetDocument();
- std::unique_ptr<ScTokenArray> pArray(new ScTokenArray);
+ ::boost::scoped_ptr<ScTokenArray> pArray(new ScTokenArray);
pArray->AddOpCode(bSubTotal ? ocSubTotal : ocSum);
pArray->AddOpCode(ocOpen);
@@ -773,7 +774,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat
ScAddress aPos( nCol, nRow, nTab );
- std::unique_ptr<ScDocument> pInsDoc(new ScDocument( SCDOCMODE_CLIP ));
+ boost::scoped_ptr<ScDocument> pInsDoc(new ScDocument( SCDOCMODE_CLIP ));
pInsDoc->ResetClip( pDoc, nTab );
if (aNewStr[0] == '=') // Formula ?
@@ -801,7 +802,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat
// MarkData was already MarkToSimple'ed in PasteFromClip
ScRange aRange;
rMark.GetMarkArea( aRange );
- std::unique_ptr<ScPatternAttr> pPattern(new ScPatternAttr( pDoc->GetPool() ));
+ boost::scoped_ptr<ScPatternAttr> pPattern(new ScPatternAttr( pDoc->GetPool() ));
pPattern->GetItemSet().Put( *pItem );
short nNewType = pDoc->GetFormatTable()->GetType( pItem->GetValue() );
pDoc->ApplyPatternIfNumberformatIncompatible( aRange, rMark,
@@ -3043,11 +3044,11 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
// none of the lines don't care?
if( (eItemState != SfxItemState::DONTCARE) && (eTLBRState != SfxItemState::DONTCARE) && (eBLTRState != SfxItemState::DONTCARE) )
{
- std::unique_ptr<SfxItemSet> pOldSet(new SfxItemSet(
+ boost::scoped_ptr<SfxItemSet> pOldSet(new SfxItemSet(
*(pDoc->GetPool()),
ATTR_PATTERN_START,
ATTR_PATTERN_END ));
- std::unique_ptr<SfxItemSet> pNewSet(new SfxItemSet(
+ boost::scoped_ptr<SfxItemSet> pNewSet(new SfxItemSet(
*(pDoc->GetPool()),
ATTR_PATTERN_START,
ATTR_PATTERN_END ));
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 1ffe6ca227e6..e6227831651b 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -67,7 +67,7 @@
#include "drawview.hxx"
#include "cliputil.hxx"
#include <gridwin.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -1246,7 +1246,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc,
// copy from clipboard
// save original data in case of calculation
- std::unique_ptr<ScDocument> pMixDoc;
+ boost::scoped_ptr<ScDocument> pMixDoc;
if (nFunction)
{
bSkipEmpty = false;
@@ -1666,7 +1666,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
}
}
- std::unique_ptr<ScDocument> pMixDoc;
+ boost::scoped_ptr<ScDocument> pMixDoc;
if (bSkipEmpty || nFunction)
{
if (nFlags & IDF_CONTENTS)
@@ -1886,7 +1886,7 @@ bool ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, b
// run with paste
ScDocument* pDoc = GetViewData().GetDocument();
- std::unique_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
+ boost::scoped_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
pDoc->CopyTabToClip( rSource.aStart.Col(), rSource.aStart.Row(),
rSource.aEnd.Col(), rSource.aEnd.Row(),
rSource.aStart.Tab(), pClipDoc.get() );
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 31c17f968a61..c071a8c2c0a1 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -70,6 +70,8 @@
#include <refupdatecontext.hxx>
#include <gridwin.hxx>
+#include <boost/scoped_ptr.hpp>
+
using namespace com::sun::star;
// STATIC DATA -----------------------------------------------------------
@@ -91,7 +93,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
const bool bRecord (rDoc.IsUndoEnabled());
const ScPatternAttr* pPattern = rDoc.GetPattern( nStartCol, nStartRow, nTab );
- std::unique_ptr<ScTabEditEngine> pEngine(new ScTabEditEngine( *pPattern, rDoc.GetEnginePool() ));
+ boost::scoped_ptr<ScTabEditEngine> pEngine(new ScTabEditEngine( *pPattern, rDoc.GetEnginePool() ));
pEngine->EnableUndo( false );
vcl::Window* pActWin = GetActiveWin();
@@ -129,7 +131,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
rDoc.EnableUndo( false );
for( sal_Int32 n = 0; n < nParCnt; n++ )
{
- std::unique_ptr<EditTextObject> pObject(pEngine->CreateTextObject(n));
+ boost::scoped_ptr<EditTextObject> pObject(pEngine->CreateTextObject(n));
EnterData(nStartCol, nRow, nTab, *pObject, true);
if( ++nRow > MAXROW )
break;
@@ -257,7 +259,7 @@ void ScViewFunc::DoRefConversion( bool bRecord )
OUString aNew = aFinder.GetText();
ScCompiler aComp( pDoc, aPos);
aComp.SetGrammar(pDoc->GetGrammar());
- std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aNew));
+ boost::scoped_ptr<ScTokenArray> pArr(aComp.CompileString(aNew));
ScFormulaCell* pNewCell =
new ScFormulaCell(
pDoc, aPos, *pArr, formula::FormulaGrammar::GRAM_DEFAULT, MM_NONE);
@@ -311,8 +313,8 @@ void ScViewFunc::DoThesaurus( bool bRecord )
ScSplitPos eWhich = GetViewData().GetActivePart();
EESpellState eState;
EditView* pEditView = NULL;
- std::unique_ptr<ESelection> pEditSel;
- std::unique_ptr<ScEditEngineDefaulter> pThesaurusEngine;
+ boost::scoped_ptr<ESelection> pEditSel;
+ boost::scoped_ptr<ScEditEngineDefaulter> pThesaurusEngine;
bool bIsEditMode = GetViewData().HasEditView(eWhich);
if (bRecord && !rDoc.IsUndoEnabled())
bRecord = false;
@@ -354,7 +356,7 @@ void ScViewFunc::DoThesaurus( bool bRecord )
pThesaurusEngine->SetSpeller(xSpeller);
MakeEditView(pThesaurusEngine.get(), nCol, nRow );
const ScPatternAttr* pPattern = NULL;
- std::unique_ptr<SfxItemSet> pEditDefaults(
+ boost::scoped_ptr<SfxItemSet> pEditDefaults(
new SfxItemSet(pThesaurusEngine->GetEmptyItemSet()));
pPattern = rDoc.GetPattern(nCol, nRow, nTab);
if (pPattern)
@@ -494,7 +496,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, bool bR
// *** create and init the edit engine *** --------------------------------
- std::unique_ptr<ScConversionEngineBase> pEngine;
+ boost::scoped_ptr<ScConversionEngineBase> pEngine;
switch( rConvParam.GetType() )
{
case SC_CONVERSION_SPELLCHECK:
@@ -737,7 +739,7 @@ void ScViewFunc::InsertBookmark( const OUString& rDescription, const OUString& r
aField.SetTargetFrame(*pTarget);
aEngine.QuickInsertField( SvxFieldItem( aField, EE_FEATURE_FIELD ), aInsSel );
- std::unique_ptr<EditTextObject> pData(aEngine.CreateTextObject());
+ boost::scoped_ptr<EditTextObject> pData(aEngine.CreateTextObject());
EnterData(nPosX, nPosY, nTab, *pData);
}
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index edd2dd67adae..cfd2dc0ae653 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -67,7 +67,7 @@
#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/dbaexchange.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -140,7 +140,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
ScMarkData aSrcMark;
aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip
- std::unique_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
+ boost::scoped_ptr<ScDocument> pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
SCCOL nFirstCol, nLastCol;
SCROW nFirstRow, nLastRow;
@@ -306,7 +306,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
// this for html pasting only, but in the future it may
// make sense to do it for other data types too.
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- std::unique_ptr<AbstractScTextImportOptionsDlg> pDlg(
+ boost::scoped_ptr<AbstractScTextImportOptionsDlg> pDlg(
pFact->CreateScTextImportOptionsDlg(NULL));
if (pDlg->Execute() == RET_OK)
@@ -335,7 +335,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
ScImportStringStream aStrm( aStr);
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
- std::unique_ptr<AbstractScImportAsciiDlg> pDlg(
+ boost::scoped_ptr<AbstractScImportAsciiDlg> pDlg(
pFact->CreateScImportAsciiDlg( NULL, OUString(), &aStrm,
SC_PASTETEXT));
@@ -492,7 +492,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
ScDocShellRef aDragShellRef( new ScDocShell );
aDragShellRef->DoInitNew(NULL);
- std::unique_ptr<FmFormModel> pModel(new FmFormModel( aPath, NULL, aDragShellRef ));
+ boost::scoped_ptr<FmFormModel> pModel(new FmFormModel( aPath, NULL, aDragShellRef ));
pModel->GetItemPool().FreezeIdRanges();
xStm->Seek(0);
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 1dd1cb45b0dc..7375f184e4a3 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -78,7 +78,7 @@
#include <rowheightcontext.hxx>
#include <docfuncutil.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDocShell *pDocSh )
{
@@ -626,7 +626,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
bool bSimple = false;
bool bCommon = false;
- std::unique_ptr<ScPatternAttr> pCellAttrs;
+ boost::scoped_ptr<ScPatternAttr> pCellAttrs;
OUString aString;
const ScPatternAttr* pOldPattern = rDoc.GetPattern( nCol, nRow, nTab );
@@ -1201,7 +1201,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
}
aChangeRanges.Append(aPos);
- std::unique_ptr<ScPatternAttr> pOldPat(new ScPatternAttr(*rDoc.GetPattern( nCol, nRow, nTab )));
+ boost::scoped_ptr<ScPatternAttr> pOldPat(new ScPatternAttr(*rDoc.GetPattern( nCol, nRow, nTab )));
rDoc.ApplyPattern( nCol, nRow, nTab, rAttr );
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 5747d0592e13..b70211e40395 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -49,7 +49,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
sal_uInt16 nWhichId, SvtScriptType nScript )
@@ -350,7 +350,7 @@ bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
SfxAllItemSet aSet( rFrame.GetObjectShell()->GetPool() );
aSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
aSet.Put( SvxFontItem( rOldFont.GetFamily(), rOldFont.GetFamilyName(), rOldFont.GetStyleName(), rOldFont.GetPitch(), rOldFont.GetCharSet(), aSet.GetPool()->GetWhich( SID_ATTR_CHAR_FONT ) ) );
- std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( &rFrame.GetWindow(), aSet, rFrame.GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
+ boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( &rFrame.GetWindow(), aSet, rFrame.GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
if ( pDlg->Execute() == RET_OK )
{
SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, false );
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 97f1ccf7c4f9..c4f892b5f2ed 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -26,13 +26,14 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/util/XChangesListener.hpp>
+#include <boost/shared_ptr.hpp>
+
#include <vcl/timer.hxx>
#include <sddllapi.h>
#include <list>
#include <map>
-#include <memory>
class SdrPathObj;
@@ -43,9 +44,9 @@ enum EValue { VALUE_FROM, VALUE_TO, VALUE_BY, VALUE_FIRST, VALUE_LAST };
class CustomAnimationEffect;
class CustomAnimationPreset;
-typedef std::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
+typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
-typedef std::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
+typedef boost::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
typedef std::list< CustomAnimationEffectPtr > EffectSequence;
@@ -258,7 +259,7 @@ private:
sal_Int32 mnGroupId;
};
-typedef std::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
+typedef boost::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
typedef std::map< sal_Int32, CustomAnimationTextGroupPtr > CustomAnimationTextGroupMap;
class SD_DLLPUBLIC EffectSequenceHelper
@@ -361,7 +362,7 @@ private:
MainSequence* mpMainSequence;
};
-typedef std::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
+typedef boost::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
typedef std::list< InteractiveSequencePtr > InteractiveSequenceList;
class MainSequence : public EffectSequenceHelper, public ISequenceListener
@@ -434,7 +435,7 @@ protected:
sal_Int32 mbIgnoreChanges;
};
-typedef std::shared_ptr< MainSequence > MainSequencePtr;
+typedef boost::shared_ptr< MainSequence > MainSequencePtr;
class MainSequenceRebuildGuard
{
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 1f7abce5a724..1c447f0b4870 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -22,9 +22,9 @@
#include <sal/config.h>
-#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/animations/AnimationNodeType.hpp>
@@ -71,7 +71,7 @@ private:
EffectsSubTypeMap maSubTypes;
};
-typedef std::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
+typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
typedef std::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
@@ -83,7 +83,7 @@ struct PresetCategory
PresetCategory( const OUString& rLabel, const EffectDescriptorList& rEffects )
: maLabel( rLabel ), maEffects( rEffects ) {}
};
-typedef std::shared_ptr< PresetCategory > PresetCategoryPtr;
+typedef boost::shared_ptr< PresetCategory > PresetCategoryPtr;
typedef std::vector< PresetCategoryPtr > PresetCategoryList;
class SD_DLLPUBLIC CustomAnimationPresets
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index fda3206e92d2..a97d2092ecc5 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -26,6 +26,8 @@
#include "OutlinerIterator.hxx"
#include <editeng/SpellPortions.hxx>
#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
#include <boost/noncopyable.hpp>
class Dialog;
@@ -181,7 +183,7 @@ private:
pointer to avoid keeping it alive when the view is changed
during searching.
*/
- std::weak_ptr<ViewShell> mpWeakViewShell;
+ ::boost::weak_ptr<ViewShell> mpWeakViewShell;
/// This window contains the view.
VclPtr< ::sd::Window> mpWindow;
/// The document on whose objects and pages this class operates.
@@ -502,7 +504,7 @@ private:
It handles i.e. registering at the associated view as selection
change listener.
*/
- void SetViewShell (const std::shared_ptr<ViewShell>& rpViewShell);
+ void SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell);
/** Activate or deactivate the search in the current selection. Call
this method whenever the selection has changed. This method creates
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 6d9b9189d0f2..43c47b3a2ffb 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -24,8 +24,8 @@
#include "pres.hxx"
#include "sal/types.h"
-#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
class SdDrawDocument;
@@ -244,7 +244,7 @@ private:
static Iterator CreateSelectionIterator (
const ::std::vector<SdrObjectWeakRef>& rObjectList,
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward=true,
IteratorLocation aLocation=BEGIN);
@@ -261,7 +261,7 @@ private:
*/
static Iterator CreateDocumentIterator (
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward=true,
IteratorLocation aLocation=BEGIN);
@@ -284,7 +284,7 @@ private:
*/
static sal_Int32 GetPageIndex (
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
PageKind ePageKind,
EditMode eEditMode,
bool bDirectionIsForward,
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 7c4054d65fdd..7420fc84c163 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_SD_INC_TRANSITIONPRESET_HXX
#define INCLUDED_SD_INC_TRANSITIONPRESET_HXX
+#include <boost/shared_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <list>
-#include <memory>
#include <unordered_map>
namespace com { namespace sun { namespace star {
@@ -36,7 +36,7 @@ class SdPage;
namespace sd {
class TransitionPreset;
-typedef std::shared_ptr< TransitionPreset > TransitionPresetPtr;
+typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
typedef std::list< TransitionPresetPtr > TransitionPresetList;
typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap;
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 05d49c8ec761..e8ac76af66d5 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -68,11 +68,16 @@
#include <basic/sbstar.hxx>
#include <basic/sbx.hxx>
#include <boost/bind.hpp>
+#include <boost/enable_shared_from_this.hpp>
#include <boost/limits.hpp>
+#include <boost/make_shared.hpp>
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
#include <canvas/canvastools.hxx>
#include <canvas/elapsedtime.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 10a15b477353..63f5bd6cd592 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -29,6 +29,7 @@
#include <basic/sbmod.hxx>
#include <basic/sbstar.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index bd065a519c3e..08d49afaab01 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -20,13 +20,14 @@
#ifndef INCLUDED_SD_INC_SDPAGE_HXX
#define INCLUDED_SD_INC_SDPAGE_HXX
+#include <boost/shared_ptr.hpp>
+
+#include <functional>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/presentation/FadeEffect.hpp>
#include <com/sun/star/office/XAnnotation.hpp>
-#include <functional>
#include <list>
-#include <memory>
#include <vector>
#include <svx/svdobj.hxx>
#include <svx/fmpage.hxx>
@@ -58,6 +59,11 @@ namespace sd
class MainSequence;
}
+namespace boost
+{
+ template<class X> class shared_ptr;
+}
+
namespace sd {
struct SD_DLLPUBLIC HeaderFooterSettings
@@ -132,7 +138,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode;
/** a helper class to manipulate effects inside the main sequence */
- std::shared_ptr< sd::MainSequence > mpMainSequence;
+ boost::shared_ptr< sd::MainSequence > mpMainSequence;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE;
@@ -301,7 +307,7 @@ public:
void setAnimationNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) throw (::com::sun::star::uno::RuntimeException);
/// @return a helper class to manipulate effects inside the main sequence
- std::shared_ptr< sd::MainSequence > getMainSequence();
+ boost::shared_ptr< sd::MainSequence > getMainSequence();
/** quick check if this slide has an animation node.
This can be used to have a cost free check if there are no animations ad this slide.
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index d1e64baa7f61..9e05c2e043fc 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -37,7 +37,7 @@
#include <editeng/unoipset.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include "prlayout.hxx"
@@ -146,7 +146,7 @@ protected:
/** broadcast helper for events */
::cppu::OBroadcastHelper mrBHelper;
- std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
+ boost::scoped_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
private:
SdStyleSheet& operator=( const SdStyleSheet& ) SAL_DELETED_FUNCTION;
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 66e2823ab225..d08f64071965 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/animations/XAnimationNode.hpp>
#include <svx/svdundo.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include "sdundo.hxx"
@@ -46,7 +46,7 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- std::unique_ptr<UndoAnimationImpl> mpImpl;
+ boost::scoped_ptr<UndoAnimationImpl> mpImpl;
};
struct UndoAnimationPathImpl;
@@ -62,7 +62,7 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- std::unique_ptr<UndoAnimationPathImpl> mpImpl;
+ boost::scoped_ptr<UndoAnimationPathImpl> mpImpl;
};
struct UndoTransitionImpl;
@@ -79,7 +79,7 @@ public:
virtual OUString GetComment() const SAL_OVERRIDE;
private:
- std::unique_ptr<UndoTransitionImpl> mpImpl;
+ boost::scoped_ptr<UndoTransitionImpl> mpImpl;
};
}
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index f77f5d4efb8f..4261b7e78d41 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1292,7 +1292,7 @@ void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj )
SdPage* pPage = dynamic_cast< SdPage* >(pPathObj->GetPage());
if( pPage )
{
- std::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
+ boost::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
if( pMainSequence.get() )
CustomAnimationEffectPtr pCreated( pMainSequence->append( *pPathObj, makeAny( xShape ), -1.0 ) );
}
@@ -1372,7 +1372,7 @@ void EffectMigration::CreateAnimatedGroup(SdrObjGroup& rGroupObj, SdPage& rPage)
if(aIter.Count())
{
- std::shared_ptr< sd::MainSequence > pMainSequence(rPage.getMainSequence());
+ boost::shared_ptr< sd::MainSequence > pMainSequence(rPage.getMainSequence());
if(pMainSequence.get())
{
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 151e4b80e656..fb0fd7fa4015 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -54,7 +54,7 @@
#include "../ui/inc/ViewShellBase.hxx"
#include <editeng/boxitem.hxx>
-#include <memory>
+#include <boost/make_shared.hpp>
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
@@ -929,7 +929,7 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw
OUString const name(GetName());
sal_Int32 const sep(name.indexOf(SD_LT_SEPARATOR));
OUString const master((sep == -1) ? OUString() : name.copy(0, sep));
- std::shared_ptr<SfxStyleSheetIterator> aSSSI = std::make_shared<SfxStyleSheetIterator>(mxPool.get(), nFamily);
+ boost::shared_ptr<SfxStyleSheetIterator> aSSSI = boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), nFamily);
for (SfxStyleSheetBase *pStyle = aSSSI->First(); pStyle; pStyle = aSSSI->Next())
{
// we hope that we have only sd style sheets
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index b948a25261e7..f27e9c71c068 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -125,7 +125,7 @@ struct UndoAnimationPathImpl: private boost::noncopyable
{
if( mpPage && xNode.is() )
{
- std::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
+ boost::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
if( pMainSequence.get() )
{
CustomAnimationEffectPtr pEffect( pMainSequence->findEffect( xNode ) );
@@ -143,7 +143,7 @@ struct UndoAnimationPathImpl: private boost::noncopyable
CustomAnimationEffectPtr pEffect;
if( mpPage && (mnEffectOffset >= 0) )
{
- std::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
+ boost::shared_ptr< sd::MainSequence > pMainSequence( mpPage->getMainSequence() );
if( pMainSequence.get() )
pEffect = pMainSequence->getEffectFromOffset( mnEffectOffset );
}
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 7a5ab073b1d2..6c84b8e85d58 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -135,7 +135,7 @@ private:
virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
+ ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
::sax_fastparser::FSHelperPtr mPresentationFS;
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 155ee5aa4667..d79aedce4880 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -32,7 +32,7 @@
#include <stdio.h>
#endif
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <list>
@@ -51,7 +51,7 @@ namespace ppt
: mxNode( xNode ), mxMaster( xMaster ) {}
};
- typedef std::shared_ptr< AfterEffectNode > AfterEffectNodePtr;
+ typedef boost::shared_ptr< AfterEffectNode > AfterEffectNodePtr;
typedef sal_uInt32 TranslateMode;
#define TRANSLATE_NONE 0
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index fce5f12d09e9..c321669fee80 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <editeng/svxenum.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace com { namespace sun { namespace star {
namespace awt { struct FontDescriptor; }
@@ -244,7 +244,7 @@ struct ImplTextObj;
class TextObj
{
- std::shared_ptr<ImplTextObj> mpImplTextObj;
+ boost::shared_ptr<ImplTextObj> mpImplTextObj;
void ImplCalculateTextPositions();
public:
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index a094807c998b..4fb08f56623a 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -47,7 +47,7 @@ using namespace com::sun::star::ui::dialogs;
#include "pres.hxx"
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class SdHtmlOptionsDialog : public cppu::WeakImplHelper
<
@@ -198,7 +198,7 @@ sal_Int16 SdHtmlOptionsDialog::execute()
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- std::unique_ptr<AbstractSdPublishingDlg> pDlg(pFact->CreateSdPublishingDlg( Application::GetDefDialogParent(), meDocType ));
+ boost::scoped_ptr<AbstractSdPublishingDlg> pDlg(pFact->CreateSdPublishingDlg( Application::GetDefDialogParent(), meDocType ));
if( pDlg )
{
if( pDlg->Execute() )
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 51b52bf1d73e..8ab49ffba8a8 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -34,7 +34,7 @@
#include <vcl/image.hxx>
#include <unotools/pathoptions.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include "buttonset.hxx"
@@ -147,7 +147,7 @@ public:
Reference< XGraphicProvider > getGraphicProvider();
- std::vector< std::shared_ptr< ButtonsImpl > > maButtons;
+ std::vector< boost::shared_ptr< ButtonsImpl > > maButtons;
Reference< XGraphicProvider > mxGraphicProvider;
};
@@ -177,7 +177,7 @@ void ButtonSetImpl::scanForButtonSets( const OUString& rPath )
{
OUString sFileName( aStatus.getFileName() );
if( sFileName.endsWithIgnoreAsciiCase( ".zip" ) )
- maButtons.push_back( std::shared_ptr< ButtonsImpl >( new ButtonsImpl( aStatus.getFileURL() ) ) );
+ maButtons.push_back( boost::shared_ptr< ButtonsImpl >( new ButtonsImpl( aStatus.getFileURL() ) ) );
}
}
}
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 72428c5261fd..d4a039989d39 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -37,8 +37,8 @@
#include "sdresid.hxx"
#include "htmlpublishmode.hxx"
-#include <memory>
#include <vector>
+#include <boost/scoped_ptr.hpp>
#define PUB_LOWRES_WIDTH 640
#define PUB_MEDRES_WIDTH 800
@@ -142,7 +142,7 @@ class HtmlExport
const OUString maHTMLHeader;
- std::unique_ptr< ButtonSet > mpButtonSet;
+ boost::scoped_ptr< ButtonSet > mpButtonSet;
static SdrTextObj* GetLayoutTextObject(SdrPage* pPage);
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index 703e77bf44c3..0d3d8d2a21b4 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -25,7 +25,7 @@
#include <diadef.h>
#include <svx/svdtypes.hxx>
#include <com/sun/star/uno/Any.h>
-#include <memory>
+#include <boost/shared_ptr.hpp>
class SdDrawDocument;
class SfxMedium;
@@ -41,7 +41,7 @@ class SdAnimationInfo;
struct PptInteractiveInfoAtom;
class Ppt97Animation;
-typedef std::shared_ptr< Ppt97Animation > Ppt97AnimationPtr;
+typedef boost::shared_ptr< Ppt97Animation > Ppt97AnimationPtr;
typedef ::std::map < SdrObject*, Ppt97AnimationPtr > tAnimationMap;
typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVector;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 3b8199907edf..3aa3461b4831 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -66,8 +66,9 @@
#include "pptin.hxx"
#include "randomnode.hxx"
+#include <boost/scoped_ptr.hpp>
+
#include <algorithm>
-#include <memory>
using ::std::map;
using ::com::sun::star::beans::NamedValue;
@@ -222,7 +223,7 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
{
Reference< XAnimationNode > xParent;
- std::unique_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, mrStCtrl ));
+ boost::scoped_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, mrStCtrl ));
if( pAtom )
{
nNodes = importAnimationContainer( pAtom.get(), xParent );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index bb5e9890a61c..032273a1a8b5 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/media/XManager.hpp>
#include <com/sun/star/media/XPlayer.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <comphelper/processfactory.hxx>
#include <i18nutil/unicode.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 851ea6756d0f..58892a0f9607 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -29,7 +29,7 @@
namespace sd {
class CustomAnimationEffect;
-typedef std::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
+typedef boost::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
class ICustomAnimationListController
{
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 9081eafde016..7b626e2e23a3 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -76,12 +76,12 @@
#include "drawdoc.hxx"
#include "app.hrc"
+#include <algorithm>
+
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/range/b2drange.hxx>
-
-#include <algorithm>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::animations;
@@ -741,7 +741,7 @@ void CustomAnimationPane::updateMotionPathTags()
if( mxView.is() )
{
- std::shared_ptr<ViewShell> xViewShell( mrBase.GetMainViewShell() );
+ ::boost::shared_ptr<ViewShell> xViewShell( mrBase.GetMainViewShell() );
if( xViewShell.get() )
pView = xViewShell->GetView();
}
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index c527ff52169a..4bc66133af1d 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -528,7 +528,7 @@ void SlideTransitionPane::onChangeCurrentPage()
{
::sd::slidesorter::SlideSorterViewShell * pSlideSorterViewShell
= ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(mrBase);
- std::shared_ptr<sd::slidesorter::SlideSorterViewShell::PageSelection> pSelection;
+ ::boost::shared_ptr<sd::slidesorter::SlideSorterViewShell::PageSelection> pSelection;
if( pSlideSorterViewShell )
{
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index da82d3cc9c27..a93d010c13d8 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -81,7 +81,7 @@
#include "textapi.hxx"
#include "optsitem.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -426,7 +426,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
TextApiObject* pTextApi = getTextApiObject( xAnnotation );
if( pTextApi )
{
- std::unique_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) );
+ boost::scoped_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) );
mpDoc->SetCalcFieldValueHdl( pOutliner.get() );
pOutliner->SetUpdateMode( true );
@@ -462,7 +462,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
pOutliner->QuickSetAttribs( aAnswerSet, aSel );
}
- std::unique_ptr< OutlinerParaObject > pOPO( pOutliner->CreateParaObject() );
+ boost::scoped_ptr< OutlinerParaObject > pOPO( pOutliner->CreateParaObject() );
pTextApi->SetText( *pOPO.get() );
SvtUserOptions aUserOptions;
@@ -668,7 +668,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
if( pPage && !pPage->getAnnotations().empty() )
{
// switch to next/previous slide with annotations
- std::shared_ptr<DrawViewShell> pDrawViewShell(std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
if (pDrawViewShell.get() != NULL)
{
pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, false);
@@ -912,7 +912,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
if( bReadOnly && !pAnnotationWindow )
return;
- std::unique_ptr< PopupMenu > pMenu( new PopupMenu( SdResId( pAnnotationWindow ? RID_ANNOTATION_CONTEXTMENU : RID_ANNOTATION_TAG_CONTEXTMENU ) ) );
+ boost::scoped_ptr< PopupMenu > pMenu( new PopupMenu( SdResId( pAnnotationWindow ? RID_ANNOTATION_CONTEXTMENU : RID_ANNOTATION_TAG_CONTEXTMENU ) ) );
SvtUserOptions aUserOptions;
OUString sCurrentAuthor( aUserOptions.GetFullName() );
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 693f84e5aee5..afc114cd7ee1 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -85,7 +85,7 @@
#include "textapi.hxx"
#include "sdresid.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::sd;
using namespace ::com::sun::star;
@@ -541,7 +541,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
if( pTextApi )
{
- std::unique_ptr< OutlinerParaObject > pOPO( pTextApi->CreateText() );
+ boost::scoped_ptr< OutlinerParaObject > pOPO( pTextApi->CreateText() );
Engine()->SetText( *pOPO.get() );
}
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 1456939a2007..9613ea63befb 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -59,6 +59,7 @@
#include "FrameView.hxx"
#include "FactoryIds.hxx"
#include "sdabstdlg.hxx"
+#include <boost/shared_ptr.hpp>
#include <memory>
#include "slideshow.hxx"
@@ -84,7 +85,7 @@ public:
private:
::sd::ViewShellBase& mrBase;
SdDrawDocument& mrDocument;
- std::shared_ptr<SvMemoryStream> mpStream;
+ ::boost::shared_ptr<SvMemoryStream> mpStream;
};
} //end of anonymous namespace
@@ -293,7 +294,7 @@ bool SdModule::OutlineToImpress(SfxRequest& rRequest)
= dynamic_cast< ::sd::ViewShellBase*>(pViewFrame->GetViewShell());
if (pBase != NULL)
{
- std::shared_ptr<FrameworkHelper> pHelper (
+ ::boost::shared_ptr<FrameworkHelper> pHelper (
FrameworkHelper::Instance(*pBase));
pHelper->RequestView(
FrameworkHelper::msOutlineViewURL,
@@ -555,7 +556,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
else
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 );
+ boost::scoped_ptr< AbstractAssistentDlg > pPilotDlg( pFact ? pFact->CreateAssistentDlg( NULL, !bNewDocDirect ) : 0 );
// Open the Pilot
if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK )
@@ -625,7 +626,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
pOpt->SetStartWithTemplate(bStartWithTemplate);
if(bNewDocDirect && !bStartWithTemplate)
{
- std::unique_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
+ boost::scoped_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
if(pRet.get())
ApplyItemSet( SID_SD_EDITOPTIONS, *pRet.get() );
@@ -643,7 +644,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
if(bNewDocDirect && !bStartWithTemplate)
{
- std::unique_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
+ boost::scoped_ptr< SfxItemSet > pRet( CreateItemSet( SID_SD_EDITOPTIONS ) );
if(pRet.get())
ApplyItemSet( SID_SD_EDITOPTIONS, *pRet.get() );
}
@@ -660,7 +661,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
if (pDoc && pBase)
{
- std::shared_ptr<sd::ViewShell> pViewSh = pBase->GetMainViewShell();
+ ::boost::shared_ptr<sd::ViewShell> pViewSh = pBase->GetMainViewShell();
SdOptions* pOptions = GetSdOptions(pDoc->GetDocumentType());
if (pOptions && pViewSh.get())
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index f82d9da4d72d..27c72a30a3f5 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -751,7 +751,7 @@ sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Se
return nRet;
}
-void SdTransferable::AddUserData (const std::shared_ptr<UserData>& rpData)
+void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData)
{
maUserData.push_back(rpData);
}
@@ -761,12 +761,12 @@ sal_Int32 SdTransferable::GetUserDataCount() const
return maUserData.size();
}
-std::shared_ptr<SdTransferable::UserData> SdTransferable::GetUserData (const sal_Int32 nIndex) const
+::boost::shared_ptr<SdTransferable::UserData> SdTransferable::GetUserData (const sal_Int32 nIndex) const
{
if (nIndex>=0 && nIndex<sal_Int32(maUserData.size()))
return maUserData[nIndex];
else
- return std::shared_ptr<UserData>();
+ return ::boost::shared_ptr<UserData>();
}
namespace
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index c4679e6f3072..527ef5855a41 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -41,7 +41,7 @@ namespace sd {
// struct ClientBoxEntry
-ClientBoxEntry::ClientBoxEntry( std::shared_ptr<ClientInfo> pClientInfo ) :
+ClientBoxEntry::ClientBoxEntry( ::boost::shared_ptr<ClientInfo> pClientInfo ) :
m_bActive( false ),
m_pClientInfo( pClientInfo )
{
@@ -632,7 +632,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt )
return true;
}
-long ClientBox::addEntry( std::shared_ptr<ClientInfo> pClientInfo )
+long ClientBox::addEntry( ::boost::shared_ptr<ClientInfo> pClientInfo )
{
long nPos = 0;
@@ -691,11 +691,11 @@ void ClientBox::populateEntries()
#ifdef ENABLE_SDREMOTE
RemoteServer::ensureDiscoverable();
- vector< std::shared_ptr< ClientInfo > > aClients( RemoteServer::getClients() );
+ vector< ::boost::shared_ptr< ClientInfo > > aClients( RemoteServer::getClients() );
- const vector< std::shared_ptr<ClientInfo > >::const_iterator aEnd( aClients.end() );
+ const vector< ::boost::shared_ptr<ClientInfo > >::const_iterator aEnd( aClients.end() );
- for ( vector< std::shared_ptr< ClientInfo > >::const_iterator aIt( aClients.begin() );
+ for ( vector< ::boost::shared_ptr< ClientInfo > >::const_iterator aIt( aClients.begin() );
aIt != aEnd; ++aIt )
{
addEntry( *aIt );
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 8b35f1bb8f44..a00e36e1ed47 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -34,7 +34,7 @@
#include "com/sun/star/lang/XEventListener.hpp"
#include "com/sun/star/deployment/XPackage.hpp"
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include "sdresid.hxx"
@@ -52,14 +52,14 @@ namespace sd {
struct ClientBoxEntry;
struct ClientInfo;
-typedef std::shared_ptr<ClientBoxEntry> TClientBoxEntry;
+typedef boost::shared_ptr<ClientBoxEntry> TClientBoxEntry;
struct ClientBoxEntry
{
bool m_bActive :1;
- std::shared_ptr<ClientInfo> m_pClientInfo;
+ boost::shared_ptr<ClientInfo> m_pClientInfo;
- ClientBoxEntry(std::shared_ptr<ClientInfo> pClientInfo);
+ ClientBoxEntry(boost::shared_ptr<ClientInfo> pClientInfo);
~ClientBoxEntry();
};
@@ -159,7 +159,7 @@ public:
void RemoveUnlocked();
void selectEntry( const long nPos );
- long addEntry(std::shared_ptr<ClientInfo> pClientInfo);
+ long addEntry(boost::shared_ptr<ClientInfo> pClientInfo);
void clearEntries();
void prepareChecking();
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index c8a5177c9d98..0776519fadb1 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -29,7 +29,7 @@
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "DrawDocShell.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
vcl::Window* pWindow, const SfxItemSet& rInAttrs)
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 042d38e0a45b..a04069b58b4a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1586,7 +1586,7 @@ void SdPageObjsTLB::AddShapeToTransferable (
if (pBase->GetDocShell() != &rDocShell)
continue;
- const std::shared_ptr<sd::ViewShell> pViewShell (pBase->GetMainViewShell());
+ const ::boost::shared_ptr<sd::ViewShell> pViewShell (pBase->GetMainViewShell());
if (pViewShell)
return pViewShell.get();
}
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 9e5b3ab66208..567bcdb520a6 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -56,7 +56,7 @@
#include "View.hxx"
#include "slideshow.hxx"
#include "fuhhconv.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -282,7 +282,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if (pFact && mpViewShell)
{
- std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( mpViewShell->GetActiveWindow(), SID_LANGUAGE_OPTIONS ));
+ boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( mpViewShell->GetActiveWindow(), SID_LANGUAGE_OPTIONS ));
pDlg->Execute();
}
}
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index e80bb8952eeb..93de709e9b24 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -768,7 +768,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
}
if (!sViewURL.isEmpty())
{
- std::shared_ptr<FrameworkHelper> pHelper (
+ ::boost::shared_ptr<FrameworkHelper> pHelper (
FrameworkHelper::Instance(rBase));
pHelper->RequestView(
sViewURL,
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index ecc5e6c51c3f..ca32796f60db 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -445,7 +445,7 @@ void DrawDocShell::ClearUndoBuffer()
ViewShellBase* pViewShellBase = dynamic_cast< ViewShellBase* >( pSfxViewFrame->GetViewShell() );
if( pViewShellBase )
{
- std::shared_ptr<ViewShell> pViewSh( pViewShellBase->GetMainViewShell() );
+ ::boost::shared_ptr<ViewShell> pViewSh( pViewShellBase->GetMainViewShell() );
if( pViewSh.get() )
{
::sd::View* pView = pViewSh->GetView();
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 7db8da3b573f..975e593ad27e 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -52,7 +52,7 @@ namespace sd { namespace framework {
ChangeRequestQueueProcessor::ChangeRequestQueueProcessor (
const ::rtl::Reference<ConfigurationController>& rpConfigurationController,
- const std::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater)
+ const ::boost::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater)
: maMutex(),
maQueue(),
mnUserEventId(0),
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index fa0263af47d2..696635d2e6c6 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -29,7 +29,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <tools/link.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
struct ImplSVEvent;
@@ -56,7 +56,7 @@ public:
*/
ChangeRequestQueueProcessor (
const ::rtl::Reference<ConfigurationController>& rxController,
- const std::shared_ptr<ConfigurationUpdater>& rpUpdater);
+ const ::boost::shared_ptr<ConfigurationUpdater>& rpUpdater);
~ChangeRequestQueueProcessor();
/** Sets the configuration who will be changed by subsequent change
@@ -112,7 +112,7 @@ private:
::rtl::Reference<ConfigurationController> mpConfigurationController;
- std::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
+ ::boost::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
/** Initiate the processing of the entries in the queue. The actual
processing starts asynchronously.
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 1dab1de52722..54f526ebab8b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -58,7 +58,7 @@ public:
/** The Broadcaster class implements storing and calling of listeners.
*/
- std::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
+ ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
/** The requested configuration which is modified (asynchronously) by
calls to requestResourceActivation() and
@@ -70,18 +70,18 @@ public:
ViewShellBase* mpBase;
- std::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
+ ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
- std::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
+ ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
- std::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
+ ::boost::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
/** The queue processor ownes the queue of configuration change request
objects and processes the objects.
*/
- std::unique_ptr<ChangeRequestQueueProcessor> mpQueueProcessor;
+ ::boost::scoped_ptr<ChangeRequestQueueProcessor> mpQueueProcessor;
- std::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock;
+ ::boost::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock;
sal_Int32 mnLockCount;
};
@@ -420,7 +420,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration (
// We will probably be making a couple of activation and deactivation
// requests so lock the configuration controller and let it later update
// all changes at once.
- std::shared_ptr<ConfigurationUpdaterLock> pLock (
+ ::boost::shared_ptr<ConfigurationUpdaterLock> pLock (
mpImplementation->mpConfigurationUpdater->GetLock());
// Get lists of resources that are to be activated or deactivated.
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 9d23701fc5cd..5e0e92864b15 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -35,8 +35,8 @@ namespace sd { namespace framework {
//===== ConfigurationControllerResourceManager ================================
ConfigurationControllerResourceManager::ConfigurationControllerResourceManager (
- const std::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster)
+ const ::boost::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
+ const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster)
: maResourceMap(ResourceComparator()),
mpResourceFactoryContainer(rpResourceFactoryContainer),
mpBroadcaster(rpBroadcaster)
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index 063aec3a393f..727365574207 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -26,8 +26,8 @@
#include <osl/mutex.hxx>
#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
#include <map>
-#include <memory>
#include <vector>
namespace sd { namespace framework {
@@ -58,8 +58,8 @@ public:
resources.
*/
ConfigurationControllerResourceManager (
- const std::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster);
+ const ::boost::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer,
+ const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster);
~ConfigurationControllerResourceManager();
@@ -108,12 +108,12 @@ private:
ResourceComparator> ResourceMap;
ResourceMap maResourceMap;
- std::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
+ ::boost::shared_ptr<ResourceFactoryManager> mpResourceFactoryContainer;
/** This broadcaster is used to notify the activation and deactivation
of resources.
*/
- std::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
+ ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
void ActivateResource (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index e9e23f08f6d2..298924f98a86 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -60,8 +60,8 @@ private:
//===== ConfigurationUpdater ==================================================
ConfigurationUpdater::ConfigurationUpdater (
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
- const std::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
+ const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
+ const ::boost::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
const Reference<XControllerManager>& rxControllerManager)
: mxControllerManager(),
mpBroadcaster(rpBroadcaster),
@@ -355,9 +355,9 @@ void ConfigurationUpdater::UnlockUpdates()
}
}
-std::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock()
+::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock()
{
- return std::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this));
+ return ::boost::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this));
}
void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue)
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index fb7209ef63d1..07f34c4b75c7 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -25,8 +25,8 @@
#include <com/sun/star/drawing/framework/XConfiguration.hpp>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <vcl/timer.hxx>
-#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
namespace sd { namespace framework {
@@ -49,8 +49,8 @@ public:
changes and the start and end of updates via the given broadcaster.
*/
ConfigurationUpdater (
- const std::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
- const std::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
+ const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster,
+ const ::boost::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager,
const css::uno::Reference<
css::drawing::framework::XControllerManager>& rxControllerManager);
~ConfigurationUpdater();
@@ -79,7 +79,7 @@ public:
returned object exists no update of the current configuration is
made.
*/
- std::shared_ptr<ConfigurationUpdaterLock> GetLock();
+ ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock();
private:
/** A reference to the XControllerManager is kept so that
@@ -88,7 +88,7 @@ private:
css::uno::Reference<
css::drawing::framework::XControllerManager> mxControllerManager;
- std::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
+ ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster;
/** The current configuration holds the resources that are currently
active. It is modified during an update.
@@ -139,7 +139,7 @@ private:
*/
sal_Int32 mnFailedUpdateCount;
- std::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
+ ::boost::shared_ptr<ConfigurationControllerResourceManager> mpResourceManager;
/** This method does the main work of an update. It calls the sub
controllers that are responsible for the various types of resources
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 4421732ab0d2..aeaf9b64ae67 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -32,7 +32,8 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
namespace {
@@ -108,7 +109,7 @@ private:
ViewShellBase* mpViewShellBase;
class PaneDescriptor;
class PaneContainer;
- std::unique_ptr<PaneContainer> mpPaneContainer;
+ ::boost::scoped_ptr<PaneContainer> mpPaneContainer;
/** Create a new instance of FrameWindowPane.
@param rPaneId
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index dee1ae7c07a4..065499bac8e5 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -58,10 +58,10 @@ class BasicViewFactory::ViewDescriptor
{
public:
Reference<XResource> mxView;
- std::shared_ptr<sd::ViewShell> mpViewShell;
+ ::boost::shared_ptr<sd::ViewShell> mpViewShell;
ViewShellWrapper* mpWrapper;
Reference<XResourceId> mxViewId;
- static bool CompareView (const std::shared_ptr<ViewDescriptor>& rpDescriptor,
+ static bool CompareView (const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor,
const Reference<XResource>& rxView)
{ return rpDescriptor->mxView.get() == rxView.get(); }
};
@@ -69,14 +69,14 @@ public:
//===== BasicViewFactory::ViewShellContainer ==================================
class BasicViewFactory::ViewShellContainer
- : public ::std::vector<std::shared_ptr<ViewDescriptor> >
+ : public ::std::vector<boost::shared_ptr<ViewDescriptor> >
{
public:
ViewShellContainer() {};
};
class BasicViewFactory::ViewCache
- : public ::std::vector<std::shared_ptr<ViewDescriptor> >
+ : public ::std::vector<boost::shared_ptr<ViewDescriptor> >
{
public:
ViewCache() {};
@@ -164,7 +164,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource (
if (pFrame != NULL && mpBase!=NULL && pWindow!=NULL)
{
// Try to get the view from the cache.
- std::shared_ptr<ViewDescriptor> pDescriptor (GetViewFromCache(rxViewId, xPane));
+ ::boost::shared_ptr<ViewDescriptor> pDescriptor (GetViewFromCache(rxViewId, xPane));
// When the requested view is not in the cache then create a new view.
if (pDescriptor.get() == NULL)
@@ -201,7 +201,7 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV
::boost::bind(&ViewDescriptor::CompareView, _1, rxView)));
if (iViewShell != mpViewShellContainer->end())
{
- std::shared_ptr<ViewShell> pViewShell ((*iViewShell)->mpViewShell);
+ ::boost::shared_ptr<ViewShell> pViewShell ((*iViewShell)->mpViewShell);
if ((*iViewShell)->mxViewId->isBoundToURL(
FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
@@ -278,7 +278,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
}
}
-std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
+::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
const Reference<XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
@@ -286,7 +286,7 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
FrameView* pFrameView,
const bool bIsCenterPane)
{
- std::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor());
+ ::boost::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor());
pDescriptor->mpViewShell = CreateViewShell(
rxViewId,
@@ -323,14 +323,14 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
return pDescriptor;
}
-std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
+::boost::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
const Reference<XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
FrameView* pFrameView,
const bool bIsCenterPane)
{
- std::shared_ptr<ViewShell> pViewShell;
+ ::boost::shared_ptr<ViewShell> pViewShell;
const OUString& rsViewURL (rxViewId->getResourceURL());
if (rsViewURL.equals(FrameworkHelper::msImpressViewURL))
{
@@ -403,7 +403,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
}
void BasicViewFactory::ReleaseView (
- const std::shared_ptr<ViewDescriptor>& rpDescriptor,
+ const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor,
bool bDoNotCache)
{
bool bIsCacheable (!bDoNotCache && IsCacheable(rpDescriptor));
@@ -441,7 +441,7 @@ void BasicViewFactory::ReleaseView (
}
}
-bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDescriptor)
+bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor)
{
bool bIsCacheable (false);
@@ -451,7 +451,7 @@ bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDes
static ::std::vector<Reference<XResourceId> > maCacheableResources;
if (maCacheableResources.empty() )
{
- std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase));
+ ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase));
// The slide sorter and the task panel are cacheable and relocatable.
maCacheableResources.push_back(FrameworkHelper::CreateResourceId(
@@ -474,11 +474,11 @@ bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDes
return bIsCacheable;
}
-std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromCache (
+::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromCache (
const Reference<XResourceId>& rxViewId,
const Reference<XPane>& rxPane)
{
- std::shared_ptr<ViewDescriptor> pDescriptor;
+ ::boost::shared_ptr<ViewDescriptor> pDescriptor;
// Search for the requested view in the cache.
ViewCache::iterator iEntry;
@@ -515,7 +515,7 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromC
}
void BasicViewFactory::ActivateCenterView (
- const std::shared_ptr<ViewDescriptor>& rpDescriptor)
+ const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor)
{
mpBase->GetDocShell()->Connect(rpDescriptor->mpViewShell.get());
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 064558c49ff5..440bf74d7208 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -32,8 +32,9 @@
#include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
#include <vcl/vclptr.hxx>
-#include <memory>
namespace sd {
class ViewShell;
@@ -99,17 +100,17 @@ private:
mxConfigurationController;
class ViewDescriptor;
class ViewShellContainer;
- std::unique_ptr<ViewShellContainer> mpViewShellContainer;
+ ::boost::scoped_ptr<ViewShellContainer> mpViewShellContainer;
ViewShellBase* mpBase;
FrameView* mpFrameView;
class ViewCache;
ScopedVclPtr<vcl::Window> mpWindow;
- std::shared_ptr<ViewCache> mpViewCache;
+ ::boost::shared_ptr<ViewCache> mpViewCache;
css::uno::Reference<css::drawing::framework::XPane> mxLocalPane;
- std::shared_ptr<ViewDescriptor> CreateView (
+ ::boost::shared_ptr<ViewDescriptor> CreateView (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
@@ -117,7 +118,7 @@ private:
FrameView* pFrameView,
const bool bIsCenterView);
- std::shared_ptr<ViewShell> CreateViewShell (
+ ::boost::shared_ptr<ViewShell> CreateViewShell (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
SfxViewFrame& rFrame,
vcl::Window& rWindow,
@@ -125,16 +126,16 @@ private:
const bool bIsCenterView);
void ActivateCenterView (
- const std::shared_ptr<ViewDescriptor>& rpDescriptor);
+ const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor);
void ReleaseView (
- const std::shared_ptr<ViewDescriptor>& rpDescriptor,
+ const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor,
bool bDoNotCache = false);
bool IsCacheable (
- const std::shared_ptr<ViewDescriptor>& rpDescriptor);
+ const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor);
- std::shared_ptr<ViewDescriptor> GetViewFromCache (
+ ::boost::shared_ptr<ViewDescriptor> GetViewFromCache (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
const css::uno::Reference<css::drawing::framework::XPane>& rxPane);
};
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index d2938ec45b3f..f2a963128a83 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <vcl/vclevent.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class WorkWindow;
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 2b3e80501a92..68ebb2a1d536 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -55,13 +55,13 @@ using ::com::sun::star::lang::DisposedException;
namespace sd { namespace framework {
ViewShellWrapper::ViewShellWrapper (
- std::shared_ptr<ViewShell> pViewShell,
+ ::boost::shared_ptr<ViewShell> pViewShell,
const Reference<XResourceId>& rxViewId,
const Reference<awt::XWindow>& rxWindow)
: ViewShellWrapperInterfaceBase(MutexOwner::maMutex),
mpViewShell(pViewShell),
mpSlideSorterViewShell(
- std::dynamic_pointer_cast< ::sd::slidesorter::SlideSorterViewShell >( pViewShell )),
+ ::boost::dynamic_pointer_cast< ::sd::slidesorter::SlideSorterViewShell >( pViewShell )),
mxViewId(rxViewId),
mxWindow(rxWindow)
{
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index 986f6fb87888..a0f2c54f1e9f 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -142,7 +142,7 @@ void CenterViewFocusModule::HandleNewView (
xTunnel->getSomething(ViewShellWrapper::getUnoTunnelId()));
if (pViewShellWrapper != NULL)
{
- std::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell();
+ ::boost::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell();
if (pViewShell.get() != NULL)
mpBase->GetViewShellManager()->MoveToTop(*pViewShell);
}
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index d0abc5dda0bf..e67595155b11 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/compbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace {
@@ -82,7 +82,7 @@ protected:
private:
class MainViewContainer;
- std::unique_ptr<MainViewContainer> mpActiveMainViewContainer;
+ ::boost::scoped_ptr<MainViewContainer> mpActiveMainViewContainer;
/// The resource managed by this class.
css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId;
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 5d4bf131c46f..63cb56baf972 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -31,7 +31,7 @@
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <cppuhelper/compbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace {
@@ -84,7 +84,7 @@ private:
css::uno::Reference<css::drawing::framework::XConfigurationController>
mxConfigurationController;
ViewShellBase* mpBase;
- std::unique_ptr<ConfigurationController::Lock> mpUpdateLock;
+ ::boost::scoped_ptr<ConfigurationController::Lock> mpUpdateLock;
Idle maPrinterPollingIdle;
DECL_LINK_TYPED(TimeoutHandler, Idle*, void);
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index 3e665834a57a..51e4b6ba6254 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -141,7 +141,7 @@ void ToolBarModule::HandleUpdateStart()
// stack.
if (mpBase != NULL)
{
- std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
+ ::boost::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
mpToolBarManagerLock.reset(new ToolBarManager::UpdateLock(pToolBarManager));
pToolBarManager->LockViewShellManager();
}
@@ -156,8 +156,8 @@ void ToolBarModule::HandleUpdateEnd()
// no longer visible. This is done before the old view shell is
// destroyed in order to avoid unnecessary updates of those tool
// bars.
- std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
- std::shared_ptr<FrameworkHelper> pFrameworkHelper (
+ ::boost::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
+ ::boost::shared_ptr<FrameworkHelper> pFrameworkHelper (
FrameworkHelper::Instance(*mpBase));
ViewShell* pViewShell
= pFrameworkHelper->GetViewShell(FrameworkHelper::msCenterPaneURL).get();
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index 60350da81777..67ec89ea8206 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -28,7 +28,7 @@
#include <osl/mutex.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
class ViewShellBase;
@@ -76,7 +76,7 @@ private:
css::uno::Reference<
css::drawing::framework::XConfigurationController> mxConfigurationController;
ViewShellBase* mpBase;
- std::unique_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
+ ::boost::scoped_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
bool mbMainViewSwitchUpdatePending;
void HandleUpdateStart();
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 5e9fe9575909..a34d34303fec 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -230,9 +230,9 @@ const OUString FrameworkHelper::msConfigurationControllerService("com.sun.star.d
//----- helper ----------------------------------------------------------------
namespace
{
- static ::std::shared_ptr< ViewShell > lcl_getViewShell( const Reference< XResource >& i_rViewShellWrapper )
+ static ::boost::shared_ptr< ViewShell > lcl_getViewShell( const Reference< XResource >& i_rViewShellWrapper )
{
- ::std::shared_ptr< ViewShell > pViewShell;
+ ::boost::shared_ptr< ViewShell > pViewShell;
if ( !i_rViewShellWrapper.is() )
return pViewShell;
@@ -295,7 +295,7 @@ class FrameworkHelper::DisposeListener
public FrameworkHelperDisposeListenerInterfaceBase
{
public:
- DisposeListener (const ::std::shared_ptr<FrameworkHelper>& rpHelper);
+ DisposeListener (const ::boost::shared_ptr<FrameworkHelper>& rpHelper);
virtual ~DisposeListener();
virtual void SAL_CALL disposing() SAL_OVERRIDE;
@@ -304,7 +304,7 @@ public:
throw(RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ::std::shared_ptr<FrameworkHelper> mpHelper;
+ ::boost::shared_ptr<FrameworkHelper> mpHelper;
};
//----- FrameworkHelper::Deleter ----------------------------------------------
@@ -320,14 +320,14 @@ public:
//----- FrameworkHelper -------------------------------------------------------
-std::unique_ptr<FrameworkHelper::ViewURLMap> FrameworkHelper::mpViewURLMap(new ViewURLMap());
+::boost::scoped_ptr<FrameworkHelper::ViewURLMap> FrameworkHelper::mpViewURLMap(new ViewURLMap());
FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap;
-::std::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& rBase)
+::boost::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& rBase)
{
- ::std::shared_ptr<FrameworkHelper> pHelper;
+ ::boost::shared_ptr<FrameworkHelper> pHelper;
InstanceMap::const_iterator iHelper (maInstanceMap.find(&rBase));
if (iHelper == maInstanceMap.end())
@@ -336,7 +336,7 @@ FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap;
::osl::MutexGuard aGuard (aMutexFunctor());
if (iHelper == maInstanceMap.end())
{
- pHelper = ::std::shared_ptr<FrameworkHelper>(
+ pHelper = ::boost::shared_ptr<FrameworkHelper>(
new FrameworkHelper(rBase),
FrameworkHelper::Deleter());
pHelper->Initialize();
@@ -405,16 +405,16 @@ bool FrameworkHelper::IsValid()
return mxConfigurationController.is();
}
-::std::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const OUString& rsPaneURL)
+::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const OUString& rsPaneURL)
{
if ( !mxConfigurationController.is() )
- return ::std::shared_ptr<ViewShell>();
+ return ::boost::shared_ptr<ViewShell>();
Reference<XResourceId> xPaneId( CreateResourceId( rsPaneURL ) );
return lcl_getViewShell( lcl_getFirstViewInPane( mxConfigurationController, xPaneId ) );
}
-::std::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const Reference<XView>& rxView)
+::boost::shared_ptr<ViewShell> FrameworkHelper::GetViewShell (const Reference<XView>& rxView)
{
return lcl_getViewShell( rxView.get() );
}
@@ -556,7 +556,7 @@ void FrameworkHelper::HandleModeChangeSlot (
Reference<XResourceId> xPaneId (
CreateResourceId(framework::FrameworkHelper::msCenterPaneURL));
Reference<XView> xView (GetView(xPaneId));
- ::std::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView));
+ ::boost::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView));
OUString sRequestedView;
if (bIsActive)
@@ -775,7 +775,7 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId (
//----- FrameworkHelper::DisposeListener --------------------------------------
FrameworkHelper::DisposeListener::DisposeListener (
- const ::std::shared_ptr<FrameworkHelper>& rpHelper)
+ const ::boost::shared_ptr<FrameworkHelper>& rpHelper)
: FrameworkHelperDisposeListenerInterfaceBase(maMutex),
mpHelper(rpHelper)
{
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 5c351f5dcbc8..ef48a6c89bf8 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -34,7 +34,7 @@
#include "app.hrc"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
TYPEINIT1( FuArea, FuPoor );
@@ -61,7 +61,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
mpView->GetAttributes( aNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSvxAreaTabDialog> pDlg(pFact ? pFact->CreateSvxAreaTabDialog( NULL,
+ boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact ? pFact->CreateSvxAreaTabDialog( NULL,
&aNewAttr,
mpDoc,
true) : 0);
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index cc989a3efd9a..4ef4f2cf4e72 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -38,7 +38,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include "drawview.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include "app.hrc"
@@ -190,7 +190,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
aSet.Put( *pFontItem );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet,
+ boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet,
mpView->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(),
RID_SVXDLG_CHARMAP ) : 0);
if( !pDlg )
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 5b5227ca77c5..b8166c2cab10 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -34,7 +34,7 @@
#include "ViewShell.hxx"
#include "DrawDocShell.hxx"
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -71,7 +71,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
aNewAttr.Put( aEditAttr, false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0);
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0);
sal_uInt16 nResult = RET_CANCEL;
if( pDlg )
{
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 8be8252b39cc..f8dbe856a728 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -180,7 +180,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
SdPage* pPage = dynamic_cast< SdPage* >( pPathObj ? pPathObj->GetPage() : 0 );
if( pPage )
{
- std::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
+ boost::shared_ptr< sd::MainSequence > pMainSequence( pPage->getMainSequence() );
if( pMainSequence.get() )
{
Sequence< Any > aTargets;
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index 494fc75ecbec..7a640ccd1ab3 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -25,7 +25,7 @@
#include "drawdoc.hxx"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -58,7 +58,7 @@ void FuConnectionDlg::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_CONNECTION) : 0);
+ boost::scoped_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_CONNECTION) : 0);
if( pDlg.get() && (pDlg->Execute() == RET_OK) )
{
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index e7cd23f6d4b0..5f6ee2ce0511 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -38,7 +38,7 @@
#include <svx/xfillit0.hxx>
#include <sfx2/request.hxx>
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -102,7 +102,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- std::unique_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorList(), mpView ));
+ boost::scoped_ptr<AbstractCopyDlg> pDlg(pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorList(), mpView ));
if (!pDlg)
return;
@@ -169,7 +169,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
// remove handles
//HMHmpView->HideMarkHdl();
- std::unique_ptr<SfxProgress> pProgress;
+ boost::scoped_ptr<SfxProgress> pProgress;
bool bWaiting = false;
if( nNumber > 1 )
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 78548c3f3fe1..3c898a24e2cb 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -31,7 +31,7 @@
#include <sfx2/viewfrm.hxx>
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -57,7 +57,7 @@ rtl::Reference<FuPoor> FuCustomShowDlg::Create( ViewShell* pViewSh, ::sd::Window
void FuCustomShowDlg::DoExecute( SfxRequest& )
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdCustomShowDlg> pDlg(pFact ? pFact->CreateSdCustomShowDlg( NULL, *mpDoc ) : 0);
+ boost::scoped_ptr<AbstractSdCustomShowDlg> pDlg(pFact ? pFact->CreateSdCustomShowDlg( NULL, *mpDoc ) : 0);
if( pDlg )
{
sal_uInt16 nRet = pDlg->Execute();
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index f2c1432c103b..2d3c5325af09 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -82,7 +82,7 @@
#include "sdxfer.hxx"
#include <vcl/svapp.hxx>
#include "undo/undoobjects.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include "glob.hrc"
#include <config_features.h>
@@ -202,7 +202,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
SotClipboardFormatId nFormatId;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() ));
+ boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() ));
if ( pDlg )
{
::com::sun::star::datatransfer::DataFlavor aFlavor;
@@ -457,7 +457,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
case SID_INSERT_FLOATINGFRAME :
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractInsertObjectDialog> pDlg(
+ boost::scoped_ptr<SfxAbstractInsertObjectDialog> pDlg(
pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(),
xStorage, &aServerLst ));
if ( pDlg )
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 281155e1b7b4..991d4f88b871 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -62,7 +62,7 @@
#include "unmovss.hxx"
#include "Outliner.hxx"
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -329,7 +329,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( false );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0);
+ boost::scoped_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0);
if( !pDlg )
return false;
@@ -421,7 +421,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg(NULL, mpDoc, NULL, aFile ) : 0);
+ boost::scoped_ptr<AbstractSdInsertPagesObjsDlg> pDlg(pFact ? pFact->CreateSdInsertPagesObjsDlg(NULL, mpDoc, NULL, aFile ) : 0);
if( !pDlg )
return;
@@ -446,7 +446,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
- std::unique_ptr<SdrOutliner> pOutliner(new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ));
+ boost::scoped_ptr<SdrOutliner> pOutliner(new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ));
// set reference device
pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
@@ -596,7 +596,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
- the draw outliner of the drawing engine has to draw something in
between
- the global outliner could be used in SdPage::CreatePresObj */
- std::unique_ptr< ::Outliner> pOutliner(new ::Outliner( &mpDoc->GetItemPool(), OUTLINERMODE_OUTLINEOBJECT ));
+ boost::scoped_ptr< ::Outliner> pOutliner(new ::Outliner( &mpDoc->GetItemPool(), OUTLINERMODE_OUTLINEOBJECT ));
pOutliner->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
// set reference device
@@ -631,7 +631,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( false );
- std::unique_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages));
+ boost::scoped_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages));
if( pProgress )
pProgress->SetState( 0, 100 );
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 6b97442ffd52..f16a9d5f327f 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -36,7 +36,7 @@
#include "app.hrc"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -72,11 +72,11 @@ void FuLine::DoExecute( SfxRequest& rReq )
if( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- std::unique_ptr<SfxItemSet> pNewAttr(new SfxItemSet( mpDoc->GetPool() ));
+ boost::scoped_ptr<SfxItemSet> pNewAttr(new SfxItemSet( mpDoc->GetPool() ));
mpView->GetAttributes( *pNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr.get(),mpDoc,pObj,bHasMarked) : 0);
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr.get(),mpDoc,pObj,bHasMarked) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 985824f860d1..b963b06e5cf8 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -32,7 +32,7 @@
#include "drawdoc.hxx"
#include "View.hxx"
#include "Window.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -114,7 +114,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0);
+ boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0);
if( pDlg )
{
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index 245004a24c26..0350b2c40300 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -29,7 +29,7 @@
#include "drawdoc.hxx"
#include "ViewShell.hxx"
#include "app.hrc"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
class SfxRequest;
@@ -59,7 +59,7 @@ void FuLink::DoExecute( SfxRequest& )
sfx2::LinkManager* pLinkManager = mpDoc->GetLinkManager();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( mpViewShell->GetActiveWindow(), pLinkManager ));
+ boost::scoped_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( mpViewShell->GetActiveWindow(), pLinkManager ));
if ( pDlg )
{
pDlg->Execute();
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index 7b5bbb280629..22bc96e496c0 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -25,7 +25,7 @@
#include "drawdoc.hxx"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -58,7 +58,7 @@ void FuMeasureDlg::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_MEASURE) : 0 );
+ boost::scoped_ptr<SfxAbstractDialog> pDlg( pFact ? pFact->CreateSfxDialog( NULL, aNewAttr, mpView, RID_SVXPAGE_MEASURE) : 0 );
if( pDlg.get() && (pDlg->Execute() == RET_OK) )
{
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index a1e25babafda..6eac885048d3 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -43,8 +43,8 @@
#include <svx/svditer.hxx>
#include <basegfx/color/bcolor.hxx>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-#include <memory>
using namespace com::sun::star;
@@ -96,7 +96,7 @@ void FuMorph::DoExecute( SfxRequest& )
SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(false, false);
SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(false, false);
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< vcl::Window*>(mpWindow), pObj1, pObj2 ) : 0);
+ boost::scoped_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< vcl::Window*>(mpWindow), pObj1, pObj2 ) : 0);
if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK))
{
B2DPolyPolygonList_impl aPolyPolyList;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 8c0b708df55c..195991509de7 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -44,7 +44,7 @@
#include "sdresid.hxx"
#include <tools/helpers.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -446,7 +446,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, false));
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0);
+ boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0);
short nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL);
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 653562aeb61e..e6538561d9b2 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -38,7 +38,7 @@
#include <svx/nbdtmg.hxx>
#include <svx/nbdtmgfact.hxx>
#include <svx/svdoutl.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace svx::sidebar;
namespace sd {
@@ -82,7 +82,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
// create and execute dialog
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0);
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0);
if( pDlg )
{
if ( pPageItem )
@@ -97,7 +97,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
+ boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
if (mpView->ISA(OutlineView))
{
@@ -234,7 +234,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
}
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
+ boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
{
if (mpView->ISA(OutlineView))
{
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index a3dceffd6599..b7fbe74f2c7a 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -35,7 +35,7 @@
#include "ViewShell.hxx"
#include "OutlineViewShell.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <stdio.h>
@@ -189,7 +189,7 @@ bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
{
mpWindow->GrabFocus();
- std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
+ boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
if( (nKeyGroup != KEYGROUP_CURSOR) && (nKeyGroup != KEYGROUP_FKEYS) )
aGuard.reset( new OutlineViewModelChangeGuard( *pOutlineView ) );
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index f652f82a54e3..518f35683542 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -67,7 +67,7 @@
#include "sdundogr.hxx"
#include "helpids.h"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -280,7 +280,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
}
}
- std::unique_ptr< SfxItemSet > pTempSet;
+ boost::scoped_ptr< SfxItemSet > pTempSet;
if( GetSlotID() == SID_SELECT_BACKGROUND )
{
@@ -310,7 +310,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
{
// create the dialog
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg( pFact ? pFact->CreateSdTabPageDialog(NULL, &aMergedAttr, mpDocSh, mbDisplayBackgroundTabPage ) : 0 );
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg( pFact ? pFact->CreateSdTabPageDialog(NULL, &aMergedAttr, mpDocSh, mbDisplayBackgroundTabPage ) : 0 );
if( pDlg.get() && pDlg->Execute() == RET_OK )
pTempSet.reset( new SfxItemSet(*pDlg->GetOutputItemSet()) );
}
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index e349856d2350..fc4031d03d8b 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -34,7 +34,7 @@
#include "drawdoc.hxx"
#include "sdabstdlg.hxx"
#include "sdattr.hrc"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -91,7 +91,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
}
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdParagraphTabDlg(NULL, &aNewAttr ) : 0);
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdParagraphTabDlg(NULL, &aNewAttr ) : 0);
if (!pDlg)
return;
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index b782e6f5f90a..f087ad9de95f 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -52,7 +52,7 @@
#include <editeng/outliner.hxx>
#include <editeng/editdata.hxx>
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd
{
@@ -110,7 +110,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
= slidesorter::SlideSorterViewShell::GetSlideSorter(mpViewShell->GetViewShellBase());
if (pSlideSorterViewShell)
{
- std::shared_ptr<slidesorter::SlideSorterViewShell::PageSelection> xSelection(
+ boost::shared_ptr<slidesorter::SlideSorterViewShell::PageSelection> xSelection(
pSlideSorterViewShell->GetPageSelection());
if (xSelection)
{
@@ -175,7 +175,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
else
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdPresLayoutDlg> pDlg(pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0);
+ boost::scoped_ptr<AbstractSdPresLayoutDlg> pDlg(pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0);
sal_uInt16 nResult = pDlg ? pDlg->Execute() : static_cast<short>(RET_CANCEL);
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index e49c96762c4f..46988bf8fed3 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -39,7 +39,7 @@
#include "prlayout.hxx"
#include "unchss.hxx"
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -140,7 +140,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
SfxStyleSheetBase& rStyleSheet = *pStyleSheet;
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, NULL, SdResId( nDlgId ), rStyleSheet, ePO, pStyleSheetPool ) : 0);
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact ? pFact->CreateSdPresLayoutTemplateDlg( mpDocSh, NULL, SdResId( nDlgId ), rStyleSheet, ePO, pStyleSheetPool ) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 2c2db012d629..9729951fd721 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -39,7 +39,7 @@
#include <sfx2/zoomitem.hxx>
#include <sfx2/request.hxx>
#include <svx/svxdlg.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -71,7 +71,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SfxItemSet aNewAttr( mpDoc->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
- std::unique_ptr<SvxZoomItem> pZoomItem;
+ boost::scoped_ptr<SvxZoomItem> pZoomItem;
SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL;
nValue = (sal_Int16) mpWindow->GetZoom();
@@ -110,7 +110,7 @@ void FuScale::DoExecute( SfxRequest& rReq )
pZoomItem->SetValueSet( nZoomValues );
aNewAttr.Put( *pZoomItem );
- std::unique_ptr<AbstractSvxZoomDialog> pDlg;
+ boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index c7b563f0d3d7..02804b71a55b 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -32,7 +32,7 @@
#include "Window.hxx"
#include "optsitem.hxx"
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -110,7 +110,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
aDlgSet.Put( SfxInt32Item( ATTR_PRESENT_DISPLAY, pOptions->GetDisplay() ) );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdStartPresDlg> pDlg(pFact ? pFact->CreateSdStartPresentationDlg(mpWindow, aDlgSet, aPageNameList, pCustomShowList) : 0);
+ boost::scoped_ptr<AbstractSdStartPresDlg> pDlg(pFact ? pFact->CreateSdStartPresentationDlg(mpWindow, aDlgSet, aPageNameList, pCustomShowList) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
OUString aPage;
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index dc522af70aa5..4014137e40f7 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -35,7 +35,7 @@
#include "sdabstdlg.hxx"
#include "app.hrc"
#include <svx/svdpagv.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -111,7 +111,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
aNewAttr.Put(SfxInt32Item(ATTR_SNAPLINE_Y, aLinePos.Y()));
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdSnapLineDlg> pDlg(pFact ? pFact->CreateSdSnapLineDlg( NULL, aNewAttr, mpView ) : 0);
+ boost::scoped_ptr<AbstractSdSnapLineDlg> pDlg(pFact ? pFact->CreateSdSnapLineDlg( NULL, aNewAttr, mpView ) : 0);
OSL_ASSERT(pDlg);
if (!pDlg)
return;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 2b4624758356..445feef4126e 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -65,7 +65,7 @@
#include "strings.hrc"
#include "helpids.h"
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
@@ -296,8 +296,8 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( pStyleSheet )
{
- std::unique_ptr<SfxAbstractTabDialog> pStdDlg;
- std::unique_ptr<SfxAbstractTabDialog> pPresDlg;
+ boost::scoped_ptr<SfxAbstractTabDialog> pStdDlg;
+ boost::scoped_ptr<SfxAbstractTabDialog> pPresDlg;
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
bool bOldDocInOtherLanguage = false;
SfxItemSet aOriSet( pStyleSheet->GetItemSet() );
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 16a07a9cefac..24f6a82f83e2 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -31,7 +31,7 @@
#include "drawdoc.hxx"
#include <svx/svxdlg.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -74,7 +74,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- std::unique_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
+ boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) );
const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -94,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
+ boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) );
if( pDlg.get() && (pDlg->Execute() == RET_OK) )
{
rReq.Done( *( pDlg->GetOutputItemSet() ) );
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index 7342f7b9934b..4c61d4dbad8b 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -26,7 +26,7 @@
#include "View.hxx"
#include "ViewShell.hxx"
#include "drawdoc.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -59,7 +59,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq )
if( !pArgs )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ));
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ));
sal_uInt16 nResult = pDlg->Execute();
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index 2ceda3bc7d70..798639c89030 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -29,7 +29,7 @@
#include "strings.hrc"
#include "sdresid.hxx"
#include "sdabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd
{
@@ -64,7 +64,7 @@ void FuVectorize::DoExecute( SfxRequest& )
if( pObj && pObj->ISA( SdrGrafObj ) )
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdVectorizeDlg> pDlg(pFact ? pFact->CreateSdVectorizeDlg( mpWindow, static_cast<SdrGrafObj*>( pObj )->GetGraphic().GetBitmap(), mpDocSh ) : 0);
+ boost::scoped_ptr<AbstractSdVectorizeDlg> pDlg(pFact ? pFact->CreateSdVectorizeDlg( mpWindow, static_cast<SdrGrafObj*>( pObj )->GetGraphic().GetBitmap(), mpDocSh ) : 0);
if( pDlg && pDlg->Execute() == RET_OK )
{
const GDIMetaFile& rMtf = pDlg->GetGDIMetaFile();
diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx
index 37fd6d539b69..fae3d8dbe6fb 100644
--- a/sd/source/ui/inc/DocumentRenderer.hxx
+++ b/sd/source/ui/inc/DocumentRenderer.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/view/XRenderable.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -63,7 +63,7 @@ public:
private:
class Implementation;
- std::unique_ptr<Implementation> mpImpl;
+ ::boost::scoped_ptr<Implementation> mpImpl;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 946bba06ea7c..df8ef82fdcae 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -22,7 +22,7 @@
#include <svx/svdobj.hxx>
#include "OutlinerIterator.hxx"
-#include <memory>
+#include <boost/weak_ptr.hpp>
class SdDrawDocument;
class SdPage;
@@ -55,10 +55,10 @@ public:
the direction is forwards otherwise it is backwards.
*/
IteratorImplBase (SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
IteratorImplBase (SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode);
virtual ~IteratorImplBase();
@@ -115,7 +115,7 @@ protected:
/// The document on whose data the iterator operates.
SdDrawDocument* mpDocument;
/// Necessary secondary source of information.
- std::weak_ptr<ViewShell> mpViewShellWeak;
+ ::boost::weak_ptr<ViewShell> mpViewShellWeak;
/// Specifies the search direction.
bool mbDirectionIsForward;
};
@@ -137,7 +137,7 @@ public:
const ::std::vector< SdrObjectWeakRef >& rObjectList,
sal_Int32 nObjectIndex,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
SelectionIteratorImpl (const SelectionIteratorImpl& rObject);
virtual ~SelectionIteratorImpl();
@@ -179,12 +179,12 @@ public:
ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward,
PageKind ePageKind,
EditMode eEditMode);
@@ -234,7 +234,7 @@ public:
PageKind ePageKind,
EditMode eEditMode,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward);
virtual ~DocumentIteratorImpl();
diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx
index 528adf971f92..a8d3b2167b34 100644
--- a/sd/source/ui/inc/PaneDockingWindow.hxx
+++ b/sd/source/ui/inc/PaneDockingWindow.hxx
@@ -23,7 +23,8 @@
#include <sfx2/titledockwin.hxx>
#include <sfx2/viewfrm.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
class SplitWindow;
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index 531554ff2e77..91718f9a364e 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -16,9 +16,10 @@
#include <unistd.h>
#endif
#include <sys/types.h>
-#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
+
#include <osl/mutex.hxx>
#include <osl/socket.hxx>
#include <rtl/ref.hxx>
@@ -72,10 +73,10 @@ namespace sd
static void presentationStopped();
// For the control dialog
- SD_DLLPUBLIC static std::vector< std::shared_ptr< ClientInfo > > getClients();
- SD_DLLPUBLIC static bool connectClient( std::shared_ptr< ClientInfo > pClient,
+ SD_DLLPUBLIC static std::vector< ::boost::shared_ptr< ClientInfo > > getClients();
+ SD_DLLPUBLIC static bool connectClient( ::boost::shared_ptr< ClientInfo > pClient,
const OUString& aPin );
- SD_DLLPUBLIC static void deauthoriseClient( std::shared_ptr< ClientInfo > pClient );
+ SD_DLLPUBLIC static void deauthoriseClient( ::boost::shared_ptr< ClientInfo > pClient );
/// ensure that discoverability (eg. for Bluetooth) is enabled
SD_DLLPUBLIC static void ensureDiscoverable();
@@ -92,7 +93,7 @@ namespace sd
static ::std::vector<Communicator*> sCommunicators;
osl::AcceptorSocket mSocket;
- ::std::vector< std::shared_ptr< ClientInfoInternal > > mAvailableClients;
+ ::std::vector< ::boost::shared_ptr< ClientInfoInternal > > mAvailableClients;
void execute() SAL_OVERRIDE;
};
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 0b7273a23abd..42dc811b68c4 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -26,9 +26,10 @@
#include <cppuhelper/weakref.hxx>
#include <sfx2/viewfrm.hxx>
#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
#include <boost/current_function.hpp>
#include <vcl/scrbar.hxx>
-#include <memory>
class ScrollBar;
class ScrollBarBox;
@@ -94,7 +95,7 @@ public:
The little square enclosed by the two scroll bars. Typically
the one from the ViewShell.
*/
- static std::shared_ptr<SlideSorter> CreateSlideSorter (
+ static ::boost::shared_ptr<SlideSorter> CreateSlideSorter (
ViewShell& rViewShell,
sd::Window* pContentWindow,
ScrollBar* pHorizontalScrollBar,
@@ -111,7 +112,7 @@ public:
The parent window of the internally created content window and
scroll bars.
*/
- static std::shared_ptr<SlideSorter> CreateSlideSorter (
+ static ::boost::shared_ptr<SlideSorter> CreateSlideSorter (
ViewShellBase& rBase,
ViewShell* pViewShell,
vcl::Window& rParentWindow);
@@ -178,11 +179,11 @@ public:
/** Return a collection of properties that are used throughout the slide
sorter.
*/
- std::shared_ptr<controller::Properties> GetProperties() const;
+ ::boost::shared_ptr<controller::Properties> GetProperties() const;
/** Return the active theme which gives access to colors and fonts.
*/
- std::shared_ptr<view::Theme> GetTheme() const;
+ ::boost::shared_ptr<view::Theme> GetTheme() const;
protected:
/** This virtual method makes it possible to create a specialization of
@@ -214,9 +215,9 @@ protected:
private:
bool mbIsValid;
- std::unique_ptr<controller::SlideSorterController> mpSlideSorterController;
- std::unique_ptr<model::SlideSorterModel> mpSlideSorterModel;
- std::unique_ptr<view::SlideSorterView> mpSlideSorterView;
+ ::boost::scoped_ptr<controller::SlideSorterController> mpSlideSorterController;
+ ::boost::scoped_ptr<model::SlideSorterModel> mpSlideSorterModel;
+ ::boost::scoped_ptr<view::SlideSorterView> mpSlideSorterView;
::com::sun::star::uno::WeakReference<com::sun::star::frame::XController> mxControllerWeak;
ViewShell* mpViewShell;
ViewShellBase* mpViewShellBase;
@@ -233,8 +234,8 @@ private:
/** Some slide sorter wide properties that are used in different
classes.
*/
- std::shared_ptr<controller::Properties> mpProperties;
- std::shared_ptr<view::Theme> mpTheme;
+ ::boost::shared_ptr<controller::Properties> mpProperties;
+ ::boost::shared_ptr<view::Theme> mpTheme;
SlideSorter (
ViewShell& rViewShell,
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 892c4897ad4a..cd590d8869b9 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -24,7 +24,7 @@
#include "glob.hxx"
#include <sfx2/shell.hxx>
#include <sfx2/viewfac.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <vector>
namespace sd { namespace slidesorter { namespace controller {
@@ -49,7 +49,7 @@ private:
static void InitInterface_Impl();
public:
- static std::shared_ptr<SlideSorterViewShell> Create(
+ static ::boost::shared_ptr<SlideSorterViewShell> Create(
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
@@ -151,9 +151,9 @@ public:
/** Return the set of selected pages.
*/
- std::shared_ptr<PageSelection> GetPageSelection() const;
+ ::boost::shared_ptr<PageSelection> GetPageSelection() const;
- void SetPageSelection (const std::shared_ptr<PageSelection>& rSelection);
+ void SetPageSelection (const ::boost::shared_ptr<PageSelection>& rSelection);
/** Add a listener that is called when the selection of the slide sorter
changes.
@@ -202,7 +202,7 @@ protected:
virtual ::svl::IUndoManager* ImpGetUndoManager() const SAL_OVERRIDE;
private:
- std::shared_ptr<SlideSorter> mpSlideSorter;
+ ::boost::shared_ptr<SlideSorter> mpSlideSorter;
bool mbIsArrangeGUIElementsPending;
SlideSorterViewShell (
@@ -218,10 +218,10 @@ private:
*/
virtual void UpdateScrollBars() SAL_OVERRIDE;
- void PostMoveSlidesActions(const std::shared_ptr<SlideSorterViewShell::PageSelection> &rpSelection);
+ void PostMoveSlidesActions(const ::boost::shared_ptr<SlideSorterViewShell::PageSelection> &rpSelection);
};
-typedef std::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection;
+typedef ::boost::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection;
} } // end of namespace ::sd::slidesorter
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index d0b87d7cc27a..1a066eebd0c0 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -25,8 +25,9 @@
#include <ucbhelper/content.hxx>
#include "com/sun/star/uno/Reference.hxx"
-#include <memory>
#include <vector>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
namespace com { namespace sun { namespace star { namespace ucb {
class XContent;
@@ -64,7 +65,7 @@ public:
bool operator()(TemplateEntry* pA, TemplateEntry* pB) const;
private:
- std::shared_ptr<comphelper::string::NaturalStringSorter> mpStringSorter;
+ ::boost::shared_ptr<comphelper::string::NaturalStringSorter> mpStringSorter;
};
/** Representation of a template or layout folder.
@@ -74,7 +75,7 @@ class TemplateDir
public:
TemplateDir (const OUString& rsRegion, const OUString& rsUrl )
: msRegion(rsRegion), msUrl(rsUrl), maEntries(),
- mbSortingEnabled(false), mpEntryCompare(nullptr) {}
+ mbSortingEnabled(false), mpEntryCompare(NULL) {}
OUString msRegion;
OUString msUrl;
@@ -85,7 +86,7 @@ public:
private:
bool mbSortingEnabled;
- std::unique_ptr<TemplateEntryCompare> mpEntryCompare;
+ ::boost::scoped_ptr<TemplateEntryCompare> mpEntryCompare;
};
/** This class scans the template folders for impress templates. There are
@@ -136,7 +137,7 @@ public:
/** Return the TemplateDir object that was last added to
mpTemplateDirectory.
@return
- <nullptr/> is returned either before the template scanning is
+ <NULL/> is returned either before the template scanning is
started or after it has ended.
*/
const TemplateEntry* GetLastAddedEntry() const { return mpLastAddedEntry;}
@@ -182,7 +183,7 @@ private:
/** The folders that are collected by GatherFolderList().
*/
class FolderDescriptorList;
- std::unique_ptr<FolderDescriptorList> mpFolderDescriptors;
+ ::boost::scoped_ptr<FolderDescriptorList> mpFolderDescriptors;
/** Set of state variables used by the methods
InitializeFolderScanning(), GatherFolderList(), ScanFolder(),
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index fa681d682fd7..5263dd059e0b 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -26,7 +26,9 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <sal/types.h>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
class SdrView;
@@ -61,16 +63,16 @@ class ViewShellManager;
in a short time on a view shell switch.
*/
class ToolBarManager
- : public std::enable_shared_from_this<ToolBarManager>
+ : public ::boost::enable_shared_from_this<ToolBarManager>
{
public:
/** Use this method instead of the constructor to create new objects of
this class.
*/
- static std::shared_ptr<ToolBarManager> Create (
+ static ::boost::shared_ptr<ToolBarManager> Create (
ViewShellBase& rBase,
- const std::shared_ptr<tools::EventMultiplexer>& rpMultiplexer,
- const std::shared_ptr<ViewShellManager>& rpViewShellManager);
+ const ::boost::shared_ptr<tools::EventMultiplexer>& rpMultiplexer,
+ const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager);
~ToolBarManager();
@@ -241,11 +243,11 @@ public:
bar operations are made in a row.
*/
class UpdateLock { public:
- UpdateLock(const std::shared_ptr<ToolBarManager>& rpManager)
+ UpdateLock(const ::boost::shared_ptr<ToolBarManager>& rpManager)
: mpManager(rpManager) { mpManager->LockUpdate(); }
~UpdateLock() { mpManager->UnlockUpdate(); }
private:
- std::shared_ptr<ToolBarManager> mpManager;
+ ::boost::shared_ptr<ToolBarManager> mpManager;
};
friend class UpdateLock;
@@ -253,7 +255,7 @@ public:
private:
class Implementation;
- std::unique_ptr<Implementation> mpImpl;
+ ::boost::scoped_ptr<Implementation> mpImpl;
/** The ViewShellBase is used to get the XLayoutManager and to determine
the plug in mode.
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index bba5c73176a0..24fe233896d9 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -34,6 +34,7 @@
#include <com/sun/star/drawing/XDrawSubController.hpp>
#include <memory>
+#include <boost/shared_ptr.hpp>
class SdPage;
class SvxRuler;
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 6ce7e4d5ed04..832add5cfb3f 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -27,7 +27,8 @@
#include "glob.hxx"
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfac.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
class SdDrawDocument;
class SfxRequest;
@@ -84,13 +85,13 @@ public:
*/
void LateInit (const OUString& rsDefaultView);
- std::shared_ptr<ViewShellManager> GetViewShellManager() const;
+ ::boost::shared_ptr<ViewShellManager> GetViewShellManager() const;
/** Return the main view shell stacked on the called ViewShellBase
object. This is usually the view shell displayed in the center
pane.
*/
- std::shared_ptr<ViewShell> GetMainViewShell() const;
+ ::boost::shared_ptr<ViewShell> GetMainViewShell() const;
/** When given a view frame this static method returns the
corresponding sd::ViewShellBase object.
@@ -200,15 +201,15 @@ public:
events from various sources. This method must not be called before
LateInit() has terminated.
*/
- std::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer();
+ ::boost::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer();
/** returns the complete area of the current view relative to the frame
window
*/
const Rectangle& getClientRectangle() const;
- std::shared_ptr<ToolBarManager> GetToolBarManager() const;
- std::shared_ptr<FormShellManager> GetFormShellManager() const;
+ ::boost::shared_ptr<ToolBarManager> GetToolBarManager() const;
+ ::boost::shared_ptr<FormShellManager> GetFormShellManager() const;
DrawController& GetDrawController() const;
@@ -233,7 +234,7 @@ protected:
private:
class Implementation;
- std::unique_ptr<Implementation> mpImpl;
+ ::boost::scoped_ptr<Implementation> mpImpl;
DrawDocShell* mpDocShell;
SdDrawDocument* mpDocument;
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index 291fb201698d..e4a7d26a64b4 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -24,6 +24,8 @@
#include "ViewShellManager.hxx"
#include "ToolBarManager.hxx"
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
#include <memory>
class SvxIMapDlg;
@@ -62,8 +64,8 @@ public:
/** Create a new instance. This allows the mpSelf member to be set
automatically.
*/
- static std::shared_ptr<ToolBarManagerLock> Create (
- const std::shared_ptr<ToolBarManager>& rpManager);
+ static ::boost::shared_ptr<ToolBarManagerLock> Create (
+ const ::boost::shared_ptr<ToolBarManager>& rpManager);
/** Release the lock. When the UI is captured
(Application::IsUICaptured() returns <TRUE/>) then the lock is
released later asynchronously.
@@ -85,8 +87,8 @@ public:
its own lifetime. This, of course, does work only when no one
holds another shared_ptr longer than only temporary.
*/
- std::shared_ptr<ToolBarManagerLock> mpSelf;
- ToolBarManagerLock (const std::shared_ptr<sd::ToolBarManager>& rpManager);
+ ::boost::shared_ptr<ToolBarManagerLock> mpSelf;
+ ToolBarManagerLock (const ::boost::shared_ptr<sd::ToolBarManager>& rpManager);
~ToolBarManagerLock();
class Deleter;
@@ -94,7 +96,7 @@ public:
};
// The member is not a unqiue_ptr because it takes over its own life time
// control.
- std::weak_ptr<ToolBarManagerLock> mpUpdateLockForMouse;
+ ::boost::weak_ptr<ToolBarManagerLock> mpUpdateLockForMouse;
Implementation (ViewShell& rViewShell);
~Implementation();
diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx
index 3b30fcc12c75..66eb593f8c18 100644
--- a/sd/source/ui/inc/ViewShellManager.hxx
+++ b/sd/source/ui/inc/ViewShellManager.hxx
@@ -22,6 +22,7 @@
#include "ShellFactory.hxx"
#include <memory>
+#include <boost/shared_ptr.hpp>
class FmFormShell;
class SfxShell;
@@ -53,7 +54,7 @@ class ViewShellBase;
class ViewShellManager
{
public:
- typedef std::shared_ptr<ShellFactory<SfxShell> > SharedShellFactory;
+ typedef ::boost::shared_ptr<ShellFactory<SfxShell> > SharedShellFactory;
ViewShellManager (ViewShellBase& rBase);
@@ -172,11 +173,11 @@ public:
class UpdateLock
{
public:
- UpdateLock (const std::shared_ptr<ViewShellManager>& rpManager)
+ UpdateLock (const ::boost::shared_ptr<ViewShellManager>& rpManager)
: mpManager(rpManager) {mpManager->LockUpdate();}
~UpdateLock() {mpManager->UnlockUpdate();};
private:
- std::shared_ptr<ViewShellManager> mpManager;
+ ::boost::shared_ptr<ViewShellManager> mpManager;
};
friend class UpdateLock;
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 67c489983a97..d298fd5b3f5c 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -32,8 +32,9 @@
#include <cppuhelper/compbase.hxx>
#include "MutexOwner.hxx"
-#include <memory>
#include <vector>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
namespace sd {
class ViewShellBase;
diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index 7bf486fc9605..c5b60e2c2c4a 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <cppuhelper/compbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace {
@@ -144,7 +144,7 @@ private:
/** The resource container holds the URLs of unique resource and of
resource linked to unique resources.
*/
- std::unique_ptr<ResourceContainer> mpResourceContainer;
+ ::boost::scoped_ptr<ResourceContainer> mpResourceContainer;
/** The broadcaster used for notifying listeners of requests for
configuration changes.
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 5cdbf0fcc128..c9802c72db37 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -35,8 +35,9 @@
#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
-#include <memory>
namespace {
@@ -194,7 +195,7 @@ public:
private:
class Implementation;
- std::unique_ptr<Implementation> mpImplementation;
+ ::boost::scoped_ptr<Implementation> mpImplementation;
bool mbIsDisposed;
/** When the called object has already been disposed this method throws
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index c5a688d4e4c3..8407203e7644 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -28,9 +28,12 @@
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+
#include <functional>
#include <map>
-#include <memory>
namespace sd {
class ViewShell;
@@ -51,7 +54,7 @@ namespace sd { namespace framework {
controllers called by it throws a DisposedException.
*/
class FrameworkHelper
- : public std::enable_shared_from_this<FrameworkHelper>,
+ : public ::boost::enable_shared_from_this<FrameworkHelper>,
public SdGlobalResource
{
public:
@@ -105,7 +108,7 @@ public:
ViewShellBase. If such an object does not yet exist, a new one is
created.
*/
- static ::std::shared_ptr<FrameworkHelper> Instance (ViewShellBase& rBase);
+ static ::boost::shared_ptr<FrameworkHelper> Instance (ViewShellBase& rBase);
/** Mark the FrameworkHelper object for the given ViewShellBase as
disposed. A following ReleaseInstance() call will destroy the
@@ -141,7 +144,7 @@ public:
When the ViewShell pointer can not be inferred from the given
reference then an empty pointer is returned.
*/
- static ::std::shared_ptr<ViewShell> GetViewShell (
+ static ::boost::shared_ptr<ViewShell> GetViewShell (
const css::uno::Reference<css::drawing::framework::XView>& rxView);
typedef ::std::function<bool (const css::drawing::framework::ConfigurationChangeEvent&)>
@@ -168,7 +171,7 @@ public:
of the involved objects does not support XUnoTunnel (where
necessary).
*/
- ::std::shared_ptr<ViewShell> GetViewShell (const OUString& rsPaneURL);
+ ::boost::shared_ptr<ViewShell> GetViewShell (const OUString& rsPaneURL);
/** Return a reference to the view that is displayed in the specified
pane. See GetViewShell () for a variant that returns a ViewShell
@@ -300,13 +303,13 @@ public:
private:
typedef ::std::map<
ViewShellBase*,
- ::std::shared_ptr<FrameworkHelper> > InstanceMap;
+ ::boost::shared_ptr<FrameworkHelper> > InstanceMap;
/** The instance map holds (at least) one FrameworkHelper instance for
every ViewShellBase object.
*/
static InstanceMap maInstanceMap;
class ViewURLMap;
- static std::unique_ptr<ViewURLMap> mpViewURLMap;
+ static ::boost::scoped_ptr<ViewURLMap> mpViewURLMap;
ViewShellBase& mrBase;
css::uno::Reference<css::drawing::framework::XConfigurationController>
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 26600110d179..d9541a91e4bf 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/compbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <set>
namespace {
@@ -90,9 +90,9 @@ private:
css::frame::XController> mxController;
class ResourceToFactoryMap;
- std::unique_ptr<ResourceToFactoryMap> mpResourceToFactoryMap;
+ ::boost::scoped_ptr<ResourceToFactoryMap> mpResourceToFactoryMap;
class LoadedFactoryContainer;
- std::unique_ptr<LoadedFactoryContainer> mpLoadedFactories;
+ ::boost::scoped_ptr<LoadedFactoryContainer> mpLoadedFactories;
ModuleController (
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index 2bd3ea19073a..1fb4586380e0 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -27,8 +27,9 @@
#include <com/sun/star/drawing/framework/TabBarButton.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/compbase.hxx>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
#include <vcl/vclptr.hxx>
-#include <memory>
namespace vcl { class Window; }
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 80d0ec45cb57..94a6eb0658b7 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -31,7 +31,8 @@
#include <osl/mutex.hxx>
#include <cppuhelper/compbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
namespace {
diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index 3394fbf917b1..9c6bf20a38df 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <cppuhelper/implbase.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace {
@@ -172,7 +172,7 @@ private:
*/
::std::vector<OUString> maResourceURLs;
- std::unique_ptr<css::util::URL> mpURL;
+ ::boost::scoped_ptr<css::util::URL> mpURL;
static css::uno::WeakReference<css::util::XURLTransformer> mxURLTransformerWeak;
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index f988b62047db..39ece9828542 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -30,7 +30,7 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace {
@@ -68,7 +68,7 @@ public:
to the ViewShell object.
*/
ViewShellWrapper (
- ::std::shared_ptr<ViewShell> pViewShell,
+ ::boost::shared_ptr<ViewShell> pViewShell,
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::framework::XResourceId>& rxViewId,
const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow);
@@ -83,7 +83,7 @@ public:
to obtain a pointer to the wrapped ViewShell object for a given
XView object.
*/
- ::std::shared_ptr<ViewShell> GetViewShell() { return mpViewShell;}
+ ::boost::shared_ptr<ViewShell> GetViewShell() { return mpViewShell;}
// XUnoTunnel
@@ -140,8 +140,8 @@ public:
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ::std::shared_ptr< ViewShell > mpViewShell;
- ::std::shared_ptr< ::sd::slidesorter::SlideSorterViewShell > mpSlideSorterViewShell;
+ ::boost::shared_ptr< ViewShell > mpViewShell;
+ ::boost::shared_ptr< ::sd::slidesorter::SlideSorterViewShell > mpSlideSorterViewShell;
const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId > mxViewId;
::com::sun::star::uno::Reference<com::sun::star::awt::XWindow > mxWindow;
};
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 9abdd7b27f7f..a4bb07f14601 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -31,7 +31,7 @@
#include "pres.hxx"
#include "assclass.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
class FixedText;
@@ -145,7 +145,7 @@ private:
VclPtr<RadioButton> pPage6_DocColors;
VclPtr<SdHtmlAttrPreview> pPage6_Preview;
- std::unique_ptr< ButtonSet > mpButtonSet;
+ boost::scoped_ptr< ButtonSet > mpButtonSet;
// standard controls
VclPtr<PushButton> pLastPageButton;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 393148159e18..b68ff7ea84dd 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -29,8 +29,8 @@
#include <svl/urlbmk.hxx>
#include <tools/ref.hxx>
#include "sdxfer.hxx"
-#include <memory>
#include <vector>
+#include <boost/scoped_ptr.hpp>
class SdDrawDocument;
class SfxMedium;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 539031147709..6d78cfbec722 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -90,7 +90,7 @@ public:
/** Add a user data object. When it was added before (and not
removed) then this call is ignored.
*/
- void AddUserData (const std::shared_ptr<UserData>& rpData);
+ void AddUserData (const ::boost::shared_ptr<UserData>& rpData);
/** Return the number of user data objects.
*/
@@ -100,7 +100,7 @@ public:
valid, ie not in the range [0,count) then an empty pointer is
returned.
*/
- std::shared_ptr<UserData> GetUserData (const sal_Int32 nIndex) const;
+ ::boost::shared_ptr<UserData> GetUserData (const sal_Int32 nIndex) const;
protected:
@@ -136,7 +136,7 @@ private:
bool mbPageTransferable : 1;
bool mbPageTransferablePersistent : 1;
bool mbIsUnoObj : 1;
- ::std::vector<std::shared_ptr<UserData> > maUserData;
+ ::std::vector<boost::shared_ptr<UserData> > maUserData;
SdTransferable( const SdTransferable& ) SAL_DELETED_FUNCTION;
SdTransferable& operator=( const SdTransferable& ) SAL_DELETED_FUNCTION;
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 5b5f7dc92c7d..67ce818be7fa 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -32,7 +32,7 @@
#include <editeng/unoipset.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace com { namespace sun { namespace star {
@@ -214,7 +214,7 @@ private:
bool mbIsInStartup;
SdDrawDocument* mpDoc;
- std::shared_ptr< PresentationSettingsEx > mxCurrentSettings;
+ boost::shared_ptr< PresentationSettingsEx > mxCurrentSettings;
ViewShellBase* mpCurrentViewShellBase;
ViewShellBase* mpFullScreenViewShellBase;
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 006293587b64..4260f07d06a4 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -29,7 +29,8 @@
#include <sfx2/viewfac.hxx>
#include <sfx2/dockwin.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
class PopupMenu;
@@ -83,9 +84,9 @@ public:
virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE;
private:
- std::unique_ptr< ToolPanelViewShell_Impl > mpImpl;
+ ::boost::scoped_ptr< ToolPanelViewShell_Impl > mpImpl;
- std::shared_ptr<TaskPaneShellManager> mpSubShellManager;
+ ::boost::shared_ptr<TaskPaneShellManager> mpSubShellManager;
/** The id of the menu in the menu bar/tool box of the parent docking
window.
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index e48a7ca80eb1..67ce4097bf50 100644
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -23,8 +23,8 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <boost/scoped_ptr.hpp>
#include <map>
-#include <memory>
namespace sd { namespace tools {
@@ -117,7 +117,7 @@ protected:
private:
typedef ::std::multimap<OUString,
css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
- std::unique_ptr<ChangeListenerContainer> mpChangeListeners;
+ ::boost::scoped_ptr<ChangeListenerContainer> mpChangeListeners;
/** Call all listeners that are registered for the given property name.
Call this method with an empty property name to call listeners that
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 3f33bf98b052..b9281ab6be4a 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -22,6 +22,7 @@
#include "sdmod.hxx"
#include <memory>
+#include <boost/shared_ptr.hpp>
#include <com/sun/star/uno/XInterface.hpp>
namespace sd {
@@ -73,7 +74,7 @@ public:
time of the destruction of SgGlobalResourceContainer no other
references exist the resource is destroyed as well.
*/
- void AddResource (std::shared_ptr<SdGlobalResource> pResource);
+ void AddResource (::boost::shared_ptr<SdGlobalResource> pResource);
/** Add a resource that is implemented as UNO object. Destruction
(when the sd modules is unloaded) is done by a) calling dispose()
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index d08a084df04a..7880bd7ecde1 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -22,7 +22,7 @@
#include <vcl/timer.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace sd { namespace tools {
@@ -48,8 +48,8 @@ public:
@param nMaxTimePerStep
The maximal time for executing steps without yielding control.
*/
- static std::shared_ptr<TimerBasedTaskExecution> Create (
- const std::shared_ptr<AsynchronousTask>& rpTask,
+ static ::boost::shared_ptr<TimerBasedTaskExecution> Create (
+ const ::boost::shared_ptr<AsynchronousTask>& rpTask,
sal_uInt32 nMillisecondsBetweenSteps,
sal_uInt32 nMaxTimePerStep);
@@ -62,23 +62,23 @@ public:
checks the given weak_ptr for being expired and catches bad_weak_ptr
exceptions.
*/
- static void ReleaseTask (const std::weak_ptr<TimerBasedTaskExecution>& rpTask);
+ static void ReleaseTask (const ::boost::weak_ptr<TimerBasedTaskExecution>& rpTask);
private:
- std::shared_ptr<AsynchronousTask> mpTask;
+ ::boost::shared_ptr<AsynchronousTask> mpTask;
Timer maTimer;
/** This shared_ptr to this is used to destroy a TimerBasedTaskExecution
object when its task has been executed completely.
*/
- std::shared_ptr<TimerBasedTaskExecution> mpSelf;
+ ::boost::shared_ptr<TimerBasedTaskExecution> mpSelf;
sal_uInt32 mnMaxTimePerStep;
TimerBasedTaskExecution (
- const std::shared_ptr<AsynchronousTask>& rpTask,
+ const ::boost::shared_ptr<AsynchronousTask>& rpTask,
sal_uInt32 nMillisecondsBetweenSteps,
sal_uInt32 nMaxTimePerStep);
~TimerBasedTaskExecution();
- void SetSelf (const std::shared_ptr<TimerBasedTaskExecution>& rpSelf);
+ void SetSelf (const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf);
class Deleter;
friend class Deleter;
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
index 8a82cc2f0dab..134ef6251e44 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
@@ -38,7 +38,7 @@ public:
CanvasUpdateRequester::RequesterMap CanvasUpdateRequester::maRequesterMap;
-std::shared_ptr<CanvasUpdateRequester> CanvasUpdateRequester::Instance (
+::boost::shared_ptr<CanvasUpdateRequester> CanvasUpdateRequester::Instance (
const Reference<rendering::XSpriteCanvas>& rxSharedCanvas)
{
RequesterMap::const_iterator iRequester;
@@ -49,7 +49,7 @@ std::shared_ptr<CanvasUpdateRequester> CanvasUpdateRequester::Instance (
}
// No requester for the given canvas found. Create a new one.
- std::shared_ptr<CanvasUpdateRequester> pRequester (
+ ::boost::shared_ptr<CanvasUpdateRequester> pRequester (
new CanvasUpdateRequester(rxSharedCanvas), Deleter());
maRequesterMap.push_back(RequesterMap::value_type(rxSharedCanvas,pRequester));
return pRequester;
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index b04281921d3f..abd1973f161e 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -22,10 +22,10 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
#include <sal/types.h>
#include <tools/solar.h>
#include <tools/link.hxx>
-#include <memory>
#include <vector>
struct ImplSVEvent;
@@ -43,7 +43,7 @@ public:
/** @return the Canvas UpdateRequester object for the given shared canvas.
A new object is created when it does not already exist.
*/
- static std::shared_ptr<CanvasUpdateRequester> Instance (
+ static ::boost::shared_ptr<CanvasUpdateRequester> Instance (
const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas);
void RequestUpdate (const bool bUpdateAll);
@@ -56,7 +56,7 @@ private:
typedef ::std::vector<
::std::pair<
css::uno::Reference<css::rendering::XSpriteCanvas>,
- std::shared_ptr<CanvasUpdateRequester> > > RequesterMap;
+ ::boost::shared_ptr<CanvasUpdateRequester> > > RequesterMap;
static RequesterMap maRequesterMap;
css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas;
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index 57bc21e7ac68..af3b06d718f9 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -35,7 +35,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace sd { namespace presenter {
@@ -375,7 +375,7 @@ private:
/** The UpdateRequester is used by updateScreen() to schedule
updateScreen() calls at the shared canvas.
*/
- std::shared_ptr<CanvasUpdateRequester> mpUpdateRequester;
+ ::boost::shared_ptr<CanvasUpdateRequester> mpUpdateRequester;
/** The clip rectangle as given to SetClip().
*/
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 879791ec5210..00406b0759b0 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -55,7 +55,7 @@ public:
virtual bool IsIdle() SAL_OVERRIDE;
virtual bool IsVisible (CacheKey aKey) SAL_OVERRIDE;
virtual const SdrPage* GetPage (CacheKey aKey) SAL_OVERRIDE;
- virtual std::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE;
+ virtual ::boost::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE;
virtual sal_Int32 GetPriority (CacheKey aKey) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE;
@@ -297,10 +297,10 @@ const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage (CacheKey a
return static_cast<const SdrPage*>(aKey);
}
-std::shared_ptr<std::vector<CacheKey> >
+::boost::shared_ptr<std::vector<CacheKey> >
PresenterPreviewCache::PresenterCacheContext::GetEntryList (bool bVisible)
{
- std::shared_ptr<std::vector<CacheKey> > pKeys (new std::vector<CacheKey>());
+ ::boost::shared_ptr<std::vector<CacheKey> > pKeys (new std::vector<CacheKey>());
if ( ! mxSlides.is())
return pKeys;
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index e471ddd61c16..f3999ef11969 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -27,7 +27,7 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace sd { namespace presenter {
@@ -97,8 +97,8 @@ private:
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
class PresenterCacheContext;
Size maPreviewSize;
- std::shared_ptr<PresenterCacheContext> mpCacheContext;
- std::shared_ptr<sd::slidesorter::cache::PageCache> mpCache;
+ ::boost::shared_ptr<PresenterCacheContext> mpCacheContext;
+ ::boost::shared_ptr<sd::slidesorter::cache::PageCache> mpCache;
/** This method throws a DisposedException when the object has already been
disposed.
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 0b389c0bde6c..ac30c3c8bd10 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -26,7 +26,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -68,7 +68,7 @@ protected:
private:
class Implementation;
- std::unique_ptr<Implementation> mpImplementation;
+ ::boost::scoped_ptr<Implementation> mpImplementation;
/** This method throws a DisposedException when the object has already been
disposed.
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index fb817ddc443f..0de7b9a8c74e 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -11,9 +11,10 @@
#include <iostream>
#include <iomanip>
-#include <memory>
#include <new>
+#include <boost/scoped_ptr.hpp>
+
#include <sal/log.hxx>
#ifdef LINUX_BLUETOOTH
@@ -701,7 +702,7 @@ getDBusBooleanProperty( DBusConnection *pConnection, DBusObject *pAdapter,
*pBoolean = false;
bool bRet = false;
- std::unique_ptr< DBusObject > pProperties (
+ ::boost::scoped_ptr< DBusObject > pProperties (
pAdapter->cloneForInterface( "org.freedesktop.DBus.Properties" ) );
DBusMessage *pMsg = pProperties->getMethodCall( "Get" );
@@ -762,7 +763,7 @@ setDBusBooleanProperty( DBusConnection *pConnection, DBusObject *pAdapter,
{
assert( pAdapter );
- std::unique_ptr< DBusObject > pProperties(
+ ::boost::scoped_ptr< DBusObject > pProperties(
pAdapter->cloneForInterface( "org.freedesktop.DBus.Properties" ) );
DBusMessage *pMsg = pProperties->getMethodCall( "Set" );
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index bb24268a000b..2427ed7c1f08 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -10,9 +10,10 @@
#define INCLUDED_SD_SOURCE_UI_REMOTECONTROL_BLUETOOTHSERVER_HXX
#include <osl/thread.hxx>
-#include <memory>
#include <vector>
+#include <boost/scoped_ptr.hpp>
+
#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS)
# define LINUX_BLUETOOTH
#endif
@@ -46,7 +47,7 @@ namespace sd
#ifdef LINUX_BLUETOOTH
struct Impl;
- std::unique_ptr<Impl> mpImpl;
+ boost::scoped_ptr<Impl> mpImpl;
#endif
virtual void SAL_CALL run() SAL_OVERRIDE;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index ad9dcc345df2..0b7f37a62f23 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -129,7 +129,7 @@ void RemoteServer::execute()
OUString aAddress = aClientAddr.getHostname();
MutexGuard aGuard( sDataMutex );
- std::shared_ptr< ClientInfoInternal > pClient(
+ ::boost::shared_ptr< ClientInfoInternal > pClient(
new ClientInfoInternal(
OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ),
aAddress, false, pSocket, OStringToOUString( aPin,
@@ -239,10 +239,10 @@ void RemoteServer::removeCommunicator( Communicator* mCommunicator )
}
}
-std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients()
+std::vector< ::boost::shared_ptr< ClientInfo > > RemoteServer::getClients()
{
SAL_INFO( "sdremote", "RemoteServer::getClients() called" );
- std::vector< std::shared_ptr< ClientInfo > > aClients;
+ std::vector< ::boost::shared_ptr< ClientInfo > > aClients;
if ( spServer )
{
MutexGuard aGuard( sDataMutex );
@@ -266,13 +266,13 @@ std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients()
Sequence< OUString > aNames = xConfig->getElementNames();
for ( int i = 0; i < aNames.getLength(); i++ )
{
- aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], "", true ) ) );
+ aClients.push_back( ::boost::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], "", true ) ) );
}
return aClients;
}
-bool RemoteServer::connectClient( std::shared_ptr< ClientInfo > pClient, const OUString& aPin )
+bool RemoteServer::connectClient( ::boost::shared_ptr< ClientInfo > pClient, const OUString& aPin )
{
SAL_INFO( "sdremote", "RemoteServer::connectClient called" );
if ( !spServer )
@@ -321,7 +321,7 @@ bool RemoteServer::connectClient( std::shared_ptr< ClientInfo > pClient, const O
sCommunicators.push_back( pCommunicator );
- for ( vector< std::shared_ptr< ClientInfoInternal > >::iterator aIt = spServer->mAvailableClients.begin();
+ for ( vector< ::boost::shared_ptr< ClientInfoInternal > >::iterator aIt = spServer->mAvailableClients.begin();
aIt != spServer->mAvailableClients.end(); ++aIt )
{
if ( pClient == *aIt )
@@ -339,7 +339,7 @@ bool RemoteServer::connectClient( std::shared_ptr< ClientInfo > pClient, const O
}
}
-void RemoteServer::deauthoriseClient( std::shared_ptr< ClientInfo > pClient )
+void RemoteServer::deauthoriseClient( ::boost::shared_ptr< ClientInfo > pClient )
{
// TODO: we probably want to forcefully disconnect at this point too?
// But possibly via a separate function to allow just disconnecting from
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 769ffd1aac77..e700df1443ed 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -86,7 +86,7 @@ VclPtr<vcl::Window> AllMasterPagesSelector::Create (
if (pDocument == NULL)
return NULL;
- std::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer());
+ ::boost::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer());
VclPtrInstance<AllMasterPagesSelector> pSelector(
pParent,
@@ -104,7 +104,7 @@ AllMasterPagesSelector::AllMasterPagesSelector (
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: MasterPagesSelector(pParent, rDocument, rBase, rpContainer, rxSidebar),
mpSortedMasterPages(new SortedMasterPageDescriptorList())
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index d0486ae5ecaa..96130c6f6efe 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -61,7 +61,7 @@ private:
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual ~AllMasterPagesSelector();
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 624bb4ec38c2..7dd6a3dfb53f 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -51,7 +51,7 @@ VclPtr<vcl::Window> CurrentMasterPagesSelector::Create (
if (pDocument == NULL)
return NULL;
- std::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer());
+ ::boost::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer());
VclPtrInstance<CurrentMasterPagesSelector> pSelector(
pParent,
@@ -69,7 +69,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector (
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar)
{
@@ -154,8 +154,8 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
pMasterPage->GetName(),
OUString(),
pMasterPage->IsPrecious(),
- std::shared_ptr<PageObjectProvider>(new ExistingPageProvider(pMasterPage)),
- std::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
+ ::boost::shared_ptr<PageObjectProvider>(new ExistingPageProvider(pMasterPage)),
+ ::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
aToken = mpContainer->PutMasterPage(pDescriptor);
}
@@ -242,8 +242,8 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
rMenu.EnableItem(SID_DELETE_MASTER_PAGE, false);
}
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
if (pDrawViewShell
&& pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
{
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index d80b0baab8b6..2a51ac104f3f 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -66,7 +66,7 @@ private:
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual ~CurrentMasterPagesSelector();
virtual void dispose() SAL_OVERRIDE;
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 38c3d36c4d3f..4dedf6d69d4e 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -287,7 +287,7 @@ void DocumentHelper::ProvideStyles (
void DocumentHelper::AssignMasterPageToPageList (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
- const std::shared_ptr<std::vector<SdPage*> >& rpPageList)
+ const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList)
{
if (pMasterPage == NULL || !pMasterPage->IsMasterPage())
return;
@@ -467,7 +467,7 @@ void DocumentHelper::AssignMasterPageToPage (
SdPage* DocumentHelper::ProvideMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
- const std::shared_ptr<std::vector<SdPage*> >& rpPageList)
+ const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList)
{
// Make sure that both the master page and its notes master exist
// in the source document. If one is missing then return without
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx
index f29b5c6fae27..0c457b209dc6 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_DOCUMENTHELPER_HXX
#include <rtl/ustring.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <vector>
class SdDrawDocument;
@@ -66,7 +66,7 @@ public:
static void AssignMasterPageToPageList (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
- const std::shared_ptr<std::vector<SdPage*> >& rPageList);
+ const ::boost::shared_ptr<std::vector<SdPage*> >& rPageList);
private:
static SdPage* AddMasterPage (
@@ -79,7 +79,7 @@ private:
static SdPage* ProvideMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
- const std::shared_ptr<std::vector<SdPage*> >& rpPageList);
+ const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList);
/** Assign the given master page to the given page.
@param pMasterPage
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 69bb63904468..38e9fea125e7 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -609,7 +609,7 @@ void LayoutMenu::Command (const CommandEvent& rEvent)
}
// Setup the menu.
- std::shared_ptr<PopupMenu> pMenu (new PopupMenu(SdResId(RID_TASKPANE_LAYOUTMENU_POPUP)));
+ ::boost::shared_ptr<PopupMenu> pMenu (new PopupMenu(SdResId(RID_TASKPANE_LAYOUTMENU_POPUP)));
FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow());
if (pMenuWindow != NULL)
pMenuWindow->SetPopupModeFlags(
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 55a1b3abb104..2b55982f3e04 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -54,7 +54,8 @@
#include "pres.hxx"
#include <osl/mutex.hxx>
#include <osl/getglobalmutex.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/weak_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -77,10 +78,10 @@ class MasterPageContainer::Implementation
public:
mutable ::osl::Mutex maMutex;
- static std::weak_ptr<Implementation> mpInstance;
+ static ::boost::weak_ptr<Implementation> mpInstance;
MasterPageContainerType maContainer;
- static std::shared_ptr<Implementation> Instance();
+ static ::boost::shared_ptr<Implementation> Instance();
void LateInit();
void AddChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink);
@@ -131,7 +132,7 @@ private:
enum InitializationState { NOT_INITIALIZED, INITIALIZING, INITIALIZED } meInitializationState;
- std::unique_ptr<MasterPageContainerQueue> mpRequestQueue;
+ ::boost::scoped_ptr<MasterPageContainerQueue> mpRequestQueue;
::com::sun::star::uno::Reference<com::sun::star::frame::XModel> mxModel;
SdDrawDocument* mpDocument;
PreviewRenderer maPreviewRenderer;
@@ -162,7 +163,7 @@ private:
// We have to remember the tasks for initialization and filling in case
// a MasterPageContainer object is destroyed before these tasks have
// been completed.
- std::weak_ptr<sd::tools::TimerBasedTaskExecution> mpFillerTask;
+ ::boost::weak_ptr<sd::tools::TimerBasedTaskExecution> mpFillerTask;
Size maSmallPreviewSizePixel;
Size maLargePreviewSizePixel;
@@ -179,13 +180,13 @@ private:
//===== MasterPageContainer ===================================================
-std::weak_ptr<MasterPageContainer::Implementation>
+::boost::weak_ptr<MasterPageContainer::Implementation>
MasterPageContainer::Implementation::mpInstance;
-std::shared_ptr<MasterPageContainer::Implementation>
+::boost::shared_ptr<MasterPageContainer::Implementation>
MasterPageContainer::Implementation::Instance()
{
- std::shared_ptr<MasterPageContainer::Implementation> pInstance;
+ ::boost::shared_ptr<MasterPageContainer::Implementation> pInstance;
if (Implementation::mpInstance.expired())
{
@@ -194,25 +195,25 @@ std::shared_ptr<MasterPageContainer::Implementation>
if (Implementation::mpInstance.expired())
{
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
- pInstance = std::shared_ptr<MasterPageContainer::Implementation>(
+ pInstance = ::boost::shared_ptr<MasterPageContainer::Implementation>(
new MasterPageContainer::Implementation(),
MasterPageContainer::Implementation::Deleter());
SdGlobalResourceContainer::Instance().AddResource(pInstance);
Implementation::mpInstance = pInstance;
}
else
- pInstance = std::shared_ptr<MasterPageContainer::Implementation>(
+ pInstance = ::boost::shared_ptr<MasterPageContainer::Implementation>(
Implementation::mpInstance);
}
else
{
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
- pInstance = std::shared_ptr<MasterPageContainer::Implementation>(
+ pInstance = ::boost::shared_ptr<MasterPageContainer::Implementation>(
Implementation::mpInstance);
}
- DBG_ASSERT (pInstance.get()!=nullptr,
- "MasterPageContainer::Implementation::Instance(): instance is nullptr");
+ DBG_ASSERT (pInstance.get()!=NULL,
+ "MasterPageContainer::Implementation::Instance(): instance is NULL");
return pInstance;
}
@@ -259,7 +260,7 @@ MasterPageContainer::Token MasterPageContainer::PutMasterPage (
void MasterPageContainer::AcquireToken (Token aToken)
{
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
{
++pDescriptor->mnUseCount;
}
@@ -268,7 +269,7 @@ void MasterPageContainer::AcquireToken (Token aToken)
void MasterPageContainer::ReleaseToken (Token aToken)
{
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
{
OSL_ASSERT(pDescriptor->mnUseCount>0);
--pDescriptor->mnUseCount;
@@ -356,7 +357,7 @@ MasterPageContainer::Token MasterPageContainer::GetTokenForPageObject (
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
Token aResult (NIL_TOKEN);
- if (pPage != nullptr)
+ if (pPage != NULL)
{
MasterPageContainerType::iterator iEntry (
::std::find_if (
@@ -375,7 +376,7 @@ OUString MasterPageContainer::GetURLForToken (
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
return pDescriptor->msURL;
else
return OUString();
@@ -387,7 +388,7 @@ OUString MasterPageContainer::GetPageNameForToken (
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
return pDescriptor->msPageName;
else
return OUString();
@@ -399,7 +400,7 @@ OUString MasterPageContainer::GetStyleNameForToken (
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
return pDescriptor->msStyleName;
else
return OUString();
@@ -411,12 +412,12 @@ SdPage* MasterPageContainer::GetPageObjectForToken (
{
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
- SdPage* pPageObject = nullptr;
+ SdPage* pPageObject = NULL;
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
{
pPageObject = pDescriptor->mpMasterPage;
- if (pPageObject == nullptr)
+ if (pPageObject == NULL)
{
// The page object is not (yet) present. Call
// UpdateDescriptor() to trigger the PageObjectProvider() to
@@ -435,7 +436,7 @@ MasterPageContainer::Origin MasterPageContainer::GetOriginForToken (Token aToken
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
return pDescriptor->meOrigin;
else
return UNKNOWN;
@@ -446,7 +447,7 @@ sal_Int32 MasterPageContainer::GetTemplateIndexForToken (Token aToken)
const ::osl::MutexGuard aGuard (mpImpl->maMutex);
SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
return pDescriptor->mnTemplateIndex;
else
return -1;
@@ -486,9 +487,9 @@ MasterPageContainer::Implementation::Implementation()
: maMutex(),
maContainer(),
meInitializationState(NOT_INITIALIZED),
- mpRequestQueue(nullptr),
- mxModel(nullptr),
- mpDocument(nullptr),
+ mpRequestQueue(NULL),
+ mxModel(NULL),
+ mpDocument(NULL),
maPreviewRenderer(),
mbFirstPageObjectSeen(false),
maLargePreviewBeingCreated(),
@@ -523,7 +524,7 @@ MasterPageContainer::Implementation::~Implementation()
{
}
}
- mxModel = nullptr;
+ mxModel = NULL;
}
void MasterPageContainer::Implementation::LateInit()
@@ -536,10 +537,10 @@ void MasterPageContainer::Implementation::LateInit()
OSL_ASSERT(Instance().get()==this);
mpRequestQueue.reset(MasterPageContainerQueue::Create(
- std::shared_ptr<MasterPageContainerQueue::ContainerAdapter>(Instance())));
+ ::boost::shared_ptr<MasterPageContainerQueue::ContainerAdapter>(Instance())));
mpFillerTask = ::sd::tools::TimerBasedTaskExecution::Create(
- std::shared_ptr<tools::AsynchronousTask>(new MasterPageContainerFiller(*this)),
+ ::boost::shared_ptr<tools::AsynchronousTask>(new MasterPageContainerFiller(*this)),
5,
50);
@@ -580,7 +581,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel()
MasterPageContainerType::const_iterator iDescriptor;
MasterPageContainerType::const_iterator iContainerEnd(maContainer.end());
for (iDescriptor=maContainer.begin(); iDescriptor!=iContainerEnd; ++iDescriptor)
- if (*iDescriptor!=0 && (*iDescriptor)->mpMasterPage != nullptr)
+ if (*iDescriptor!=0 && (*iDescriptor)->mpMasterPage != NULL)
{
Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize());
OSL_ASSERT(aPageSize.Width() > 0 && aPageSize.Height() > 0);
@@ -622,7 +623,7 @@ IMPL_LINK_TYPED(MasterPageContainer::Implementation,AsynchronousNotifyCallback,
EventData* pData = static_cast<EventData*>(p);
const ::osl::MutexGuard aGuard (maMutex);
- if (pData != nullptr)
+ if (pData != NULL)
{
FireContainerChange(pData->first, pData->second);
delete pData;
@@ -649,7 +650,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
if (aEntry == maContainer.end())
{
// Insert a new MasterPageDescriptor.
- bool bIgnore (rpDescriptor->mpPageObjectProvider.get()==nullptr
+ bool bIgnore (rpDescriptor->mpPageObjectProvider.get()==NULL
&& rpDescriptor->msURL.isEmpty());
if ( ! bIgnore)
@@ -686,7 +687,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
aResult = (*aEntry)->maToken;
std::unique_ptr<std::vector<MasterPageContainerChangeEvent::EventType> > pEventTypes(
(*aEntry)->Update(*rpDescriptor));
- if (pEventTypes.get()!=nullptr && pEventTypes->size()>0)
+ if (pEventTypes.get()!=NULL && pEventTypes->size()>0)
{
// One or more aspects of the descriptor have changed. Send
// appropriate events to the listeners.
@@ -707,7 +708,7 @@ bool MasterPageContainer::Implementation::HasToken (Token aToken) const
{
return aToken>=0
&& (unsigned)aToken<maContainer.size()
- && maContainer[aToken].get()!=nullptr;
+ && maContainer[aToken].get()!=NULL;
}
const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (
@@ -732,7 +733,7 @@ void MasterPageContainer::Implementation::InvalidatePreview (Token aToken)
const ::osl::MutexGuard aGuard (maMutex);
SharedMasterPageDescriptor pDescriptor (GetDescriptor(aToken));
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
{
pDescriptor->maSmallPreview = Image();
pDescriptor->maLargePreview = Image();
@@ -753,7 +754,7 @@ Image MasterPageContainer::Implementation::GetPreviewForToken (
// When the preview is missing but inexpensively creatable then do that
// now.
- if (pDescriptor.get()!=nullptr)
+ if (pDescriptor.get()!=NULL)
{
if (ePreviewState == PS_CREATABLE)
if (UpdateDescriptor(pDescriptor, false,false, true))
@@ -801,11 +802,11 @@ MasterPageContainer::PreviewState MasterPageContainer::Implementation::GetPrevie
PreviewState eState (PS_NOT_AVAILABLE);
SharedMasterPageDescriptor pDescriptor = GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
{
if (pDescriptor->maLargePreview.GetSizePixel().Width() != 0)
eState = PS_AVAILABLE;
- else if (pDescriptor->mpPreviewProvider.get() != nullptr)
+ else if (pDescriptor->mpPreviewProvider.get() != NULL)
{
// The preview does not exist but can be created. When that is
// not expensive then do it at once.
@@ -824,7 +825,7 @@ MasterPageContainer::PreviewState MasterPageContainer::Implementation::GetPrevie
bool MasterPageContainer::Implementation::RequestPreview (Token aToken)
{
SharedMasterPageDescriptor pDescriptor = GetDescriptor(aToken);
- if (pDescriptor.get() != nullptr)
+ if (pDescriptor.get() != NULL)
return mpRequestQueue->RequestPreview(pDescriptor);
else
return false;
@@ -938,7 +939,7 @@ void MasterPageContainer::Implementation::CleanContainer()
// elements in the middle can not be removed because that would
// invalidate the references still held by others.
int nIndex (maContainer.size()-1);
- while (nIndex>=0 && maContainer[nIndex].get()==nullptr)
+ while (nIndex>=0 && maContainer[nIndex].get()==NULL)
--nIndex;
maContainer.resize(++nIndex);
}
@@ -978,7 +979,7 @@ bool MasterPageContainer::Implementation::UpdateDescriptor (
// and the caller needs the preview.
bForcePageObject |= (bForcePreview
&& rpDescriptor->mpPreviewProvider->NeedsPageObject()
- && rpDescriptor->mpMasterPage==nullptr);
+ && rpDescriptor->mpMasterPage==NULL);
// Define a cost threshold so that an update or page object or preview
// that is at least this cost are made at once. Updates with higher cost
diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx
index 5e23c6a1065e..d1f27b9a1b21 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.hxx
@@ -29,7 +29,7 @@
#include <vcl/timer.hxx>
#include "tools/SdGlobalResourceContainer.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
class SdPage;
@@ -109,7 +109,7 @@ public:
the existing entry is replaced/updated by the given one. Otherwise
a new entry is inserted.
*/
- Token PutMasterPage (const std::shared_ptr<MasterPageDescriptor>& rDescriptor);
+ Token PutMasterPage (const ::boost::shared_ptr<MasterPageDescriptor>& rDescriptor);
void AcquireToken (Token aToken);
void ReleaseToken (Token aToken);
@@ -137,7 +137,7 @@ public:
SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true);
Origin GetOriginForToken (Token aToken);
sal_Int32 GetTemplateIndexForToken (Token aToken);
- std::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken);
+ ::boost::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken);
void InvalidatePreview (Token aToken);
@@ -157,7 +157,7 @@ public:
private:
class Implementation;
- std::shared_ptr<Implementation> mpImpl;
+ ::boost::shared_ptr<Implementation> mpImpl;
PreviewSize mePreviewSize;
};
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
index c47d2ed52cc0..f85c72f360e4 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
@@ -46,8 +46,8 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte
OUString(),
OUString(),
false,
- std::shared_ptr<PageObjectProvider>(new DefaultPageObjectProvider()),
- std::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
+ ::boost::shared_ptr<PageObjectProvider>(new DefaultPageObjectProvider()),
+ ::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
mrContainerAdapter.PutMasterPage(pDescriptor);
}
@@ -146,9 +146,9 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate()
mpLastAddedEntry->msTitle,
OUString(),
false,
- std::shared_ptr<PageObjectProvider>(
+ ::boost::shared_ptr<PageObjectProvider>(
new TemplatePageObjectProvider(mpLastAddedEntry->msPath)),
- std::shared_ptr<PreviewProvider>(
+ ::boost::shared_ptr<PreviewProvider>(
new TemplatePreviewProvider(mpLastAddedEntry->msPath))));
// For user supplied templates we use a different preview provider:
// The preview in the document shows not only shapes on the master
@@ -156,7 +156,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate()
// therefore these previews are discarded and created directly from
// the page objects.
if (pDescriptor->GetURLClassification() == MasterPageDescriptor::URLCLASS_USER)
- pDescriptor->mpPreviewProvider = std::shared_ptr<PreviewProvider>(
+ pDescriptor->mpPreviewProvider = ::boost::shared_ptr<PreviewProvider>(
new PagePreviewProvider());
mrContainerAdapter.PutMasterPage(pDescriptor);
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 0f6906759746..d23c9f21246a 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -82,7 +82,7 @@ public:
//===== MasterPageContainerQueue ==============================================
MasterPageContainerQueue* MasterPageContainerQueue::Create (
- const std::weak_ptr<ContainerAdapter>& rpContainer)
+ const ::boost::weak_ptr<ContainerAdapter>& rpContainer)
{
MasterPageContainerQueue* pQueue = new MasterPageContainerQueue(rpContainer);
pQueue->LateInit();
@@ -90,7 +90,7 @@ MasterPageContainerQueue* MasterPageContainerQueue::Create (
}
MasterPageContainerQueue::MasterPageContainerQueue (
- const std::weak_ptr<ContainerAdapter>& rpContainer)
+ const ::boost::weak_ptr<ContainerAdapter>& rpContainer)
: mpWeakContainer(rpContainer),
mpRequestQueue(new RequestQueue()),
maDelayedPreviewCreationTimer(),
@@ -219,7 +219,7 @@ IMPL_LINK_TYPED(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer
mnRequestsServedCount += 1;
if ( ! mpWeakContainer.expired())
{
- std::shared_ptr<ContainerAdapter> pContainer (mpWeakContainer);
+ ::boost::shared_ptr<ContainerAdapter> pContainer (mpWeakContainer);
if (pContainer.get() != NULL)
pContainer->UpdateDescriptor(aRequest.mpDescriptor,false,true,true);
}
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index e8b1553ac546..b60d2c03147c 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -23,7 +23,8 @@
#include "MasterPageContainer.hxx"
#include "MasterPageDescriptor.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/weak_ptr.hpp>
namespace sd { namespace sidebar {
@@ -49,7 +50,7 @@ public:
};
static MasterPageContainerQueue* Create (
- const std::weak_ptr<ContainerAdapter>& rpContainer);
+ const ::boost::weak_ptr<ContainerAdapter>& rpContainer);
virtual ~MasterPageContainerQueue();
/** This method is typically called for entries in the container for
@@ -77,10 +78,10 @@ public:
void ProcessAllRequests();
private:
- std::weak_ptr<ContainerAdapter> mpWeakContainer;
+ ::boost::weak_ptr<ContainerAdapter> mpWeakContainer;
class PreviewCreationRequest;
class RequestQueue;
- std::unique_ptr<RequestQueue> mpRequestQueue;
+ ::boost::scoped_ptr<RequestQueue> mpRequestQueue;
Timer maDelayedPreviewCreationTimer;
sal_uInt32 mnRequestsServedCount;
@@ -114,7 +115,7 @@ private:
*/
static sal_uInt32 snWaitForMoreRequestsCount;
- MasterPageContainerQueue (const std::weak_ptr<ContainerAdapter>& rpContainer);
+ MasterPageContainerQueue (const ::boost::weak_ptr<ContainerAdapter>& rpContainer);
void LateInit();
/** Calculate the priority that defines the order in which requests
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
index 025b3f23512e..ad9ea155cddb 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
@@ -34,8 +34,8 @@ MasterPageDescriptor::MasterPageDescriptor (
const OUString& rsPageName,
const OUString& rsStyleName,
const bool bIsPrecious,
- const std::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
- const std::shared_ptr<PreviewProvider>& rpPreviewProvider)
+ const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
+ const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider)
: maToken(MasterPageContainer::NIL_TOKEN),
meOrigin(eOrigin),
msURL(INetURLObject(rsURL).GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS)),
@@ -196,7 +196,7 @@ int MasterPageDescriptor::UpdatePageObject (
// will create the real one.
maSmallPreview = Image();
maLargePreview = Image();
- mpPreviewProvider = std::shared_ptr<PreviewProvider>(new PagePreviewProvider());
+ mpPreviewProvider = ::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider());
}
else
{
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index f2519e55a019..a002203b897a 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_MASTERPAGEDESCRIPTOR_HXX
#include "MasterPageContainer.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace sd { namespace sidebar {
@@ -29,7 +29,7 @@ class PageObjectProvider;
class PreviewProvider;
class MasterPageDescriptor;
-typedef std::shared_ptr<MasterPageDescriptor> SharedMasterPageDescriptor;
+typedef ::boost::shared_ptr<MasterPageDescriptor> SharedMasterPageDescriptor;
/** A collection of data that is stored for every master page in the
MasterpageContainer.
@@ -44,8 +44,8 @@ public:
const OUString& rPageName,
const OUString& rStyleName,
const bool bIsPrecious,
- const std::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
- const std::shared_ptr<PreviewProvider>& rpPreviewProvider);
+ const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider,
+ const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider);
MasterPageDescriptor (const MasterPageDescriptor& rDescriptor);
~MasterPageDescriptor();
@@ -185,12 +185,12 @@ public:
/** The prewview provider. May be empty. May be replaced during the
lifetime of a MasterPageDescriptor object.
*/
- std::shared_ptr<PreviewProvider> mpPreviewProvider;
+ ::boost::shared_ptr<PreviewProvider> mpPreviewProvider;
/** The master page provider. May be empty. May be replaced during
the lifetime of a MasterPageDescriptor object.
*/
- std::shared_ptr<PageObjectProvider> mpPageObjectProvider;
+ ::boost::shared_ptr<PageObjectProvider> mpPageObjectProvider;
/** This index represents the order in which templates are provided via
the TemplateScanner. It defines the order in which the entries in
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 9aa811fb7618..1ae6067113b6 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -68,7 +68,7 @@ MasterPagesSelector::MasterPagesSelector (
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: PreviewValueSet(pParent),
maMutex(),
@@ -222,7 +222,7 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent)
}
// Setup the menu.
- std::unique_ptr<PopupMenu> pMenu (new PopupMenu(GetContextMenuResId()));
+ ::boost::scoped_ptr<PopupMenu> pMenu (new PopupMenu(GetContextMenuResId()));
FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow());
if (pMenuWindow != NULL)
pMenuWindow->SetPopupModeFlags(
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 8d65e5ad2b78..33a49cbd69c2 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -60,7 +60,7 @@ public:
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual ~MasterPagesSelector();
virtual void dispose() SAL_OVERRIDE;
@@ -108,7 +108,7 @@ public:
protected:
mutable ::osl::Mutex maMutex;
- std::shared_ptr<MasterPageContainer> mpContainer;
+ ::boost::shared_ptr<MasterPageContainer> mpContainer;
SdDrawDocument& mrDocument;
bool mbSmallPreviewSize;
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index 16c58068a28b..b05e1a7a77fb 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -25,7 +25,7 @@
#include <vcl/ctrl.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index 53b182acf33b..bdab2d639de6 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -28,9 +28,10 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <boost/noncopyable.hpp>
#include <map>
-#include <memory>
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
+
namespace sd {
class ViewShellBase;
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index c4492e837b87..271438486dcd 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -41,7 +41,7 @@ VclPtr<vcl::Window> RecentMasterPagesSelector::Create (
if (pDocument == NULL)
return NULL;
- std::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer());
+ ::boost::shared_ptr<MasterPageContainer> pContainer (new MasterPageContainer());
VclPtrInstance<RecentMasterPagesSelector> pSelector(
pParent,
@@ -59,7 +59,7 @@ RecentMasterPagesSelector::RecentMasterPagesSelector (
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: MasterPagesSelector (pParent, rDocument, rBase, rpContainer, rxSidebar)
{
@@ -128,7 +128,7 @@ void RecentMasterPagesSelector::Fill (ItemList& rItemList)
void RecentMasterPagesSelector::AssignMasterPageToPageList (
SdPage* pMasterPage,
- const std::shared_ptr<std::vector<SdPage*> >& rpPageList)
+ const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList)
{
sal_uInt16 nSelectedItemId = PreviewValueSet::GetSelectItemId();
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 0b2500c4e849..33bc2c303096 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -54,7 +54,7 @@ protected:
*/
virtual void AssignMasterPageToPageList (
SdPage* pMasterPage,
- const std::shared_ptr<std::vector<SdPage*> >& rpPageList) SAL_OVERRIDE;
+ const ::boost::shared_ptr<std::vector<SdPage*> >& rpPageList) SAL_OVERRIDE;
virtual void ProcessPopupMenu (Menu& rMenu) SAL_OVERRIDE;
@@ -63,7 +63,7 @@ private:
vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
- const std::shared_ptr<MasterPageContainer>& rpContainer,
+ const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual ~RecentMasterPagesSelector();
virtual void dispose() SAL_OVERRIDE;
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 318108d19987..052f8331a61d 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -152,9 +152,9 @@ void RecentlyUsedMasterPages::LoadPersistentValues()
OUString(),
sName,
false,
- std::shared_ptr<PageObjectProvider>(
+ ::boost::shared_ptr<PageObjectProvider>(
new TemplatePageObjectProvider(sURL)),
- std::shared_ptr<PreviewProvider>(
+ ::boost::shared_ptr<PreviewProvider>(
new TemplatePreviewProvider(sURL))));
// For user supplied templates we use a different
// preview provider: The preview in the document shows
@@ -163,7 +163,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues()
// these previews are discarded and created directly
// from the page objects.
if (pDescriptor->GetURLClassification() == MasterPageDescriptor::URLCLASS_USER)
- pDescriptor->mpPreviewProvider = std::shared_ptr<PreviewProvider>(
+ pDescriptor->mpPreviewProvider = ::boost::shared_ptr<PreviewProvider>(
new PagePreviewProvider());
MasterPageContainer::Token aToken (mpContainer->PutMasterPage(pDescriptor));
mvMasterPages.push_back(Descriptor(aToken,sURL,sName));
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 778b97dfbea4..8853a8aed59b 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -89,7 +89,7 @@ private:
typedef ::std::vector<Descriptor> MasterPageList;
MasterPageList mvMasterPages;
unsigned long int mnMaxListSize;
- std::shared_ptr<MasterPageContainer> mpContainer;
+ ::boost::shared_ptr<MasterPageContainer> mpContainer;
RecentlyUsedMasterPages();
virtual ~RecentlyUsedMasterPages();
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index be3db6ab1958..42417ad7ccaa 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -100,7 +100,7 @@ IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void)
// restart of the slide show.
if (mpViewShellBase != NULL)
{
- ::std::shared_ptr<FrameworkHelper> pHelper(
+ ::boost::shared_ptr<FrameworkHelper> pHelper(
FrameworkHelper::Instance(*mpViewShellBase));
if (pHelper->GetConfigurationController()->getResource(
FrameworkHelper::CreateResourceId(FrameworkHelper::msFullScreenPaneURL)).is())
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 240d6ec77ef7..42b494c91fd0 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -24,7 +24,7 @@
#include "ViewShellBase.hxx"
#include <rtl/ref.hxx>
#include <tools/link.hxx>
-#include <memory>
+#include <boost/enable_shared_from_this.hpp>
namespace sd {
@@ -37,7 +37,7 @@ namespace sd {
opportunity to show or hide depending on the number of available displays.
*/
class SlideShowRestarter
- : public std::enable_shared_from_this<SlideShowRestarter>
+ : public boost::enable_shared_from_this<SlideShowRestarter>
{
public:
/** Create a new SlideShowRestarter object.
@@ -64,7 +64,7 @@ private:
ImplSVEvent * mnEventId;
::rtl::Reference<SlideShow> mpSlideShow;
ViewShellBase* mpViewShellBase;
- ::std::shared_ptr<SlideShowRestarter> mpSelf;
+ ::boost::shared_ptr<SlideShowRestarter> mpSelf;
sal_Int32 mnDisplayCount;
SfxDispatcher* mpDispatcher;
sal_Int32 mnCurrentSlideNumber;
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index a04d0cd08b0a..46cec5f87145 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -94,7 +94,7 @@ namespace {
}
private:
- ::std::shared_ptr<SlideShowRestarter> mpRestarter;
+ ::boost::shared_ptr<SlideShowRestarter> mpRestarter;
};
}
@@ -701,7 +701,7 @@ void SAL_CALL SlideShow::end()
// Get the shell pointer in its own scope to be sure that
// the shared_ptr to the shell is released before DoClose()
// is called.
- ::std::shared_ptr<ViewShell> pSharedView (pFullScreenViewShellBase->GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> pSharedView (pFullScreenViewShellBase->GetMainViewShell());
pShell = dynamic_cast<PresentationViewShell*>(pSharedView.get());
}
if( pShell && pShell->GetViewFrame() )
@@ -973,7 +973,7 @@ void SlideShow::activate( ViewShellBase& rBase )
{
if( (mpFullScreenViewShellBase == &rBase) && !mxController.is() )
{
- ::std::shared_ptr<PresentationViewShell> pShell = std::dynamic_pointer_cast<PresentationViewShell>(rBase.GetMainViewShell());
+ ::boost::shared_ptr<PresentationViewShell> pShell = ::boost::dynamic_pointer_cast<PresentationViewShell>(rBase.GetMainViewShell());
if(pShell.get() != NULL)
{
pShell->FinishInitialization( mpFullScreenFrameView );
@@ -1093,8 +1093,8 @@ void SlideShow::StartInPlacePresentation()
ViewShell::ShellType eShell = ViewShell::ST_NONE;
- ::std::shared_ptr<FrameworkHelper> pHelper(FrameworkHelper::Instance(*mpCurrentViewShellBase));
- ::std::shared_ptr<ViewShell> pMainViewShell(pHelper->GetViewShell(FrameworkHelper::msCenterPaneURL));
+ ::boost::shared_ptr<FrameworkHelper> pHelper(FrameworkHelper::Instance(*mpCurrentViewShellBase));
+ ::boost::shared_ptr<ViewShell> pMainViewShell(pHelper->GetViewShell(FrameworkHelper::msCenterPaneURL));
if( pMainViewShell.get() )
eShell = pMainViewShell->GetShellType();
@@ -1170,7 +1170,7 @@ void SlideShow::StartFullscreenPresentation( )
// changes made by the presentation have an effect on the other
// view shells.
FrameView* pOriginalFrameView = 0;
- ::std::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
if (xShell.get())
pOriginalFrameView = xShell->GetFrameView();
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 6cf680235c3d..a7af2838e268 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -112,7 +112,7 @@ struct WrappedShapeEventImpl
WrappedShapeEventImpl() : meClickAction( css::presentation::ClickAction_NONE ), mnVerb( 0 ) {};
};
-typedef std::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr;
+typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr;
typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap;
class SlideShowListenerProxy : private ::cppu::BaseMutex,
@@ -336,7 +336,7 @@ private:
VclPtr<ShowWindow> mpShowWindow;
VclPtr<PushButton> mpTimeButton;
- std::shared_ptr< AnimationSlideController > mpSlideController;
+ boost::shared_ptr< AnimationSlideController > mpSlideController;
long mnRestoreSlide;
Point maSlideOrigin;
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 46a3fca292af..eabd8aeb0176 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -43,7 +43,7 @@ public:
~CacheEntry() {};
inline void Recycle (const CacheEntry& rEntry);
inline sal_Int32 GetMemorySize() const;
- void Compress (const std::shared_ptr<BitmapCompressor>& rpCompressor);
+ void Compress (const ::boost::shared_ptr<BitmapCompressor>& rpCompressor);
inline void Decompress();
bool IsUpToDate() const { return mbIsUpToDate; }
@@ -67,8 +67,8 @@ public:
private:
Bitmap maPreview;
Bitmap maMarkedPreview;
- std::shared_ptr<BitmapReplacement> mpReplacement;
- std::shared_ptr<BitmapCompressor> mpCompressor;
+ ::boost::shared_ptr<BitmapReplacement> mpReplacement;
+ ::boost::shared_ptr<BitmapCompressor> mpCompressor;
Size maBitmapSize;
bool mbIsUpToDate;
sal_Int32 mnLastAccessTime;
@@ -414,7 +414,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache)
void BitmapCache::Compress (
const CacheKey& rKey,
- const std::shared_ptr<BitmapCompressor>& rpCompressor)
+ const ::boost::shared_ptr<BitmapCompressor>& rpCompressor)
{
::osl::MutexGuard aGuard (maMutex);
@@ -504,7 +504,7 @@ inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize() const
return nSize;
}
-void BitmapCache::CacheEntry::Compress (const std::shared_ptr<BitmapCompressor>& rpCompressor)
+void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompressor>& rpCompressor)
{
if ( ! maPreview.IsEmpty())
{
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index 29390abb943f..fe022d4ace48 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -24,7 +24,8 @@ class SdrPage;
#include <vcl/bitmapex.hxx>
#include <osl/mutex.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter { namespace cache {
@@ -169,12 +170,12 @@ public:
*/
void Compress (
const CacheKey& rKey,
- const std::shared_ptr<BitmapCompressor>& rpCompressor);
+ const ::boost::shared_ptr<BitmapCompressor>& rpCompressor);
private:
mutable ::osl::Mutex maMutex;
- std::unique_ptr<CacheBitmapContainer> mpBitmapContainer;
+ ::boost::scoped_ptr<CacheBitmapContainer> mpBitmapContainer;
/** Total size of bytes that are occupied by bitmaps in the cache for
whom the slides are currently not inside the visible area.
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index da99597c9f61..d1e222214d4d 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -43,9 +43,9 @@ public:
virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE { return maPreview.GetSizeBytes(); }
};
-std::shared_ptr<BitmapReplacement> NoBitmapCompression::Compress (const Bitmap& rBitmap) const
+::boost::shared_ptr<BitmapReplacement> NoBitmapCompression::Compress (const Bitmap& rBitmap) const
{
- return std::shared_ptr<BitmapReplacement>(new DummyReplacement(rBitmap));
+ return ::boost::shared_ptr<BitmapReplacement>(new DummyReplacement(rBitmap));
}
Bitmap NoBitmapCompression::Decompress (const BitmapReplacement& rBitmapData) const
@@ -60,9 +60,9 @@ bool NoBitmapCompression::IsLossless() const
//===== CompressionByDeletion =================================================
-std::shared_ptr<BitmapReplacement> CompressionByDeletion::Compress (const Bitmap& ) const
+::boost::shared_ptr<BitmapReplacement> CompressionByDeletion::Compress (const Bitmap& ) const
{
- return std::shared_ptr<BitmapReplacement>();
+ return ::boost::shared_ptr<BitmapReplacement>();
}
Bitmap CompressionByDeletion::Decompress (const BitmapReplacement& ) const
@@ -100,7 +100,7 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize() con
return maPreview.GetSizeBytes();
}
-std::shared_ptr<BitmapReplacement> ResolutionReduction::Compress (
+::boost::shared_ptr<BitmapReplacement> ResolutionReduction::Compress (
const Bitmap& rBitmap) const
{
ResolutionReducedReplacement* pResult = new ResolutionReducedReplacement();
@@ -113,7 +113,7 @@ std::shared_ptr<BitmapReplacement> ResolutionReduction::Compress (
pResult->maPreview.Scale(Size(mnWidth,nHeight));
}
- return std::shared_ptr<BitmapReplacement>(pResult);
+ return ::boost::shared_ptr<BitmapReplacement>(pResult);
}
Bitmap ResolutionReduction::Decompress (const BitmapReplacement& rBitmapData) const
@@ -161,7 +161,7 @@ public:
}
};
-std::shared_ptr<BitmapReplacement> PngCompression::Compress (const Bitmap& rBitmap) const
+::boost::shared_ptr<BitmapReplacement> PngCompression::Compress (const Bitmap& rBitmap) const
{
vcl::PNGWriter aWriter (rBitmap);
SvMemoryStream aStream (32768, 32768);
@@ -173,7 +173,7 @@ std::shared_ptr<BitmapReplacement> PngCompression::Compress (const Bitmap& rBitm
pResult->mpData = new char[pResult->mnDataSize];
memcpy(pResult->mpData, aStream.GetData(), pResult->mnDataSize);
- return std::shared_ptr<BitmapReplacement>(pResult);
+ return ::boost::shared_ptr<BitmapReplacement>(pResult);
}
Bitmap PngCompression::Decompress (
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
index 243ebcfbfb90..6c40c0d4d4c4 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSBITMAPCOMPRESSOR_HXX
#include <sal/types.h>
-#include <memory>
+#include <boost/shared_ptr.hpp>
class Bitmap;
@@ -38,7 +38,7 @@ public:
/** Compress the given bitmap into a replacement format that is specific
to the compressor class.
*/
- virtual std::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const = 0;
+ virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const = 0;
/** Decompress the given replacement data into a preview bitmap.
Depending on the compression technique the returned bitmap may
@@ -82,7 +82,7 @@ class NoBitmapCompression
class DummyReplacement;
public:
virtual ~NoBitmapCompression() {}
- virtual std::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE;
+ virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE;
virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE;
virtual bool IsLossless() const SAL_OVERRIDE;
};
@@ -97,7 +97,7 @@ class CompressionByDeletion
{
public:
virtual ~CompressionByDeletion() {}
- virtual std::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE;
+ virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE;
virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE;
virtual bool IsLossless() const SAL_OVERRIDE;
};
@@ -114,7 +114,7 @@ class ResolutionReduction
static const sal_Int32 mnWidth = 100;
public:
virtual ~ResolutionReduction() {}
- virtual std::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE;
+ virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE;
/** Scale the replacement bitmap up to the original size.
*/
virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE;
@@ -130,7 +130,7 @@ class PngCompression
class PngReplacement;
public:
virtual ~PngCompression() {}
- virtual std::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE;
+ virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE;
virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE;
virtual bool IsLossless() const SAL_OVERRIDE;
};
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
index af4323b64b1b..80805787be51 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_CACHE_SLSBITMAPFACTORY_HXX
#include "PreviewRenderer.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
class SdPage;
class Size;
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index d85a7064cdf7..ea0dc48d9264 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -64,13 +64,13 @@ public:
CacheCompactionByCompression (
::sd::slidesorter::cache::BitmapCache& rCache,
sal_Int32 nMaximalCacheSize,
- const std::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor);
+ const ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor);
protected:
virtual void Run() SAL_OVERRIDE;
private:
- std::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> mpCompressor;
+ ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> mpCompressor;
};
} // end of anonymous namespace
@@ -87,7 +87,7 @@ namespace sd { namespace slidesorter { namespace cache {
static const char sResolution[] = "ResolutionReduction";
static const char sPNGCompression[] = "PNGCompression";
- std::shared_ptr<BitmapCompressor> pCompressor;
+ ::boost::shared_ptr<BitmapCompressor> pCompressor;
OUString sCompressionPolicy(sPNGCompression);
Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue("CompressionPolicy"));
if (aCompressionPolicy.has<OUString>())
@@ -159,7 +159,7 @@ namespace {
CacheCompactionByCompression::CacheCompactionByCompression (
::sd::slidesorter::cache::BitmapCache& rCache,
sal_Int32 nMaximalCacheSize,
- const std::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor)
+ const ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor)
: CacheCompactor(rCache,nMaximalCacheSize),
mpCompressor(rpCompressor)
{
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 39ad6efd7962..cae6b2724504 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -35,15 +35,15 @@ namespace sd { namespace slidesorter { namespace cache {
namespace
{
- typedef std::shared_ptr<CacheConfiguration> CacheConfigSharedPtr;
+ typedef ::boost::shared_ptr<CacheConfiguration> CacheConfigSharedPtr;
class theInstance :
public rtl::Static<CacheConfigSharedPtr, theInstance> {};
}
-std::weak_ptr<CacheConfiguration> CacheConfiguration::mpWeakInstance;
+::boost::weak_ptr<CacheConfiguration> CacheConfiguration::mpWeakInstance;
Timer CacheConfiguration::maReleaseTimer;
-std::shared_ptr<CacheConfiguration> CacheConfiguration::Instance()
+::boost::shared_ptr<CacheConfiguration> CacheConfiguration::Instance()
{
SolarMutexGuard aSolarGuard;
CacheConfigSharedPtr &rInstancePtr = theInstance::get();
@@ -51,7 +51,7 @@ std::shared_ptr<CacheConfiguration> CacheConfiguration::Instance()
{
// Maybe somebody else kept a previously created instance alive.
if ( ! mpWeakInstance.expired())
- rInstancePtr = std::shared_ptr<CacheConfiguration>(mpWeakInstance);
+ rInstancePtr = ::boost::shared_ptr<CacheConfiguration>(mpWeakInstance);
if (rInstancePtr.get() == NULL)
{
// We have to create a new instance.
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index 606233b38a2e..2f55a20cae49 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -23,7 +23,8 @@
#include <com/sun/star/uno/Any.hxx>
#include <vcl/timer.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
namespace sd { namespace slidesorter { namespace cache {
@@ -37,7 +38,7 @@ public:
seconds. Subsequent calls to this function will create a new
instance.
*/
- static std::shared_ptr<CacheConfiguration> Instance();
+ static ::boost::shared_ptr<CacheConfiguration> Instance();
/** Look up the specified value in
MultiPaneGUI/SlideSorter/PreviewCache. When the specified value
@@ -49,7 +50,7 @@ private:
/** When a caller holds a reference after we have released ours we use
this weak pointer to avoid creating a new instance.
*/
- static std::weak_ptr<CacheConfiguration> mpWeakInstance;
+ static ::boost::weak_ptr<CacheConfiguration> mpWeakInstance;
static Timer maReleaseTimer;
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess> mxCacheNode;
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index d2058991eb92..fe4a6dda6116 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -214,7 +214,7 @@ void GenericPageCache::RequestPreviewBitmap (
bool GenericPageCache::InvalidatePreviewBitmap (const CacheKey aKey)
{
// Invalidate the page in all caches that reference it, not just this one.
- std::shared_ptr<cache::PageCacheManager> pCacheManager (
+ ::boost::shared_ptr<cache::PageCacheManager> pCacheManager (
cache::PageCacheManager::Instance());
if (pCacheManager)
return pCacheManager->InvalidatePreviewBitmap(
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
index 315b91411b0d..207dceeb531e 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
@@ -22,7 +22,7 @@
#include "SlideSorter.hxx"
#include "SlsRequestQueue.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter { namespace cache {
@@ -128,11 +128,11 @@ public:
void Resume();
private:
- std::shared_ptr<BitmapCache> mpBitmapCache;
+ ::boost::shared_ptr<BitmapCache> mpBitmapCache;
RequestQueue maRequestQueue;
- std::unique_ptr<QueueProcessor> mpQueueProcessor;
+ ::boost::scoped_ptr<QueueProcessor> mpQueueProcessor;
SharedCacheContext mpCacheContext;
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 0e639944a58e..9e8624bb3add 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -25,7 +25,7 @@
#include <deque>
#include <map>
-#include <memory>
+#include <boost/weak_ptr.hpp>
namespace {
@@ -62,12 +62,12 @@ class RecentlyUsedCacheDescriptor
public:
::sd::slidesorter::cache::PageCacheManager::DocumentKey mpDocument;
Size maPreviewSize;
- std::shared_ptr< ::sd::slidesorter::cache::PageCacheManager::Cache> mpCache;
+ ::boost::shared_ptr< ::sd::slidesorter::cache::PageCacheManager::Cache> mpCache;
RecentlyUsedCacheDescriptor(
::sd::slidesorter::cache::PageCacheManager::DocumentKey pDocument,
const Size& rPreviewSize,
- const std::shared_ptr< ::sd::slidesorter::cache::PageCacheManager::Cache>& rpCache)
+ const ::boost::shared_ptr< ::sd::slidesorter::cache::PageCacheManager::Cache>& rpCache)
:mpDocument(pDocument),maPreviewSize(rPreviewSize),mpCache(rpCache)
{}
};
@@ -112,7 +112,7 @@ namespace sd { namespace slidesorter { namespace cache {
*/
class PageCacheManager::PageCacheContainer
: public std::unordered_map<CacheDescriptor,
- std::shared_ptr<PageCacheManager::Cache>,
+ ::boost::shared_ptr<PageCacheManager::Cache>,
CacheDescriptor::Hash,
CacheDescriptor::Equal>
{
@@ -123,12 +123,12 @@ public:
address only.
*/
class CompareWithCache { public:
- CompareWithCache(const std::shared_ptr<PageCacheManager::Cache>& rpCache)
+ CompareWithCache(const ::boost::shared_ptr<PageCacheManager::Cache>& rpCache)
: mpCache(rpCache) {}
bool operator () (const PageCacheContainer::value_type& rValue) const
{ return rValue.second == mpCache; }
private:
- std::shared_ptr<PageCacheManager::Cache> mpCache;
+ ::boost::shared_ptr<PageCacheManager::Cache> mpCache;
};
};
@@ -160,18 +160,18 @@ public:
//===== PageCacheManager ====================================================
-std::weak_ptr<PageCacheManager> PageCacheManager::mpInstance;
+::boost::weak_ptr<PageCacheManager> PageCacheManager::mpInstance;
-std::shared_ptr<PageCacheManager> PageCacheManager::Instance()
+::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance()
{
- std::shared_ptr<PageCacheManager> pInstance;
+ ::boost::shared_ptr<PageCacheManager> pInstance;
::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
pInstance = mpInstance.lock();
if (pInstance.get() == NULL)
{
- pInstance = std::shared_ptr<PageCacheManager>(
+ pInstance = ::boost::shared_ptr<PageCacheManager>(
new PageCacheManager(),
PageCacheManager::Deleter());
mpInstance = pInstance;
@@ -191,11 +191,11 @@ PageCacheManager::~PageCacheManager()
{
}
-std::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetCache (
+::boost::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetCache (
DocumentKey pDocument,
const Size& rPreviewSize)
{
- std::shared_ptr<Cache> pResult;
+ ::boost::shared_ptr<Cache> pResult;
// Look for the cache in the list of active caches.
CacheDescriptor aKey (pDocument, rPreviewSize);
@@ -224,7 +224,7 @@ std::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetCache (
}
void PageCacheManager::Recycle (
- const std::shared_ptr<Cache>& rpCache,
+ const ::boost::shared_ptr<Cache>& rpCache,
DocumentKey pDocument,
const Size& rPreviewSize)
{
@@ -258,7 +258,7 @@ void PageCacheManager::Recycle (
}
}
-void PageCacheManager::ReleaseCache (const std::shared_ptr<Cache>& rpCache)
+void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache)
{
PageCacheContainer::iterator iCache (::std::find_if(
mpPageCaches->begin(),
@@ -275,14 +275,14 @@ void PageCacheManager::ReleaseCache (const std::shared_ptr<Cache>& rpCache)
}
}
-std::shared_ptr<PageCacheManager::Cache> PageCacheManager::ChangeSize (
- const std::shared_ptr<Cache>& rpCache,
+::boost::shared_ptr<PageCacheManager::Cache> PageCacheManager::ChangeSize (
+ const ::boost::shared_ptr<Cache>& rpCache,
const Size& rOldPreviewSize,
const Size& rNewPreviewSize)
{
(void)rOldPreviewSize;
- std::shared_ptr<Cache> pResult;
+ ::boost::shared_ptr<Cache> pResult;
if (rpCache.get() != NULL)
{
@@ -388,11 +388,11 @@ void PageCacheManager::ReleasePreviewBitmap (const SdrPage* pPage)
iCache->second->ReleaseBitmap(pPage);
}
-std::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetRecentlyUsedCache (
+::boost::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetRecentlyUsedCache (
DocumentKey pDocument,
const Size& rPreviewSize)
{
- std::shared_ptr<Cache> pCache;
+ ::boost::shared_ptr<Cache> pCache;
// Look for the cache in the list of recently used caches.
RecentlyUsedPageCaches::iterator iQueue (mpRecentlyUsedPageCaches->find(pDocument));
@@ -414,7 +414,7 @@ std::shared_ptr<PageCacheManager::Cache> PageCacheManager::GetRecentlyUsedCache
void PageCacheManager::PutRecentlyUsedCache(
DocumentKey pDocument,
const Size& rPreviewSize,
- const std::shared_ptr<Cache>& rpCache)
+ const ::boost::shared_ptr<Cache>& rpCache)
{
// Look up the list of recently used caches for the given document.
RecentlyUsedPageCaches::iterator iQueue (mpRecentlyUsedPageCaches->find(pDocument));
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index b3ef313c100a..212734e3df0b 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -27,7 +27,7 @@ namespace sd { namespace slidesorter { namespace cache {
QueueProcessor::QueueProcessor (
RequestQueue& rQueue,
- const std::shared_ptr<BitmapCache>& rpCache,
+ const ::boost::shared_ptr<BitmapCache>& rpCache,
const Size& rPreviewSize,
const bool bDoSuperSampling,
const SharedCacheContext& rpCacheContext)
@@ -182,7 +182,7 @@ void QueueProcessor::ProcessOneRequest (
}
void QueueProcessor::SetBitmapCache (
- const std::shared_ptr<BitmapCache>& rpCache)
+ const ::boost::shared_ptr<BitmapCache>& rpCache)
{
mpCache = rpCache;
}
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 906e2e84beb9..40fd28b59ce9 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -55,7 +55,7 @@ public:
typedef ::std::function<bool ()> IdleDetectionCallback;
QueueProcessor (
RequestQueue& rQueue,
- const std::shared_ptr<BitmapCache>& rpCache,
+ const ::boost::shared_ptr<BitmapCache>& rpCache,
const Size& rPreviewSize,
const bool bDoSuperSampling,
const SharedCacheContext& rpCacheContext);
@@ -83,7 +83,7 @@ public:
BitmapCache. This is usually necessary after calling
PageCacheManager::ChangeSize().
*/
- void SetBitmapCache (const std::shared_ptr<BitmapCache>& rpCache);
+ void SetBitmapCache (const ::boost::shared_ptr<BitmapCache>& rpCache);
private:
/** This mutex is used to guard the queue processor. Be careful not to
@@ -100,7 +100,7 @@ private:
bool mbDoSuperSampling;
SharedCacheContext mpCacheContext;
RequestQueue& mrQueue;
- std::shared_ptr<BitmapCache> mpCache;
+ ::boost::shared_ptr<BitmapCache> mpCache;
BitmapFactory maBitmapFactory;
bool mbIsPaused;
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx
index aec7035c3f33..ce4b860710d7 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx
@@ -34,7 +34,7 @@ void RequestFactory::operator()(
RequestQueue& rRequestQueue,
const SharedCacheContext& rpCacheContext)
{
- std::shared_ptr<std::vector<CacheKey> > aKeys;
+ ::boost::shared_ptr<std::vector<CacheKey> > aKeys;
// Add the requests for the visible pages.
aKeys = rpCacheContext->GetEntryList(true);
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index a499b16956d6..21b47c24bef7 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -27,7 +27,7 @@
#include <osl/mutex.hxx>
#include <svx/sdrpageuser.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter { namespace cache {
@@ -110,7 +110,7 @@ public:
private:
::osl::Mutex maMutex;
class Container;
- std::unique_ptr<Container> mpRequestQueue;
+ ::boost::scoped_ptr<Container> mpRequestQueue;
SharedCacheContext mpCacheContext;
/** A lower bound of the lowest priority of all elements in the queues.
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 96ed5554e8e6..1aaae267a10a 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -83,7 +83,7 @@
#include <com/sun/star/drawing/XDrawPages.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -240,25 +240,25 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager()
return *mpScrollBarManager.get();
}
-std::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const
+::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const
{
OSL_ASSERT(mpCurrentSlideManager.get()!=NULL);
return mpCurrentSlideManager;
}
-std::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const
+::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const
{
OSL_ASSERT(mpSlotManager.get()!=NULL);
return mpSlotManager;
}
-std::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const
+::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const
{
OSL_ASSERT(mpSelectionManager.get()!=NULL);
return mpSelectionManager;
}
-std::shared_ptr<InsertionIndicatorHandler>
+::boost::shared_ptr<InsertionIndicatorHandler>
SlideSorterController::GetInsertionIndicatorHandler() const
{
OSL_ASSERT(mpInsertionIndicatorHandler.get()!=NULL);
@@ -330,7 +330,7 @@ bool SlideSorterController::Command (
// view shell, b) the edit mode, and c) on whether the selection
// is empty or not.
ViewShell::ShellType eMainViewShellType (ViewShell::ST_NONE);
- std::shared_ptr<ViewShell> pMainViewShell (
+ ::boost::shared_ptr<ViewShell> pMainViewShell (
pViewShell->GetViewShellBase().GetMainViewShell());
if (pMainViewShell.get() != NULL)
eMainViewShellType = pMainViewShell->GetShellType();
@@ -355,7 +355,7 @@ bool SlideSorterController::Command (
else
nPopupId = RID_SLIDE_SORTER_MASTER_NOSEL_POPUP;
}
- std::unique_ptr<InsertionIndicatorHandler::ForceShowContext> pContext;
+ ::boost::scoped_ptr<InsertionIndicatorHandler::ForceShowContext> pContext;
if (pPage == NULL)
{
// When there is no selection, then we show the insertion
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index a4c6734fc5f4..0d43120c134f 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -110,7 +110,7 @@ Animator::AnimationId Animator::AddAnimation (
if (mbIsDisposed)
return -1;
- std::shared_ptr<Animation> pAnimation (
+ boost::shared_ptr<Animation> pAnimation (
new Animation(
rAnimation,
nStartOffset / 1000.0,
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 2ef25e5b5d48..b270ac67a58c 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -73,6 +73,7 @@
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <boost/bind.hpp>
namespace sd { namespace slidesorter { namespace controller {
@@ -111,7 +112,7 @@ class Clipboard::UndoContext
public:
UndoContext (
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpMainViewShell)
+ const ::boost::shared_ptr<ViewShell>& rpMainViewShell)
: mpDocument(pDocument),
mpMainViewShell(rpMainViewShell)
{
@@ -137,7 +138,7 @@ public:
}
private:
SdDrawDocument* mpDocument;
- std::shared_ptr<ViewShell> mpMainViewShell;
+ ::boost::shared_ptr<ViewShell> mpMainViewShell;
};
Clipboard::Clipboard (SlideSorter& rSlideSorter)
@@ -270,7 +271,7 @@ sal_Int32 Clipboard::GetInsertionPosition (vcl::Window* pWindow)
// selection.
// d) After the last page when there is no selection and no focus.
- std::shared_ptr<controller::InsertionIndicatorHandler> pInsertionIndicatorHandler (
+ ::boost::shared_ptr<controller::InsertionIndicatorHandler> pInsertionIndicatorHandler (
mrController.GetInsertionIndicatorHandler());
if (pInsertionIndicatorHandler->IsActive())
{
@@ -399,7 +400,7 @@ void Clipboard::CreateSlideTransferable (
aSelectedPages.Rewind();
::std::vector<TransferableData::Representative> aRepresentatives;
aRepresentatives.reserve(3);
- std::shared_ptr<cache::PageCache> pPreviewCache (
+ ::boost::shared_ptr<cache::PageCache> pPreviewCache (
mrSlideSorter.GetView().GetPreviewCache());
while (aSelectedPages.HasMoreElements())
{
@@ -468,7 +469,7 @@ void Clipboard::CreateSlideTransferable (
}
}
-std::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData (SdTransferable* pTransferable)
+::boost::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData (SdTransferable* pTransferable)
{
do
{
@@ -513,7 +514,7 @@ std::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData
// Create preview.
::std::vector<TransferableData::Representative> aRepresentatives;
aRepresentatives.reserve(1);
- std::shared_ptr<cache::PageCache> pPreviewCache (
+ ::boost::shared_ptr<cache::PageCache> pPreviewCache (
rSlideSorter.GetView().GetPreviewCache());
model::SharedPageDescriptor pDescriptor (rSlideSorter.GetModel().GetPageDescriptor((nPageIndex-1)/2));
if ( ! pDescriptor || pDescriptor->GetPage()==NULL)
@@ -530,7 +531,7 @@ std::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData
rOtherClipboard.maPagesToRemove.push_back(pDescriptor->GetPage());
// Create the new transferable.
- std::shared_ptr<SdTransferable::UserData> pNewTransferable (
+ ::boost::shared_ptr<SdTransferable::UserData> pNewTransferable (
new TransferableData(
pSlideSorterViewShell,
aRepresentatives));
@@ -550,7 +551,7 @@ std::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData
}
while (false);
- return std::shared_ptr<SdTransferable::UserData>();
+ return ::boost::shared_ptr<SdTransferable::UserData>();
}
void Clipboard::StartDrag (
@@ -703,7 +704,7 @@ sal_Int8 Clipboard::ExecuteDrop (
( pDragTransferable->GetView() != &mrSlideSorter.GetView() )
|| ( nXOffset >= 2 && nYOffset >= 2 );
- std::shared_ptr<InsertionIndicatorHandler> pInsertionIndicatorHandler(
+ ::boost::shared_ptr<InsertionIndicatorHandler> pInsertionIndicatorHandler(
mrController.GetInsertionIndicatorHandler());
// Get insertion position and then turn off the insertion indicator.
pInsertionIndicatorHandler->UpdatePosition(aEventModelPosition, rEvent.mnAction);
@@ -743,7 +744,7 @@ sal_Int8 Clipboard::ExecuteDrop (
// only that is notified automatically about the drag
// operation being finished. Because the target slide sorter
// has be notified, too, add a callback for that.
- std::shared_ptr<TransferableData> pSlideSorterTransferable (
+ ::boost::shared_ptr<TransferableData> pSlideSorterTransferable (
TransferableData::GetFromTransferable(pDragTransferable));
BOOST_ASSERT(pSlideSorterTransferable);
if (pSlideSorterTransferable
@@ -784,7 +785,7 @@ bool Clipboard::IsInsertionTrivial (
SdTransferable* pTransferable,
const sal_Int8 nDndAction) const
{
- std::shared_ptr<TransferableData> pSlideSorterTransferable (
+ ::boost::shared_ptr<TransferableData> pSlideSorterTransferable (
TransferableData::GetFromTransferable(pTransferable));
if (pSlideSorterTransferable
&& pSlideSorterTransferable->GetSourceViewShell() != mrSlideSorter.GetViewShell())
@@ -876,9 +877,9 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop (
// technical reasons: The actual code to accept or execute a shape drop
// is implemented in the ViewShell class and uses the page view of the
// main edit view. This is not possible without a DrawViewShell.
- std::shared_ptr<DrawViewShell> pDrawViewShell;
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell;
if (mrSlideSorter.GetViewShell() != NULL)
- pDrawViewShell = std::dynamic_pointer_cast<DrawViewShell>(
+ pDrawViewShell = ::boost::dynamic_pointer_cast<DrawViewShell>(
mrSlideSorter.GetViewShell()->GetViewShellBase().GetMainViewShell());
if (pDrawViewShell.get() != NULL
&& (pDrawViewShell->GetShellType() == ViewShell::ST_IMPRESS
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index b167ab23c08a..b14c36caff4b 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -190,8 +190,8 @@ void CurrentSlideManager::SetCurrentSlideAtTabControl (const SharedPageDescripto
ViewShellBase* pBase = mrSlideSorter.GetViewShellBase();
if (pBase != NULL)
{
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell()));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell()));
if (pDrawViewShell)
{
sal_uInt16 nPageNumber = (rpDescriptor->GetPage()->GetPageNum()-1)/2;
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 5fb9af5837cb..93fc920193d5 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -89,7 +89,7 @@ void DragAndDropContext::UpdatePosition (
// constant while scrolling.)
sd::Window *pWindow (mpTargetSlideSorter->GetContentWindow());
const Point aMouseModelPosition (pWindow->PixelToLogic(rMousePosition));
- std::shared_ptr<InsertionIndicatorHandler> pInsertionIndicatorHandler (
+ ::boost::shared_ptr<InsertionIndicatorHandler> pInsertionIndicatorHandler (
mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler());
bool bDoAutoScroll = bAllowAutoScroll
diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index 3f433ac44992..42b932e640a8 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition (
}
}
-std::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator()
+::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator()
{
if ( ! mpInsertAnimator)
mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter));
@@ -234,7 +234,7 @@ bool InsertionIndicatorHandler::IsInsertionTrivial (const sal_Int8 nDndAction)
//===== InsertionIndicatorHandler::ForceShowContext ===========================
InsertionIndicatorHandler::ForceShowContext::ForceShowContext (
- const std::shared_ptr<InsertionIndicatorHandler>& rpHandler)
+ const ::boost::shared_ptr<InsertionIndicatorHandler>& rpHandler)
: mpHandler(rpHandler)
{
mpHandler->ForceShow();
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 486834e17fe0..d4f65d7375f0 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -595,7 +595,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage)
// Invalidate the preview of the page (in all slide sorters that display
// it.)
- std::shared_ptr<cache::PageCacheManager> pCacheManager (cache::PageCacheManager::Instance());
+ ::boost::shared_ptr<cache::PageCacheManager> pCacheManager (cache::PageCacheManager::Instance());
if ( ! pCacheManager)
return;
SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 09dec77c5655..0753edd986e4 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -32,7 +32,7 @@
#include <svl/lstner.hxx>
#include <tools/link.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace sd {
class ViewShellBase;
@@ -151,7 +151,7 @@ private:
events. It is references counted in order to cope with events that
are expected but never sent.
*/
- std::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock;
+ ::boost::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock;
void ReleaseListeners();
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index f2603e4f0af3..b9563ae7b814 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -37,7 +37,7 @@
#include "ViewShellBase.hxx"
#include <com/sun/star/drawing/XDrawView.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -261,9 +261,9 @@ void PageSelector::DisableBroadcasting()
mnBroadcastDisableLevel ++;
}
-std::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() const
+::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() const
{
- std::shared_ptr<PageSelection> pSelection (new PageSelection());
+ ::boost::shared_ptr<PageSelection> pSelection (new PageSelection());
pSelection->reserve(GetSelectedPageCount());
int nPageCount = GetPageCount();
@@ -278,7 +278,7 @@ std::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() co
}
void PageSelector::SetPageSelection (
- const std::shared_ptr<PageSelection>& rpSelection,
+ const ::boost::shared_ptr<PageSelection>& rpSelection,
const bool bUpdateCurrentPage)
{
PageSelection::const_iterator iPage;
@@ -322,7 +322,7 @@ void PageSelector::UpdateCurrentPage (const bool bUpdateOnlyWhenPending)
// selection to just the new current slide. To prevent that,
// we store (and at the end of this scope restore) the current
// selection.
- std::shared_ptr<PageSelection> pSelection (GetPageSelection());
+ ::boost::shared_ptr<PageSelection> pSelection (GetPageSelection());
mrController.GetCurrentSlideManager()->SwitchCurrentSlide(pCurrentPageDescriptor);
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 95f850791ff4..7a456824b01a 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -306,7 +306,7 @@ protected:
virtual bool ProcessDragEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE;
private:
- std::unique_ptr<DragAndDropContext> mpDragAndDropContext;
+ ::boost::scoped_ptr<DragAndDropContext> mpDragAndDropContext;
};
//===== SelectionFunction =====================================================
@@ -683,7 +683,7 @@ void SelectionFunction::ProcessEvent (EventDescriptor& rDescriptor)
// The call to ProcessEvent may switch to another mode handler.
// Prevent the untimely destruction of the called handler by acquiring a
// temporary reference here.
- std::shared_ptr<ModeHandler> pModeHandler (mpModeHandler);
+ ::boost::shared_ptr<ModeHandler> pModeHandler (mpModeHandler);
pModeHandler->ProcessEvent(rDescriptor);
}
@@ -697,7 +697,7 @@ bool Match (
void SelectionFunction::SwitchToNormalMode()
{
if (mpModeHandler->GetMode() != NormalMode)
- SwitchMode(std::shared_ptr<ModeHandler>(
+ SwitchMode(::boost::shared_ptr<ModeHandler>(
new NormalModeHandler(mrSlideSorter, *this)));
}
@@ -706,7 +706,7 @@ void SelectionFunction::SwitchToDragAndDropMode (const Point& rMousePosition)
if (mpModeHandler->GetMode() != DragAndDropMode)
{
#ifndef MACOSX
- std::shared_ptr<DragAndDropModeHandler> handler(
+ ::boost::shared_ptr<DragAndDropModeHandler> handler(
new DragAndDropModeHandler(mrSlideSorter, *this));
SwitchMode(handler);
// Delayed initialization, only after mpModeHanler is set, otherwise DND initialization
@@ -714,7 +714,7 @@ void SelectionFunction::SwitchToDragAndDropMode (const Point& rMousePosition)
// and without mpModeHandler set it would again try to set a new handler.
handler->Initialize(rMousePosition, mpWindow);
#else
- SwitchMode(std::shared_ptr<ModeHandler>(
+ SwitchMode(::boost::shared_ptr<ModeHandler>(
new DragAndDropModeHandler(mrSlideSorter, *this, rMousePosition, mpWindow)));
#endif
}
@@ -727,7 +727,7 @@ void SelectionFunction::SwitchToMultiSelectionMode (
if (mpModeHandler->GetMode() != MultiSelectionMode)
#ifndef MACOSX
{
- std::shared_ptr<MultiSelectionModeHandler> handler(
+ ::boost::shared_ptr<MultiSelectionModeHandler> handler(
new MultiSelectionModeHandler(mrSlideSorter, *this, rMousePosition));
SwitchMode(handler);
// Delayed initialization, only after mpModeHanler is set, the handle ctor
@@ -735,12 +735,12 @@ void SelectionFunction::SwitchToMultiSelectionMode (
handler->Initialize(nEventCode);
}
#else
- SwitchMode(std::shared_ptr<ModeHandler>(
+ SwitchMode(::boost::shared_ptr<ModeHandler>(
new MultiSelectionModeHandler(mrSlideSorter, *this, rMousePosition, nEventCode)));
#endif
}
-void SelectionFunction::SwitchMode (const std::shared_ptr<ModeHandler>& rpHandler)
+void SelectionFunction::SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHandler)
{
// Not all modes allow mouse over indicator.
if (mpModeHandler->IsMouseOverIndicatorAllowed() != rpHandler->IsMouseOverIndicatorAllowed())
@@ -765,8 +765,8 @@ void SelectionFunction::ResetMouseAnchor()
{
if (mpModeHandler && mpModeHandler->GetMode() == NormalMode)
{
- std::shared_ptr<NormalModeHandler> pHandler (
- std::dynamic_pointer_cast<NormalModeHandler>(mpModeHandler));
+ ::boost::shared_ptr<NormalModeHandler> pHandler (
+ ::boost::dynamic_pointer_cast<NormalModeHandler>(mpModeHandler));
if (pHandler)
pHandler->ResetButtonDownLocation();
}
@@ -1120,7 +1120,7 @@ bool NormalModeHandler::ProcessButtonDownEvent (
// Insert a new slide:
// First of all we need to set the insertion indicator which sets the
// position where the new slide will be inserted.
- std::shared_ptr<InsertionIndicatorHandler> pInsertionIndicatorHandler
+ ::boost::shared_ptr<InsertionIndicatorHandler> pInsertionIndicatorHandler
= mrSlideSorter.GetController().GetInsertionIndicatorHandler();
pInsertionIndicatorHandler->Start(false);
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 446c6fc8c5d9..5a32041c1e31 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -88,7 +88,7 @@
#include <vcl/svapp.hxx>
#include <boost/bind.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -263,7 +263,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
+ boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
mrSlideSorter.GetContentWindow(),
pDocument) : 0);
@@ -374,8 +374,8 @@ void SlotManager::FuSupport (SfxRequest& rRequest)
ViewShellBase* pBase = mrSlideSorter.GetViewShellBase();
if (pBase != NULL)
{
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell()));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell()));
if (pDrawViewShell.get() != NULL)
pDrawViewShell->FuSupport(rRequest);
}
@@ -733,8 +733,8 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
ViewShellBase* pBase = mrSlideSorter.GetViewShellBase();
if (pBase != NULL)
{
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell()));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell()));
if (pDrawViewShell.get() != NULL)
{
TransferableDataHelper aDataHelper (
@@ -904,7 +904,7 @@ void SlotManager::RenameSlide()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog(
+ boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog(
mrSlideSorter.GetContentWindow(),
aPageName, aDescr));
DBG_ASSERT(aNameDlg, "Dialog creation failed!");
diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
index a5c9a41eea98..85777682c4e2 100644
--- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
@@ -32,24 +32,24 @@ SdTransferable* TransferableData::CreateTransferable (
const ::std::vector<Representative>& rRepresentatives)
{
SdTransferable* pTransferable = new SdTransferable (pSrcDoc, pWorkView, bInitOnGetData);
- std::shared_ptr<TransferableData> pData (new TransferableData(pViewShell, rRepresentatives));
+ ::boost::shared_ptr<TransferableData> pData (new TransferableData(pViewShell, rRepresentatives));
pTransferable->AddUserData(pData);
return pTransferable;
}
-std::shared_ptr<TransferableData> TransferableData::GetFromTransferable (const SdTransferable* pTransferable)
+::boost::shared_ptr<TransferableData> TransferableData::GetFromTransferable (const SdTransferable* pTransferable)
{
if (pTransferable)
{
for (sal_Int32 nIndex=0,nCount=pTransferable->GetUserDataCount(); nIndex<nCount; ++nIndex)
{
- std::shared_ptr<TransferableData> xData =
- std::dynamic_pointer_cast<TransferableData>(pTransferable->GetUserData(nIndex));
+ ::boost::shared_ptr<TransferableData> xData =
+ ::boost::dynamic_pointer_cast<TransferableData>(pTransferable->GetUserData(nIndex));
if (xData)
return xData;
}
}
- return std::shared_ptr<TransferableData>();
+ return ::boost::shared_ptr<TransferableData>();
}
TransferableData::TransferableData (
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
index 10126e663c4b..206ef860819e 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <com/sun/star/uno/XInterface.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <vector>
class SdrPage;
@@ -76,7 +76,7 @@ public:
to allow rendering of previews that are not visible (ahead of
time). When not then return an empty pointer or an empty vector.
*/
- virtual std::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) = 0;
+ virtual ::boost::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) = 0;
/** Return the priority that defines the order in which previews are
created for different keys/pages. Typically the visible pages come
@@ -92,7 +92,7 @@ public:
virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() = 0;
};
-typedef std::shared_ptr<CacheContext> SharedCacheContext;
+typedef ::boost::shared_ptr<CacheContext> SharedCacheContext;
} } } // end of namespace ::sd::slidesorter::cache
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 022c88b82735..27b8e9e35baf 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -22,8 +22,8 @@
#include "cache/SlsCacheContext.hxx"
#include <sal/types.h>
+#include <boost/scoped_ptr.hpp>
#include <vcl/bitmap.hxx>
-#include <memory>
class Size;
@@ -152,7 +152,7 @@ public:
void Resume();
private:
- std::unique_ptr<GenericPageCache> mpImplementation;
+ ::boost::scoped_ptr<GenericPageCache> mpImplementation;
};
} } } // end of namespace ::sd::slidesorter::cache
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
index 257aaec0839d..e6ed624f6032 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx
@@ -22,6 +22,7 @@
#include <sal/types.h>
#include <com/sun/star/uno/XInterface.hpp>
+#include <boost/shared_ptr.hpp>
#include <memory>
#include <vector>
@@ -41,12 +42,12 @@ class PageCacheManager
{
public:
typedef BitmapCache Cache;
- typedef std::vector< std::pair<Size, std::shared_ptr<BitmapCache> > > BestFittingPageCaches;
+ typedef ::std::vector< ::std::pair<Size, ::boost::shared_ptr<BitmapCache> > > BestFittingPageCaches;
typedef css::uno::Reference<css::uno::XInterface> DocumentKey;
/** Return the one instance of the PageCacheManager class.
*/
- static std::shared_ptr<PageCacheManager> Instance();
+ static ::boost::shared_ptr<PageCacheManager> Instance();
/** Look up the cache for the given model in which the previews have the
specified size. If no such cache exists, then one is created. When
@@ -57,7 +58,7 @@ public:
The returned cache lives as long as somebody keeps a shared
pointer and the ReleaseCache() method has not been called.
*/
- std::shared_ptr<Cache> GetCache (
+ ::boost::shared_ptr<Cache> GetCache (
DocumentKey pDocument,
const Size& rPreviewSize);
@@ -65,14 +66,14 @@ public:
cache. After that the cache will live as long as the caller (and
maybe others) holds its reference.
*/
- void ReleaseCache (const std::shared_ptr<Cache>& rpCache);
+ void ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache);
/** This is an information to the cache manager that the size of preview
bitmaps in the specified cache has changed.
*/
- std::shared_ptr<Cache> ChangeSize (
- const std::shared_ptr<Cache>& rpCache,
+ ::boost::shared_ptr<Cache> ChangeSize (
+ const ::boost::shared_ptr<Cache>& rpCache,
const Size& rOldPreviewSize,
const Size& rNewPreviewSize);
@@ -108,15 +109,15 @@ private:
shared_ptr so that the cache manager has the same life time as the
ViewShellBase.
*/
- static std::weak_ptr<PageCacheManager> mpInstance;
+ static ::boost::weak_ptr<PageCacheManager> mpInstance;
/// List of active caches.
class PageCacheContainer;
- std::unique_ptr<PageCacheContainer> mpPageCaches;
+ ::std::unique_ptr<PageCacheContainer> mpPageCaches;
/// List of inactive, recently used caches.
class RecentlyUsedPageCaches;
- std::unique_ptr<RecentlyUsedPageCaches> mpRecentlyUsedPageCaches;
+ ::std::unique_ptr<RecentlyUsedPageCaches> mpRecentlyUsedPageCaches;
/** The maximal number of recently used caches that are kept alive after
they have become inactive, i.e. after they are not used anymore by a
@@ -130,7 +131,7 @@ private:
class Deleter;
friend class Deleter;
- std::shared_ptr<Cache> GetRecentlyUsedCache(
+ ::boost::shared_ptr<Cache> GetRecentlyUsedCache(
DocumentKey pDocument,
const Size& rSize);
@@ -141,7 +142,7 @@ private:
void PutRecentlyUsedCache(
DocumentKey pDocument,
const Size& rPreviewSize,
- const std::shared_ptr<Cache>& rpCache);
+ const ::boost::shared_ptr<Cache>& rpCache);
/** Return a sorted list of the available caches, both active caches and
those recently used, for the given document. The sort order is so
@@ -156,7 +157,7 @@ private:
BitmapCache with already exisiting previews.
*/
void Recycle (
- const std::shared_ptr<Cache>& rpCache,
+ const ::boost::shared_ptr<Cache>& rpCache,
DocumentKey pDocument,
const Size& rPreviewSize);
};
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 743772791594..8d1d378991c1 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -30,7 +30,7 @@
#include <tools/link.hxx>
#include <tools/gen.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter {
class SlideSorter;
@@ -116,10 +116,10 @@ public:
*/
ScrollBarManager& GetScrollBarManager();
- std::shared_ptr<CurrentSlideManager> GetCurrentSlideManager() const;
- std::shared_ptr<SlotManager> GetSlotManager() const;
- std::shared_ptr<SelectionManager> GetSelectionManager() const;
- std::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler() const;
+ ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager() const;
+ ::boost::shared_ptr<SlotManager> GetSlotManager() const;
+ ::boost::shared_ptr<SelectionManager> GetSelectionManager() const;
+ ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler() const;
/** This method forwards the call to the SlideSorterView and executes
pending operations like moving selected pages into the visible area.
@@ -215,7 +215,7 @@ public:
/** Return an Animator object.
*/
- std::shared_ptr<Animator> GetAnimator() const { return mpAnimator;}
+ ::boost::shared_ptr<Animator> GetAnimator() const { return mpAnimator;}
VisibleAreaManager& GetVisibleAreaManager() const;
@@ -226,16 +226,16 @@ private:
SlideSorter& mrSlideSorter;
model::SlideSorterModel& mrModel;
view::SlideSorterView& mrView;
- std::unique_ptr<PageSelector> mpPageSelector;
- std::unique_ptr<FocusManager> mpFocusManager;
- std::shared_ptr<SlotManager> mpSlotManager;
- std::unique_ptr<ScrollBarManager> mpScrollBarManager;
- mutable std::shared_ptr<CurrentSlideManager> mpCurrentSlideManager;
- std::shared_ptr<SelectionManager> mpSelectionManager;
- std::unique_ptr<controller::Clipboard> mpClipboard;
- std::shared_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler;
- std::shared_ptr<Animator> mpAnimator;
- std::unique_ptr<VisibleAreaManager> mpVisibleAreaManager;
+ ::boost::scoped_ptr<PageSelector> mpPageSelector;
+ ::boost::scoped_ptr<FocusManager> mpFocusManager;
+ ::boost::shared_ptr<SlotManager> mpSlotManager;
+ ::boost::scoped_ptr<ScrollBarManager> mpScrollBarManager;
+ mutable ::boost::shared_ptr<CurrentSlideManager> mpCurrentSlideManager;
+ ::boost::shared_ptr<SelectionManager> mpSelectionManager;
+ ::boost::scoped_ptr<controller::Clipboard> mpClipboard;
+ ::boost::shared_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler;
+ ::boost::shared_ptr<Animator> mpAnimator;
+ ::boost::scoped_ptr<VisibleAreaManager> mpVisibleAreaManager;
// The listener listens to UNO events and thus is a UNO object.
::rtl::Reference<controller::Listener> mpListener;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index f9c8db38773d..09135d9738b0 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -27,7 +27,9 @@
#include <vcl/idle.hxx>
#include <sal/types.h>
-#include <memory>
+#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <functional>
#include <vector>
@@ -97,11 +99,11 @@ private:
Idle maIdle;
bool mbIsDisposed;
class Animation;
- typedef ::std::vector<std::shared_ptr<Animation> > AnimationList;
+ typedef ::std::vector<boost::shared_ptr<Animation> > AnimationList;
AnimationList maAnimations;
::canvas::tools::ElapsedTime maElapsedTime;
- std::unique_ptr<view::SlideSorterView::DrawLock> mpDrawLock;
+ ::boost::scoped_ptr<view::SlideSorterView::DrawLock> mpDrawLock;
AnimationId mnNextAnimationId;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 546facbf0e2e..5caeba792722 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -66,7 +66,7 @@ public:
transferable. The returned transferable is set up with all
information necessary so that it can be dropped on a slide sorter.
*/
- static std::shared_ptr<SdTransferable::UserData> CreateTransferableUserData (SdTransferable* pTransferable);
+ static ::boost::shared_ptr<SdTransferable::UserData> CreateTransferableUserData (SdTransferable* pTransferable);
void HandleSlotCall (SfxRequest& rRequest);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
index 80b1049ec61e..d4084e6cc90d 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx
@@ -62,10 +62,10 @@ public:
class ForceShowContext
{
public:
- ForceShowContext (const std::shared_ptr<InsertionIndicatorHandler>& rpHandler);
+ ForceShowContext (const ::boost::shared_ptr<InsertionIndicatorHandler>& rpHandler);
~ForceShowContext();
private:
- const std::shared_ptr<InsertionIndicatorHandler> mpHandler;
+ const ::boost::shared_ptr<InsertionIndicatorHandler> mpHandler;
};
/** Update the indicator icon from the current transferable (from the
@@ -107,8 +107,8 @@ public:
private:
SlideSorter& mrSlideSorter;
- std::shared_ptr<view::InsertAnimator> mpInsertAnimator;
- std::shared_ptr<view::InsertionIndicatorOverlay> mpInsertionIndicatorOverlay;
+ ::boost::shared_ptr<view::InsertAnimator> mpInsertAnimator;
+ ::boost::shared_ptr<view::InsertionIndicatorOverlay> mpInsertionIndicatorOverlay;
view::InsertPosition maInsertPosition;
Mode meMode;
bool mbIsInsertionTrivial;
@@ -121,7 +121,7 @@ private:
void SetPosition (
const Point& rPoint,
const Mode eMode);
- std::shared_ptr<view::InsertAnimator> GetInsertAnimator();
+ ::boost::shared_ptr<view::InsertAnimator> GetInsertAnimator();
/** Make the insertion indicator visible (that is the show part) and
keep it visible, even when the mouse leaves the window (that is the
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 1a1ec8a87fa9..9f2051cff76e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -125,7 +125,7 @@ public:
even if pages are exchanged a later call to SetPageSelection()
is valid.
*/
- std::shared_ptr<PageSelection> GetPageSelection() const;
+ ::boost::shared_ptr<PageSelection> GetPageSelection() const;
/** Restore a page selection according to the given selection object.
@param rSelection
@@ -142,7 +142,7 @@ public:
used to prevent a recursion loop.
*/
void SetPageSelection (
- const std::shared_ptr<PageSelection>& rSelection,
+ const ::boost::shared_ptr<PageSelection>& rSelection,
const bool bUpdateCurrentPage = true);
/** Call this method after the model has changed to set the number
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 723a3567e06e..bc10d3b39618 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -26,7 +26,7 @@
#include "fupoor.hxx"
#include <svtools/transfer.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter {
class SlideSorter;
@@ -142,7 +142,7 @@ private:
/** The selection function can be in one of several mutually
exclusive modes.
*/
- std::shared_ptr<ModeHandler> mpModeHandler;
+ ::boost::shared_ptr<ModeHandler> mpModeHandler;
/** Make the slide nOffset slides away of the current one the new
current slide. When the new index is outside the range of valid
@@ -174,7 +174,7 @@ private:
void StopDragAndDrop();
- void SwitchMode (const std::shared_ptr<ModeHandler>& rpHandler);
+ void SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHandler);
};
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index f754ab15ef0c..eddbf63c0e00 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -103,7 +103,7 @@ public:
*/
void SetInsertionPosition (const sal_Int32 nInsertionPosition);
- std::shared_ptr<SelectionObserver> GetSelectionObserver() const { return mpSelectionObserver;}
+ ::boost::shared_ptr<SelectionObserver> GetSelectionObserver() const { return mpSelectionObserver;}
private:
SlideSorter& mrSlideSorter;
@@ -134,9 +134,9 @@ private:
Animator::AnimationId mnAnimationId;
class PageInsertionListener;
- std::unique_ptr<PageInsertionListener> mpPageInsertionListener;
+ ::boost::scoped_ptr<PageInsertionListener> mpPageInsertionListener;
- std::shared_ptr<SelectionObserver> mpSelectionObserver;
+ ::boost::shared_ptr<SelectionObserver> mpSelectionObserver;
/** Delete the given list of normal pages. This method is a helper
function for DeleteSelectedPages().
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 4bdfc158db89..6cbeb2804795 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_CONTROLLER_SLSSELECTIONOBSERVER_HXX
#include <sal/types.h>
-#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
namespace sd { namespace slidesorter {
class SlideSorter;
@@ -60,7 +60,7 @@ public:
~Context();
void Abort();
private:
- std::shared_ptr<SelectionObserver> mpSelectionObserver;
+ ::boost::shared_ptr<SelectionObserver> mpSelectionObserver;
};
private:
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index 0874ee2451c5..bc189e0a466e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -63,7 +63,7 @@ public:
SlideSorterViewShell* pViewShell,
const ::std::vector<TransferableData::Representative>& rRepresentatives);
- static std::shared_ptr<TransferableData> GetFromTransferable (const SdTransferable* pTransferable);
+ static ::boost::shared_ptr<TransferableData> GetFromTransferable (const SdTransferable* pTransferable);
TransferableData (
SlideSorterViewShell* pViewShell,
diff --git a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx
index cee3acc1ae0c..ec76ec99dc07 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsSharedPageDescriptor.hxx
@@ -20,13 +20,13 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_MODEL_SLSSHAREDPAGEDESCRIPTOR_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_MODEL_SLSSHAREDPAGEDESCRIPTOR_HXX
-#include <memory>
+#include <boost/shared_ptr.hpp>
namespace sd { namespace slidesorter { namespace model {
class PageDescriptor;
-typedef std::shared_ptr<PageDescriptor> SharedPageDescriptor;
+typedef ::boost::shared_ptr<PageDescriptor> SharedPageDescriptor;
} } } // end of namespace ::sd::slidesorter::model
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 6368cd67d6ff..9d7f242a4aaf 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -35,6 +35,7 @@
#include <vcl/outdev.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <memory>
+#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
class Point;
@@ -144,7 +145,7 @@ public:
*/
void InvalidatePageObjectVisibilities();
- std::shared_ptr<cache::PageCache> GetPreviewCache();
+ ::boost::shared_ptr<cache::PageCache> GetPreviewCache();
/** Return the range of currently visible page objects including the
first and last one in that range.
@@ -188,8 +189,8 @@ public:
void UpdateOrientation();
- std::shared_ptr<PageObjectPainter> GetPageObjectPainter();
- std::shared_ptr<LayeredDevice> GetLayeredDevice() const { return mpLayeredDevice;}
+ ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter();
+ ::boost::shared_ptr<LayeredDevice> GetLayeredDevice() const { return mpLayeredDevice;}
class DrawLock
{
@@ -218,20 +219,20 @@ private:
bool mbIsDisposed;
::std::unique_ptr<Layouter> mpLayouter;
bool mbPageObjectVisibilitiesValid;
- std::shared_ptr<cache::PageCache> mpPreviewCache;
- std::shared_ptr<LayeredDevice> mpLayeredDevice;
+ ::boost::shared_ptr<cache::PageCache> mpPreviewCache;
+ ::boost::shared_ptr<LayeredDevice> mpLayeredDevice;
Range maVisiblePageRange;
bool mbModelChangedWhileModifyEnabled;
Size maPreviewSize;
bool mbPreciousFlagUpdatePending;
Layouter::Orientation meOrientation;
- std::shared_ptr<controller::Properties> mpProperties;
+ ::boost::shared_ptr<controller::Properties> mpProperties;
model::SharedPageDescriptor mpPageUnderMouse;
- std::shared_ptr<PageObjectPainter> mpPageObjectPainter;
- std::shared_ptr<SelectionPainter> mpSelectionPainter;
+ ::boost::shared_ptr<PageObjectPainter> mpPageObjectPainter;
+ ::boost::shared_ptr<SelectionPainter> mpSelectionPainter;
vcl::Region maRedrawRegion;
SharedILayerPainter mpBackgroundPainter;
- std::unique_ptr<ToolTip> mpToolTip;
+ ::boost::scoped_ptr<ToolTip> mpToolTip;
bool mbIsRearrangePending;
::std::vector<Link<LinkParamNone*,void>> maVisibilityChangeListeners;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index b503109e019a..6507bb957a33 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -22,7 +22,7 @@
#include "tools/SdGlobalResourceContainer.hxx"
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <vcl/mapmod.hxx>
namespace vcl { class Font; }
@@ -36,7 +36,7 @@ class FontProvider
: public SdGlobalResource
{
public:
- typedef std::shared_ptr<vcl::Font> SharedFontPointer;
+ typedef boost::shared_ptr<vcl::Font> SharedFontPointer;
/** Return the single instance of this class. Throws a RuntimeException
when no instance can be created.
diff --git a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
index f317f70f900a..20d524c8beec 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSILAYERPAINTER_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSILAYERPAINTER_HXX
+#include <boost/shared_ptr.hpp>
#include <sal/types.h>
-#include <memory>
class OutputDevice;
class Rectangle;
@@ -35,7 +35,7 @@ public:
virtual void Invalidate (const Rectangle& rInvalidationBox) = 0;
};
-typedef std::shared_ptr<ILayerInvalidator> SharedILayerInvalidator;
+typedef ::boost::shared_ptr<ILayerInvalidator> SharedILayerInvalidator;
class ILayerPainter
{
@@ -48,7 +48,7 @@ public:
OutputDevice& rDevice,
const Rectangle& rRepaintArea) = 0;
};
-typedef std::shared_ptr<ILayerPainter> SharedILayerPainter;
+typedef ::boost::shared_ptr<ILayerPainter> SharedILayerPainter;
} } } // end of namespace ::sd::slidesorter::view
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
index 2e3753f49adf..344232805586 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_SLIDESORTER_INC_VIEW_SLSINSERTANIMATOR_HXX
#include "controller/SlsAnimator.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
namespace sd { namespace slidesorter { namespace view {
@@ -53,7 +53,7 @@ public:
private:
class Implementation;
- std::shared_ptr<Implementation> mpImplementation;
+ ::boost::shared_ptr<Implementation> mpImplementation;
};
} } } // end of namespace ::sd::slidesorter::view
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 71ea6642d90a..5f604726a172 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -27,7 +27,8 @@
#include <tools/gen.hxx>
#include <vcl/bitmapex.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
#include <vector>
class OutputDevice;
@@ -49,7 +50,7 @@ class FramePainter;
*/
class InsertionIndicatorOverlay
: public ILayerPainter,
- public std::enable_shared_from_this<InsertionIndicatorOverlay>
+ public ::boost::enable_shared_from_this<InsertionIndicatorOverlay>
{
public:
InsertionIndicatorOverlay (SlideSorter& rSlideSorter);
@@ -86,7 +87,7 @@ private:
Point maLocation;
BitmapEx maIcon;
Point maIconOffset;
- std::unique_ptr<FramePainter> mpShadowPainter;
+ ::boost::scoped_ptr<FramePainter> mpShadowPainter;
void SetPositionAndSize (const Rectangle& rBoundingBox);
Point PaintRepresentatives (
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 2ebed558939f..15068205a5f4 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -65,10 +65,10 @@ public:
Layouter (
sd::Window *rpWindow,
- const std::shared_ptr<Theme>& rpTheme);
+ const ::boost::shared_ptr<Theme>& rpTheme);
~Layouter();
- std::shared_ptr<PageObjectLayouter> GetPageObjectLayouter() const;
+ ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter() const;
/** Set the interval of valid column counts. When nMinimalColumnCount
<= nMaximalColumnCount is not fulfilled then the call is ignored.
@param nMinimalColumnCount
@@ -186,7 +186,7 @@ public:
class Implementation;
private:
- std::unique_ptr<Implementation> mpImplementation;
+ ::boost::scoped_ptr<Implementation> mpImplementation;
VclPtr<sd::Window> mpWindow;
};
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index fa283214e133..97a4db1329d5 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -135,7 +135,7 @@ private:
Rectangle maCustomAnimationEffectBoundingBox;
const Image maTransitionEffectIcon;
const Image maCustomAnimationEffectIcon;
- const std::shared_ptr<vcl::Font> mpPageNumberFont;
+ const boost::shared_ptr<vcl::Font> mpPageNumberFont;
Size GetPageNumberAreaSize (const int nPageCount);
Rectangle CalculatePreviewBoundingBox (
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 978bddf7ddeb..c47a1eb88c33 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -24,7 +24,7 @@
#include "model/SlsPageDescriptor.hxx"
#include "view/SlsLayouter.hxx"
#include "view/SlsTheme.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter { namespace cache {
class PageCache;
@@ -51,7 +51,7 @@ public:
the given theme is the same object as the one already in use by this
painter everything that depends on the theme is updated.
*/
- void SetTheme (const std::shared_ptr<view::Theme>& rpTheme);
+ void SetTheme (const ::boost::shared_ptr<view::Theme>& rpTheme);
/** Return a preview bitmap for the given page descriptor. When the
page is excluded from the show then the preview is marked
@@ -70,12 +70,12 @@ public:
private:
const Layouter& mrLayouter;
- std::shared_ptr<cache::PageCache> mpCache;
- std::shared_ptr<controller::Properties> mpProperties;
- std::shared_ptr<view::Theme> mpTheme;
- std::shared_ptr<vcl::Font> mpPageNumberFont;
- std::unique_ptr<FramePainter> mpShadowPainter;
- std::unique_ptr<FramePainter> mpFocusBorderPainter;
+ ::boost::shared_ptr<cache::PageCache> mpCache;
+ ::boost::shared_ptr<controller::Properties> mpProperties;
+ ::boost::shared_ptr<view::Theme> mpTheme;
+ ::boost::shared_ptr<vcl::Font> mpPageNumberFont;
+ ::boost::scoped_ptr<FramePainter> mpShadowPainter;
+ ::boost::scoped_ptr<FramePainter> mpFocusBorderPainter;
Bitmap maNormalBackground;
Bitmap maSelectionBackground;
Bitmap maFocusedSelectionBackground;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 5aaf9c9ac101..808b515de22c 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -27,7 +27,8 @@
#include <vcl/gradient.hxx>
#include <tools/color.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
namespace sd { namespace slidesorter { namespace controller {
class Properties;
@@ -43,13 +44,13 @@ const int Theme_FocusIndicatorWidth = 3;
class Theme
{
public:
- Theme (const std::shared_ptr<controller::Properties>& rpProperties);
+ Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties);
/** Call this method to update some colors as response to a change of
a system color change.
*/
void Update (
- const std::shared_ptr<controller::Properties>& rpProperties);
+ const ::boost::shared_ptr<controller::Properties>& rpProperties);
// BitmapEx GetInsertIndicatorIcon() const;
@@ -57,7 +58,7 @@ public:
Font_PageNumber,
Font_PageCount
};
- static std::shared_ptr<vcl::Font> GetFont (
+ static boost::shared_ptr<vcl::Font> GetFont (
const FontType eType,
const OutputDevice& rDevice);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index dc574435e73b..fd45631f4a08 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -69,14 +69,14 @@ private:
//===== SlideSorter ===========================================================
-std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter(
+::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter(
ViewShell& rViewShell,
sd::Window* pContentWindow,
ScrollBar* pHorizontalScrollBar,
ScrollBar* pVerticalScrollBar,
ScrollBarBox* pScrollBarBox)
{
- std::shared_ptr<SlideSorter> pSlideSorter(
+ ::boost::shared_ptr<SlideSorter> pSlideSorter(
new SlideSorter(
rViewShell,
pContentWindow,
@@ -87,12 +87,12 @@ std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter(
return pSlideSorter;
}
-std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter (
+::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter (
ViewShellBase& rBase,
ViewShell* pViewShell,
vcl::Window& rParentWindow)
{
- std::shared_ptr<SlideSorter> pSlideSorter(
+ ::boost::shared_ptr<SlideSorter> pSlideSorter(
new SlideSorter(
rBase,
pViewShell,
@@ -419,13 +419,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction)
}
}
-std::shared_ptr<controller::Properties> SlideSorter::GetProperties() const
+::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties() const
{
OSL_ASSERT(mpProperties);
return mpProperties;
}
-std::shared_ptr<view::Theme> SlideSorter::GetTheme() const
+::boost::shared_ptr<view::Theme> SlideSorter::GetTheme() const
{
OSL_ASSERT(mpTheme);
return mpTheme;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index d71a7e7fee61..8df86926d785 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -32,7 +32,8 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace slidesorter {
@@ -180,10 +181,10 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- std::shared_ptr<SlideSorter> mpSlideSorter;
+ ::boost::shared_ptr<SlideSorter> mpSlideSorter;
css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
css::uno::Reference<css::awt::XWindow> mxParentWindow;
- std::unique_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper;
+ ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper;
void Resize();
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index bd64a4f078ee..4adcc1ffdcd4 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -90,7 +90,7 @@ void SlideSorterViewShell::InitInterface_Impl()
TYPEINIT1(SlideSorterViewShell, ViewShell);
-std::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
+::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
@@ -99,7 +99,7 @@ std::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
{
(void)bIsCenterPane;
- std::shared_ptr<SlideSorterViewShell> pViewShell;
+ ::boost::shared_ptr<SlideSorterViewShell> pViewShell;
try
{
pViewShell.reset(
@@ -216,7 +216,7 @@ SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase
try
{
- std::shared_ptr<FrameworkHelper> pFrameworkHelper (FrameworkHelper::Instance(rBase));
+ ::boost::shared_ptr<FrameworkHelper> pFrameworkHelper (FrameworkHelper::Instance(rBase));
if (pFrameworkHelper->IsValid())
for (int i=0; pViewShell==NULL && !aPaneURLs[i].isEmpty(); ++i)
{
@@ -341,7 +341,7 @@ SdPage* SlideSorterViewShell::GetActualPage()
// (if we are that not ourself).
if ( ! IsMainViewShell())
{
- std::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
if (pMainViewShell.get() != NULL)
pCurrentPage = pMainViewShell->GetActualPage();
}
@@ -473,7 +473,7 @@ void SlideSorterViewShell::Activate (bool bIsMDIActivate)
// Determine and broadcast the context that belongs to the main view shell.
EnumContext::Context eContext = EnumContext::Context_Unknown;
- std::shared_ptr<ViewShell> pMainViewShell (GetViewShellBase().GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> pMainViewShell (GetViewShellBase().GetMainViewShell());
ViewShell::ShellType eMainViewShellType (
pMainViewShell
? pMainViewShell->GetShellType()
@@ -545,7 +545,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView)
// certain values.
if ( ! IsMainViewShell())
{
- std::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
if (pMainViewShell.get() != NULL)
mpSlideSorter->GetController().GetCurrentSlideManager()->NotifyCurrentSlideChange(
pMainViewShell->getCurrentPage());
@@ -678,7 +678,7 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop (
nLayer);
}
-std::shared_ptr<SlideSorterViewShell::PageSelection>
+::boost::shared_ptr<SlideSorterViewShell::PageSelection>
SlideSorterViewShell::GetPageSelection() const
{
OSL_ASSERT(mpSlideSorter.get()!=NULL);
@@ -686,7 +686,7 @@ std::shared_ptr<SlideSorterViewShell::PageSelection>
}
void SlideSorterViewShell::SetPageSelection (
- const std::shared_ptr<PageSelection>& rSelection)
+ const ::boost::shared_ptr<PageSelection>& rSelection)
{
OSL_ASSERT(mpSlideSorter.get()!=NULL);
mpSlideSorter->GetController().GetPageSelector().SetPageSelection(rSelection);
@@ -710,7 +710,7 @@ void SlideSorterViewShell::ExecMovePageFirst (SfxRequest& /*rReq*/)
{
// SdDrawDocument MovePages is based on SdPage IsSelected, so
// transfer the SlideSorter selection to SdPages (*it)
- std::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
+ ::boost::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
for (auto it = pSelection->begin(); it != pSelection->end() ; ++it ) {
GetDoc()->SetSelected(*it, true);
}
@@ -725,7 +725,7 @@ void SlideSorterViewShell::GetStateMovePageFirst (SfxItemSet& rSet)
{
if ( ! IsMainViewShell())
{
- std::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
if (pMainViewShell.get() != NULL && pMainViewShell->ISA(DrawViewShell))
{
DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(pMainViewShell.get());
@@ -740,7 +740,7 @@ void SlideSorterViewShell::GetStateMovePageFirst (SfxItemSet& rSet)
sal_uInt16 firstSelectedPageNo = SAL_MAX_UINT16;
sal_uInt16 pageNo;
- std::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
+ ::boost::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
for (auto it = pSelection->begin(); it != pSelection->end() ; ++it ) {
// Check page number
pageNo = (*it)->GetPageNum();
@@ -762,7 +762,7 @@ void SlideSorterViewShell::ExecMovePageUp (SfxRequest& /*rReq*/)
sal_uInt16 pageNo;
// SdDrawDocument MovePages is based on SdPage IsSelected, so
// transfer the SlideSorter selection to SdPages (*it)
- std::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
+ ::boost::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
for (auto it = pSelection->begin(); it != pSelection->end() ; ++it ) {
// Check page number
pageNo = (*it)->GetPageNum();
@@ -794,7 +794,7 @@ void SlideSorterViewShell::ExecMovePageDown (SfxRequest& /*rReq*/)
sal_uInt16 pageNo;
// SdDrawDocument MovePages is based on SdPage IsSelected, so
// transfer the SlideSorter selection to SdPages (*it)
- std::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
+ ::boost::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
for (auto it = pSelection->begin(); it != pSelection->end() ; ++it )
{
// Check page number
@@ -826,7 +826,7 @@ void SlideSorterViewShell::ExecMovePageLast (SfxRequest& /*rReq*/)
{
// SdDrawDocument MovePages is based on SdPage IsSelected, so
// transfer the SlideSorter selection to SdPages (*it)
- std::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
+ ::boost::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
for (auto it = pSelection->begin(); it != pSelection->end() ; ++it ) {
GetDoc()->SetSelected(*it, true);
}
@@ -842,7 +842,7 @@ void SlideSorterViewShell::ExecMovePageLast (SfxRequest& /*rReq*/)
void SlideSorterViewShell::GetStateMovePageLast (SfxItemSet& rSet)
{
- std::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell();
if (pMainViewShell.get() != NULL && pMainViewShell->ISA(DrawViewShell))
{
DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(pMainViewShell.get());
@@ -858,7 +858,7 @@ void SlideSorterViewShell::GetStateMovePageLast (SfxItemSet& rSet)
sal_uInt16 pageNo;
// SdDrawDocument MovePages is based on SdPage IsSelected, so
// transfer the SlideSorter selection to SdPages (*it)
- std::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
+ ::boost::shared_ptr<SlideSorterViewShell::PageSelection> pSelection ( GetPageSelection() );
for (auto it = pSelection->begin(); it != pSelection->end() ; ++it )
{
// Check page number
@@ -879,7 +879,7 @@ void SlideSorterViewShell::GetStateMovePageLast (SfxItemSet& rSet)
}
}
-void SlideSorterViewShell::PostMoveSlidesActions(const std::shared_ptr<SlideSorterViewShell::PageSelection> &rpSelection)
+void SlideSorterViewShell::PostMoveSlidesActions(const ::boost::shared_ptr<SlideSorterViewShell::PageSelection> &rpSelection)
{
sal_uInt16 nNoOfPages = GetDoc()->GetSdPageCount(PK_STANDARD);
for (sal_uInt16 nPage = 0; nPage < nNoOfPages; nPage++)
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index a023aa4fd154..0cf7ea0274df 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -287,8 +287,8 @@ void SlideSorterView::HandleDataChangeEvent()
GetPageObjectPainter()->SetTheme(mrSlideSorter.GetTheme());
// Update the color used by the background painter.
- std::shared_ptr<BackgroundPainter> pPainter (
- std::dynamic_pointer_cast<BackgroundPainter>(mpBackgroundPainter));
+ ::boost::shared_ptr<BackgroundPainter> pPainter (
+ ::boost::dynamic_pointer_cast<BackgroundPainter>(mpBackgroundPainter));
if (pPainter)
pPainter->SetColor(mrSlideSorter.GetTheme()->GetColor(Theme::Color_Background));
@@ -417,7 +417,7 @@ void SlideSorterView::Layout ()
pWindow->SetViewOrigin (aViewBox.TopLeft());
pWindow->SetViewSize (aViewBox.GetSize());
- std::shared_ptr<PageObjectLayouter> pPageObjectLayouter(
+ ::boost::shared_ptr<PageObjectLayouter> pPageObjectLayouter(
mpLayouter->GetPageObjectLayouter());
if (pPageObjectLayouter)
{
@@ -509,7 +509,7 @@ void SlideSorterView::UpdatePreciousFlags()
mbPreciousFlagUpdatePending = false;
model::SharedPageDescriptor pDescriptor;
- std::shared_ptr<cache::PageCache> pCache = GetPreviewCache();
+ ::boost::shared_ptr<cache::PageCache> pCache = GetPreviewCache();
sal_Int32 nPageCount (mrModel.GetPageCount());
for (int nIndex=0; nIndex<=nPageCount; ++nIndex)
@@ -698,7 +698,7 @@ void SlideSorterView::ConfigurationChanged (
}
-std::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache()
+::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache()
{
sd::Window *pWindow (mrSlideSorter.GetContentWindow());
if (pWindow && mpPreviewCache.get() == NULL)
@@ -841,7 +841,7 @@ bool SlideSorterView::SetState (
return bModified;
}
-std::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter()
+::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter()
{
if ( ! mpPageObjectPainter)
mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter));
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index f73529409104..5e5ef8580416 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -25,9 +25,9 @@
#include "model/SlideSorterModel.hxx"
#include "model/SlsPageEnumerationProvider.hxx"
-#include <memory>
#include <set>
#include <boost/bind.hpp>
+#include <boost/enable_shared_from_this.hpp>
namespace sd { namespace slidesorter { namespace view {
@@ -38,11 +38,11 @@ class PageObjectRun;
class AnimatorAccess
{
public:
- virtual void AddRun (const std::shared_ptr<PageObjectRun>& rRun) = 0;
- virtual void RemoveRun (const std::shared_ptr<PageObjectRun>& rRun) = 0;
+ virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0;
+ virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0;
virtual model::SlideSorterModel& GetModel (void) const = 0;
virtual view::SlideSorterView& GetView (void) const = 0;
- virtual std::shared_ptr<controller::Animator> GetAnimator (void) = 0;
+ virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) = 0;
virtual VclPtr<sd::Window> GetContentWindow (void) = 0;
protected:
@@ -52,7 +52,7 @@ protected:
/** Controller of the position offsets of all page objects in one row or one
column.
*/
-class PageObjectRun : public std::enable_shared_from_this<PageObjectRun>
+class PageObjectRun : public ::boost::enable_shared_from_this<PageObjectRun>
{
public:
PageObjectRun (
@@ -88,8 +88,8 @@ public:
class Comparator
{
public: bool operator() (
- const std::shared_ptr<PageObjectRun>& rpRunA,
- const std::shared_ptr<PageObjectRun>& rpRunB) const
+ const ::boost::shared_ptr<PageObjectRun>& rpRunA,
+ const ::boost::shared_ptr<PageObjectRun>& rpRunB) const
{
return rpRunA->mnRunIndex < rpRunB->mnRunIndex;
}
@@ -101,7 +101,7 @@ private:
void RestartAnimation();
};
-typedef std::shared_ptr<PageObjectRun> SharedPageObjectRun;
+typedef ::boost::shared_ptr<PageObjectRun> SharedPageObjectRun;
Point Blend (const Point& rPointA, const Point& rPointB, const double nT)
{
@@ -122,19 +122,19 @@ public:
const InsertPosition& rInsertPosition,
const controller::Animator::AnimationMode eAnimationMode);
- virtual void AddRun (const std::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE;
- virtual void RemoveRun (const std::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE;
+ virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE;
+ virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE;
virtual model::SlideSorterModel& GetModel() const SAL_OVERRIDE { return mrModel; }
virtual view::SlideSorterView& GetView() const SAL_OVERRIDE { return mrView; }
- virtual std::shared_ptr<controller::Animator> GetAnimator() SAL_OVERRIDE { return mpAnimator; }
+ virtual ::boost::shared_ptr<controller::Animator> GetAnimator() SAL_OVERRIDE { return mpAnimator; }
virtual VclPtr<sd::Window> GetContentWindow() SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); }
private:
model::SlideSorterModel& mrModel;
view::SlideSorterView& mrView;
SlideSorter& mrSlideSorter;
- std::shared_ptr<controller::Animator> mpAnimator;
+ ::boost::shared_ptr<controller::Animator> mpAnimator;
typedef ::std::set<SharedPageObjectRun, PageObjectRun::Comparator> RunContainer;
RunContainer maRuns;
InsertPosition maInsertPosition;
@@ -264,7 +264,7 @@ InsertAnimator::Implementation::RunContainer::const_iterator
nRunIndex));
}
-void InsertAnimator::Implementation::AddRun (const std::shared_ptr<PageObjectRun>& rRun)
+void InsertAnimator::Implementation::AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun)
{
if (rRun)
{
@@ -276,7 +276,7 @@ void InsertAnimator::Implementation::AddRun (const std::shared_ptr<PageObjectRun
}
}
-void InsertAnimator::Implementation::RemoveRun (const std::shared_ptr<PageObjectRun>& rRun)
+void InsertAnimator::Implementation::RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun)
{
if (rRun)
{
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index ba7805234ffa..d10615fc3b86 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -85,7 +85,7 @@ void InsertionIndicatorOverlay::Create (const SdTransferable* pTransferable)
if (pTransferable == NULL)
return;
- std::shared_ptr<controller::TransferableData> pData (
+ ::boost::shared_ptr<controller::TransferableData> pData (
controller::TransferableData::GetFromTransferable(pTransferable));
if ( ! pData)
return;
@@ -110,9 +110,9 @@ void InsertionIndicatorOverlay::Create (
const sal_Int32 nSelectionCount)
{
view::Layouter& rLayouter (mrSlideSorter.GetView().GetLayouter());
- std::shared_ptr<view::PageObjectLayouter> pPageObjectLayouter (
+ ::boost::shared_ptr<view::PageObjectLayouter> pPageObjectLayouter (
rLayouter.GetPageObjectLayouter());
- std::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme());
+ ::boost::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme());
const Size aOriginalPreviewSize (pPageObjectLayouter->GetPreviewSize(
PageObjectLayouter::WindowCoordinateSystem));
@@ -241,8 +241,8 @@ void InsertionIndicatorOverlay::PaintPageCount (
const Point& rFirstPageOffset) const
{
// Paint the number of slides.
- std::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme());
- std::shared_ptr<vcl::Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice));
+ ::boost::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme());
+ ::boost::shared_ptr<vcl::Font> pFont(Theme::GetFont(Theme::Font_PageCount, rDevice));
if (pFont)
{
OUString sNumber (OUString::number(nSelectionCount));
@@ -323,7 +323,7 @@ void InsertionIndicatorOverlay::Show()
{
mbIsVisible = true;
- std::shared_ptr<LayeredDevice> pLayeredDevice (
+ ::boost::shared_ptr<LayeredDevice> pLayeredDevice (
mrSlideSorter.GetView().GetLayeredDevice());
if (pLayeredDevice)
{
@@ -340,7 +340,7 @@ void InsertionIndicatorOverlay::Hide()
{
mbIsVisible = false;
- std::shared_ptr<LayeredDevice> pLayeredDevice (
+ ::boost::shared_ptr<LayeredDevice> pLayeredDevice (
mrSlideSorter.GetView().GetLayeredDevice());
if (pLayeredDevice)
{
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 137f4f5bbf10..f385ae549ff0 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -39,7 +39,7 @@ class LayerInvalidator : public ILayerInvalidator
{
public:
LayerInvalidator (
- const std::shared_ptr<LayeredDevice>& rpLayeredDevice,
+ const ::boost::shared_ptr<LayeredDevice>& rpLayeredDevice,
sd::Window *pTargetWindow,
const int nLayer)
: mpLayeredDevice(rpLayeredDevice),
@@ -59,7 +59,7 @@ public:
}
private:
- const std::shared_ptr<LayeredDevice> mpLayeredDevice;
+ const ::boost::shared_ptr<LayeredDevice> mpLayeredDevice;
VclPtr<sd::Window> mpTargetWindow;
const int mnLayer;
};
@@ -129,7 +129,7 @@ private:
void ValidateRectangle (const Rectangle& rBox);
};
-typedef std::shared_ptr<Layer> SharedLayer;
+typedef ::boost::shared_ptr<Layer> SharedLayer;
} // end of anonymous namespace
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
index 989dadb545cf..f614842afe33 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
@@ -27,7 +27,9 @@
#include <vcl/virdev.hxx>
#include <boost/noncopyable.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
#include <vector>
class Rectangle;
@@ -39,7 +41,7 @@ namespace sd { namespace slidesorter { namespace view {
Each layer may contain any number of painters.
*/
class LayeredDevice
- : public std::enable_shared_from_this<LayeredDevice>
+ : public ::boost::enable_shared_from_this<LayeredDevice>
{
public:
@@ -72,7 +74,7 @@ public:
private:
VclPtr<sd::Window> mpTargetWindow;
class LayerContainer;
- std::unique_ptr<LayerContainer> mpLayers;
+ ::boost::scoped_ptr<LayerContainer> mpLayers;
ScopedVclPtr<VirtualDevice> mpBackBuffer;
MapMode maSavedMapMode;
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 65a83e7a68a7..b63b307435e2 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -57,8 +57,8 @@ public:
/// rows.
sal_Int32 mnMaxRowCount;
Size maPageObjectSize;
- std::shared_ptr<PageObjectLayouter> mpPageObjectLayouter;
- std::shared_ptr<view::Theme> mpTheme;
+ ::boost::shared_ptr<PageObjectLayouter> mpPageObjectLayouter;
+ ::boost::shared_ptr<view::Theme> mpTheme;
/** Specify how the gap between two page objects is associated with the
page objects.
@@ -201,7 +201,7 @@ public:
protected:
Implementation (
sd::Window *pWindow,
- const std::shared_ptr<view::Theme>& rpTheme);
+ const ::boost::shared_ptr<view::Theme>& rpTheme);
explicit Implementation (const Implementation& rImplementation);
virtual void CalculateRowAndColumnCount (const Size& rWindowSize) = 0;
@@ -272,7 +272,7 @@ class GridImplementation : public Layouter::Implementation
public:
GridImplementation (
sd::Window *pWindow,
- const std::shared_ptr<view::Theme>& rpTheme);
+ const ::boost::shared_ptr<view::Theme>& rpTheme);
explicit GridImplementation(const Implementation& rImplementation);
virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE;
@@ -293,7 +293,7 @@ protected:
Layouter::Layouter (
sd::Window *pWindow,
- const std::shared_ptr<Theme>& rpTheme)
+ const ::boost::shared_ptr<Theme>& rpTheme)
: mpImplementation(new GridImplementation(pWindow, rpTheme)),
mpWindow(pWindow)
{
@@ -303,7 +303,7 @@ Layouter::~Layouter()
{
}
-std::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const
+::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const
{
return mpImplementation->mpPageObjectLayouter;
}
@@ -428,7 +428,7 @@ Layouter::Implementation* Layouter::Implementation::Create (
Layouter::Implementation::Implementation (
sd::Window *pWindow,
- const std::shared_ptr<view::Theme>& rpTheme)
+ const ::boost::shared_ptr<view::Theme>& rpTheme)
: mpWindow(pWindow),
mnRequestedLeftBorder(5),
mnRequestedRightBorder(5),
@@ -1103,7 +1103,7 @@ void VerticalImplementation::CalculateLogicalInsertPosition (
GridImplementation::GridImplementation (
sd::Window *pWindow,
- const std::shared_ptr<view::Theme>& rpTheme)
+ const ::boost::shared_ptr<view::Theme>& rpTheme)
: Implementation(pWindow, rpTheme)
{
}
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 1d9444d145f3..91b7e8ef3346 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -33,8 +33,8 @@
#include <vcl/svapp.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/virdev.hxx>
+#include <boost/scoped_ptr.hpp>
#include "CustomAnimationEffect.hxx"
-#include <memory>
using namespace ::drawinglayer::primitive2d;
@@ -101,7 +101,7 @@ bool PageObjectPainter::UpdatePageObjectLayouter()
return true;
}
-void PageObjectPainter::SetTheme (const std::shared_ptr<view::Theme>& rpTheme)
+void PageObjectPainter::SetTheme (const ::boost::shared_ptr<view::Theme>& rpTheme)
{
mpTheme = rpTheme;
}
@@ -292,7 +292,7 @@ void PageObjectPainter::PaintCustomAnimationEffect (
const model::SharedPageDescriptor& rpDescriptor)
{
SdPage* pPage = rpDescriptor->GetPage();
- std::shared_ptr< MainSequence > aMainSequence = pPage->getMainSequence();
+ boost::shared_ptr< MainSequence > aMainSequence = pPage->getMainSequence();
EffectSequence::iterator aIter = aMainSequence->getBegin();
EffectSequence::iterator aEnd = aMainSequence->getEnd();
if ( aIter != aEnd )
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index f669b6ad4639..d7fddd2b7d5a 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -59,7 +59,7 @@ ColorData HGBAdapt (
nNewBrightness>=0 ? nNewBrightness : nBrightness);
}
-Theme::Theme (const std::shared_ptr<controller::Properties>& rpProperties)
+Theme::Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties)
: maBackgroundColor(rpProperties->GetBackgroundColor().GetColor()),
maPageBackgroundColor(COL_WHITE),
maGradients(),
@@ -82,7 +82,7 @@ Theme::Theme (const std::shared_ptr<controller::Properties>& rpProperties)
Update(rpProperties);
}
-void Theme::Update (const std::shared_ptr<controller::Properties>& rpProperties)
+void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpProperties)
{
// Set up colors.
maBackgroundColor = rpProperties->GetBackgroundColor().GetColor();
@@ -128,11 +128,11 @@ void Theme::Update (const std::shared_ptr<controller::Properties>& rpProperties)
}
}
-std::shared_ptr<vcl::Font> Theme::GetFont (
+::boost::shared_ptr<vcl::Font> Theme::GetFont (
const FontType eType,
const OutputDevice& rDevice)
{
- std::shared_ptr<vcl::Font> pFont;
+ ::boost::shared_ptr<vcl::Font> pFont;
switch (eType)
{
diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
index 3ad7c0ba7151..ffd9a825319c 100644
--- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
+++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
@@ -83,9 +83,9 @@ const SdrPage* ViewCacheContext::GetPage (cache::CacheKey aKey)
return static_cast<const SdrPage*>(aKey);
}
-std::shared_ptr<std::vector<cache::CacheKey> > ViewCacheContext::GetEntryList (bool bVisible)
+::boost::shared_ptr<std::vector<cache::CacheKey> > ViewCacheContext::GetEntryList (bool bVisible)
{
- std::shared_ptr<std::vector<cache::CacheKey> > pKeys (new std::vector<cache::CacheKey>());
+ ::boost::shared_ptr<std::vector<cache::CacheKey> > pKeys (new std::vector<cache::CacheKey>());
model::PageEnumeration aPageEnumeration (
bVisible
diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
index 02740539292a..19b814a73879 100644
--- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
+++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx
@@ -45,7 +45,7 @@ public:
virtual bool IsIdle() SAL_OVERRIDE;
virtual bool IsVisible (cache::CacheKey aKey) SAL_OVERRIDE;
virtual const SdrPage* GetPage (cache::CacheKey aKey) SAL_OVERRIDE;
- virtual std::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE;
+ virtual ::boost::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE;
virtual sal_Int32 GetPriority (cache::CacheKey aKey) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE;
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index c29e590c2ca4..8c5c05c7f6fa 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -500,8 +500,8 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle )
}
}
-typedef std::vector< std::shared_ptr< CellInfo > > CellInfoVector;
-typedef std::shared_ptr< CellInfo > CellInfoMatrix[nPreviewColumns][nPreviewRows];
+typedef std::vector< boost::shared_ptr< CellInfo > > CellInfoVector;
+typedef boost::shared_ptr< CellInfo > CellInfoMatrix[nPreviewColumns][nPreviewRows];
struct TableStyleSettings
{
@@ -550,7 +550,7 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe
for( sal_Int32 nCol = 0; nCol < nPreviewColumns; ++nCol )
{
- std::shared_ptr< CellInfo > xCellInfo;
+ boost::shared_ptr< CellInfo > xCellInfo;
// first and last row win first, if used and available
if( bFirstRow )
@@ -646,7 +646,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
sal_Int32 nX = 0;
for( sal_Int32 nCol = 0; nCol < nPreviewColumns; ++nCol, nX += nCellWidth-1 )
{
- std::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
+ boost::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
Color aTextColor( COL_AUTO );
if( xCellInfo.get() )
@@ -680,7 +680,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
sal_Int32 nX = 0;
for( sal_Int32 nCol = 0; nCol < nPreviewColumns; ++nCol, nX += nCellWidth-1 )
{
- std::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
+ boost::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
if( xCellInfo.get() )
{
@@ -704,7 +704,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
if( (nBorderCol >= 0) && (nBorderCol < nPreviewColumns) && (nBorderRow >= 0) && (nBorderRow < nPreviewRows) )
{
// check border
- std::shared_ptr< CellInfo > xBorderInfo( aMatrix[nBorderCol][nBorderRow] );
+ boost::shared_ptr< CellInfo > xBorderInfo( aMatrix[nBorderCol][nBorderRow] );
if( xBorderInfo.get() )
{
const ::editeng::SvxBorderLine* pBorderLine2 = xBorderInfo->maBorder.GetLine(static_cast<SvxBoxItemLine>(static_cast<int>(nLine)^1));
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index ecbe8931129a..419ab7cb7cc4 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -32,7 +32,7 @@
#include <vcl/button.hxx>
#include <svx/sidebar/PanelLayout.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd
{
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index e2129cc80373..b05d570298b3 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -63,7 +63,7 @@
#include "sdresid.hxx"
#include "undo/undoobjects.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::sd;
using namespace sdr::table;
@@ -128,7 +128,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
if( (nColumns == 0) || (nRows == 0) )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SvxAbstractNewTableDialog> pDlg( pFact ? pFact->CreateSvxNewTableDialog( NULL ) : 0);
+ boost::scoped_ptr<SvxAbstractNewTableDialog> pDlg( pFact ? pFact->CreateSvxNewTableDialog( NULL ) : 0);
if( !pDlg.get() || (pDlg->Execute() != RET_OK) )
break;
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 3fe246a6ab63..71df3dffe6eb 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -50,7 +50,7 @@
#include "tableobjectbar.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace sd;
using namespace sd::ui::table;
@@ -140,7 +140,7 @@ void TableObjectBar::Execute( SfxRequest& rReq )
case SID_TABLE_INSERT_COL_DLG:
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand()) : 0);
+ boost::scoped_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand()) : 0);
if( pDlg.get() && (pDlg->Execute() == 1) )
{
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index 81b7ab176041..b5b9645a6587 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -36,7 +36,7 @@
#include <svx/sdr/contact/viewobjectcontact.hxx>
#include <svx/sdr/contact/viewcontact.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -308,7 +308,7 @@ void PreviewRenderer::PaintPage (
}
// Use a special redirector to prevent PresObj shapes from being painted.
- std::unique_ptr<ViewRedirector> pRedirector;
+ boost::scoped_ptr<ViewRedirector> pRedirector;
if ( ! bDisplayPresentationObjects)
pRedirector.reset(new ViewRedirector());
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index d6c0a02cf701..88eab7dd0518 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -43,7 +43,7 @@ private:
typedef ::std::vector<SdGlobalResource*> ResourceList;
ResourceList maResources;
- typedef ::std::vector<std::shared_ptr<SdGlobalResource> > SharedResourceList;
+ typedef ::std::vector<boost::shared_ptr<SdGlobalResource> > SharedResourceList;
SharedResourceList maSharedResources;
typedef ::std::vector<Reference<XInterface> > XInterfaceResourceList;
@@ -89,7 +89,7 @@ void SdGlobalResourceContainer::AddResource (
}
void SdGlobalResourceContainer::AddResource (
- std::shared_ptr<SdGlobalResource> pResource)
+ ::boost::shared_ptr<SdGlobalResource> pResource)
{
::osl::MutexGuard aGuard (mpImpl->maMutex);
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index 039606ea62a1..a6b1299834ce 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -21,8 +21,8 @@
#include "tools/AsynchronousTask.hxx"
#include <tools/time.hxx>
#include <osl/diagnose.h>
+#include <boost/weak_ptr.hpp>
#include "sal/log.hxx"
-#include <memory>
namespace sd { namespace tools {
@@ -37,12 +37,12 @@ public:
}
};
-std::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create (
- const std::shared_ptr<AsynchronousTask>& rpTask,
+::boost::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create (
+ const ::boost::shared_ptr<AsynchronousTask>& rpTask,
sal_uInt32 nMillisecondsBetweenSteps,
sal_uInt32 nMaxTimePerStep)
{
- std::shared_ptr<TimerBasedTaskExecution> pExecution(
+ ::boost::shared_ptr<TimerBasedTaskExecution> pExecution(
new TimerBasedTaskExecution(rpTask,nMillisecondsBetweenSteps,nMaxTimePerStep),
Deleter());
// Let the new object have a shared_ptr to itself, so that it can
@@ -60,16 +60,16 @@ void TimerBasedTaskExecution::Release()
//static
void TimerBasedTaskExecution::ReleaseTask (
- const std::weak_ptr<TimerBasedTaskExecution>& rpExecution)
+ const ::boost::weak_ptr<TimerBasedTaskExecution>& rpExecution)
{
if ( ! rpExecution.expired())
{
try
{
- std::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution);
+ ::boost::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution);
pExecution->Release();
}
- catch (const std::bad_weak_ptr&)
+ catch (const ::boost::bad_weak_ptr&)
{
// When a bad_weak_ptr has been thrown then the object pointed
// to by rpTask has been released right after we checked that it
@@ -80,7 +80,7 @@ void TimerBasedTaskExecution::ReleaseTask (
}
TimerBasedTaskExecution::TimerBasedTaskExecution (
- const std::shared_ptr<AsynchronousTask>& rpTask,
+ const ::boost::shared_ptr<AsynchronousTask>& rpTask,
sal_uInt32 nMillisecondsBetweenSteps,
sal_uInt32 nMaxTimePerStep)
: mpTask(rpTask),
@@ -100,7 +100,7 @@ TimerBasedTaskExecution::~TimerBasedTaskExecution()
}
void TimerBasedTaskExecution::SetSelf (
- const std::shared_ptr<TimerBasedTaskExecution>& rpSelf)
+ const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf)
{
if (mpTask.get() != NULL)
mpSelf = rpSelf;
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index cc9f88a63305..78fcbe04db87 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -48,7 +48,7 @@
#include <sfx2/sidebar/EnumContext.hxx>
#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
-#include <memory>
+#include <boost/shared_ptr.hpp>
using namespace ::std;
using namespace ::cppu;
@@ -138,7 +138,7 @@ void SAL_CALL DrawController::dispose()
{
mbDisposing = true;
- std::shared_ptr<ViewShell> pViewShell;
+ boost::shared_ptr<ViewShell> pViewShell;
if (mpBase)
pViewShell = mpBase->GetMainViewShell();
if ( pViewShell )
@@ -508,7 +508,7 @@ void DrawController::FirePropertyChange (
void DrawController::BroadcastContextChange() const
{
- std::shared_ptr<ViewShell> pViewShell (mpBase->GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpBase->GetMainViewShell());
if ( ! pViewShell)
return;
@@ -703,7 +703,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor
FmFormShell* pFormShell = mpBase->GetFormShellManager()->GetFormShell();
SdrView* pSdrView = mpBase->GetDrawView();
- std::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL;
uno::Reference< form::runtime::XFormController > xController( NULL );
@@ -740,7 +740,7 @@ uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::
FmFormShell* pFormShell = mpBase->GetFormShellManager()->GetFormShell();
SdrView* pSdrView = mpBase->GetDrawView();
- std::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL;
uno::Reference< awt::XControl > xControl( NULL );
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 8a7d894b60d0..0a553f9222d8 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -28,7 +28,7 @@
#include "sal/types.h"
#include <string.h>
-#include <memory>
+#include <boost/shared_ptr.hpp>
#include <unordered_map>
using namespace com::sun::star;
@@ -46,8 +46,8 @@ enum FactoryId
typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap;
namespace {
-static std::shared_ptr<FactoryMap> spFactoryMap;
-std::shared_ptr<FactoryMap> GetFactoryMap()
+static ::boost::shared_ptr<FactoryMap> spFactoryMap;
+::boost::shared_ptr<FactoryMap> GetFactoryMap()
{
if (spFactoryMap.get() == NULL)
{
@@ -76,7 +76,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory(
uno::Reference<lang::XSingleServiceFactory> xFactory;
uno::Reference<lang::XSingleComponentFactory> xComponentFactory;
- std::shared_ptr<FactoryMap> pFactoryMap (GetFactoryMap());
+ ::boost::shared_ptr<FactoryMap> pFactoryMap (GetFactoryMap());
OUString sImplementationName (OUString::createFromAscii(pImplName));
FactoryMap::const_iterator iFactory (pFactoryMap->find(sImplementationName));
if (iFactory != pFactoryMap->end())
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 86df4579f849..81dc5b7daa86 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -68,7 +68,7 @@ namespace {
public:
PrintOptions (
const vcl::PrinterOptionsHelper& rHelper,
- const std::vector<sal_Int32>& rSlidesPerPage)
+ const ::std::vector<sal_Int32>& rSlidesPerPage)
: mrProperties(rHelper),
maSlidesPerPage(rSlidesPerPage)
{
@@ -221,7 +221,7 @@ namespace {
private:
const vcl::PrinterOptionsHelper& mrProperties;
- const std::vector<sal_Int32> maSlidesPerPage;
+ const ::std::vector<sal_Int32> maSlidesPerPage;
/** When the value of the property with name pName is a boolean then
return its value. When the property is unknown then
@@ -353,14 +353,14 @@ namespace {
}
}
- std::vector<sal_Int32> GetSlidesPerPage() const
+ ::std::vector<sal_Int32> GetSlidesPerPage() const
{
return maSlidesPerPage;
}
private:
- std::vector<beans::PropertyValue> maProperties;
- std::vector<sal_Int32> maSlidesPerPage;
+ ::std::vector<beans::PropertyValue> maProperties;
+ ::std::vector<sal_Int32> maSlidesPerPage;
bool mbImpress;
sal_Int32 mnCurPage;
@@ -799,9 +799,9 @@ namespace {
// Print at least two rows and columns. More if the document
// page fits completely onto the printer page.
- const sal_Int32 nColumnCount (std::max(sal_Int32(2),
+ const sal_Int32 nColumnCount (::std::max(sal_Int32(2),
sal_Int32(aPrintSize.Width() / nPageWidth)));
- const sal_Int32 nRowCount (std::max(sal_Int32(2),
+ const sal_Int32 nRowCount (::std::max(sal_Int32(2),
sal_Int32(aPrintSize.Height() / nPageHeight)));
for (sal_Int32 nRow=0; nRow<nRowCount; ++nRow)
for (sal_Int32 nColumn=0; nColumn<nColumnCount; ++nColumn)
@@ -913,7 +913,7 @@ namespace {
public:
HandoutPrinterPage (
const sal_uInt16 nHandoutPageIndex,
- const std::vector<sal_uInt16>& rPageIndices,
+ const ::std::vector<sal_uInt16>& rPageIndices,
const MapMode& rMapMode,
const OUString& rsPageString,
const Point& rPageStringOffset,
@@ -1045,7 +1045,7 @@ namespace {
private:
const sal_uInt16 mnHandoutPageIndex;
- const std::vector<sal_uInt16> maPageIndices;
+ const ::std::vector<sal_uInt16> maPageIndices;
};
/** The outline information (title, subtitle, outline objects) of the
@@ -1119,7 +1119,7 @@ namespace {
}
private:
- std::unique_ptr<OutlinerParaObject> mpParaObject;
+ ::boost::scoped_ptr<OutlinerParaObject> mpParaObject;
};
}
@@ -1247,23 +1247,23 @@ public:
Printer& rPrinter (*mpPrinter);
- std::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
if ( ! pViewShell)
return;
SdDrawDocument* pDocument = pViewShell->GetDoc();
OSL_ASSERT(pDocument!=NULL);
- std::shared_ptr<DrawViewShell> pDrawViewShell(
- std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
+ ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
- if (!mpPrintView)
+ if ( ! mpPrintView)
mpPrintView.reset(new DrawView(mrBase.GetDocShell(), &rPrinter, NULL));
if (nIndex<0 || sal::static_int_cast<sal_uInt32>(nIndex)>=maPrinterPages.size())
return;
- const std::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]);
+ const ::boost::shared_ptr<PrinterPage> pPage (maPrinterPages[nIndex]);
OSL_ASSERT(pPage);
if ( ! pPage)
return;
@@ -1322,11 +1322,11 @@ private:
bool mbIsDisposed;
VclPtr<Printer> mpPrinter;
Size maPrinterPageSizePixel;
- std::unique_ptr<PrintOptions> mpOptions;
- std::vector< std::shared_ptr< ::sd::PrinterPage> > maPrinterPages;
- std::unique_ptr<DrawView> mpPrintView;
+ ::boost::scoped_ptr<PrintOptions> mpOptions;
+ ::std::vector< ::boost::shared_ptr< ::sd::PrinterPage> > maPrinterPages;
+ ::boost::scoped_ptr<DrawView> mpPrintView;
bool mbHasOrientationWarningBeenShown;
- std::vector<sal_Int32> maSlidesPerPage;
+ ::std::vector<sal_Int32> maSlidesPerPage;
awt::Size maPrintSize;
void Dispose()
@@ -1620,7 +1620,7 @@ private:
long nPageH = aOutRect.GetHeight();
- std::vector< sal_Int32 > aPages;
+ ::std::vector< sal_Int32 > aPages;
sal_Int32 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
StringRangeEnumerator::getRangesFromString(
mpOptions->GetPrinterSelection(nPageCount, GetCurrentPageIndex()),
@@ -1724,7 +1724,7 @@ private:
}
maPrinterPages.push_back(
- std::shared_ptr<PrinterPage>(
+ ::boost::shared_ptr<PrinterPage>(
new OutlinerPrinterPage(
pOutliner->CreateParaObject(),
aMap,
@@ -1798,7 +1798,7 @@ private:
aMap.SetOrigin(Point());
}
- std::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
pViewShell->WriteFrameViewData();
// Count page shapes.
@@ -1820,7 +1820,7 @@ private:
StringRangeEnumerator aRangeEnum(
mpOptions->GetPrinterSelection(nPageCount, GetCurrentPageIndex()),
0, nPageCount-1);
- std::vector<sal_uInt16> aPageIndices;
+ ::std::vector<sal_uInt16> aPageIndices;
sal_uInt16 nPrinterPageIndex = 0;
StringRangeEnumerator::Iterator it = aRangeEnum.begin(), itEnd = aRangeEnum.end();
bool bLastLoop = (it == itEnd);
@@ -1840,7 +1840,7 @@ private:
if (!aPageIndices.empty() && (aPageIndices.size() == nShapeCount || bLastLoop))
{
maPrinterPages.push_back(
- std::shared_ptr<PrinterPage>(
+ ::boost::shared_ptr<PrinterPage>(
new HandoutPrinterPage(
nPrinterPageIndex++,
aPageIndices,
@@ -1889,7 +1889,7 @@ private:
const PageKind ePageKind,
PrintInfo& rInfo)
{
- std::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
pViewShell->WriteFrameViewData();
sal_Int32 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
@@ -2022,7 +2022,7 @@ private:
StringRangeEnumerator aRangeEnum(
mpOptions->GetPrinterSelection(nPageCount, GetCurrentPageIndex()),
0, nPageCount-1);
- std::vector< sal_uInt16 > aPageVector;
+ ::std::vector< sal_uInt16 > aPageVector;
for (StringRangeEnumerator::Iterator
it = aRangeEnum.begin(),
itEnd = aRangeEnum.end();
@@ -2035,23 +2035,23 @@ private:
}
// create pairs of pages to print on each page
- typedef std::vector< std::pair< sal_uInt16, sal_uInt16 > > PairVector;
+ typedef ::std::vector< ::std::pair< sal_uInt16, sal_uInt16 > > PairVector;
PairVector aPairVector;
if ( ! aPageVector.empty())
{
sal_uInt32 nFirstIndex = 0, nLastIndex = aPageVector.size() - 1;
if( aPageVector.size() & 1 )
- aPairVector.push_back( std::make_pair( (sal_uInt16) 65535, aPageVector[ nFirstIndex++ ] ) );
+ aPairVector.push_back( ::std::make_pair( (sal_uInt16) 65535, aPageVector[ nFirstIndex++ ] ) );
else
- aPairVector.push_back( std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
+ aPairVector.push_back( ::std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
while( nFirstIndex < nLastIndex )
{
if( nFirstIndex & 1 )
- aPairVector.push_back( std::make_pair( aPageVector[ nFirstIndex++ ], aPageVector[ nLastIndex-- ] ) );
+ aPairVector.push_back( ::std::make_pair( aPageVector[ nFirstIndex++ ], aPageVector[ nLastIndex-- ] ) );
else
- aPairVector.push_back( std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
+ aPairVector.push_back( ::std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
}
}
@@ -2065,14 +2065,14 @@ private:
if ((!bIsIndexOdd && mpOptions->IsPrintFrontPage())
|| (bIsIndexOdd && mpOptions->IsPrintBackPage()))
{
- const std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]);
+ const ::std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]);
Point aSecondOffset (aOffset);
if (rInfo.meOrientation == ORIENTATION_LANDSCAPE)
aSecondOffset.X() += aAdjustedPrintSize.Width() / 2;
else
aSecondOffset.Y() += aAdjustedPrintSize.Height() / 2;
maPrinterPages.push_back(
- std::shared_ptr<PrinterPage>(
+ ::boost::shared_ptr<PrinterPage>(
new BookletPrinterPage(
aPair.first,
aPair.second,
@@ -2105,7 +2105,7 @@ private:
nPaperBin = rInfo.mpPrinter->GetPaperBin();
maPrinterPages.push_back(
- std::shared_ptr<PrinterPage>(
+ ::boost::shared_ptr<PrinterPage>(
new TiledPrinterPage(
sal::static_int_cast<sal_uInt16>(nPageIndex),
ePageKind,
@@ -2153,7 +2153,7 @@ private:
// if CutPage is set then do not move it, otherwise move the
// scaled page to printable area
maPrinterPages.push_back(
- std::shared_ptr<PrinterPage>(
+ ::boost::shared_ptr<PrinterPage>(
new RegularPrinterPage(
sal::static_int_cast<sal_uInt16>(nPageIndex),
ePageKind,
@@ -2189,7 +2189,7 @@ private:
{
aMap.SetOrigin(aPageOrigin);
maPrinterPages.push_back(
- std::shared_ptr<PrinterPage>(
+ ::boost::shared_ptr<PrinterPage>(
new RegularPrinterPage(
sal::static_int_cast<sal_uInt16>(nPageIndex),
ePageKind,
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 7c191ae057c7..64d7884823ff 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -39,7 +39,7 @@
#include "drawview.hxx"
#include "sdresid.hxx"
#include "drawdoc.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace sd;
@@ -86,7 +86,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet )
{
if( SID_AVMEDIA_TOOLBOX == nWhich )
{
- std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
+ boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
bool bDisable = true;
if( 1 == pMarkList->GetMarkCount() )
@@ -123,7 +123,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq )
if( pItem )
{
- std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
+ boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() ));
if( 1 == pMarkList->GetMarkCount() )
{
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 29521588152b..c1964def738c 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -104,7 +104,7 @@ public:
*/
void ProvideOutlinerView (
Outliner& rOutliner,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
vcl::Window* pWindow);
/** This method is called when the OutlinerView is no longer used.
@@ -256,7 +256,7 @@ void Outliner::PrepareSpelling()
SetViewShell (pBase->GetMainViewShell());
SetRefDevice( SD_MOD()->GetRefDevice( *mpDrawDocument->GetDocSh() ) );
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell)
{
mbStringFound = false;
@@ -291,8 +291,8 @@ void Outliner::StartSpelling()
void Outliner::EndSpelling()
{
// Keep old view shell alive until we release the outliner view.
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- std::shared_ptr<ViewShell> pOldViewShell (pViewShell);
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pOldViewShell (pViewShell);
ViewShellBase* pBase = PTR_CAST(ViewShellBase,SfxViewShell::Current());
if (pBase != NULL)
@@ -353,7 +353,7 @@ void Outliner::EndSpelling()
bool Outliner::SpellNextDocument()
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell->ISA(OutlineViewShell))
{
// When doing a spell check in the outline view then there is
@@ -445,7 +445,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
bool bAbort = false;
if (pBase != NULL)
{
- std::shared_ptr<ViewShell> pShell (pBase->GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> pShell (pBase->GetMainViewShell());
SetViewShell(pShell);
if (pShell.get() == NULL)
bAbort = true;
@@ -465,7 +465,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
}
}
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -523,7 +523,7 @@ void Outliner::Initialize (bool bDirectionIsForward)
maObjectIterator = ::sd::outliner::OutlinerContainer(this).current();
maCurrentPosition = *maObjectIterator;
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -584,7 +584,7 @@ bool Outliner::SearchAndReplaceAll()
// matches.
RememberStartPosition ();
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -637,7 +637,7 @@ bool Outliner::SearchAndReplaceOnce()
if( NULL == pOutlinerView || !GetEditEngine().HasView( &pOutlinerView->GetEditView() ) )
return true;
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell != 0)
{
mpView = pViewShell->GetView();
@@ -731,9 +731,9 @@ void Outliner::DetectChange()
{
::sd::outliner::IteratorPosition aPosition (maCurrentPosition);
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
// Detect whether the view has been switched from the outside.
if (pDrawViewShell.get() != NULL
@@ -825,7 +825,7 @@ bool Outliner::DetectSelectionChange()
void Outliner::RememberStartPosition()
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -837,8 +837,8 @@ void Outliner::RememberStartPosition()
if (pViewShell->ISA(DrawViewShell))
{
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
if (pDrawViewShell.get() != NULL)
{
meStartViewMode = pDrawViewShell->GetPageKind();
@@ -884,7 +884,7 @@ void Outliner::RestoreStartPosition()
if (mnStartPageIndex == (sal_uInt16)-1 )
bRestore = false;
// Dont't restore when the view shell is not valid.
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell == 0)
bRestore = false;
@@ -892,8 +892,8 @@ void Outliner::RestoreStartPosition()
{
if (pViewShell->ISA(DrawViewShell))
{
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
SetViewMode (meStartViewMode);
if (pDrawViewShell.get() != NULL)
SetPage (meStartEditMode, mnStartPageIndex);
@@ -959,7 +959,7 @@ void Outliner::ProvideNextTextObject()
{
PutTextIntoOutliner ();
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell != 0)
switch (meMode)
{
@@ -986,7 +986,7 @@ void Outliner::ProvideNextTextObject()
void Outliner::EndOfSearch()
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if ( ! pViewShell)
{
OSL_ASSERT(pViewShell);
@@ -1185,9 +1185,9 @@ void Outliner::PrepareSearchAndReplace()
void Outliner::SetViewMode (PageKind ePageKind)
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- std::shared_ptr<DrawViewShell> pDrawViewShell(
- std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
if (pDrawViewShell.get()!=NULL && ePageKind != pDrawViewShell->GetPageKind())
{
// Restore old edit mode.
@@ -1214,7 +1214,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
bool bMatchMayExist = mbMatchMayExist;
ViewShellBase& rBase = pViewShell->GetViewShellBase();
- SetViewShell(std::shared_ptr<ViewShell>());
+ SetViewShell(::boost::shared_ptr<ViewShell>());
framework::FrameworkHelper::Instance(rBase)->RequestView(
sViewURL,
framework::FrameworkHelper::msCenterPaneURL);
@@ -1240,7 +1240,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
// Save edit mode so that it can be restored when switching the view
// shell again.
- pDrawViewShell = std::dynamic_pointer_cast<DrawViewShell>(pViewShell);
+ pDrawViewShell = ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell);
OSL_ASSERT(pDrawViewShell.get()!=NULL);
if (pDrawViewShell.get() != NULL)
mpImpl->meOriginalEditMode = pDrawViewShell->GetEditMode();
@@ -1251,9 +1251,9 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex)
{
if ( ! mbRestrictSearchToSelection)
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
- std::shared_ptr<DrawViewShell> pDrawViewShell(
- std::dynamic_pointer_cast<DrawViewShell>(pViewShell));
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
+ ::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
OSL_ASSERT(pDrawViewShell.get()!=NULL);
if (pDrawViewShell.get() != NULL)
{
@@ -1274,7 +1274,7 @@ void Outliner::EnterEditMode (bool bGrabFocus)
// Make FuText the current function.
SfxUInt16Item aItem (SID_TEXTEDIT, 1);
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
pViewShell->GetDispatcher()->
Execute(SID_TEXTEDIT, SfxCallMode::SYNCHRON |
SfxCallMode::RECORD, &aItem, 0L);
@@ -1370,9 +1370,9 @@ SdrObject* Outliner::SetObject (
return rPosition.mxObject.get();
}
-void Outliner::SetViewShell (const std::shared_ptr<ViewShell>& rpViewShell)
+void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell)
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell != rpViewShell)
{
// Set the new view shell.
@@ -1424,7 +1424,7 @@ void Outliner::HandleChangedSelection()
void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive )
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
bool bMultiDoc = pViewShell->ISA(DrawViewShell);
meMode = TEXT_CONVERSION;
@@ -1481,7 +1481,7 @@ void Outliner::BeginConversion()
if (pBase != NULL)
SetViewShell (pBase->GetMainViewShell());
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell)
{
mbStringFound = false;
@@ -1509,7 +1509,7 @@ void Outliner::EndConversion()
bool Outliner::ConvertNextDocument()
{
- std::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
+ ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell && pViewShell->ISA(OutlineViewShell) )
return false;
@@ -1611,7 +1611,7 @@ Outliner::Implementation::~Implementation()
*/
void Outliner::Implementation::ProvideOutlinerView (
Outliner& rOutliner,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
vcl::Window* pWindow)
{
if (rpViewShell.get() != NULL)
@@ -1646,7 +1646,7 @@ void Outliner::Implementation::ProvideOutlinerView (
rOutliner.SetText(OUString(), rOutliner.GetParagraph(0));
meOriginalEditMode =
- std::static_pointer_cast<DrawViewShell>(rpViewShell)->GetEditMode();
+ ::boost::static_pointer_cast<DrawViewShell>(rpViewShell)->GetEditMode();
}
break;
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 1186b60527c7..2fcd500b986f 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -197,7 +197,7 @@ Iterator OutlinerContainer::CreateIterator (IteratorLocation aLocation)
Iterator OutlinerContainer::CreateSelectionIterator (
const ::std::vector<SdrObjectWeakRef>& rObjectList,
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward,
IteratorLocation aLocation)
{
@@ -236,7 +236,7 @@ Iterator OutlinerContainer::CreateSelectionIterator (
Iterator OutlinerContainer::CreateDocumentIterator (
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
bool bDirectionIsForward,
IteratorLocation aLocation)
{
@@ -275,8 +275,8 @@ Iterator OutlinerContainer::CreateDocumentIterator (
break;
case CURRENT:
- const std::shared_ptr<DrawViewShell> pDrawViewShell(
- std::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
+ const ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
+ ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
if (pDrawViewShell.get())
{
ePageKind = pDrawViewShell->GetPageKind();
@@ -300,7 +300,7 @@ Iterator OutlinerContainer::CreateDocumentIterator (
sal_Int32 OutlinerContainer::GetPageIndex (
SdDrawDocument* pDocument,
- const std::shared_ptr<ViewShell>& rpViewShell,
+ const ::boost::shared_ptr<ViewShell>& rpViewShell,
PageKind ePageKind,
EditMode eEditMode,
bool bDirectionIsForward,
@@ -311,8 +311,8 @@ sal_Int32 OutlinerContainer::GetPageIndex (
sal_Int32 nPageIndex;
sal_Int32 nPageCount;
- const std::shared_ptr<DrawViewShell> pDrawViewShell(
- std::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
+ const ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
+ ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
switch (eEditMode)
{
@@ -363,16 +363,16 @@ sal_Int32 OutlinerContainer::GetPageIndex (
//===== IteratorImplBase ====================================================
IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: maPosition()
, mpDocument (pDocument)
, mpViewShellWeak (rpViewShellWeak)
, mbDirectionIsForward (bDirectionIsForward)
{
- std::shared_ptr<DrawViewShell> pDrawViewShell;
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell;
if ( ! mpViewShellWeak.expired())
- pDrawViewShell = std::dynamic_pointer_cast<DrawViewShell>(rpViewShellWeak.lock());
+ pDrawViewShell = ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShellWeak.lock());
if (pDrawViewShell.get())
{
@@ -387,7 +387,7 @@ IteratorImplBase::IteratorImplBase(SdDrawDocument* pDocument,
}
IteratorImplBase::IteratorImplBase( SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode)
: maPosition()
, mpDocument (pDocument)
@@ -442,7 +442,7 @@ SelectionIteratorImpl::SelectionIteratorImpl (
const ::std::vector<SdrObjectWeakRef>& rObjectList,
sal_Int32 nObjectIndex,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: IteratorImplBase (pDocument, rpViewShellWeak, bDirectionIsForward),
mrObjectList(rObjectList),
@@ -542,7 +542,7 @@ bool SelectionIteratorImpl::IsEqual (
ViewIteratorImpl::ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: IteratorImplBase (pDocument, rpViewShellWeak, bDirectionIsForward),
mbPageChangeOccurred(false),
@@ -555,7 +555,7 @@ ViewIteratorImpl::ViewIteratorImpl (
ViewIteratorImpl::ViewIteratorImpl (
sal_Int32 nPageIndex,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward,
PageKind ePageKind,
EditMode eEditMode)
@@ -729,7 +729,7 @@ DocumentIteratorImpl::DocumentIteratorImpl (
sal_Int32 nPageIndex,
PageKind ePageKind, EditMode eEditMode,
SdDrawDocument* pDocument,
- const std::weak_ptr<ViewShell>& rpViewShellWeak,
+ const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
bool bDirectionIsForward)
: ViewIteratorImpl (nPageIndex, pDocument, rpViewShellWeak, bDirectionIsForward,
ePageKind, eEditMode)
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index ee078591fd6b..053989d79800 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -151,8 +151,8 @@ public:
This ViewShellManager is used to activate or deactivate shells.
*/
void UpdateShells (
- const std::shared_ptr<ViewShell>& rpMainViewShell,
- const std::shared_ptr<ViewShellManager>& rpManager);
+ const ::boost::shared_ptr<ViewShell>& rpMainViewShell,
+ const ::boost::shared_ptr<ViewShellManager>& rpManager);
private:
class ShellDescriptor
@@ -184,8 +184,8 @@ class ToolBarRules
{
public:
ToolBarRules (
- const std::shared_ptr<ToolBarManager>& rpToolBarManager,
- const std::shared_ptr<ViewShellManager>& rpViewShellManager);
+ const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager,
+ const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager);
/** This method calls MainViewShellChanged() and SelectionHasChanged()
for the current main view shell and its view.
@@ -222,8 +222,8 @@ public:
sd::ShellId nShellId);
private:
- std::shared_ptr<ToolBarManager> mpToolBarManager;
- std::shared_ptr<ViewShellManager> mpViewShellManager;
+ ::boost::shared_ptr<ToolBarManager> mpToolBarManager;
+ ::boost::shared_ptr<ViewShellManager> mpViewShellManager;
};
} // end of anonymous namespace
@@ -243,9 +243,9 @@ public:
*/
Implementation (
ViewShellBase& rBase,
- const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
- const std::shared_ptr<ViewShellManager>& rpViewShellManager,
- const std::shared_ptr<ToolBarManager>& rpToolBarManager);
+ const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
+ const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager);
~Implementation();
void SetValid (bool bValid);
@@ -300,7 +300,7 @@ private:
mutable ::osl::Mutex maMutex;
ViewShellBase& mrBase;
- std::shared_ptr<sd::tools::EventMultiplexer> mpEventMultiplexer;
+ ::boost::shared_ptr<sd::tools::EventMultiplexer> mpEventMultiplexer;
bool mbIsValid;
ToolBarList maToolBarList;
ToolBarShellList maToolBarShellList;
@@ -346,12 +346,12 @@ const OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar");
const OUString ToolBarManager::msMediaObjectBar("mediaobjectbar");
const OUString ToolBarManager::msTableObjectBar("tableobjectbar");
-std::shared_ptr<ToolBarManager> ToolBarManager::Create (
+::boost::shared_ptr<ToolBarManager> ToolBarManager::Create (
ViewShellBase& rBase,
- const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
- const std::shared_ptr<ViewShellManager>& rpViewShellManager)
+ const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager)
{
- std::shared_ptr<ToolBarManager> pManager (new ToolBarManager());
+ ::boost::shared_ptr<ToolBarManager> pManager (new ToolBarManager());
pManager->mpImpl.reset(
new Implementation(rBase,rpMultiplexer,rpViewShellManager,pManager));
return pManager;
@@ -515,9 +515,9 @@ const OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:
ToolBarManager::Implementation::Implementation (
ViewShellBase& rBase,
- const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
- const std::shared_ptr<ViewShellManager>& rpViewShellManager,
- const std::shared_ptr<ToolBarManager>& rpToolBarManager)
+ const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+ const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
+ const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager)
: maMutex(),
mrBase(rBase),
mpEventMultiplexer(rpMultiplexer),
@@ -954,8 +954,8 @@ LayouterLock::~LayouterLock()
//===== ToolBarRules ==========================================================
ToolBarRules::ToolBarRules (
- const std::shared_ptr<sd::ToolBarManager>& rpToolBarManager,
- const std::shared_ptr<sd::ViewShellManager>& rpViewShellManager)
+ const ::boost::shared_ptr<sd::ToolBarManager>& rpToolBarManager,
+ const ::boost::shared_ptr<sd::ViewShellManager>& rpViewShellManager)
: mpToolBarManager(rpToolBarManager),
mpViewShellManager(rpViewShellManager)
{
@@ -1397,8 +1397,8 @@ void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules)
}
void ToolBarShellList::UpdateShells (
- const std::shared_ptr<ViewShell>& rpMainViewShell,
- const std::shared_ptr<ViewShellManager>& rpManager)
+ const ::boost::shared_ptr<ViewShell>& rpMainViewShell,
+ const ::boost::shared_ptr<ViewShellManager>& rpManager)
{
if (rpMainViewShell.get() != NULL)
{
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 461d9bf05f26..a6fda969ca9f 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -140,10 +140,10 @@ public:
It does not include the ViewTabBar.
*/
VclPtr<vcl::Window> mpViewWindow;
- std::shared_ptr<ToolBarManager> mpToolBarManager;
- std::shared_ptr<ViewShellManager> mpViewShellManager;
- std::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer;
- std::shared_ptr<FormShellManager> mpFormShellManager;
+ ::boost::shared_ptr<ToolBarManager> mpToolBarManager;
+ ::boost::shared_ptr<ViewShellManager> mpViewShellManager;
+ ::boost::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer;
+ ::boost::shared_ptr<FormShellManager> mpFormShellManager;
Implementation (ViewShellBase& rBase);
~Implementation();
@@ -191,7 +191,7 @@ private:
order to ensure that it stays alive while the ViewShellBase is
alive.
*/
- std::shared_ptr<slidesorter::cache::PageCacheManager> mpPageCacheManager;
+ ::boost::shared_ptr<slidesorter::cache::PageCacheManager> mpPageCacheManager;
};
namespace {
@@ -313,7 +313,7 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
if (sView.isEmpty())
sView = GetInitialViewShellType();
- std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*this));
+ ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*this));
// Create the resource ids for the center pane and view.
const Reference<drawing::framework::XResourceId> xCenterPaneId (
@@ -359,14 +359,14 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
}
}
-std::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager() const
+::boost::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager() const
{
return mpImpl->mpViewShellManager;
}
-std::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell() const
+::boost::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell() const
{
- std::shared_ptr<ViewShell> pMainViewShell (
+ ::boost::shared_ptr<ViewShell> pMainViewShell (
framework::FrameworkHelper::Instance(*const_cast<ViewShellBase*>(this))
->GetViewShell(framework::FrameworkHelper::msCenterPaneURL));
if (pMainViewShell.get() == NULL)
@@ -423,7 +423,7 @@ void ViewShellBase::InitializeFramework()
OUString ViewShellBase::GetSelectionText(bool bCompleteWords)
{
- std::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
DrawViewShell *const pDrawViewShell(
dynamic_cast<DrawViewShell*>(pMainShell.get()));
return (pDrawViewShell)
@@ -433,7 +433,7 @@ OUString ViewShellBase::GetSelectionText(bool bCompleteWords)
bool ViewShellBase::HasSelection(bool bText) const
{
- std::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
+ ::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell());
DrawViewShell *const pDrawViewShell(
dynamic_cast<DrawViewShell*>(pMainShell.get()));
return (pDrawViewShell)
@@ -538,8 +538,8 @@ sal_uInt16 ViewShellBase::SetPrinter (
bScaleAll = (aWarnBox->Execute() == RET_YES);
}
- std::shared_ptr<DrawViewShell> pDrawViewShell (
- std::dynamic_pointer_cast<DrawViewShell>(GetMainViewShell()));
+ ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
+ ::boost::dynamic_pointer_cast<DrawViewShell>(GetMainViewShell()));
if (pDrawViewShell)
{
SdPage* pPage = GetDocument()->GetSdPage(
@@ -903,7 +903,7 @@ OUString ViewShellBase::GetInitialViewShellType()
return sRequestedView;
}
-std::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer()
+::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer()
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=NULL);
@@ -916,7 +916,7 @@ const Rectangle& ViewShellBase::getClientRectangle() const
return mpImpl->maClientArea;
}
-std::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
+::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpToolBarManager.get()!=NULL);
@@ -924,7 +924,7 @@ std::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
return mpImpl->mpToolBarManager;
}
-std::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const
+::boost::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const
{
OSL_ASSERT(mpImpl.get()!=NULL);
OSL_ASSERT(mpImpl->mpFormShellManager.get()!=NULL);
@@ -1041,7 +1041,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot()
pFrameView->GetPageKindOnLoad());
pFrameView->SetPageKind(
pFrameView->GetPageKindOnLoad());
- std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(mrBase));
+ ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(mrBase));
pHelper->RequestView(
FrameworkHelper::GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
FrameworkHelper::msCenterPaneURL);
@@ -1387,7 +1387,7 @@ void FocusForwardingWindow::dispose()
void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt)
{
- std::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
if (pViewShell.get() != NULL)
{
vcl::Window* pWindow = pViewShell->GetActiveWindow();
@@ -1404,7 +1404,7 @@ void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt)
void FocusForwardingWindow::Command (const CommandEvent& rEvent)
{
- std::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell();
if (pViewShell.get() != NULL)
{
vcl::Window* pWindow = pViewShell->GetActiveWindow();
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 970e9db8a05f..a0c190512df9 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -77,7 +77,7 @@ ViewShell::Implementation::~Implementation()
{
if ( ! mpUpdateLockForMouse.expired())
{
- std::shared_ptr<ToolBarManagerLock> pLock(mpUpdateLockForMouse);
+ ::boost::shared_ptr<ToolBarManagerLock> pLock(mpUpdateLockForMouse);
if (pLock.get() != NULL)
{
// Force the ToolBarManagerLock to be released even when the
@@ -328,11 +328,11 @@ class ViewShell::Implementation::ToolBarManagerLock::Deleter { public:
void operator() (ToolBarManagerLock* pObject) { delete pObject; }
};
-std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock>
+::boost::shared_ptr<ViewShell::Implementation::ToolBarManagerLock>
ViewShell::Implementation::ToolBarManagerLock::Create (
- const std::shared_ptr<ToolBarManager>& rpManager)
+ const ::boost::shared_ptr<ToolBarManager>& rpManager)
{
- std::shared_ptr<ToolBarManagerLock> pLock (
+ ::boost::shared_ptr<ToolBarManagerLock> pLock (
new ViewShell::Implementation::ToolBarManagerLock(rpManager),
ViewShell::Implementation::ToolBarManagerLock::Deleter());
pLock->mpSelf = pLock;
@@ -340,7 +340,7 @@ std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock>
}
ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock (
- const std::shared_ptr<ToolBarManager>& rpManager)
+ const ::boost::shared_ptr<ToolBarManager>& rpManager)
: mpLock(new ToolBarManager::UpdateLock(rpManager)),
maTimer()
{
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index be7b3fc0cdc4..fea331f1813f 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -72,7 +72,7 @@
#include "Outliner.hxx"
#include "futext.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -87,7 +87,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
sal_uInt16 nSlot = rReq.GetSlot();
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
- std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
+ boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
if (mpView->ISA(OutlineView))
{
@@ -154,7 +154,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) );
aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes"
const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aAttr.Get( EE_PARA_ULSPACE ) );
- std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
+ boost::scoped_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )
@@ -195,7 +195,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
SfxItemSet aNewAttrs(*(aEditAttr.GetPool()), aEditAttr.GetRanges());
const SvxULSpaceItem& rItem = static_cast<const SvxULSpaceItem&>( aEditAttr.Get( EE_PARA_ULSPACE ) );
- std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
+ boost::scoped_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 358d3cea0075..103a892d7419 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -171,7 +171,7 @@
#include <sfx2/sidebar/Sidebar.hxx>
#include "ViewShellBase.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace {
const char CustomAnimationPanelId[] = "CustomAnimationPanel";
@@ -427,7 +427,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
+ boost::scoped_ptr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ));
DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetText( aTitle );
aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true );
@@ -801,7 +801,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_SET_DEFAULT:
{
- std::unique_ptr<SfxItemSet> pSet;
+ boost::scoped_ptr<SfxItemSet> pSet;
if (mpDrawView->IsTextEdit())
{
@@ -876,7 +876,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
std::pair<SfxItemSet*,SdrObjUserCall*> &rAttr = aAttrList[j++];
- std::unique_ptr<SfxItemSet> pNewSet(rAttr.first);
+ boost::scoped_ptr<SfxItemSet> pNewSet(rAttr.first);
SdrObjUserCall* pUserCall = rAttr.second;
if ( pNewSet && pNewSet->GetItemState( SDRATTR_TEXT_MINFRAMEHEIGHT ) == SfxItemState::SET )
@@ -1398,7 +1398,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( SdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : 0);
+ boost::scoped_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : 0);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
@@ -1566,7 +1566,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( SdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : 0);
+ boost::scoped_ptr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : 0);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
@@ -1836,7 +1836,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_INSERT_FLD_FILE:
{
sal_uInt16 nMul = 1;
- std::unique_ptr<SvxFieldItem> pFieldItem;
+ boost::scoped_ptr<SvxFieldItem> pFieldItem;
switch( nSId )
{
@@ -1976,12 +1976,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
// Dialog...
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOLV->GetAttribs() ) : 0);
+ boost::scoped_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOLV->GetAttribs() ) : 0);
if( pDlg && pDlg->Execute() == RET_OK )
{
// To make a correct SetAttribs() call at the utlinerView
// it is necessary to split the actions here
- std::unique_ptr<SvxFieldData> pField(pDlg->GetField());
+ boost::scoped_ptr<SvxFieldData> pField(pDlg->GetField());
ESelection aSel = pOLV->GetSelection();
bool bSelectionWasModified(false);
@@ -2085,7 +2085,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
+ boost::scoped_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
@@ -2118,7 +2118,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
+ boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
@@ -2366,7 +2366,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
if( pFact )
{
- std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nAnz) ));
+ boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateBreakDlg(GetActiveWindow(), mpDrawView, GetDocSh(), nCount, static_cast<sal_uLong>(nAnz) ));
if( pDlg )
{
pDlg->Execute();
@@ -2880,7 +2880,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
+ boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
GetActiveWindow(),
GetDoc()) : 0);
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index a6ec31ef3df4..f95eacae4b19 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -84,7 +84,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <editeng/lspcitem.hxx>
#include <editeng/ulspitem.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
@@ -293,7 +293,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_INSERT_DATE_TIME:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0);
+ boost::scoped_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0);
if( pDlg )
{
pDlg->Execute();
@@ -317,7 +317,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
pPage = static_cast<SdPage*>(&pPage->TRG_GetMasterPage());
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateMasterLayoutDialog( GetActiveWindow(), GetDoc(), pPage ) : 0);
+ boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateMasterLayoutDialog( GetActiveWindow(), GetDoc(), pPage ) : 0);
if( pDlg )
{
pDlg->Execute();
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 5c2210335ffa..43dab6be0282 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -63,7 +63,7 @@
#include <svx/svditer.hxx>
#include <navigatr.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -563,7 +563,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
aMPos = Point( 20, 20 );
aFieldPopup.Execute( pWin, aMPos );
- std::unique_ptr<SvxFieldData> pField(aFieldPopup.GetField());
+ boost::scoped_ptr<SvxFieldData> pField(aFieldPopup.GetField());
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
@@ -896,7 +896,7 @@ void DrawViewShell::ShowSnapLineContextMenu (
const Point& rMouseLocation)
{
const SdrHelpLine& rHelpLine (rPageView.GetHelpLines()[nSnapLineIndex]);
- std::unique_ptr<PopupMenu> pMenu (new PopupMenu ());
+ ::boost::scoped_ptr<PopupMenu> pMenu (new PopupMenu ());
if (rHelpLine.GetKind() == SDRHELPLINE_POINT)
{
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 0f7ff416f90b..d42f2aa894d8 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -62,7 +62,7 @@
#include "ViewShellBase.hxx"
#include "FormShellManager.hxx"
#include "DrawController.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 7623e4bbb0c0..13f80cc720a8 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -60,7 +60,7 @@
#include <svx/galleryitem.hxx>
#include <com/sun/star/gallery/GalleryItemType.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -202,7 +202,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
CheckLineTo (rReq);
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- std::unique_ptr<SfxItemSet> pAttr(new SfxItemSet ( GetDoc()->GetPool() ));
+ boost::scoped_ptr<SfxItemSet> pAttr(new SfxItemSet ( GetDoc()->GetPool() ));
GetView()->GetAttributes( *pAttr );
const SfxItemSet* pArgs = rReq.GetArgs();
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index e2ff2092d92c..1c82bbccbb22 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -69,7 +69,7 @@
#include "DrawController.hxx"
#include <boost/bind.hpp>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -553,7 +553,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
}
else
{
- std::unique_ptr<SvxZoomItem> pZoomItem;
+ boost::scoped_ptr<SvxZoomItem> pZoomItem;
sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
if( mbZoomOnPage )
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 1e1e322f817d..aada4c5cdc37 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -63,7 +63,7 @@
#include <editeng/adjustitem.hxx>
#include <svx/nbdtmgfact.hxx>
#include <svx/nbdtmg.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace svx::sidebar;
using namespace ::com::sun::star;
@@ -578,7 +578,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
SfxItemSet aNewAttr( GetPool(), EE_ITEMS_START, EE_ITEMS_END );
aNewAttr.Put( aEditAttr, false );
- std::unique_ptr<SvxNumRule> pNumRule;
+ boost::scoped_ptr<SvxNumRule> pNumRule;
const SfxPoolItem* pTmpItem=NULL;
sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE;
sal_uInt16 nActNumLvl = mpDrawView->GetSelectionLevel();
@@ -676,7 +676,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
nWhich = aIter.NextWhich();
}
- std::unique_ptr<SfxItemSet> pSet;
+ boost::scoped_ptr<SfxItemSet> pSet;
if( bAttr )
{
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index a12ac7bb4b38..7806b653dfea 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -63,7 +63,7 @@
#include "framework/FrameworkHelper.hxx"
#include "DrawViewShell.hxx"
#include "slideshow.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
@@ -312,7 +312,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
case SID_PHOTOALBUM:
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
+ boost::scoped_ptr<VclAbstractDialog> pDlg(pFact ? pFact->CreateSdPhotoAlbumDialog(
GetActiveWindow(),
GetDoc()) : 0);
@@ -357,7 +357,7 @@ void OutlineViewShell::ShowSlideShow(SfxRequest& rReq)
void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
- std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
+ boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
if (nSId != SID_OUTLINE_BULLET && nSId != FN_SVX_SET_BULLET && nSId != FN_SVX_SET_NUMBER)
{
aGuard.reset( new OutlineViewModelChangeGuard(*pOlView) );
@@ -488,7 +488,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
case SID_INSERT_FLD_PAGES:
case SID_INSERT_FLD_FILE:
{
- std::unique_ptr<SvxFieldItem> pFieldItem;
+ boost::scoped_ptr<SvxFieldItem> pFieldItem;
switch( nSId )
{
@@ -583,10 +583,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
{
// Dialog...
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOutlinerView->GetAttribs() ) : 0);
+ boost::scoped_ptr<AbstractSdModifyFieldDlg> pDlg(pFact ? pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOutlinerView->GetAttribs() ) : 0);
if( pDlg && (pDlg->Execute() == RET_OK) )
{
- std::unique_ptr<SvxFieldData> pField(pDlg->GetField());
+ boost::scoped_ptr<SvxFieldData> pField(pDlg->GetField());
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 79f89985d09c..a690de1acc08 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -86,7 +86,7 @@
#include "DrawController.hxx"
#include "framework/FrameworkHelper.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -425,7 +425,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
bool bPreviewState = false;
sal_uLong nSlot = rReq.GetSlot();
- std::unique_ptr< OutlineViewModelChangeGuard > aGuard;
+ boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard;
if( pOlView && (
(nSlot == SID_TRANSLITERATE_SENTENCE_CASE) ||
(nSlot == SID_TRANSLITERATE_TITLE_CASE) ||
@@ -1272,7 +1272,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
{
sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
- std::unique_ptr<SvxZoomItem> pZoomItem(new SvxZoomItem( SvxZoomType::PERCENT, nZoom ));
+ boost::scoped_ptr<SvxZoomItem> pZoomItem(new SvxZoomItem( SvxZoomType::PERCENT, nZoom ));
// limit area
SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 675799067e9c..18fbf2e7e68b 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -93,8 +93,8 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include "DrawController.hxx"
-#include <memory>
#include <numeric>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -1268,7 +1268,7 @@ bool View::ShouldToggleOn(
return false;
bool bToggleOn = false;
- std::unique_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
+ boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
const size_t nMarkCount = GetMarkedObjectCount();
for (size_t nIndex = 0; nIndex < nMarkCount && !bToggleOn; ++nIndex)
{
@@ -1336,8 +1336,8 @@ void View::ChangeMarkedObjectsBulletsNumbering(
const bool bToggleOn = ShouldToggleOn( bToggle, bHandleBullets );
- std::unique_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
- std::unique_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow));
+ boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
+ boost::scoped_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow));
const size_t nMarkCount = GetMarkedObjectCount();
for (size_t nIndex = 0; nIndex < nMarkCount; ++nIndex)
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 24bff878d70c..7bb04352864f 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -65,7 +65,7 @@
#include <vcl/svapp.hxx>
#include "slideshow.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -888,7 +888,7 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<AbstractSvxNameDialog> pDlg;
+ boost::scoped_ptr<AbstractSvxNameDialog> pDlg;
if (pFact)
pDlg.reset(pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), aNewName, aDesc ));
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index d9a4211320fb..f0dd92267b69 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -76,7 +76,7 @@
#include <vcl/cvtgrf.hxx>
#include <svx/sdrhittesthelper.hxx>
#include <svx/xbtmpit.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// - Namespaces -
@@ -267,7 +267,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
TransferableDataHelper aDataHelper( rDataHelper );
SdrObject* pPickObj = NULL;
SdPage* pPage = NULL;
- std::unique_ptr<ImageMap> pImageMap;
+ boost::scoped_ptr<ImageMap> pImageMap;
bool bReturn = false;
bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 );
bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink );
@@ -1504,7 +1504,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
bool View::PasteRTFTable( ::tools::SvRef<SotStorageStream> xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions )
{
- std::unique_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
+ boost::scoped_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
pModel->NewOrLoadCompleted(NEW_DOC);
pModel->GetItemPool().SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
pModel->InsertPage(pModel->AllocPage(false));
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index a48b08db6214..815801549b5b 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -488,7 +488,7 @@ bool ViewOverlayManager::CreateTags()
{
bool bChanges = false;
- std::shared_ptr<ViewShell> aMainShell = mrBase.GetMainViewShell();
+ ::boost::shared_ptr<ViewShell> aMainShell = mrBase.GetMainViewShell();
SdPage* pPage = aMainShell.get() ? aMainShell->getCurrentPage() : NULL;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index c060272f5e4d..dc49a6b508cd 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -635,7 +635,7 @@ void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
if ( ! mpImpl->mpUpdateLockForMouse.expired())
{
- std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
+ ::boost::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
mpImpl->mpUpdateLockForMouse);
if (pLock.get() != NULL)
pLock->Release();
@@ -683,7 +683,7 @@ void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
if ( ! mpImpl->mpUpdateLockForMouse.expired())
{
- std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
+ ::boost::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock(
mpImpl->mpUpdateLockForMouse);
if (pLock.get() != NULL)
pLock->Release();
diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx
index 1bc69b686951..0de2e9881bd4 100644
--- a/sd/workben/custompanel/ctp_panel.hxx
+++ b/sd/workben/custompanel/ctp_panel.hxx
@@ -30,7 +30,7 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
namespace sd { namespace colortoolpanel
{
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 3238db11aec8..268aba405abd 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -24,6 +24,8 @@
#include <tools/urlobj.hxx>
#include "svx/svxdllapi.h"
+#include <boost/scoped_ptr.hpp>
+
class SfxBindings;
class Gallery;
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 9efff8aa954b..886c28596b3d 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -65,6 +65,8 @@
#include <boost/bind.hpp>
#include <boost/noncopyable.hpp>
#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <cassert>
#include <climits>
#include <cmath>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index cf4860dcd2d0..99fa0de8ce1b 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -96,6 +96,8 @@
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <boost/spirit/include/classic_core.hpp>
#include <cassert>
#include <cmath>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 97e75d7acdfb..900a72034e70 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
+#include <boost/shared_ptr.hpp>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/color/bcolortools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 84a8a0ef91ce..0a9bd0b59154 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -57,6 +57,7 @@
#include <unotools/pathoptions.hxx>
#include "svtools/treelistentry.hxx"
#include <officecfg/Office/Recovery.hxx>
+#include <boost/scoped_ptr.hpp>
namespace svx{
namespace DocRecovery{
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 542198a439d2..fff348d45c4a 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -28,6 +28,7 @@
#include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
+#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 0806ffa6bc63..45f6bce0de01 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -32,6 +32,7 @@
#include <svx/sidebar/PanelLayout.hxx>
#include <svl/intitem.hxx>
#include <com/sun/star/ui/XUIElement.hpp>
+#include <boost/scoped_ptr.hpp>
#include <svx/sidebar/AreaPropertyPanelBase.hxx>
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index 244cfe6b15a0..3f43d3c628d4 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -24,6 +24,7 @@
#include <sfx2/sidebar/ControllerItem.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/fixed.hxx>
+#include <boost/scoped_ptr.hpp>
class FixedText;
class MetricField;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index d058bbdecee4..e24b41b08341 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -23,6 +23,7 @@
#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
+#include <boost/scoped_ptr.hpp>
#include <svx/rectenum.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <svl/poolitem.hxx>
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index 62741880de4e..da120999a180 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -13,6 +13,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/field.hxx>
#include <vcl/slider.hxx>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
#include <sfx2/request.hxx>
#include <svx/dlgctrl.hxx>
diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx
index 01a8bcb24fa5..7408bdf888a0 100644
--- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx
+++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx
@@ -7,6 +7,7 @@
#include <sfx2/sidebar/EnumContext.hxx>
#include <svtools/ctrlbox.hxx>
#include <editeng/fhgtitem.hxx>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/ui/XSidebar.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 03ba9983e15e..6db14862a9ab 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -26,6 +26,7 @@
#include <sal/types.h>
#include <basegfx/range/b2irectangle.hxx>
#include <basegfx/tuple/b2ituple.hxx>
+#include <boost/shared_ptr.hpp>
#include <vector>
#include <map>
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 381ed6dd53ed..7993b9309a5f 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -36,6 +36,7 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
+#include <boost/scoped_ptr.hpp>
#include <officecfg/Office/Recovery.hxx>
namespace svxdr = svx::DocRecovery;
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index b78a28a59eae..0a6f16fa9ac0 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -36,6 +36,7 @@
#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
+#include <boost/scoped_ptr.hpp>
#include <cassert>
#include <com/sun/star/animations/AnimationAdditiveMode.hpp>
#include <com/sun/star/animations/AnimationCalcMode.hpp>