summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-22 15:00:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-22 15:01:05 +0100
commit871426533f7afe31bc451fa6b407b83db8e52827 (patch)
treeed60cee61ebee91994eaffc9c9a3638836ed2ab4
parent5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff)
just silence the auto_ptr deprecations in isolation
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx2
-rw-r--r--basctl/source/basicide/bastype2.cxx4
-rw-r--r--basctl/source/basicide/moduldlg.cxx9
-rw-r--r--basegfx/test/basegfx2d.cxx60
-rw-r--r--basegfx/test/basegfx3d.cxx20
-rw-r--r--binaryurp/source/reader.cxx8
-rw-r--r--bridges/source/jni_uno/jni_bridge.cxx4
-rw-r--r--bridges/source/jni_uno/jni_data.cxx14
-rw-r--r--bridges/source/jni_uno/jni_helper.h2
-rw-r--r--bridges/source/jni_uno/jni_uno2java.cxx2
-rw-r--r--chart2/source/controller/inc/AxisItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/CharacterPropertyItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/DataPointItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/LegendItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/MultipleChartConverters.hxx6
-rw-r--r--chart2/source/controller/inc/RegressionEquationItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/TitleDialogData.hxx4
-rw-r--r--chart2/source/controller/inc/TitleItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx8
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx3
-rw-r--r--chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx6
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx6
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx21
-rw-r--r--chart2/source/view/inc/VDataSeries.hxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx14
-rw-r--r--chart2/source/view/main/VDataSeries.cxx10
-rw-r--r--codemaker/source/javamaker/javatype.cxx38
-rw-r--r--comphelper/inc/comphelper/listenernotification.hxx15
-rw-r--r--comphelper/source/misc/anycompare.cxx2
-rw-r--r--connectivity/source/commontools/predicateinput.cxx5
-rw-r--r--connectivity/source/simpledbt/dbtfactory.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.cxx8
-rw-r--r--cppuhelper/source/unourl.cxx26
-rw-r--r--cui/source/dialogs/scriptdlg.cxx41
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx4
-rw-r--r--dbaccess/source/core/api/KeySet.cxx4
-rw-r--r--dbaccess/source/core/api/KeySet.hxx4
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx4
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx2
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx8
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx3
-rw-r--r--dbaccess/source/ui/app/AppController.cxx20
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx3
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx6
-rw-r--r--dbaccess/source/ui/app/AppView.cxx6
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx6
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx4
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx6
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx5
-rw-r--r--editeng/inc/editeng/AccessibleStaticTextBase.hxx6
-rw-r--r--editeng/inc/editeng/hangulhanja.hxx2
-rw-r--r--editeng/inc/editeng/unoedhlp.hxx2
-rw-r--r--editeng/inc/editeng/unoedprx.hxx4
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx8
-rw-r--r--editeng/source/uno/unoedprx.cxx4
-rw-r--r--extensions/source/propctrlr/defaultforminspection.hxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx4
-rw-r--r--extensions/source/propctrlr/formlinkdialog.hxx2
-rw-r--r--extensions/source/propctrlr/propertycomposer.hxx2
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx7
-rw-r--r--filter/inc/filter/msfilter/escherex.hxx4
-rw-r--r--filter/source/msfilter/eschesdo.cxx2
-rw-r--r--forms/source/inc/controlfeatureinterception.hxx2
-rw-r--r--forms/source/inc/formnavigation.hxx4
-rw-r--r--forms/source/misc/InterfaceContainer.cxx8
-rw-r--r--forms/source/xforms/datatypes.cxx2
-rw-r--r--forms/source/xforms/submission/replace.cxx5
-rw-r--r--formula/inc/formula/FormulaOpCodeMapperObj.hxx4
-rw-r--r--formula/inc/formula/formula.hxx4
-rw-r--r--formula/source/core/api/FormulaOpCodeMapperObj.cxx5
-rw-r--r--framework/inc/uiconfiguration/moduleimagemanager.hxx2
-rw-r--r--idlc/source/astexpression.cxx4
-rw-r--r--lotuswordpro/source/filter/lwpoverride.cxx4
-rw-r--r--lotuswordpro/source/filter/lwppara1.cxx10
-rw-r--r--lotuswordpro/source/filter/lwpparaborderoverride.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpparastyle.cxx2
-rw-r--r--oox/inc/oox/vml/vmldrawing.hxx2
-rw-r--r--oox/inc/oox/vml/vmlshape.hxx4
-rw-r--r--registry/source/regimpl.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.hxx3
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx6
-rw-r--r--reportdesign/source/ui/inc/DataProviderHandler.hxx2
-rw-r--r--reportdesign/source/ui/inc/GeometryHandler.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportComponentHandler.hxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx11
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx8
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx8
-rw-r--r--sal/inc/osl/diagnose.h8
-rw-r--r--sal/inc/sal/macros.h5
-rw-r--r--sal/inc/sal/precppunit.hxx13
-rw-r--r--sal/inc/sal/types.h19
-rw-r--r--sal/qa/osl/condition/osl_Condition.cxx20
-rw-r--r--sal/qa/rtl/alloc/rtl_alloc.cxx8
-rw-r--r--sc/inc/chart2uno.hxx4
-rw-r--r--sc/inc/dpsave.hxx6
-rw-r--r--sc/inc/dptabsrc.hxx6
-rw-r--r--sc/inc/editsrc.hxx4
-rw-r--r--sc/inc/segmenttree.hxx6
-rw-r--r--sc/inc/tokenuno.hxx2
-rw-r--r--sc/source/core/data/dpobject.cxx6
-rw-r--r--sc/source/core/data/funcdesc.cxx4
-rw-r--r--sc/source/core/data/validat.cxx4
-rw-r--r--sc/source/core/tool/dbdata.cxx6
-rw-r--r--sc/source/core/tool/interpr1.cxx14
-rw-r--r--sc/source/core/tool/interpr4.cxx2
-rw-r--r--sc/source/core/tool/rangenam.cxx6
-rw-r--r--sc/source/filter/excel/read.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx4
-rw-r--r--sc/source/filter/excel/xichart.cxx12
-rw-r--r--sc/source/filter/excel/xicontent.cxx16
-rw-r--r--sc/source/filter/html/htmlpars.cxx10
-rw-r--r--sc/source/filter/inc/xcl97esc.hxx2
-rw-r--r--sc/source/filter/inc/xecontent.hxx6
-rw-r--r--sc/source/filter/inc/xehelper.hxx2
-rw-r--r--sc/source/filter/inc/xlpivot.hxx2
-rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.cxx2
-rw-r--r--sc/source/filter/xml/xmlbodyi.cxx2
-rw-r--r--sc/source/filter/xml/xmldrani.cxx8
-rw-r--r--sc/source/filter/xml/xmlsubti.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx4
-rw-r--r--sc/source/ui/docshell/docfunc.cxx10
-rw-r--r--sc/source/ui/docshell/docsh5.cxx4
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx6
-rw-r--r--sc/source/ui/formdlg/formula.cxx4
-rw-r--r--sc/source/ui/inc/tpformula.hxx2
-rw-r--r--sc/source/ui/inc/undotab.hxx8
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx4
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx6
-rw-r--r--sc/source/ui/undo/undorangename.cxx4
-rw-r--r--sc/source/ui/undo/undotab.cxx8
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx24
-rw-r--r--sc/source/ui/unoobj/editsrc.cxx4
-rw-r--r--sc/source/ui/unoobj/tokenuno.cxx2
-rw-r--r--sc/source/ui/vba/vbaaxis.hxx2
-rw-r--r--sc/source/ui/vba/vbachartobject.hxx2
-rw-r--r--sc/source/ui/vba/vbatitle.hxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx4
-rw-r--r--sc/source/ui/view/viewfun3.cxx14
-rw-r--r--sd/source/ui/app/sdmod1.cxx6
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx2
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.cxx3
-rw-r--r--sd/source/ui/func/fuolbull.cxx2
-rw-r--r--sd/source/ui/func/fuoltext.cxx2
-rw-r--r--sd/source/ui/func/futransf.cxx6
-rw-r--r--sd/source/ui/inc/ViewShell.hxx8
-rw-r--r--sd/source/ui/inc/taskpane/TitleBar.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx5
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx9
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx18
-rw-r--r--sd/source/ui/toolpanel/ScrollPanel.cxx8
-rw-r--r--sd/source/ui/toolpanel/ToolPanel.cxx2
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx4
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx4
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx2
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx7
-rw-r--r--sd/source/ui/view/drtxtob1.cxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx4
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sfx2/qa/cppunit/test_metadatable.cxx6
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx6
-rw-r--r--sfx2/source/dialog/taskpane.cxx6
-rw-r--r--solenv/gbuild/platform/unxgcc.mk2
-rw-r--r--solenv/inc/unxgcc.mk2
-rw-r--r--stoc/source/registry_tdprovider/tdiface.cxx6
-rw-r--r--stoc/source/registry_tdprovider/tdservice.cxx4
-rw-r--r--svtools/source/control/roadmap.cxx6
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx2
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx4
-rw-r--r--svx/source/accessibility/AccessibleTextEventQueue.cxx2
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx14
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/form/dbtoolsclient.cxx2
-rw-r--r--svx/source/form/fmshell.cxx6
-rw-r--r--svx/source/form/fmvwimp.cxx4
-rw-r--r--svx/source/inc/gridcell.hxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx8
-rw-r--r--sw/inc/unoport.hxx2
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx8
-rw-r--r--sw/source/core/access/accpara.cxx6
-rw-r--r--sw/source/core/crsr/swcrsr.cxx4
-rw-r--r--sw/source/core/doc/docbm.cxx8
-rw-r--r--sw/source/core/docnode/ndsect.cxx2
-rw-r--r--sw/source/core/inc/UndoAttribute.hxx20
-rw-r--r--sw/source/core/inc/rolbck.hxx10
-rw-r--r--sw/source/core/inc/unometa.hxx4
-rw-r--r--sw/source/core/text/txttab.cxx4
-rw-r--r--sw/source/core/undo/docundo.cxx2
-rw-r--r--sw/source/core/undo/unsect.cxx4
-rw-r--r--sw/source/core/unocore/unoobj.cxx12
-rw-r--r--sw/source/core/unocore/unoobj2.cxx12
-rw-r--r--sw/source/core/unocore/unoportenum.cxx8
-rw-r--r--sw/source/core/unocore/unoredline.cxx4
-rw-r--r--sw/source/core/unocore/unorefmk.cxx6
-rw-r--r--sw/source/core/unocore/unosect.cxx12
-rw-r--r--sw/source/core/unocore/unotext.cxx12
-rw-r--r--sw/source/ui/dialog/regionsw.cxx7
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx6
-rw-r--r--ucb/source/ucp/webdav/ContentProperties.cxx2
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx33
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.hxx4
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx4
-rw-r--r--uui/source/iahndl-authentication.cxx20
-rw-r--r--uui/source/iahndl-locking.cxx18
-rw-r--r--uui/source/iahndl-ssl.cxx10
-rw-r--r--uui/source/iahndl.cxx12
-rw-r--r--vbahelper/inc/vbahelper/vbashape.hxx3
-rw-r--r--vbahelper/source/msforms/vbalistbox.hxx2
-rw-r--r--vcl/source/gdi/impimagetree.cxx7
-rw-r--r--vcl/source/gdi/rendergraphicrasterizer.cxx14
-rw-r--r--writerfilter/inc/resourcemodel/WW8ResourceModel.hxx4
-rw-r--r--writerfilter/source/doctok/WW8ResourceModelImpl.cxx2
-rw-r--r--writerfilter/source/doctok/WW8Sttbf.cxx2
-rw-r--r--writerfilter/source/doctok/WW8Sttbf.hxx2
-rw-r--r--xmloff/source/style/PageMasterImportPropMapper.cxx6
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.cxx3
-rw-r--r--xmloff/source/text/txtimp.cxx4
-rw-r--r--xmloff/source/text/txtimppr.cxx4
-rw-r--r--xmloff/source/text/txtparae.cxx2
246 files changed, 1328 insertions, 195 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 622ef04664c9..3fdae83e19d8 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1674,7 +1674,9 @@ void Document::init()
if (m_xParagraphs.get() == 0)
{
::sal_uLong nCount = m_rEngine.GetParagraphCount();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< Paragraphs > p(new Paragraphs);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->reserve(static_cast< Paragraphs::size_type >(nCount));
// numeric overflow is harmless here
for (::sal_uLong i = 0; i < nCount; ++i)
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 3f8ecf15fef5..9820cc1f22f1 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -235,11 +235,13 @@ void BasicTreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocati
String aRootName( GetRootEntryName( rDocument, eLocation ) );
Image aImage;
GetRootEntryBitmaps( rDocument, aImage );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pDocumentRootEntry = AddEntry(
aRootName,
aImage,
0, true,
std::auto_ptr< BasicEntry >( new BasicDocumentEntry( rDocument, eLocation ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
SetUpdateMode( sal_True );
@@ -696,6 +698,7 @@ sal_Bool BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
return bProtected;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
SvLBoxEntry* BasicTreeListBox::AddEntry(
const String& rText,
const Image& rImage,
@@ -709,6 +712,7 @@ SvLBoxEntry* BasicTreeListBox::AddEntry(
aUserData.release() ); // XXX possible leak
return p;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage )
{
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index b7258cf0b6d7..c3912bd1da41 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -56,6 +56,7 @@
#include "localizationmgr.hxx"
#include <basic/sbx.hxx>
#include <tools/diagnose_ex.h>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -818,7 +819,7 @@ void ObjectPage::NewDialog()
{
aDocument.getOrCreateLibrary( E_DIALOGS, aLibName );
- std::auto_ptr< NewObjectDialog > xNewDlg(
+ boost::scoped_ptr< NewObjectDialog > xNewDlg(
new NewObjectDialog(this, NEWOBJECTMODE_DLG, true));
xNewDlg->SetObjectName( aDocument.createObjectName( E_DIALOGS, aLibName ) );
@@ -863,11 +864,13 @@ void ObjectPage::NewDialog()
SvLBoxEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG );
if ( !pEntry )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pEntry = aBasicBox.AddEntry(
aDlgName,
Image( IDEResId( RID_IMG_DIALOG ) ),
pLibEntry, false,
std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_DIALOG ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
}
aBasicBox.SetCurEntry( pEntry );
@@ -979,7 +982,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
if ( !aModName.Len() )
aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
- std::auto_ptr< NewObjectDialog > xNewDlg(
+ boost::scoped_ptr< NewObjectDialog > xNewDlg(
new NewObjectDialog( pWin, NEWOBJECTMODE_MOD, true ) );
xNewDlg->SetObjectName( aModName );
@@ -1036,11 +1039,13 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
if ( !pEntry )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pEntry = rBasicBox.AddEntry(
aModName,
Image( IDEResId( RID_IMG_MODULE ) ),
pSubRootEntry, false,
std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
}
rBasicBox.SetCurEntry( pEntry );
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 0d14638797fb..e888fe52aed5 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -277,9 +277,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dsvgdimpex);
+ SAL_CPPUNIT_TEST_SUITE(b2dsvgdimpex);
CPPUNIT_TEST(impex);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dsvgdimpex
class b2dpolyrange : public CppUnit::TestFixture
@@ -316,9 +316,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dpolyrange);
+ SAL_CPPUNIT_TEST_SUITE(b2dpolyrange);
CPPUNIT_TEST(check);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
};
class b2dbeziertools : public CppUnit::TestFixture
@@ -545,10 +545,10 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dbeziertools);
+ SAL_CPPUNIT_TEST_SUITE(b2dbeziertools);
CPPUNIT_TEST(adaptiveByDistance); // TODO: add tests for quadratic bezier (subdivide and degree reduction)
CPPUNIT_TEST(adaptiveByAngle);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dcubicbezier
@@ -575,9 +575,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dcubicbezier);
+ SAL_CPPUNIT_TEST_SUITE(b2dcubicbezier);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dcubicbezier
@@ -929,7 +929,7 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dhommatrix);
+ SAL_CPPUNIT_TEST_SUITE(b2dhommatrix);
CPPUNIT_TEST(equal);
CPPUNIT_TEST(identity);
CPPUNIT_TEST(scale);
@@ -938,7 +938,7 @@ public:
CPPUNIT_TEST(shear);
CPPUNIT_TEST(multiply);
CPPUNIT_TEST(decompose);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dhommatrix
@@ -964,9 +964,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dhompoint);
+ SAL_CPPUNIT_TEST_SUITE(b2dhompoint);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dhompoint
@@ -993,9 +993,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dpoint);
+ SAL_CPPUNIT_TEST_SUITE(b2dpoint);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dpoint
@@ -1068,9 +1068,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dpolygon);
+ SAL_CPPUNIT_TEST_SUITE(b2dpolygon);
CPPUNIT_TEST(testBasics);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dpolygon
@@ -1157,9 +1157,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dpolygontools);
+ SAL_CPPUNIT_TEST_SUITE(b2dpolygontools);
CPPUNIT_TEST(testIsRectangle);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dpolygontools
@@ -1184,9 +1184,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dpolypolygon);
+ SAL_CPPUNIT_TEST_SUITE(b2dpolypolygon);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dpolypolygon
@@ -1213,9 +1213,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dquadraticbezier);
+ SAL_CPPUNIT_TEST_SUITE(b2dquadraticbezier);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dquadraticbezier
@@ -1240,9 +1240,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2drange);
+ SAL_CPPUNIT_TEST_SUITE(b2drange);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2drange
@@ -1269,9 +1269,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dtuple);
+ SAL_CPPUNIT_TEST_SUITE(b2dtuple);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dtuple
@@ -1296,9 +1296,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b2dvector);
+ SAL_CPPUNIT_TEST_SUITE(b2dvector);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dvector
class bcolor : public CppUnit::TestFixture
@@ -1468,11 +1468,11 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(bcolor);
+ SAL_CPPUNIT_TEST_SUITE(bcolor);
CPPUNIT_TEST(hslTest);
CPPUNIT_TEST(hsvTest);
CPPUNIT_TEST(ciexyzTest);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b2dvector
// -----------------------------------------------------------------------------
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index c488f977c55b..c9309b7b2c19 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -63,9 +63,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b3dhommatrix);
+ SAL_CPPUNIT_TEST_SUITE(b3dhommatrix);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b3dhommatrix
@@ -92,9 +92,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b3dpoint);
+ SAL_CPPUNIT_TEST_SUITE(b3dpoint);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b3dpoint
@@ -119,9 +119,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b3drange);
+ SAL_CPPUNIT_TEST_SUITE(b3drange);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b3drange
@@ -148,9 +148,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b3dtuple);
+ SAL_CPPUNIT_TEST_SUITE(b3dtuple);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b3dtuple
@@ -175,9 +175,9 @@ public:
// member functions of the current class,
// because these macros are need by auto register mechanism.
- CPPUNIT_TEST_SUITE(b3dvector);
+ SAL_CPPUNIT_TEST_SUITE(b3dvector);
CPPUNIT_TEST(EmptyMethod);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class b3dvector
// -----------------------------------------------------------------------------
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index d305bafb7508..b304dbee4942 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -64,6 +64,8 @@
#include "specialfunctionids.hxx"
#include "unmarshal.hxx"
+#include <boost/scoped_ptr.hpp>
+
namespace binaryurp {
namespace {
@@ -100,7 +102,7 @@ css::uno::Sequence< sal_Int8 > read(
extern "C" void SAL_CALL request(void * pThreadSpecificData) {
OSL_ASSERT(pThreadSpecificData != 0);
- std::auto_ptr< IncomingRequest >(
+ boost::scoped_ptr< IncomingRequest >(
static_cast< IncomingRequest * >(pThreadSpecificData))->
execute();
}
@@ -397,10 +399,12 @@ void Reader::readMessage(Unmarshal & unmarshal) {
}
break;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< IncomingRequest > req(
new IncomingRequest(
bridge_, tid, oid, obj, type, functionId, synchronous, memberTd,
setter, inArgs, ccMode, cc));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (synchronous) {
bridge_->incrementActiveCalls();
}
@@ -514,8 +518,10 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) {
switch (req.kind) {
case OutgoingRequest::KIND_NORMAL:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< IncomingReply > resp(
new IncomingReply(exc, ret, outArgs));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
uno_threadpool_putJob(
bridge_->getThreadPool(), tid.getHandle(), resp.get(), 0,
false);
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index d15f05a814fd..cf9f5c2decbe 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -337,9 +337,11 @@ void JNI_context::java_exc_occurred() const
}
jsize len = m_env->GetStringLength( (jstring) jo_descr.get() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > ustr_mem(
rtl_mem::allocate(
sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl_uString * ustr = (rtl_uString *)ustr_mem.get();
m_env->GetStringRegion( (jstring) jo_descr.get(), 0, len, ustr->buffer );
if (m_env->ExceptionCheck())
@@ -413,9 +415,11 @@ OUString JNI_context::get_stack_trace( jobject jo_exc ) const
{
jsize len =
m_env->GetStringLength( (jstring) jo_stack_trace.get() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > ustr_mem(
rtl_mem::allocate(
sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl_uString * ustr = (rtl_uString *)ustr_mem.get();
m_env->GetStringRegion(
(jstring) jo_stack_trace.get(), 0, len, ustr->buffer );
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index aca455d154ed..5edb23868da6 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -45,8 +45,10 @@ namespace jni_uno
//------------------------------------------------------------------------------
inline rtl_mem * seq_allocate( sal_Int32 nElements, sal_Int32 nSize )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > seq(
rtl_mem::allocate( SAL_SEQUENCE_HEADER_SIZE + (nElements * nSize) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
uno_Sequence * p = (uno_Sequence *)seq.get();
p->nRefCount = 1;
p->nElements = nElements;
@@ -137,7 +139,9 @@ void createDefaultUnoValue(
case typelib_TypeClass_SEQUENCE:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > seq(seq_allocate(0, 0));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (assign) {
uno_type_destructData(uno_data, type, 0);
}
@@ -603,8 +607,10 @@ void Bridge::map_to_uno(
}
else
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > mem(
rtl_mem::allocate( sizeof (sal_Int64) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
*(jlong *) mem.get() = jni->CallLongMethodA(
java_data.l, m_jni_info->m_method_Long_longValue, 0 );
jni.ensure_no_exception();
@@ -621,8 +627,10 @@ void Bridge::map_to_uno(
}
else
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > mem(
rtl_mem::allocate( sizeof (float) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
*(jfloat *) mem.get() = jni->CallFloatMethodA(
java_data.l, m_jni_info->m_method_Float_floatValue, 0 );
jni.ensure_no_exception();
@@ -641,8 +649,10 @@ void Bridge::map_to_uno(
}
else
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > mem(
rtl_mem::allocate( sizeof (double) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
*(jdouble *) mem.get() =
jni->CallDoubleMethodA(
java_data.l,
@@ -672,8 +682,10 @@ void Bridge::map_to_uno(
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > mem(
rtl_mem::allocate( value_td.get()->nSize ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
map_to_uno(
jni, mem.get(), java_data, value_td.get()->pWeakRef, 0,
false /* no assign */, false /* no out param */ );
@@ -1027,7 +1039,9 @@ void Bridge::map_to_uno(
typelib_TypeDescriptionReference * element_type =
((typelib_IndirectTypeDescription *)td.get())->pType;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > seq;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Int32 nElements = jni->GetArrayLength( (jarray) java_data.l );
switch (element_type->eTypeClass)
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index 293bf82d868e..f124dd37b594 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -47,9 +47,11 @@ inline void jstring_to_ustring(
else
{
jsize len = jni->GetStringLength( jstr );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< rtl_mem > mem(
rtl_mem::allocate(
sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl_uString * ustr = (rtl_uString *)mem.get();
jni->GetStringRegion( jstr, 0, len, (jchar *) ustr->buffer );
jni.ensure_no_exception();
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 5fa8fa3e01b3..17f6d9c99fea 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -106,7 +106,9 @@ void Bridge::handle_java_exc(
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< rtl_mem > uno_data( rtl_mem::allocate( td.get()->nSize ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
jvalue val;
val.l = jo_exc.get();
map_to_uno(
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index eb43cb984f76..1951185b679f 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -48,6 +48,7 @@ namespace wrapper
class AxisItemConverter : public ::comphelper::ItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
AxisItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -59,6 +60,7 @@ public:
ExplicitIncrementData * pIncrement = NULL,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~AxisItemConverter();
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const;
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 51b91c0dd3dd..79284670efa3 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -48,6 +48,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
CharacterPropertyItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -57,6 +58,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rRefSizePropSet =
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~CharacterPropertyItemConverter();
protected:
@@ -72,7 +74,9 @@ protected:
::com::sun::star::beans::XPropertySet > GetRefSizePropertySet() const;
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::com::sun::star::awt::Size > m_pRefSize;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::rtl::OUString m_aRefSizePropertyName;
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > m_xRefSizePropSet;
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 9f9d6174289d..b334de12f5ba 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -51,6 +51,7 @@ class DataPointItemConverter :
public ::comphelper::ItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
DataPointItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
@@ -75,6 +76,7 @@ public:
bool bOverwriteLabelsForAttributedDataPointsAlso=false,
sal_Int32 nNumberFormat=0,
sal_Int32 nPercentNumberFormat=0);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~DataPointItemConverter();
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index 9ec794aed482..3f5a07db1696 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -46,6 +46,7 @@ class LegendItemConverter :
public ::comphelper::ItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
LegendItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -55,6 +56,7 @@ public:
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~LegendItemConverter();
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const;
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index a4f08c697525..d42231c45f69 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -44,6 +44,7 @@ namespace wrapper
class AllAxisItemConverter : public ::comphelper::MultipleItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllAxisItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
@@ -53,6 +54,7 @@ public:
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~AllAxisItemConverter();
protected:
@@ -78,6 +80,7 @@ protected:
class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllDataLabelItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
@@ -87,6 +90,7 @@ public:
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~AllDataLabelItemConverter();
protected:
@@ -96,6 +100,7 @@ protected:
class AllTitleItemConverter : public ::comphelper::MultipleItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllTitleItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel,
@@ -105,6 +110,7 @@ public:
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~AllTitleItemConverter();
protected:
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index 799189ff1017..323bfe108038 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -50,6 +50,7 @@ class RegressionEquationItemConverter :
public ::comphelper::ItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
RegressionEquationItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -59,6 +60,7 @@ public:
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~RegressionEquationItemConverter();
virtual void FillItemSet( SfxItemSet & rOutItemSet ) const;
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx
index 6e29af8243b8..fc2ff605dfe5 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -48,10 +48,14 @@ struct TitleDialogData
::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList;
::com::sun::star::uno::Sequence< sal_Bool > aExistenceList;
::com::sun::star::uno::Sequence< rtl::OUString > aTextList;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ReferenceSizeProvider > apReferenceSizeProvider;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitleDialogData( ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProvider =
::std::auto_ptr< ReferenceSizeProvider >( 0 ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void readFromModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
/* return true if anything has changed;
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index cb149ffdd43f..bb26683619dc 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -46,6 +46,7 @@ class TitleItemConverter :
public ::comphelper::ItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitleItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -55,6 +56,7 @@ public:
::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
::std::auto_ptr< ::com::sun::star::awt::Size >() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~TitleItemConverter();
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index ac45b985aad1..f6a740e3d53c 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -89,7 +89,9 @@ private:
bool m_bIsClosable;
sal_Int32 m_nOnePageOnlyIndex;//if nOnePageOnlyIndex is an index of an exsisting page starting with 0, then only this page is displayed without next/previous and roadmap
ChartTypeTemplateProvider* m_pTemplateProvider;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DialogModel > m_apDialogModel;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
WizardState m_nFirstState;
WizardState m_nLastState;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index f2ad9b27939b..449ca565fd33 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -88,6 +88,7 @@ namespace chart
namespace wrapper
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
AxisItemConverter::AxisItemConverter(
const Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
@@ -118,6 +119,7 @@ AxisItemConverter::AxisItemConverter(
m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
OSL_ASSERT( m_xAxis.is());
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
AxisItemConverter::~AxisItemConverter()
{
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 4597499f7032..386a2e6c2214 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -88,6 +88,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
ItemConverter( rPropertySet, rItemPool )
{}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
CharacterPropertyItemConverter::CharacterPropertyItemConverter(
const uno::Reference< beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
@@ -99,6 +100,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
m_aRefSizePropertyName( rRefSizePropertyName ),
m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet )
{}
+SAL_WNODEPRECATED_DECLARATIONS_POP
CharacterPropertyItemConverter::~CharacterPropertyItemConverter()
{}
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 1c494c94de31..18d8b5abd298 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -208,6 +208,7 @@ namespace chart
namespace wrapper
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
DataPointItemConverter::DataPointItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
const uno::Reference< uno::XComponentContext > & xContext,
@@ -256,6 +257,7 @@ DataPointItemConverter::DataPointItemConverter(
m_bForbidPercentValue = AxisType::CATEGORY != ChartTypeHelper::getAxisType( xChartType, 0 );
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
DataPointItemConverter::~DataPointItemConverter()
{
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 75f2254c2218..43b7fd3b07a3 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -51,6 +51,7 @@ namespace chart
namespace wrapper
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
LegendItemConverter::LegendItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -67,6 +68,7 @@ LegendItemConverter::LegendItemConverter(
rPropertySet, rItemPool, pRefSize,
C2U( "ReferencePageSize" ) ));
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
LegendItemConverter::~LegendItemConverter()
{
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 46d5269793de..7ab399dedbe1 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -55,6 +55,7 @@ namespace wrapper
//-----------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllAxisItemConverter::AllAxisItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
@@ -79,6 +80,7 @@ AllAxisItemConverter::AllAxisItemConverter(
uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), 0, 0 ) );
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
AllAxisItemConverter::~AllAxisItemConverter()
{
@@ -121,7 +123,7 @@ const sal_uInt16 * AllGridItemConverter::GetWhichPairs() const
}
//-----------------------------------------------------------------------------
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllDataLabelItemConverter::AllDataLabelItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
@@ -157,6 +159,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
));
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
AllDataLabelItemConverter::~AllDataLabelItemConverter()
{
@@ -169,7 +172,7 @@ const sal_uInt16 * AllDataLabelItemConverter::GetWhichPairs() const
}
//-----------------------------------------------------------------------------
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
AllTitleItemConverter::AllTitleItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
SfxItemPool& rItemPool,
@@ -191,6 +194,7 @@ AllTitleItemConverter::AllTitleItemConverter(
xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, pSingleRefSize ));
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
AllTitleItemConverter::~AllTitleItemConverter()
{
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 0244bc6cba92..12290d78812a 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -60,6 +60,7 @@ namespace chart
namespace wrapper
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
RegressionEquationItemConverter::RegressionEquationItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -76,8 +77,8 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
m_aConverters.push_back( new CharacterPropertyItemConverter(
rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize")));
-
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
RegressionEquationItemConverter::~RegressionEquationItemConverter()
{
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 2dd9d8730055..f6cb3c8ed5ac 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -68,11 +68,13 @@ namespace wrapper
class FormattedStringsConverter : public ::comphelper::MultipleItemConverter
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
FormattedStringsConverter(
const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
SfxItemPool & rItemPool,
::std::auto_ptr< awt::Size > pRefSize,
const uno::Reference< beans::XPropertySet > & xParentProp );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~FormattedStringsConverter();
protected:
@@ -81,6 +83,7 @@ protected:
// ----------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
FormattedStringsConverter::FormattedStringsConverter(
const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
SfxItemPool & rItemPool,
@@ -105,6 +108,7 @@ FormattedStringsConverter::FormattedStringsConverter(
}
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
FormattedStringsConverter::~FormattedStringsConverter()
{
@@ -117,6 +121,7 @@ const sal_uInt16 * FormattedStringsConverter::GetWhichPairs() const
// ========================================
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitleItemConverter::TitleItemConverter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropertySet,
@@ -144,6 +149,7 @@ TitleItemConverter::TitleItemConverter(
}
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
TitleItemConverter::~TitleItemConverter()
{
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index a84dccbaa2ef..6de3c53bdefe 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -85,6 +85,7 @@ using ::rtl::OUString;
namespace
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::comphelper::ItemConverter* createItemConverter(
const ::rtl::OUString & aObjectCID
, const uno::Reference< frame::XModel > & xChartModel
@@ -331,6 +332,7 @@ namespace
}
return pItemConverter;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel )
{
@@ -752,6 +754,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ReferenceSizeProvider > pRefSizeProv(
impl_createReferenceSizeProvider());
::std::auto_ptr< ::comphelper::ItemConverter > apItemConverter(
@@ -760,6 +763,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
&aNumberFormatterWrapper,
ExplicitValueProvider::getExplicitValueProvider(m_xChartView),
pRefSizeProv ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if(!apItemConverter.get())
return bRet;
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 22418d3bce86..6ac32197406c 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -161,6 +161,7 @@ bool lcl_deleteDataCurve(
namespace chart
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ReferenceSizeProvider > ChartController::impl_createReferenceSizeProvider()
{
awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
@@ -169,11 +170,14 @@ namespace chart
new ReferenceSizeProvider( aPageSize,
Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY )));
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
void ChartController::impl_adaptDataSeriesAutoResize()
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ReferenceSizeProvider > apRefSizeProvider(
impl_createReferenceSizeProvider());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( apRefSizeProvider.get())
apRefSizeProvider->setValuesAtAllDataSeries();
}
@@ -248,7 +252,9 @@ void ChartController::executeDispatch_ScaleText()
String( SchResId( STR_ACTION_SCALE_TEXT )),
m_xUndoManager );
ControllerLockGuard aCtlLockGuard( getModel() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ReferenceSizeProvider > apRefSizeProv( impl_createReferenceSizeProvider());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
OSL_ASSERT( apRefSizeProv.get());
if( apRefSizeProv.get())
apRefSizeProv->toggleAutoResizeState();
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 111982dbf2d2..51cb01697e08 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -556,12 +556,16 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
VAxisBase::createAllTickInfos(rAllTickInfos);
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< TickIter > VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel )
{
if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) )
return ::std::auto_ptr< TickIter >( new PureTickIter( m_aAllTickInfos[nTextLevel] ) );
return ::std::auto_ptr< TickIter >();
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< TickIter > VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel )
{
if( isComplexCategoryAxis() || isDateAxis() )
@@ -581,6 +585,7 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
}
return ::std::auto_ptr< TickIter >();
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Int32 VCartesianAxis::getTextLevelCount() const
{
@@ -1330,7 +1335,9 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel
B2DVector aCummulatedLabelsDistance(0,0);
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if(apTickIter.get())
{
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
@@ -1368,7 +1375,9 @@ void VCartesianAxis::createLabels()
//create labels
if( m_aAxisProperties.m_bDisplayLabels )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1387,7 +1396,9 @@ void VCartesianAxis::createLabels()
sal_Int32 nScreenDistanceBetweenTicks = -1;
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if(apTickIter.get())
{
if(nTextLevel==0)
@@ -1434,7 +1445,9 @@ void VCartesianAxis::createMaximumLabels()
//create labels
if( m_aAxisProperties.m_bDisplayLabels )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1454,7 +1467,9 @@ void VCartesianAxis::createMaximumLabels()
sal_Int32 nTextLevelCount = getTextLevelCount();
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< TickIter > apTickIter = createMaximumLabelTickIterator( nTextLevel );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if(apTickIter.get())
{
while( !createTextShapes( m_xTextTarget, *apTickIter.get(), aAxisLabelProperties, pTickFactory2D, -1 ) )
@@ -1472,7 +1487,9 @@ void VCartesianAxis::updatePositions()
//update positions of labels
if( m_aAxisProperties.m_bDisplayLabels )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1569,7 +1586,9 @@ void VCartesianAxis::createShapes()
if( !prepareShapeCreation() )
return;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1593,7 +1612,9 @@ void VCartesianAxis::createShapes()
sal_Int32 nTextLevelCount = getTextLevelCount();
for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< TickIter > apTickIter = createLabelTickIterator( nTextLevel );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( apTickIter.get() )
{
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 4f811a6d8667..a7738e7f54f4 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -234,6 +234,7 @@ private: //member
sal_Int32 m_nGlobalSeriesIndex;
//some cached values for data labels as they are very expensive
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
mutable ::std::auto_ptr< ::com::sun::star::chart2::DataPointLabel >
m_apLabel_Series;
mutable ::std::auto_ptr< tNameSequence > m_apLabelPropNames_Series;
@@ -249,6 +250,7 @@ private: //member
m_apSymbolProperties_AttributedPoint;
mutable ::std::auto_ptr< ::com::sun::star::chart2::Symbol >
m_apSymbolProperties_InvisibleSymbolForSelection;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mutable sal_Int32 m_nCurrentAttributedPoint;
::com::sun::star::awt::Size m_aReferenceSize;
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 779c57498f90..72f1a4a8655b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2127,6 +2127,7 @@ void changePositionOfAxisTitle( VTitle* pVTitle, TitleAlignment eAlignment
pVTitle->changePosition( aNewPosition );
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
, const uno::Reference< drawing::XShapes>& xPageShapes
, const uno::Reference< lang::XMultiServiceFactory>& xShapeFactory
@@ -2269,6 +2270,7 @@ std::auto_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
}
return apVTitle;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
bool lcl_createLegend( const uno::Reference< XLegend > & xLegend
, const uno::Reference< drawing::XShapes>& xPageShapes
@@ -2477,7 +2479,9 @@ void ChartView::createShapes()
uno::Reference< drawing::XShapes > xDiagramPlusAxes_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes ) );
//------------ create some titles
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<VTitle> apVTitle(0);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bool bAutoPositionDummy = true;
//------------ create main title shape
@@ -2509,7 +2513,9 @@ void ChartView::createShapes()
//------------ create x axis title
bool bAutoPosition_XTitle = true;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<VTitle> apVTitle_X;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 0 ) )
apVTitle_X = lcl_createTitle( TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION, xPageShapes, m_xShapeFactory, m_xChartModel
, aRemainingSpace, aPageSize, ALIGN_BOTTOM, bAutoPosition_XTitle );
@@ -2518,7 +2524,9 @@ void ChartView::createShapes()
//------------ create y axis title
bool bAutoPosition_YTitle = true;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<VTitle> apVTitle_Y;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 1 ) )
apVTitle_Y = lcl_createTitle( TitleHelper::TITLE_AT_STANDARD_Y_AXIS_POSITION, xPageShapes, m_xShapeFactory, m_xChartModel
, aRemainingSpace, aPageSize, ALIGN_LEFT, bAutoPosition_YTitle );
@@ -2527,7 +2535,9 @@ void ChartView::createShapes()
//------------ create z axis title
bool bAutoPosition_ZTitle = true;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<VTitle> apVTitle_Z;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 2 ) )
apVTitle_Z = lcl_createTitle( TitleHelper::Z_AXIS_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel
, aRemainingSpace, aPageSize, ALIGN_RIGHT, bAutoPosition_ZTitle );
@@ -2539,7 +2549,9 @@ void ChartView::createShapes()
//------------ create secondary x axis title
bool bAutoPosition_SecondXTitle = true;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<VTitle> apVTitle_SecondX;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 0 ) )
apVTitle_SecondX = lcl_createTitle( TitleHelper::SECONDARY_X_AXIS_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel
, aRemainingSpace, aPageSize, bIsVertical? ALIGN_RIGHT : ALIGN_TOP, bAutoPosition_SecondXTitle );
@@ -2548,7 +2560,9 @@ void ChartView::createShapes()
//------------ create secondary y axis title
bool bAutoPosition_SecondYTitle = true;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<VTitle> apVTitle_SecondY;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 1 ) )
apVTitle_SecondY = lcl_createTitle( TitleHelper::SECONDARY_Y_AXIS_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel
, aRemainingSpace, aPageSize, bIsVertical? ALIGN_TOP : ALIGN_RIGHT, bAutoPosition_SecondYTitle );
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index e63dba596ed0..4748eff81255 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -742,6 +742,7 @@ double VDataSeries::getYMeanValue() const
return m_fYMeanValue;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< Symbol > getSymbolPropertiesFromPropertySet(
const uno::Reference< beans::XPropertySet >& xProp )
{
@@ -764,6 +765,7 @@ double VDataSeries::getYMeanValue() const
}
return apSymbolProps;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
{
@@ -784,7 +786,9 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
{
if(!m_apSymbolProperties_InvisibleSymbolForSelection.get())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
m_apSymbolProperties_InvisibleSymbolForSelection = ::std::auto_ptr< Symbol >( new Symbol() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_apSymbolProperties_InvisibleSymbolForSelection->Style = SymbolStyle_STANDARD;
m_apSymbolProperties_InvisibleSymbolForSelection->StandardSymbol = 0;//square
m_apSymbolProperties_InvisibleSymbolForSelection->Size = m_apSymbolProperties_Series->Size;
@@ -876,6 +880,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfSeries() const
return uno::Reference<beans::XPropertySet>(m_xDataSeries, uno::UNO_QUERY );
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DataPointLabel > getDataPointLabelFromPropertySet(
const uno::Reference< beans::XPropertySet >& xProp )
{
@@ -891,6 +896,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfSeries() const
}
return apLabel;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
void VDataSeries::adaptPointCache( sal_Int32 nNewPointIndex ) const
{
@@ -953,8 +959,10 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index
pPropValues = new tAnySequence();
xTextProp.set( this->getPropertiesOfPoint( index ));
PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *pPropNames, *pPropValues );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
m_apLabelPropNames_AttributedPoint = ::std::auto_ptr< tNameSequence >(pPropNames);
m_apLabelPropValues_AttributedPoint = ::std::auto_ptr< tAnySequence >(pPropValues);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bDoDynamicFontResize = true;
}
pPropNames = m_apLabelPropNames_AttributedPoint.get();
@@ -968,8 +976,10 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index
pPropValues = new tAnySequence();
xTextProp.set( this->getPropertiesOfPoint( index ));
PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *pPropNames, *pPropValues );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
m_apLabelPropNames_Series = ::std::auto_ptr< tNameSequence >(pPropNames);
m_apLabelPropValues_Series = ::std::auto_ptr< tAnySequence >(pPropValues);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bDoDynamicFontResize = true;
}
pPropNames = m_apLabelPropNames_Series.get();
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 4b99ef9f116b..0d534526b3fb 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -807,7 +807,9 @@ void addTypeInfo(
RTL_CONSTASCII_STRINGPARAM(
"[Lcom/sun/star/lib/uno/typeinfo/TypeInfo;")),
0, rtl::OString());
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > code(classFile->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
code->loadIntegerConstant(static_cast< sal_Int32 >(typeInfos));
code->instrAnewarray(
rtl::OString(
@@ -862,6 +864,7 @@ void handleEnumType(
//TODO
}
rtl::OString className(codemaker::convertString(reader.getTypeName()));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile > cf(
new ClassFile(
static_cast< ClassFile::AccessFlags >(
@@ -870,6 +873,7 @@ void handleEnumType(
className,
rtl::OString(RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Enum")),
rtl::OString()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OStringBuffer buf;
buf.append('L');
buf.append(className);
@@ -900,7 +904,9 @@ void handleEnumType(
rtl::OString(RTL_CONSTASCII_STRINGPARAM("I")),
cf->addIntegerInfo(fieldValue.m_value.aLong), rtl::OString());
}}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > code(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
code->loadLocalReference(0);
code->loadLocalInteger(1);
code->instrInvokespecial(
@@ -944,7 +950,9 @@ void handleEnumType(
<= 2 * size)
|| size > SAL_MAX_INT32)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > defCode(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
defCode->instrAconstNull();
defCode->instrAreturn();
std::list< ClassFile::Code * > blocks;
@@ -960,7 +968,9 @@ void handleEnumType(
}
}
last = value;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > blockCode(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
blockCode->instrGetstatic(className, i->second, classDescriptor);
blockCode->instrAreturn();
blocks.push_back(blockCode.get());
@@ -972,8 +982,10 @@ void handleEnumType(
{
delete *i;
}}
- } else {
+ } else{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > defCode(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
defCode->instrAconstNull();
defCode->instrAreturn();
std::list< std::pair< sal_Int32, ClassFile::Code * > > blocks;
@@ -981,7 +993,9 @@ void handleEnumType(
for (std::map< sal_Int32, rtl::OString >::iterator i(map.begin());
i != map.end(); ++i)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > blockCode(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
blockCode->instrGetstatic(className, i->second, classDescriptor);
blockCode->instrAreturn();
blocks.push_back(std::make_pair(i->first, blockCode.get()));
@@ -1925,11 +1939,13 @@ void handleAggregatingType(
buf.append(RTL_CONSTASCII_STRINGPARAM(">Ljava/lang/Object;"));
sig = buf.makeStringAndClear();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile > cf(
new ClassFile(
static_cast< ClassFile::AccessFlags >(
ClassFile::ACC_PUBLIC | ClassFile::ACC_SUPER),
className, superClass, sig));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
std::vector< TypeInfo > typeInfo;
{for (sal_uInt16 i = firstField; i < fields; ++i) {
RTFieldAccess flags = reader.getFieldFlags(i);
@@ -1969,7 +1985,9 @@ void handleAggregatingType(
RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XInterface")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("Context")), 0);
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > code(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
code->loadLocalReference(0);
code->instrInvokespecial(
superClass, rtl::OString(RTL_CONSTASCII_STRINGPARAM("<init>")),
@@ -2134,6 +2152,7 @@ void handleInterfaceType(
rtl::OString(RTL_CONSTASCII_STRINGPARAM("Bad type information")));
//TODO
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile > cf(
new ClassFile(
static_cast< ClassFile::AccessFlags >(
@@ -2142,6 +2161,7 @@ void handleInterfaceType(
className,
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")),
rtl::OString()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{for (sal_uInt16 i = 0; i < superTypes; ++i) {
rtl::OString t(codemaker::convertString(reader.getSuperTypeName(i)));
dependencies->insert(t);
@@ -2545,6 +2565,7 @@ void handleConstantGroup(
//TODO
}
rtl::OString className(codemaker::convertString(reader.getTypeName()));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile > cf(
new ClassFile(
static_cast< ClassFile::AccessFlags >(
@@ -2553,6 +2574,7 @@ void handleConstantGroup(
className,
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")),
rtl::OString()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt16 fields = reader.getFieldCount();
for (sal_uInt16 i = 0; i < fields; ++i) {
addConstant(manager, reader, false, i, dependencies, cf.get());
@@ -2579,6 +2601,7 @@ void handleModule(
for (sal_uInt16 i = 0; i < fields; ++i) {
rtl::OString className(
prefix + codemaker::convertString(reader.getFieldName(i)));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile > cf(
new ClassFile(
static_cast< ClassFile::AccessFlags >(
@@ -2587,6 +2610,7 @@ void handleModule(
className,
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")),
rtl::OString()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
addConstant(manager, reader, true, i, dependencies, cf.get());
writeClassFile(options, className, *cf.get());
}
@@ -2623,7 +2647,9 @@ void addConstructor(
rtl::OString(
RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XComponentContext")),
false, false, 0);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > code(classFile->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
code->loadLocalReference(0);
// stack: context
code->instrInvokestatic(
@@ -2842,6 +2868,7 @@ void handleService(
translateUnoTypeToJavaFullyQualifiedName(
unoName, rtl::OString(RTL_CONSTASCII_STRINGPARAM("service"))));
unoName = unoName.replace('/', '.');
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile > cf(
new ClassFile(
static_cast< ClassFile::AccessFlags >(
@@ -2850,6 +2877,7 @@ void handleService(
className,
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")),
rtl::OString()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (methods > 0) {
rtl::OString base(codemaker::convertString(
reader.getSuperTypeName(0)));
@@ -2898,7 +2926,9 @@ void handleService(
}
// Synthetic getFactory method:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > code(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
code->loadLocalReference(0);
// stack: context
code->instrInvokeinterface(
@@ -2957,7 +2987,9 @@ void handleService(
}
// Synthetic castInstance method:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > code(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
code->instrNew(
rtl::OString(
RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Type")));
@@ -3086,6 +3118,7 @@ void handleSingleton(
dependencies->insert(
rtl::OString(
RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XComponentContext")));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile > cf(
new ClassFile(
static_cast< ClassFile::AccessFlags >(
@@ -3094,12 +3127,15 @@ void handleSingleton(
className,
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")),
rtl::OString()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
MethodDescriptor desc(manager, dependencies, base, 0, 0);
desc.addParameter(
rtl::OString(
RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XComponentContext")),
false, false, 0);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ClassFile::Code > code(cf->newCode());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
code->loadLocalReference(0);
// stack: context
code->loadStringConstant(
diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx
index 98143f1d3242..46ae73a1f651 100644
--- a/comphelper/inc/comphelper/listenernotification.hxx
+++ b/comphelper/inc/comphelper/listenernotification.hxx
@@ -95,8 +95,13 @@ namespace comphelper
/** creates an iterator for looping through all registered listeners
*/
- inline ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper >
- createIterator();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > createIterator()
+ {
+ ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) );
+ return pIterator;
+ }
+ SAL_WNODEPRECATED_DECLARATIONS_POP
protected:
OListenerContainer( ::osl::Mutex& _rMutex );
@@ -158,12 +163,6 @@ namespace comphelper
return m_aListeners.getLength();
}
- inline ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > OListenerContainer::createIterator()
- {
- ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pIterator( new ::cppu::OInterfaceIteratorHelper( m_aListeners ) );
- return pIterator;
- }
-
//====================================================================
//= OSimpleListenerContainer
//====================================================================
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index a86174daf08e..f776b36be445 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -69,7 +69,9 @@ namespace comphelper
//------------------------------------------------------------------------------------------------------------------
::std::auto_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< IKeyPredicateLess > pComparator;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
switch ( i_type.getTypeClass() )
{
case TypeClass_CHAR:
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 06c743d65561..d315aa52530b 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -28,6 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx"
+
#include <connectivity/predicateinput.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
@@ -38,6 +39,8 @@
#include <connectivity/PColumn.hxx>
#include <comphelper/numbers.hxx>
+#include <boost/shared_ptr.hpp>
+
//.........................................................................
namespace dbtools
{
@@ -394,7 +397,7 @@ namespace dbtools
::rtl::OUString sReturn;
if ( pParseNode )
{
- ::std::auto_ptr<OSQLParseNode> pTemp(pParseNode);
+ boost::shared_ptr<OSQLParseNode> xTakeOwnership(pParseNode);
OSQLParseNode* pOdbcSpec = pParseNode->getByRule( OSQLParseNode::odbc_fct_spec );
if ( pOdbcSpec )
{
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index d3e8f52afb3a..89f457c6f302 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -95,12 +95,14 @@ namespace connectivity
}
//----------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue( const ::comphelper::ComponentContext& _rContext,
const Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn )
{
::std::auto_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rContext, _rxRowSet, _rxColumn ) );
return pValue;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
//----------------------------------------------------------------
::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XMultiServiceFactory >& _rxServiceFactory,const IParseContext* _pContext) const
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 482b2a430dc1..93f83e7a03bf 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -185,6 +185,7 @@ namespace cppcanvas
aLocalTransformation );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr& rGroupMtf,
const Renderer::Parameters& rParms,
const ::basegfx::B2DPoint& rDstPoint,
@@ -216,7 +217,9 @@ namespace cppcanvas
maLastSubset.mnSubsetBegin = 0;
maLastSubset.mnSubsetEnd = -1;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr& rGroupMtf,
GradientAutoPtr& rAlphaGradient,
const Renderer::Parameters& rParms,
@@ -248,6 +251,7 @@ namespace cppcanvas
maLastSubset.mnSubsetBegin = 0;
maLastSubset.mnSubsetEnd = -1;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// TODO(P3): The whole float transparency handling is a mess,
// this should be refactored. What's more, the old idea of
@@ -539,6 +543,7 @@ namespace cppcanvas
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr& rGroupMtf,
const Renderer::Parameters& rParms,
const ::basegfx::B2DPoint& rDstPoint,
@@ -555,7 +560,9 @@ namespace cppcanvas
rCanvas,
rState ) );
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr& rGroupMtf,
GradientAutoPtr& rAlphaGradient,
const Renderer::Parameters& rParms,
@@ -572,6 +579,7 @@ namespace cppcanvas
rCanvas,
rState ) );
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
}
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index eff9f8a0be2a..a30cbc5dc74b 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -157,9 +157,11 @@ UnoUrlDescriptor::UnoUrlDescriptor(rtl::OUString const & rDescriptor):
m_xImpl(new Impl(rDescriptor))
{}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
UnoUrlDescriptor::UnoUrlDescriptor(std::auto_ptr< Impl > & rImpl):
m_xImpl(rImpl)
{}
+SAL_WNODEPRECATED_DECLARATIONS_POP
UnoUrlDescriptor::UnoUrlDescriptor(UnoUrlDescriptor const & rOther):
m_xImpl(rOther.m_xImpl->clone())
@@ -211,19 +213,17 @@ public:
static inline Impl * create(rtl::OUString const & rUrl);
private:
- inline Impl(std::auto_ptr< UnoUrlDescriptor::Impl > & rConnection,
- std::auto_ptr< UnoUrlDescriptor::Impl > & rProtocol,
- rtl::OUString const & rObjectName);
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ Impl(std::auto_ptr< UnoUrlDescriptor::Impl > & rConnection,
+ std::auto_ptr< UnoUrlDescriptor::Impl > & rProtocol,
+ rtl::OUString const & rObjectName):
+ m_aConnection(rConnection),
+ m_aProtocol(rProtocol),
+ m_aObjectName(rObjectName)
+ {}
+SAL_WNODEPRECATED_DECLARATIONS_POP
};
-inline UnoUrl::Impl::Impl(std::auto_ptr< UnoUrlDescriptor::Impl > & rConnection,
- std::auto_ptr< UnoUrlDescriptor::Impl > & rProtocol,
- rtl::OUString const & rObjectName):
- m_aConnection(rConnection),
- m_aProtocol(rProtocol),
- m_aObjectName(rObjectName)
-{}
-
inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
{
if (!rUrl.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("uno:"), 0))
@@ -236,16 +236,20 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
throw rtl::MalformedUriException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"UNO URL has too few semicolons")));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< UnoUrlDescriptor::Impl >
xConnection(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i)));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
i = j + 1;
j = rUrl.indexOf(0x3B, i); // ';'
if (j < 0)
throw rtl::MalformedUriException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"UNO URL has too few semicolons")));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< UnoUrlDescriptor::Impl >
xProtocol(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i)));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
i = j + 1;
if (i == rUrl.getLength())
throw rtl::MalformedUriException(
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 2072b293f76c..8c0a3730667c 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -258,8 +258,10 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
Reference< browse::XBrowseNode > langEntries =
getLangNodeFromRootNode( children[ n ], lang );
- insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT,
- 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT,
+ 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
SetUpdateMode( sal_True );
@@ -345,13 +347,17 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co
::rtl::OUString name( children[ n ]->getName() );
if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
insertEntry( name, IMG_LIB, pRootEntry, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, children[ n ],model )));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
else
{
if ( children[ n ]->getType() == browse::BrowseNodeTypes::SCRIPT )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
insertEntry( name, IMG_MACRO, pRootEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, children[ n ],model )));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
}
@@ -367,6 +373,7 @@ void SFTreeListBox::ExpandAllTrees()
{
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
SvLBoxEntry * SFTreeListBox::insertEntry(
String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent,
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL )
@@ -385,7 +392,9 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
}
return p;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
SvLBoxEntry * SFTreeListBox::insertEntry(
String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent,
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData )
@@ -412,6 +421,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
aUserData.release()); // XXX possible leak
return p;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
void SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
{
@@ -944,7 +954,9 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
xNewDlg->SetObjectName( aNewName );
do
@@ -1018,23 +1030,28 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
// not in alphabetical order
if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pNewEntry = aScriptsBox.insertEntry( aChildName,
IMG_MACRO, pEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_METHOD, aChildNode,xDocumentModel ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
else
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pNewEntry = aScriptsBox.insertEntry( aChildName,
IMG_LIB, pEntry, false, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) ) );
- // If the Parent is not loaded then set to
- // loaded, this will prevent RequestingChilds ( called
- // from vcl via RequestingChilds ) from
- // creating new ( duplicate ) children
- SFEntry* userData = (SFEntry*)pEntry->GetUserData();
- if ( userData && !userData->isLoaded() )
- {
- userData->setLoaded();
- }
+ SAL_WNODEPRECATED_DECLARATIONS_POP
+
+ // If the Parent is not loaded then set to
+ // loaded, this will prevent RequestingChilds ( called
+ // from vcl via RequestingChilds ) from
+ // creating new ( duplicate ) children
+ SFEntry* userData = (SFEntry*)pEntry->GetUserData();
+ if ( userData && !userData->isLoaded() )
+ {
+ userData->setLoaded();
+ }
}
aScriptsBox.SetCurEntry( pNewEntry );
aScriptsBox.Select( aScriptsBox.GetCurEntry() );
@@ -1069,7 +1086,9 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
}
sal_uInt16 nMode = INPUTMODE_RENAME;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
xNewDlg->SetObjectName( aNewName );
sal_Bool bValid;
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 94543a8c553a..f6554bbce4d0 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -113,8 +113,10 @@ namespace svx
class HangulHanjaConversionDialog : public ModalDialog
{
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxCommonLinguisticControl >
m_pPlayground; // order matters: before all other controls!
+ SAL_WNODEPRECATED_DECLARATIONS_POP
PushButton m_aFind;
SuggestionDisplay m_aSuggestions;
@@ -122,10 +124,12 @@ namespace svx
RadioButton m_aSimpleConversion;
RadioButton m_aHangulBracketed;
RadioButton m_aHanjaBracketed;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< RadioButton > m_pHanjaAbove;
::std::auto_ptr< RadioButton > m_pHanjaBelow;
::std::auto_ptr< RadioButton > m_pHangulAbove;
::std::auto_ptr< RadioButton > m_pHangulBelow;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
FixedText m_aConversion;
CheckBox m_aHangulOnly;
CheckBox m_aHanjaOnly;
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index f5e8e9c7df27..28c6828bb1a8 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -152,6 +152,8 @@ void OKeySet::initColumns()
m_pParameterNames.reset( new SelectColumnsMetaData(bCase) );
m_pForeignColumnNames.reset( new SelectColumnsMetaData(bCase) );
}
+
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
const ::rtl::OUString& i_rUpdateTableName,
const Reference<XDatabaseMetaData>& i_xMeta,
@@ -221,6 +223,8 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
m_aAutoColumns.push_back( keyColumn->first );
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
::rtl::OUStringBuffer OKeySet::createKeyFilter()
{
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 22a56da716a4..30afda241670 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -92,10 +92,12 @@ namespace dbaccess
OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching
ORowSetValueVector m_aParameterValueForCache;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SelectColumnsMetaData> m_pKeyColumnNames; // contains all key column names
::std::auto_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names
::std::auto_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names
::std::auto_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest
+ SAL_WNODEPRECATED_DECLARATIONS_POP
connectivity::OSQLTable m_xTable; // reference to our table
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xTableKeys;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement;
@@ -134,11 +136,13 @@ namespace dbaccess
void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData);
void initColumns();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable,
const ::rtl::OUString& i_rUpdateTableName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns,
::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::rtl::OUStringBuffer createKeyFilter();
void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch);
void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 7255a470fb2e..e086ea5740ff 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -135,7 +135,9 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::
const ::rtl::OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength();
for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
findTableColumnsMatching_throw(xTables->getByName(*pTableNameIter),*pTableNameIter,xMeta,xQueryColumns,pKeyColumNames);
m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end());
}
@@ -154,7 +156,9 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::
xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery());
// check for joins
::rtl::OUString aErrorMsg;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_aSqlIterator.setParseTree( pStatementNode.get() );
m_aSqlIterator.traverseAll();
fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions());
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 447137062b50..2fdaffdd8534 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1532,7 +1532,9 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection,
::rtl::OUString sSql = _xAnalyzer->getQuery();
::rtl::OUString sErrorMsg;
::connectivity::OSQLParser aSqlParser( m_aContext.getLegacyServiceFactory() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( pSqlParseNode.get() && SQL_ISRULE(pSqlParseNode, select_statement) )
{
OSQLParseNode* pTableRefCommalist = pSqlParseNode->getByRule(::connectivity::OSQLParseNode::table_ref_commalist);
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 2942f5ccbe78..943711145400 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -665,7 +665,9 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
aClauses.push_back( getSQLPart( eLoopParts, m_aSqlIterator, sal_True ) );
// overwrite the one part in question here
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< TokenComposer > pComposer;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( ( _ePart == Where ) || ( _ePart == Having ) )
pComposer.reset( new FilterCreator );
else
@@ -811,7 +813,9 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
::rtl::OUString sSQL( aSQL.makeStringAndClear() );
// normalize the statement so that it doesn't contain any application-level features anymore
::rtl::OUString sError;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL, false ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
OSL_ENSURE( pStatementTree.get(), "OSingleSelectQueryComposer::getColumns: could not parse the column retrieval statement!" );
if ( pStatementTree.get() )
if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, m_xConnection, m_aSqlParser, NULL ) )
@@ -1725,7 +1729,9 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
aSql += sFilter;
::rtl::OUString aErrorMsg;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OSQLParseNode> pSqlParseNode( m_aSqlParser.parseTree(aErrorMsg,aSql));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( pSqlParseNode.get() )
{
m_aAdditiveIterator.setParseTree(pSqlParseNode.get());
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 3d4d2ab3dfde..783d9df38e45 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -714,7 +714,9 @@ void ODBExport::exportDataSourceSettings()
else
{
// the not-that-simple case, we need to iterate through the sequence elements
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<IIterator> pSequenceIterator;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
switch (aSimpleType.getTypeClass())
{
case TypeClass_STRING:
@@ -835,7 +837,9 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
{
if ( _xCollection.is() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLElementExport> pComponents;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( _bExportContext )
pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True));
Sequence< ::rtl::OUString> aSeq = _xCollection->getElementNames();
@@ -1113,7 +1117,9 @@ void ODBExport::exportQueries(sal_Bool _bExportContext)
Reference< XNameAccess > xCollection = xSup->getQueryDefinitions();
if ( xCollection.is() && xCollection->hasElements() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( _bExportContext )
pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) );
else
@@ -1133,7 +1139,9 @@ void ODBExport::exportTables(sal_Bool _bExportContext)
Reference< XNameAccess > xCollection = xSup->getTables();
if ( xCollection.is() && xCollection->hasElements() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( _bExportContext )
pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportTable) );
else
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index c4e2a16dc856..854f792bd8b4 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -76,6 +76,8 @@ private:
TPropertyNameMap m_aTablesSettings;
TInfoSequence m_aInfoSequence;
Reference< XComponent > m_xSrcDoc;
+
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap;
@@ -86,6 +88,7 @@ private:
mutable ::std::auto_ptr<SvXMLTokenMap> m_pComponentElemTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pQueryElemTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnElemTokenMap;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper;
mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 9c349639445c..e02e1874f400 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -342,7 +342,9 @@ OApplicationController::~OApplicationController()
osl_incrementInterlockedCount( &m_refCount );
dispose();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< Window> aTemp( getView() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
DBG_DTOR(OApplicationController,NULL);
@@ -479,7 +481,9 @@ sal_Bool OApplicationController::Construct(Window* _pParent)
if ( !bSuccess )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< Window> aTemp( getView() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
return sal_False;
}
@@ -1099,7 +1103,9 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
if ( !aArgs.getLength() )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::std::vector<SotFormatStringId> aFormatIds;
getSupportedFormats(getContainer()->getElementType(),aFormatIds);
const ::std::vector<SotFormatStringId>::iterator aEnd = aFormatIds.end();
@@ -1855,7 +1861,9 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
{
if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( !aHelper->isConnected() )
break;
@@ -1877,7 +1885,9 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
if ( !xConnection.is() )
break;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DatabaseObjectView > pDesigner;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::comphelper::NamedValueCollection aArguments( _rAdditionalArguments );
Any aDataSource;
@@ -1962,7 +1972,9 @@ void OApplicationController::newElementWithPilot( ElementType _eType )
case E_REPORT:
case E_FORM:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( aHelper->isConnected() )
{
sal_Int32 nCommandType = -1;
@@ -1977,7 +1989,9 @@ void OApplicationController::newElementWithPilot( ElementType _eType )
case E_QUERY:
case E_TABLE:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( aHelper->isConnected() )
{
if ( E_QUERY == _eType )
@@ -2009,7 +2023,9 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType,
case E_FORM:
case E_REPORT:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( !aHelper->isConnected() )
break;
@@ -2020,7 +2036,9 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType,
case E_QUERY:
case E_TABLE:
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DatabaseObjectView > pDesigner;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SharedConnection xConnection( ensureConnection() );
if ( !xConnection.is() )
break;
@@ -2091,8 +2109,10 @@ void OApplicationController::renameEntry()
{
if ( xContainer.is() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< IObjectNameCheck > pNameChecker;
::std::auto_ptr< OSaveAsDlg > aDialog;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Reference<XRename> xRename;
const ElementType eType = getContainer()->getElementType();
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 7e8f56972e0f..f0e8ae74ec6e 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -470,6 +470,7 @@ void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUSt
}
// -----------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType )
{
OSL_ENSURE( ( _eType == E_TABLE ) || ( _eType == E_QUERY ) || ( _eType == E_FORM ) || ( _eType == E_REPORT ),
@@ -489,6 +490,8 @@ void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUSt
) );
return pDocuments;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
// -----------------------------------------------------------------------------
TransferableHelper* OApplicationController::copyObject()
{
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index c488a0cafa1f..c125979ed1fa 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -263,7 +263,9 @@ OAppDetailPageHelper::~OAppDetailPageHelper()
{
m_pLists[i]->clearCurrentSelection();
m_pLists[i]->Hide();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<DBTreeListBox> aTemp(m_pLists[i]);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pLists[i]->clearCurrentSelection(); // why a second time?
m_pLists[i] = NULL;
}
@@ -1173,9 +1175,11 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
}
Reference< XDatabaseDocumentUI > xApplication( getBorderWin().getView()->getAppController().getXController(), UNO_QUERY );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< DatabaseObjectView > pDispatcher( new ResultSetBrowser(
getBorderWin().getView()->getORB(), xApplication, NULL, _bTable
) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pDispatcher->setTargetFrame( m_xFrame );
::comphelper::NamedValueCollection aArgs;
@@ -1218,7 +1222,9 @@ IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/)
m_aTBPreview.Update();
// execute the menu
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> aMenu(new PopupMenu( ModuleRes( RID_MENU_APP_PREVIEW ) ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt16 pActions[] = { SID_DB_APP_DISABLE_PREVIEW
, SID_DB_APP_VIEW_DOC_PREVIEW
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 4974a3ef6333..2622c01146e9 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -105,13 +105,17 @@ OAppBorderWindow::~OAppBorderWindow()
if ( m_pPanel )
{
m_pPanel->Hide();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pPanel);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pPanel = NULL;
}
if ( m_pDetailView )
{
m_pDetailView->Hide();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pDetailView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pDetailView = NULL;
}
@@ -241,7 +245,9 @@ OApplicationView::~OApplicationView()
{
stopComponentListening(m_xObject);
m_pWin->Hide();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 3eadbe21154c..fb136694de8d 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -333,7 +333,9 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
clearTreeModel();
// clear the tree model
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvLBoxTreeList> aTemp(m_pTreeModel);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTreeModel = NULL;
}
@@ -2210,7 +2212,9 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
//------------------------------------------------------------------------------
SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const String& _rName, void* _pUserData, EntryType _eEntryType )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Image aImage;
pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage );
@@ -3371,6 +3375,7 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC
}
// -----------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvLBoxEntry* _pAnyEntry )
{
::std::auto_ptr< ImageProvider > pImageProvider( new ImageProvider );
@@ -3379,6 +3384,7 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC
pImageProvider.reset( new ImageProvider( xConnection ) );
return pImageProvider;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
// -----------------------------------------------------------------------------
sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvLBoxEntry* _pAnyEntry, SharedConnection& _rConnection )
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 4e285f9b3172..4b4457fceaee 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -249,11 +249,15 @@ OFieldDescControl::~OFieldDescControl()
DBG_DTOR(OFieldDescControl,NULL);
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pVertScroll);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pVertScroll = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pHorzScroll);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pHorzScroll = NULL;
}
if ( m_bAdded )
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 5f36c9678b99..1590cc2eab4e 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -166,7 +166,9 @@ namespace dbaui
aFind->second = Event.IsEnabled;
if ( m_aCommandURL == aFind->first && !Event.IsEnabled )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> pMenu = getMenu();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt16 nCount = pMenu->GetItemCount();
for (sal_uInt16 i = 0; i < nCount; ++i)
{
@@ -185,6 +187,7 @@ namespace dbaui
}
}
// -----------------------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> OToolboxController::getMenu()
{
::std::auto_ptr<PopupMenu> pMenu;
@@ -232,6 +235,7 @@ namespace dbaui
}
return pMenu;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// -----------------------------------------------------------------------------
Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException)
{
@@ -240,7 +244,9 @@ namespace dbaui
::osl::MutexGuard aGuard(m_aMutex);
ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PopupMenu> pMenu = getMenu();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt16 nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN);
// "cleanup" the toolbox state
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 397bb804c829..ab5a8927bad2 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -75,9 +75,13 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController
// -----------------------------------------------------------------------------
OJoinDesignView::~OJoinDesignView()
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aT3(m_pScrollWindow);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pScrollWindow = NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aT2(m_pTableView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTableView = NULL;
}
// -------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index f2d906e5017a..6d5c6944f711 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -103,7 +103,9 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
OScrollWindowHelper::~OScrollWindowHelper()
{
DBG_DTOR(OScrollWindowHelper,NULL);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pCornerWindow);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pCornerWindow = NULL;
m_pTableView = NULL;
}
@@ -1632,7 +1634,9 @@ void OJoinTableView::clearLayoutInformation()
{
if ( aIter->second )
aIter->second->clearListBox();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(aIter->second);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
aIter->second = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 27912e355d69..8fc9e70e313b 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -789,7 +789,9 @@ namespace
::rtl::OUString aTmp = aCriteria;
::rtl::OUString aErrorMsg;
Reference<XPropertySet> xColumn;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -820,7 +822,9 @@ namespace
::rtl::OUString aTmp = aCriteria;
::rtl::OUString aErrorMsg;
Reference<XPropertySet> xColumn;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pParseNode.get())
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
@@ -1182,7 +1186,9 @@ namespace
::rtl::OUString aTmp = pEntryField->GetField();
::rtl::OUString aErrorMsg;
Reference<XPropertySet> xColumn;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pParseNode.get())
{
::rtl::OUString sGroupBy;
@@ -2549,7 +2555,9 @@ OQueryDesignView::~OQueryDesignView()
{
if ( m_pTableView )
::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pSelectionBox);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pSelectionBox = NULL;
DBG_DTOR(OQueryDesignView,NULL);
@@ -2952,7 +2960,9 @@ sal_Bool OQueryDesignView::checkStatement()
{
::connectivity::OSQLParser& rParser( rController.getParser() );
::rtl::OUString sErrorMessage;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( pParseNode.get() )
{
OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
@@ -3066,7 +3076,9 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE "));
sSql += pEntry->GetField();
sSql += _sCriteria;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, sal_True ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
nType = DataType::DOUBLE;
if ( pParseNode.get() )
{
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 0ad058656489..e79bed250f34 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -57,11 +57,15 @@ OQueryViewSwitch::~OQueryViewSwitch()
{
DBG_DTOR(OQueryViewSwitch,NULL);
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pTextView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTextView = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pDesignView);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pDesignView = NULL;
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 4c5882c7ef9e..182128d36388 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -85,11 +85,15 @@ OTableBorderWindow::~OTableBorderWindow()
m_pFieldDescWin->Hide();
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pEditorCtrl);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pEditorCtrl = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pFieldDescWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pFieldDescWin = NULL;
}
@@ -222,7 +226,9 @@ OTableDesignView::~OTableDesignView()
m_pWin->Hide();
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index ca2680fc09a8..913cdd2b4a01 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -95,15 +95,21 @@ OTableFieldDescWin::~OTableFieldDescWin()
m_pHeader->Hide();
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pGenPage);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pGenPage = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pHeader);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pHeader = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp(m_pHelpBar);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pHelpBar = NULL;
}
}
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 3fb4b032e3bc..52cbf98d4e5d 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -253,11 +253,13 @@ namespace dbaui
/** extracts the source object (table or query) described by the given descriptor,
relative to m_xSourceConnection
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ICopyTableSourceObject >
impl_extractSourceObject_throw(
const Reference< XPropertySet >& _rxDescriptor,
sal_Int32& _out_rCommandType
) const;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** extracts the result set to copy records from, and the selection-related aspects, if any.
@@ -352,8 +354,10 @@ private:
// source
SharedConnection m_xSourceConnection;
sal_Int32 m_nCommandType;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ICopyTableSourceObject >
m_pSourceObject;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Reference< XResultSet > m_xSourceResultSet;
Sequence< Any > m_aSourceSelection;
sal_Bool m_bSourceSelectionBookmarks;
@@ -770,6 +774,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
}
//-------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const
{
OSL_PRECOND( _rxDescriptor.is() && m_xSourceConnection.is(), "CopyTableWizard::impl_extractSourceObject_throw: illegal arguments!" );
@@ -838,6 +843,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
return pSourceObject;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
//-------------------------------------------------------------------------
void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPropertySet >& i_rDescriptor )
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 7c75f9dee4c2..a5e0daf33fe7 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -97,6 +97,7 @@
#include <queue>
#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
#if (defined(_MSC_VER) && (_MSC_VER < 1400))
#define _WIN32_WINNT 0x0400
@@ -602,7 +603,7 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
text = ::comphelper::anyToString( rStatus ); // fallback
const SolarMutexGuard aGuard;
- const ::std::auto_ptr< ErrorBox > aBox( new ErrorBox( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, text ) );
+ const boost::scoped_ptr< ErrorBox > aBox( new ErrorBox( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, text ) );
aBox->Execute();
}
++m_nCurrentProgress;
@@ -844,7 +845,7 @@ void ExtensionCmdQueue::Thread::execute()
msg = ::comphelper::anyToString(exc);
const SolarMutexGuard guard;
- ::std::auto_ptr<ErrorBox> box(
+ boost::scoped_ptr<ErrorBox> box(
new ErrorBox( currentCmdEnv->activeDialog(), WB_OK, msg ) );
if ( m_pDialogHelper )
box->SetText( m_pDialogHelper->getWindow()->GetText() );
diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
index ec93d5dd60bc..c9faeff8cd22 100644
--- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx
+++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
@@ -110,7 +110,9 @@ namespace accessibility
model) contained in the given SvxEditSource.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~AccessibleStaticTextBase();
private:
@@ -158,7 +160,9 @@ namespace accessibility
The new edit source to set. Object ownership is transferred
from the caller to the callee.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** Set the event source
@@ -269,7 +273,9 @@ namespace accessibility
private:
/// @dyn
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
diff --git a/editeng/inc/editeng/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx
index 69c3ae8c6496..25f91bc42ee1 100644
--- a/editeng/inc/editeng/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
@@ -102,7 +102,9 @@ namespace editeng
};
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< HangulHanjaConversion_Impl > m_pImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// used to set initial values of m_pImpl object from saved ones
static sal_Bool m_bUseSavedValues; // defines if the followng two values should be used for initialization
diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index 681043f48a86..5d8caa616aef 100644
--- a/editeng/inc/editeng/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -79,7 +79,9 @@ public:
@return the translated hint
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
static ::std::auto_ptr<SfxHint> EENotification2Hint( EENotify* aNotify );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** Calculate attribute run for EditEngines
diff --git a/editeng/inc/editeng/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx
index 573b23c35035..7fa85deddbab 100644
--- a/editeng/inc/editeng/unoedprx.hxx
+++ b/editeng/inc/editeng/unoedprx.hxx
@@ -159,7 +159,9 @@ public:
virtual void UpdateData();
virtual SfxBroadcaster& GetBroadcaster() const;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Bool IsValid() const;
private:
@@ -167,7 +169,9 @@ private:
SvxEditSourceAdapter( const SvxEditSourceAdapter& );
SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > mpAdaptee;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SvxAccessibleTextAdapter maTextAdapter;
SvxAccessibleTextEditViewAdapter maEditViewAdapter;
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 0af51fcef399..d909892756f8 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -138,7 +138,9 @@ namespace accessibility
return maEditSource;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
@@ -248,6 +250,7 @@ namespace accessibility
DBG_DTOR( AccessibleStaticTextBase_Impl, NULL );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
{
DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
@@ -256,6 +259,7 @@ namespace accessibility
if( mpTextParagraph )
mpTextParagraph->SetEditSource( &maEditSource );
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint )
{
@@ -467,6 +471,7 @@ namespace accessibility
//
//------------------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ) :
mpImpl( new AccessibleStaticTextBase_Impl() )
{
@@ -474,6 +479,7 @@ namespace accessibility
SetEditSource( pEditSource );
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
AccessibleStaticTextBase::~AccessibleStaticTextBase()
{
@@ -494,6 +500,7 @@ namespace accessibility
#endif
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void AccessibleStaticTextBase::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException))
{
#ifdef DBG_UTIL
@@ -509,6 +516,7 @@ namespace accessibility
mpImpl->SetEditSource( pEditSource );
#endif
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void AccessibleStaticTextBase::SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 245241595af1..73220b8fbac0 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -336,7 +336,9 @@ SvxEditSource* SvxEditSourceAdapter::Clone() const
{
if( mbEditSourceValid && mpAdaptee.get() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > pClonedAdaptee( mpAdaptee->Clone() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( pClonedAdaptee.get() )
{
@@ -424,6 +426,7 @@ SfxBroadcaster& SvxEditSourceAdapter::GetBroadcaster() const
return maDummyBroadcaster;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee )
{
if( pAdaptee.get() )
@@ -439,6 +442,7 @@ void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdap
mbEditSourceValid = sal_False;
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Bool SvxEditSourceAdapter::IsValid() const
{
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index 3e3a873b5482..9ceaa157e215 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -51,7 +51,9 @@ namespace pcr
bool m_bConstructed;
/// access to property meta data
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OPropertyInfoService > m_pInfoService;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
protected:
~DefaultFormComponentInspectorModel();
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 54f78e55a013..34b723c33c11 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -256,7 +256,9 @@ namespace pcr
{
if ( !_bDoListen )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
while ( pListenerIterator->hasMoreElements() )
{
PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( pListenerIterator->next() );
@@ -290,7 +292,9 @@ namespace pcr
}
else
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
while ( pListenerIterator->hasMoreElements() )
{
Reference< XPropertyChangeListener > xListener( pListenerIterator->next(), UNO_QUERY );
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index a660a569cd89..1aa488cdbcae 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -57,10 +57,12 @@ namespace pcr
FixedText m_aExplanation;
FixedText m_aDetailLabel;
FixedText m_aMasterLabel;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< FieldLinkRow > m_aRow1;
::std::auto_ptr< FieldLinkRow > m_aRow2;
::std::auto_ptr< FieldLinkRow > m_aRow3;
::std::auto_ptr< FieldLinkRow > m_aRow4;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
OKButton m_aOK;
CancelButton m_aCancel;
HelpButton m_aHelp;
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index b1d5cbedbe9c..cbfd8c820912 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -69,7 +69,9 @@ namespace pcr
private:
HandlerArray m_aSlaveHandlers;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
PropertyChangeListeners m_aPropertyListeners;
bool m_bSupportedPropertiesAreKnown;
PropertyBag m_aSupportedProperties;
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index c3fe86810dba..68dfdf808134 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -102,8 +102,10 @@ namespace pcr
return;
// remove all old property change listeners
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator();
::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed
+ SAL_WNODEPRECATED_DECLARATIONS_POP
while ( removeListener->hasMoreElements() )
removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) );
OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: derived classes are expected to forward the removePropertyChangeListener call to their base class (me)!" );
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index b065ee6d899e..ee55c3d8845c 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -61,6 +61,7 @@
#include <memory>
#include <limits>
#include <boost/bind.hpp>
+#include <boost/scoped_ptr.hpp>
//............................................................................
namespace pcr
@@ -1079,16 +1080,16 @@ namespace pcr
DropDownEditControl::~DropDownEditControl()
{
{
- ::std::auto_ptr<Window> aTemp(m_pFloatingEdit);
+ boost::scoped_ptr<Window> aTemp(m_pFloatingEdit);
m_pFloatingEdit = NULL;
}
{
- ::std::auto_ptr<Window> aTemp(m_pImplEdit);
+ boost::scoped_ptr<Window> aTemp(m_pImplEdit);
SetSubEdit( NULL );
m_pImplEdit = NULL;
}
{
- ::std::auto_ptr<Window> aTemp(m_pDropdownButton);
+ boost::scoped_ptr<Window> aTemp(m_pDropdownButton);
m_pDropdownButton = NULL;
}
}
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx
index 6ffa250de479..de9d27e5569a 100644
--- a/filter/inc/filter/msfilter/escherex.hxx
+++ b/filter/inc/filter/msfilter/escherex.hxx
@@ -1397,7 +1397,9 @@ public:
class InteractionInfo
{
bool mbHasInteraction;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<SvMemoryStream> mpHyperlinkRecord;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
InteractionInfo();
public:
@@ -1406,7 +1408,9 @@ public:
mpHyperlinkRecord.reset( pStream );
}
bool hasInteraction() { return mbHasInteraction; }
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< SvMemoryStream >& getHyperlinkRecord() { return mpHyperlinkRecord; }
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
class EscherExHostAppData
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 32557538580c..f6986b9ea44f 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -229,7 +229,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName );
if ( InteractionInfo* pInteraction = mpHostAppData ? mpHostAppData->GetInteractionInfo():NULL )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( pMemStrm.get() )
{
pMemStrm->ObjectOwnsMemory( sal_False );
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index d3c9aa3c91e3..c34294cf26ff 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -59,7 +59,9 @@ namespace frm
private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >
m_xFirstDispatchInterceptor;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< UrlTransformer > m_pUrlTransformer;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
/** retrieves our URL transformer, so our clients may use it, too
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 6e56e4f54519..040967da027b 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -74,8 +74,10 @@ namespace frm
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
m_xORB;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ControlFeatureInterception >
m_pFeatureInterception;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// all supported features
FeatureMap m_aSupportedFeatures;
@@ -190,7 +192,9 @@ namespace frm
class OFormNavigationMapper
{
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< UrlTransformer > m_pUrlTransformer;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
OFormNavigationMapper(
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index ff5b9c79d86b..2f5c307419de 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -831,7 +831,9 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
// SYNCHRONIZED ----->
::osl::ClearableMutexGuard aGuard( m_rMutex );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ElementDescription > aAutoDeleteMetaData;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ElementDescription* pElementMetaData = _pApprovalResult;
if ( !pElementMetaData )
{ // not yet approved by the caller -> do ourself
@@ -839,7 +841,9 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
DBG_ASSERT( pElementMetaData, "OInterfaceContainer::implInsert: createElementMetaData returned nonsense!" );
// ensure that the meta data structure will be deleted later on
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
aAutoDeleteMetaData = ::std::auto_ptr< ElementDescription >( pElementMetaData );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// will throw an exception if necessary
approveNewElement( _rxElement, pElementMetaData );
@@ -979,7 +983,9 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implReplaceByIndex: precondition not met (index)!" );
// approve the new object
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" );
{
Reference< XPropertySet > xElementProps;
@@ -1127,7 +1133,9 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c
{
Reference< XPropertySet > xElementProps;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" );
// ensure the correct name of the element
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index c8c76c8d848f..502f0be462b2 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -208,6 +208,7 @@ namespace xforms
//--------------------------------------------------------------------
namespace
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const ::rtl::OUString& _rPattern )
{
UErrorCode nMatchStatus = U_ZERO_ERROR;
@@ -216,6 +217,7 @@ namespace xforms
OSL_ENSURE( U_SUCCESS( nMatchStatus ), "lcl_initializePatternMatcher: invalid pattern property!" );
// if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
static bool lcl_matchString( RegexMatcher& _rMatcher, const ::rtl::OUString& _rText )
{
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index 9ac1f08eb5ff..b3af353d554c 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -116,6 +116,8 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
}
return CSubmission::UNKNOWN_ERROR;
}
+
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< CSerialization > CSubmission::createSerialization(const Reference< XInteractionHandler >& _xHandler,Reference<XCommandEnvironment>& _rOutEnv)
{
// PUT always uses application/xml
@@ -139,7 +141,6 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
_rOutEnv = pHelper;
return apSerialization;
}
-
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
index 78d44e91892a..7451013c16c7 100644
--- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx
+++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
@@ -45,14 +45,18 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
::com::sun::star::sheet::XFormulaOpCodeMapper,
::com::sun::star::lang::XServiceInfo >
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FormulaCompiler> m_pCompiler;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
static ::rtl::OUString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);
protected:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~FormulaOpCodeMapperObj();
private:
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 8da444308d93..32643b5a4ba5 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -69,7 +69,9 @@ public:
,IControlReferenceHandler* _pDlg = NULL );
virtual ~FormulaModalDialog();
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FormulaDlg_Impl> m_pImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
protected:
void disableOk();
@@ -117,7 +119,9 @@ public:
, IControlReferenceHandler* _pDlg = NULL );
virtual ~FormulaDlg();
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FormulaDlg_Impl> m_pImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
DECL_LINK( UpdateFocusHdl, Timer*);
protected:
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 50ed85868538..c3be20034d04 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -44,10 +44,12 @@ sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const ::rtl::OUString
return ::comphelper::findValue( getSupportedServiceNames_Static(), _rServiceName, sal_True ).getLength() != 0;
}
//------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler)
: m_pCompiler(_pCompiler)
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj()
{
@@ -115,11 +117,14 @@ uno::Sequence< rtl::OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServ
return aSeq;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
uno::Reference< uno::XInterface > SAL_CALL FormulaOpCodeMapperObj::create(
uno::Reference< uno::XComponentContext > const & /*_xContext*/)
{
return static_cast<sheet::XFormulaOpCodeMapper*>(new FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler>(new FormulaCompiler())));
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
// -----------------------------------------------------------------------------
// =============================================================================
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 97d8446875e6..eee1629a3308 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -117,7 +117,9 @@ namespace framework
virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException);
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ImageManagerImpl> m_pImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
}
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index 7b5a0ca390c4..516e3e242c8d 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -1026,7 +1026,9 @@ AstExprValue* AstExpression::eval_bit_op(EvalKind ek)
if (m_subExpr2->getExprValue() == NULL)
return NULL;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< AstExprValue > retval(new AstExprValue());
+SAL_WNODEPRECATED_DECLARATIONS_POP
retval->et = ET_long;
switch (m_combOperator)
@@ -1069,7 +1071,9 @@ AstExprValue* AstExpression::eval_un_op(EvalKind ek)
if (m_subExpr1->getExprValue() == NULL)
return NULL;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< AstExprValue > retval(new AstExprValue());
+SAL_WNODEPRECATED_DECLARATIONS_POP
retval->et = ET_double;
switch (m_combOperator)
diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx
index 21a00885e29a..30ea479cd798 100644
--- a/lotuswordpro/source/filter/lwpoverride.cxx
+++ b/lotuswordpro/source/filter/lwpoverride.cxx
@@ -386,10 +386,12 @@ LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther)
, m_pParaSpacingAbove(0)
, m_pParaSpacingBelow(0)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpSpacingCommonOverride> pSpacing(::clone(rOther.m_pSpacing));
std::auto_ptr<LwpSpacingCommonOverride> pAboveLineSpacing(::clone(rOther.m_pAboveLineSpacing));
std::auto_ptr<LwpSpacingCommonOverride> pParaSpacingAbove(::clone(rOther.m_pParaSpacingAbove));
std::auto_ptr<LwpSpacingCommonOverride> pParaSpacingBelow(::clone(rOther.m_pParaSpacingBelow));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pSpacing = pSpacing.release();
m_pAboveLineSpacing = pAboveLineSpacing.release();
m_pParaSpacingAbove = pParaSpacingAbove.release();
@@ -468,7 +470,9 @@ LwpAmikakeOverride::LwpAmikakeOverride(LwpAmikakeOverride const& rOther)
, m_pBackgroundStuff(0)
, m_nType(rOther.m_nType)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpBackgroundStuff> pBackgroundStuff(::clone(rOther.m_pBackgroundStuff));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pBackgroundStuff = pBackgroundStuff.release();
}
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 38ad11236591..6b99b6aabd52 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -355,11 +355,13 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl
}
LwpOverride* pBorder = pParaStyle->GetParaBorder();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpParaBorderOverride> pFinalBorder(
pBorder
? polymorphic_downcast<LwpParaBorderOverride*>(pBorder->clone())
: new LwpParaBorderOverride)
;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// get local border
pBorder = static_cast<LwpParaBorderProperty*>(pProps)->GetLocalParaBorder();
@@ -387,11 +389,13 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl
}
LwpOverride* pBreaks = pParaStyle->GetBreaks();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpBreaksOverride> pFinalBreaks(
pBreaks
? polymorphic_downcast<LwpBreaksOverride*>(pBreaks->clone())
: new LwpBreaksOverride)
;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// get local breaks
pBreaks = static_cast<LwpParaBreaksProperty*>(pProps)->GetLocalParaBreaks();
@@ -474,11 +478,13 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
m_bHasBullet = sal_True;
LwpOverride* pBullet= pParaStyle->GetBulletOverride();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpBulletOverride> pFinalBullet(
pBullet
? polymorphic_downcast<LwpBulletOverride*>(pBullet->clone())
: new LwpBulletOverride)
;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
boost::scoped_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone());
pLocalBullet2->Override(pFinalBullet.get());
@@ -512,7 +518,9 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
m_pSilverBullet->SetFoundry(m_pFoundry);
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpBulletOverride> pBulletOverride(pBullOver->clone());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
delete m_pBullOver;
m_pBullOver = pBulletOverride.release();
}
@@ -532,7 +540,9 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps)
}
LwpNumberingOverride* pParaNumbering = pParaStyle->GetNumberingOverride();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpNumberingOverride> pOver(new LwpNumberingOverride);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
//Override with the local numbering, if any
if (pProps)
{
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.cxx b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
index b299e091d82a..cae9854c0960 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
@@ -101,10 +101,12 @@ LwpParaBorderOverride::LwpParaBorderOverride(LwpParaBorderOverride const& rOther
, m_nRightWidth(rOther.m_nRightWidth)
, m_nBetweenMargin(rOther.m_nBetweenMargin)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpBorderStuff> pBorderStuff(::clone(rOther.m_pBorderStuff));
std::auto_ptr<LwpBorderStuff> pBetweenStuff(::clone(rOther.m_pBetweenStuff));
std::auto_ptr<LwpShadow> pShadow(::clone(rOther.m_pShadow));
std::auto_ptr<LwpMargins> pMargins(::clone(rOther.m_pMargins));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pBorderStuff = pBorderStuff.release();
m_pBetweenStuff = pBetweenStuff.release();
m_pShadow = pShadow.release();
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index 9637e89c0bce..e00ac2c054ee 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -445,7 +445,9 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden
else
pParentPara = NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<LwpIndentOverride> pTotalIndent(new LwpIndentOverride);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pIndent->IsUseRelative() && pParentPara)
{
LwpIndentOverride* pParentIndent = pParentPara->GetIndent();
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index 91d9c1abdcfb..2b6ef0e17fdc 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -193,8 +193,10 @@ public:
private:
typedef ::std::vector< sal_Int32 > BlockIdVector;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< ::oox::ole::EmbeddedForm > EmbeddedFormPtr;
typedef ::std::auto_ptr< ShapeContainer > ShapeContainerPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
typedef ::std::map< ::rtl::OUString, OleObjectInfo > OleObjectInfoMap;
typedef ::std::map< ::rtl::OUString, ControlInfo > ControlInfoMap;
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index a99654b8a367..65683f722716 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -172,8 +172,10 @@ struct ClientData
struct ShapeModel
{
typedef ::std::vector< ::com::sun::star::awt::Point > PointVector;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< TextBox > TextBoxPtr;
typedef ::std::auto_ptr< ClientData > ClientDataPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::rtl::OUString maType; /// Shape template with default properties.
PointVector maPoints; /// Points for the polyline shape.
@@ -369,7 +371,9 @@ protected:
const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< ShapeContainer > ShapeContainerPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ShapeContainerPtr mxChildren; /// Shapes and templates that are part of this group.
};
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 0bd28d0a2fb8..3f709be508be 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -744,7 +744,9 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName,
break;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ORegKey > p(new ORegKey(path, this));
+SAL_WNODEPRECATED_DECLARATIONS_POP
i = m_openKeyTable.insert(std::make_pair(path, p.get())).first;
p.release();
} else {
@@ -969,7 +971,9 @@ RegError ORegistry::saveKey(RegKeyHandle hKey, const OUString& regFileName,
RegError _ret = REG_NO_ERROR;
ORegKey* pKey = static_cast< ORegKey* >(hKey);
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ORegistry > pReg (new ORegistry());
+SAL_WNODEPRECATED_DECLARATIONS_POP
_ret = pReg->initRegistry(regFileName, REG_CREATE);
if (_ret != REG_NO_ERROR)
return _ret;
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index e7cc2b664108..98909e81b18d 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1496,7 +1496,9 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
UniReference< XMLShapeExport > xShapeExport = GetShapeExport();
xShapeExport->seekShapes(_xSection.get());
const sal_Int32 nCount = _xSection->getCount();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLElementExport> pParagraphContent;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( _bAddParagraph )
pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False));
@@ -1507,7 +1509,9 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
uno::Reference< XShape > xShape(_xSection->getByIndex(i),uno::UNO_QUERY);
if ( xShape.is() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLElementExport> pSubDocument;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
uno::Reference< frame::XModel> xModel(xShape->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"))),uno::UNO_QUERY);
if ( xModel.is() ) // special handling for chart object
{
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 73ba163f7b39..756d7661a50b 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -201,7 +201,9 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
{
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
try
{
::rtl::OUString sMasterField,sDetailField;
@@ -247,7 +249,9 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
{
sal_Bool bHasCategories = sal_True;
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for(sal_Int16 i = 0; i < nLength; ++i)
{
::rtl::OUString sLocalName;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 4ea40033edda..efed1a7f69f1 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -98,7 +98,9 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
// -----------------------------------------------------------------------------
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 9e4970d97d3d..07bc1fc42f8e 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -84,6 +84,8 @@ private:
TGroupFunctionMap m_aFunctions;
com::sun::star::uno::Any m_aViewSettings;
Reference< XComponent > m_xSrcDoc;
+
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
mutable ::std::auto_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pReportElemTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap;
@@ -97,6 +99,7 @@ private:
mutable ::std::auto_ptr<SvXMLTokenMap> m_pFormatElemTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnTokenMap;
mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory;
UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 60e97c7257a5..5092c43265c2 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -42,6 +42,8 @@
#include <formula/funcutl.hxx>
#include <formula/tokenarray.hxx>
+#include <boost/scoped_ptr.hpp>
+
#include "Formula.hxx"
#include "AddField.hxx"
#include "helpids.hrc"
@@ -103,7 +105,7 @@ FormulaDialog::~FormulaDialog()
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) );
aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
- ::std::auto_ptr<Window> aTemp2(m_pAddField);
+ boost::scoped_ptr<Window> aTemp2(m_pAddField);
m_pAddField = NULL;
}
}
@@ -263,12 +265,14 @@ table::CellAddress FormulaDialog::getReferencePosition() const
return table::CellAddress();
}
// -----------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList)
{
::std::auto_ptr<formula::FormulaTokenArray> pArray(new FormulaTokenArray());
pArray->Fill(_aTokenList, NULL);
return pArray;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
// =============================================================================
} // rptui
// =============================================================================
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index 458debb305b3..9fa7e61616a1 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -121,7 +121,9 @@ namespace rptui
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > m_xMasterDetails;
/// type converter, needed on various occasions
::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OPropertyInfoService > m_pInfoService;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
//........................................................................
} // namespace rptui
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 91504e7f1cb9..68053cd2c062 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -308,7 +308,9 @@ namespace rptui
/// type converter, needed on various occasions
::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter;
/// access to property meta data
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OPropertyInfoService > m_pInfoService;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mutable ::rtl::OUString m_sDefaultFunction;
mutable ::rtl::OUString m_sScope;
sal_uInt32 m_nDataFieldType;
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index c2b1929e1612..b315743e50f1 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -107,7 +107,9 @@ namespace rptui
::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xReportComponent; /// inspectee
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xFormComponent; /// inspectee
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< OPropertyInfoService > m_pInfoService;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
//........................................................................
} // namespace rptui
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index abde2bced493..4904169a89ab 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -284,7 +284,9 @@ namespace
const SfxPoolItem* pItem = _rItemSet.GetItem(aIt->nWID);
if ( pItem )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxPoolItem> pClone(pItem->Clone());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pClone->PutValue(_xShape->getPropertyValue(aIt->sName), aIt->nMemberId);
_rItemSet.Put(*pClone, aIt->nWID);
}
@@ -656,8 +658,10 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
{ SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }
};
Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
::std::auto_ptr<XColorList> pColorTable( new XColorList( SvtPathOptions().GetPalettePath() ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SfxPoolItem* pDefaults[] =
{
new SvxFontItem(ITEMID_FONT),
@@ -718,7 +722,9 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
bool bSuccess = false;
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> pDescriptor( new SfxItemSet( *pPool, pRanges ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
lcl_CharPropertiesToItems( _rxReportControlFormat, *pDescriptor );
{ // want the dialog to be destroyed before our set
@@ -761,13 +767,16 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
try
{
SfxItemPool& rItemPool = pModel->GetItemPool();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> pDescriptor( new SfxItemSet( rItemPool, rItemPool.GetFirstWhich(),rItemPool.GetLastWhich() ) );
-
+ SAL_WNODEPRECATED_DECLARATIONS_POP
lcl_fillShapeToItems(_xShape,*pDescriptor);
{ // want the dialog to be destroyed before our set
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// #i74099# by default, the dialog deletes the current color table if a different one is loaded
// (see SwDrawShell::ExecDrawDlg)
const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 26aa98a447d1..c7940bae74a1 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -196,7 +196,9 @@ ODesignView::~ODesignView()
if ( m_pPropWin )
{
notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pPropWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pPropWin = NULL;
}
if ( m_pAddField )
@@ -204,7 +206,9 @@ ODesignView::~ODesignView()
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) );
aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pAddField);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pAddField = NULL;
}
if ( m_pReportExplorer )
@@ -212,11 +216,15 @@ ODesignView::~ODesignView()
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) );
aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pReportExplorer);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pReportExplorer = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pTaskPane);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTaskPane = NULL;
}
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 781a78aec69b..d8aa5ebafd95 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -351,7 +351,9 @@ void OReportController::disposing()
{
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) );
aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FloatingWindow> aTemp(m_pGroupsFloater);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pGroupsFloater = NULL;
}
@@ -2425,7 +2427,9 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// fill it
if ( _xSection.is() )
pDescriptor->Put(SvxBrushItem(::Color(_xSection->getBackColor()),ITEMID_BRUSH));
@@ -4232,13 +4236,17 @@ void OReportController::openZoomDialog()
pPool->FreezeIdRanges(); // the same
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> pDescriptor(new SfxItemSet(*pPool, pRanges));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// fill it
SvxZoomItem aZoomItem( m_eZoomType, m_nZoomValue, SID_ATTR_ZOOM );
aZoomItem.SetValueSet(SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_WHOLEPAGE|SVX_ZOOM_ENABLE_PAGEWIDTH);
pDescriptor->Put(aZoomItem);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pDlg->SetLimits( 20, 400 );
bool bCancel = ( RET_CANCEL == pDlg->Execute() );
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index fa722d3ef1e2..ab5243fe94d5 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -122,14 +122,8 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
#define OSL_THIS_FILE __FILE__
-/* the macro OSL_TO_STRING is intended to be an office internal macro for now */
-#define OSL_TO_STRING( x ) #x
-
-/* the macro OSL_MACRO_VALUE_TO_STRING is intended to be an office internal macro for now */
-#define OSL_MACRO_VALUE_TO_STRING( x ) OSL_TO_STRING( x )
-
/* the macro OSL_LOG_PREFIX is intended to be an office internal macro for now */
-#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; "
+#define OSL_LOG_PREFIX OSL_THIS_FILE ":" SAL_STRINGIFY( __LINE__ ) "; "
#define OSL_DEBUG_ONLY(s) _OSL_DEBUG_ONLY(s)
#define OSL_TRACE _OSL_TRACE
diff --git a/sal/inc/sal/macros.h b/sal/inc/sal/macros.h
index e4c35138266d..b002248d221a 100644
--- a/sal/inc/sal/macros.h
+++ b/sal/inc/sal/macros.h
@@ -77,6 +77,11 @@
# define SAL_ABS(a) (((a) < 0) ? (-(a)) : (a))
#endif
+#ifndef SAL_STRINGIFY
+# define SAL_STRINGIFY_ARG(x) #x
+# define SAL_STRINGIFY(x) SAL_STRINGIFY_ARG(x)
+#endif
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/sal/precppunit.hxx b/sal/inc/sal/precppunit.hxx
index a0f7c942f27c..31536c30df7e 100644
--- a/sal/inc/sal/precppunit.hxx
+++ b/sal/inc/sal/precppunit.hxx
@@ -29,11 +29,22 @@
#define INCLUDED_SAL_PRECPPUNIT_HXX
#include "sal/config.h"
-
#include "sal/types.h"
// Overwrite the way CppUnit test plug-ins export the test function, adapting it
// to OOo's symbol visibility framework:
#define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
+//std::auto_ptr is deprecated in c++0x, but we're stuck with them in cppunit
+//So push and pop -Wdeprecated-declarations for gcc
+#define SAL_CPPUNIT_TEST_SUITE(X) \
+SAL_WNODEPRECATED_DECLARATIONS_PUSH \
+CPPUNIT_TEST_SUITE(X)
+
+#define SAL_CPPUNIT_TEST_SUITE_END(X) \
+CPPUNIT_TEST_SUITE_END(X) \
+; \
+SAL_WNODEPRECATED_DECLARATIONS_POP \
+typedef int SalCppUnitDummyTypedefForSemiColonEnding__ \
+
#endif
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index d6cf9b0eacbb..22bad17fee16 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -447,7 +447,6 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
/**
Use as follows:
SAL_DEPRECATED("Dont use, its evil.") void doit(int nPara);
- note that currently a c++0x compatible gcc disables deprecation warnings
*/
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
@@ -460,6 +459,24 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
# define SAL_DEPRECATED(message)
#endif
+/**
+ Use as follows:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ ::std::auto_ptr<X> ...
+ SAL_WNODEPRECATED_DECLARATIONS_POP
+*/
+
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+#define SAL_WNODEPRECATED_DECLARATIONS_PUSH \
+ _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic push)) \
+ _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic ignored "-Wdeprecated-declarations"))
+#define SAL_WNODEPRECATED_DECLARATIONS_POP \
+ _Pragma(SAL_STRINGIFY_ARG(GCC diagnostic pop))
+#else
+# define SAL_WNODEPRECATED_DECLARATIONS_PUSH
+# define SAL_WNODEPRECATED_DECLARATIONS_POP
+#endif
+
#endif /*_SAL_TYPES_H_ */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 415f17f6a881..2a16243342d2 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -138,10 +138,10 @@ namespace osl_Condition
sal_True == bRes );
}
- CPPUNIT_TEST_SUITE( ctors );
+ SAL_CPPUNIT_TEST_SUITE( ctors );
CPPUNIT_TEST( ctors_001 );
CPPUNIT_TEST( ctors_002 );
- CPPUNIT_TEST_SUITE_END( );
+ SAL_CPPUNIT_TEST_SUITE_END( );
}; // class ctors
@@ -183,10 +183,10 @@ namespace osl_Condition
}
- CPPUNIT_TEST_SUITE( set );
+ SAL_CPPUNIT_TEST_SUITE( set );
CPPUNIT_TEST( set_001 );
CPPUNIT_TEST( set_002 );
- CPPUNIT_TEST_SUITE_END( );
+ SAL_CPPUNIT_TEST_SUITE_END( );
}; // class set
@@ -228,10 +228,10 @@ namespace osl_Condition
( sal_False == bRes && sal_True == bRes1 ) );
}
- CPPUNIT_TEST_SUITE( reset );
+ SAL_CPPUNIT_TEST_SUITE( reset );
CPPUNIT_TEST( reset_001 );
CPPUNIT_TEST( reset_002 );
- CPPUNIT_TEST_SUITE_END( );
+ SAL_CPPUNIT_TEST_SUITE_END( );
}; // class reset
@@ -296,10 +296,10 @@ namespace osl_Condition
( ::osl::Condition::result_ok == wRes1 ) );
}
- CPPUNIT_TEST_SUITE( wait );
+ SAL_CPPUNIT_TEST_SUITE( wait );
CPPUNIT_TEST( wait_001 );
CPPUNIT_TEST( wait_002 );
- CPPUNIT_TEST_SUITE_END( );
+ SAL_CPPUNIT_TEST_SUITE_END( );
}; // class wait
@@ -343,10 +343,10 @@ namespace osl_Condition
( sal_True == bRes && sal_False == bRes1 ) );
}
- CPPUNIT_TEST_SUITE( check );
+ SAL_CPPUNIT_TEST_SUITE( check );
CPPUNIT_TEST( check_001 );
CPPUNIT_TEST( check_002 );
- CPPUNIT_TEST_SUITE_END( );
+ SAL_CPPUNIT_TEST_SUITE_END( );
}; // class check
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 5523af2cf8f0..0e6da162cb52 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -99,10 +99,10 @@ public:
CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, nSize, 2) == true);
}
- CPPUNIT_TEST_SUITE(Memory);
+ SAL_CPPUNIT_TEST_SUITE(Memory);
CPPUNIT_TEST(rtl_allocateMemory_001);
CPPUNIT_TEST(rtl_reallocateMemory_001);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
}; // class test
class ZeroMemory : public CppUnit::TestFixture
@@ -142,9 +142,9 @@ public:
CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3) == true);
}
- CPPUNIT_TEST_SUITE(ZeroMemory);
+ SAL_CPPUNIT_TEST_SUITE(ZeroMemory);
CPPUNIT_TEST(rtl_allocateZeroMemory_001);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
};
// -----------------------------------------------------------------------------
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 705a7c328c6e..a670f10d3d35 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -448,9 +448,11 @@ private:
sal_Bool m_bIncludeHiddenCells;
// internals
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< ::std::vector<ScTokenRef> > TokenListPtr;
typedef ::std::auto_ptr< ::std::vector<sal_uInt32> > RangeIndexMapPtr;
typedef ::std::auto_ptr<ExternalRefListener> ExtRefListenerPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Int64 m_nObjectId;
ScDocument* m_pDocument;
@@ -460,7 +462,9 @@ private:
com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider;
SfxItemPropertySet m_aPropSet;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<HiddenRangeListener> m_pHiddenListener;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScLinkListener* m_pValueListener;
XModifyListenerArr_Impl m_aValueListeners;
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 0458332d1e3d..e17c5c3901eb 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -62,7 +62,9 @@ class ScDPSaveMember
{
private:
::rtl::OUString aName;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table.
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt16 nVisibleMode;
sal_uInt16 nShowDetailsMode;
@@ -106,8 +108,10 @@ class SC_DLLPUBLIC ScDPSaveDimension
private:
::rtl::OUString aName;
::rtl::OUString* pSelectedPage;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpLayoutName;
::std::auto_ptr<rtl::OUString> mpSubtotalName;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bool bIsDataLayout;
bool bDupFlag;
sal_uInt16 nOrientation;
@@ -251,7 +255,9 @@ private:
* created. */
bool mbDimensionMembersBuilt;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpGrandTotalName;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
SC_DLLPUBLIC ScDPSaveData();
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index c19bdfaf426f..0519bd20b1ac 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -133,7 +133,9 @@ private:
std::vector<ScDPLevel*> aRowLevelList;
sal_Bool bResultOverflow;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpGrandTotalName;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void CreateRes_Impl();
void FillMemberResults();
@@ -337,8 +339,10 @@ private:
long nUsedHier;
sal_uInt16 nFunction; // enum GeneralFunction
String aName; // if empty, take from source
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpLayoutName;
::std::auto_ptr<rtl::OUString> mpSubtotalName;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
long nSourceDim; // >=0 if dup'ed
::com::sun::star::sheet::DataPilotFieldReference
aReferenceValue; // settings for "show data as" / "displayed value"
@@ -748,7 +752,9 @@ private:
SCROW mnDataId;
// String aCaption; // visible name (changeable by user)
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpLayoutName;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Int32 nPosition; // manual sorting
sal_Bool bVisible;
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 15ed5ba554dc..b8c8180c4cec 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -176,10 +176,14 @@ public:
class ScAccessibilityEditSource : public SvxEditSource
{
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > mpAccessibleTextData;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~ScAccessibilityEditSource();
virtual SvxEditSource* Clone() const;
diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 1c6b36c57950..667e80c20e1f 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -86,7 +86,9 @@ public:
SCROW findLastNotOf(bool bValue) const;
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
class ScFlatBoolColSegments
@@ -109,7 +111,9 @@ public:
void insertSegment(SCCOL nCol, SCCOL nSize, bool bSkipStartBoundary);
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
class ScFlatUInt16SegmentsImpl;
@@ -156,7 +160,9 @@ public:
void enableTreeSearch(bool bEnable);
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScFlatUInt16SegmentsImpl> mpImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
#endif
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index e213e797a76f..8f68d0762db4 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -150,7 +150,9 @@ public:
class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
// ============================================================================
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 126e220c0303..ff18497c72e1 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2425,7 +2425,9 @@ const ScDPCache* ScDPCollection::SheetCaches::getCache(const ScRange& rRange)
// already cached.
return itr->second;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDPCache> pCache(new ScDPCache(mpDoc));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pCache->InitFromDoc(mpDoc, rRange);
const ScDPCache* p = pCache.get();
maCaches.insert(rRange, pCache);
@@ -2448,7 +2450,9 @@ const ScDPCache* ScDPCollection::NameCaches::getCache(const OUString& rName, con
// already cached.
return itr->second;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDPCache> pCache(new ScDPCache(mpDoc));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pCache->InitFromDoc(mpDoc, rRange);
const ScDPCache* p = pCache.get();
maCaches.insert(rName, pCache);
@@ -2533,7 +2537,9 @@ const ScDPCache* ScDPCollection::DBCaches::getCache(sal_Int32 nSdbType, const OU
return NULL;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDPCache> pCache(new ScDPCache(mpDoc));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SvNumberFormatter aFormat(mpDoc->GetServiceManager(), ScGlobal::eLnge);
pCache->InitFromDataBase(xRowSet, *aFormat.GetNullDate());
::comphelper::disposeComponent(xRowSet);
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 0c46a3504a91..fb9f1e1114f5 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -391,7 +391,9 @@ ScFunctionList::ScFunctionList() :
for (sal_uInt16 k = 0; k < SAL_N_ELEMENTS(nDescBlock); ++k)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// Browse for all possible OpCodes. This is not the fastest method, but
// otherwise the sub resources within the resource blocks and the
// resource blocks themselfs would had to be ordered according to
@@ -784,7 +786,9 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
return ::rtl::OUString();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
return ResId::toString(ScResId(static_cast<sal_uInt16>(_nCategoryNumber)));
}
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 43dfd04dc70b..b6144ab119ab 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -801,7 +801,9 @@ bool ScValidationData::FillSelectionList( TypedScStrCollection& rStrColl, const
if( HasSelectionList() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > pTokArr( CreateTokenArry( 0 ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// *** try if formula is a string list ***
@@ -854,7 +856,9 @@ bool ScValidationData::IsListValid( ScBaseCell* pCell, const ScAddress& rPos ) c
5) A formula resulting in a cell/range reference or matrix/array.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > pTokArr( CreateTokenArry( 0 ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// *** try if formula is a string list ***
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index f4881f61da25..609fc52f7bb0 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -726,7 +726,9 @@ ScDBData* ScDBCollection::NamedDBs::findByUpperName(const ::rtl::OUString& rName
bool ScDBCollection::NamedDBs::insert(ScDBData* p)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBData> pData(p);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!pData->GetIndex())
pData->SetIndex(mrParent.nEntryIndex++);
@@ -806,9 +808,11 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange)
{
// Insert a new db data. They all have identical names.
rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pNew(new ScDBData(
aName, rRange.aStart.Tab(), rRange.aStart.Col(), rRange.aStart.Row(),
rRange.aEnd.Col(), rRange.aEnd.Row(), true, false));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pData = pNew.get();
maDBs.push_back(pNew);
}
@@ -818,7 +822,9 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange)
void ScDBCollection::AnonDBs::insert(ScDBData* p)
{
rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pNew(p);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
maDBs.push_back(pNew);
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8257afad926c..8f5328386483 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6256,7 +6256,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField )
if ( GetByte() == 3 )
{
// First, get the query criteria range.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBRangeBase> pQueryRef( PopDBDoubleRef() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!pQueryRef.get())
return NULL;
@@ -6314,7 +6316,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField )
SetError( errIllegalParameter );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBRangeBase> pDBRef( PopDBDoubleRef() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (nGlobalError || !pDBRef.get())
return NULL;
@@ -6346,7 +6350,9 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField )
if (!ValidCol(nField))
return NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBQueryParamBase> pParam( pDBRef->createQueryParam(pQueryRef.get()) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pParam.get())
{
@@ -6387,7 +6393,9 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc )
bool bNull = true;
sal_uLong nCount = 0;
bool bMissingField = false;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pQueryParam.get())
{
if (!pQueryParam->IsValidFieldIndex())
@@ -6456,7 +6464,9 @@ void ScInterpreter::ScDBCount()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount" );
bool bMissingField = true;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pQueryParam.get())
{
sal_uLong nCount = 0;
@@ -6516,7 +6526,9 @@ void ScInterpreter::ScDBCount2()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount2" );
bool bMissingField = true;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pQueryParam.get())
{
if (!pQueryParam->IsValidFieldIndex())
@@ -6582,7 +6594,9 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount )
rValCount = 0.0;
double fSum = 0.0;
bool bMissingField = false;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pQueryParam.get())
{
if (!pQueryParam->IsValidFieldIndex())
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 5a3e81dcd9fe..261403e6ed90 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2442,7 +2442,9 @@ void ScInterpreter::ScDBGet()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBGet" );
bool bMissingField = false;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!pQueryParam.get())
{
// Failed to create query param.
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 6ba9c26628ea..d3ded0cef664 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -186,7 +186,9 @@ void ScRangeData::CompileRangeData( const String& rSymbol, bool bSetError )
if (bSetError)
aComp.SetExtendedErrorDetection( ScCompiler::EXTENDED_ERROR_DETECTION_NAME_NO_BREAK);
ScTokenArray* pNewCode = aComp.CompileString( rSymbol );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScTokenArray> pOldCode( pCode); // old pCode will be deleted
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pCode = pNewCode;
if( !pCode->GetCodeError() )
{
@@ -280,7 +282,9 @@ void ScRangeData::GetSymbol( OUString& rSymbol, const FormulaGrammar::Grammar eG
void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos,
const FormulaGrammar::Grammar eGrammar )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScTokenArray> pTemp( pCode->Clone() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScCompiler aComp( pDoc, rPos, *pTemp.get());
aComp.SetGrammar(eGrammar);
aComp.MoveRelWrap(GetMaxCol(), GetMaxRow());
@@ -413,7 +417,9 @@ bool ScRangeData::IsReference( ScRange& rRange, const ScAddress& rPos ) const
{
if ( (eType & ( RT_ABSAREA | RT_REFAREA | RT_ABSPOS ) ) && pCode )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScTokenArray> pTemp( pCode->Clone() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScCompiler aComp( pDoc, rPos, *pTemp);
aComp.SetGrammar(pDoc->GetGrammar());
aComp.MoveRelWrap(MAXCOL, MAXROW);
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 6d7c36c56ecd..7900d85de7ae 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -95,8 +95,10 @@ FltError ImportExcel::Read( void )
OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/* #i104057# Need to track a base position for progress bar calculation,
because sheet substreams may not be in order of sheets. */
@@ -821,8 +823,10 @@ FltError ImportExcel8::Read( void )
FltError eLastErr = eERR_OK;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar(
aIn.GetSvStreamSize(), GetDocShell(), STR_LOAD_DOC ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/* #i104057# Need to track a base position for progress bar calculation,
because sheet substreams may not be in order of sheets. */
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 528408ce3d35..15aaee4d5317 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -675,7 +675,9 @@ XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rF
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xScTokArr( mrFormatEntry.CreateTokenArry( 0 ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_CONDFMT, *xScTokArr );
if( bFmla2 )
@@ -1027,7 +1029,9 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
// formulas
XclExpFormulaCompiler& rFmlaComp = GetFormulaCompiler();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xScTokArr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// first formula
xScTokArr.reset( pValData->CreateTokenArry( 0 ) );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index f2ffc76aca3f..d5b357f24769 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2074,7 +2074,9 @@ void XclImpChSeries::ReadChSerTrendLine( XclImpStream& rStrm )
void XclImpChSeries::ReadChSerErrorBar( XclImpStream& rStrm )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChSerErrorBar> pErrorBar(new XclImpChSerErrorBar(GetChRoot()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pErrorBar->ReadChSerErrorBar(rStrm);
sal_uInt8 nBarType = pErrorBar->GetBarType();
maErrorBars.insert(nBarType, pErrorBar);
@@ -2775,13 +2777,17 @@ void XclImpChTypeGroup::ReadChDropBar( XclImpStream& rStrm )
{
if (maDropBars.find(EXC_CHDROPBAR_UP) == maDropBars.end())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_UP));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->ReadRecordGroup(rStrm);
maDropBars.insert(EXC_CHDROPBAR_UP, p);
}
else if(maDropBars.find(EXC_CHDROPBAR_DOWN) == maDropBars.end())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_DOWN));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->ReadRecordGroup(rStrm);
maDropBars.insert(EXC_CHDROPBAR_DOWN, p);
}
@@ -3817,7 +3823,9 @@ void XclImpChChart::ReadChDefaultText( XclImpStream& rStrm )
sal_uInt16 nTextId = rStrm.ReaduInt16();
if( (rStrm.GetNextRecId() == EXC_ID_CHTEXT) && rStrm.StartNextRecord() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<XclImpChText> pText(new XclImpChText(GetChRoot()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pText->ReadRecordGroup(rStrm);
maDefTexts.insert(nTextId, pText);
}
@@ -3967,12 +3975,16 @@ void XclImpChChart::Convert( const Reference<XChartDocument>& xChartDoc,
ScDocument& rDoc = GetRoot().GetDoc();
if( ScChartListenerCollection* pChartCollection = rDoc.GetChartListenerCollection() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::std::vector< ScTokenRef > > xRefTokens( new ::std::vector< ScTokenRef > );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for( XclImpChSeriesVec::const_iterator aIt = maSeries.begin(), aEnd = maSeries.end(); aIt != aEnd; ++aIt )
(*aIt)->FillAllSourceLinks( *xRefTokens );
if( !xRefTokens->empty() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScChartListener > xListener( new ScChartListener( rObjName, &rDoc, xRefTokens.release() ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
xListener->SetUsed( true );
xListener->StartListeningTo();
pChartCollection->Insert( xListener.release() );
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 243d6ad87443..e4f25cfe4257 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -206,7 +206,9 @@ void lclInsertUrl( const XclImpRoot& rRoot, const String& rUrl, SCCOL nScCol, SC
rEE.QuickSetAttribs( aItemSet, ESelection( 0, 0, 0xFFFF, 0 ) );
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< EditTextObject > xTextObj( rEE.CreateTextObject() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScEditCell* pCell = new ScEditCell( xTextObj.get(), &rDoc, rEE.GetEditTextObjectPool() );
rDoc.PutCell( aScPos, pCell );
@@ -248,9 +250,11 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream& rStrm )
OSL_ENSURE( aGuid == XclTools::maGuidStdLink, "XclImpHyperlink::ReadEmbeddedData - unknown header GUID" );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< String > xLongName; // link / file name
::std::auto_ptr< String > xShortName; // 8.3-representation of file name
::std::auto_ptr< String > xTextMark; // text mark
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// description (ignore)
if( ::get_flag( nFlags, EXC_HLINK_DESCR ) )
@@ -600,7 +604,9 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
const ScAddress& rPos = maRanges.front()->aStart; // assured above that maRanges is not empty
ExcelToSc& rFmlaConv = GetOldFmlaConverter();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr1;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( nFmlaSize1 > 0 )
{
const ScTokenArray* pTokArr = 0;
@@ -611,7 +617,9 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
xTokArr1.reset( pTokArr->Clone() );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > pTokArr2;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( nFmlaSize2 > 0 )
{
const ScTokenArray* pTokArr = 0;
@@ -743,7 +751,9 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
// first formula
// string list is single tStr token with NUL separators -> replace them with LF
rStrm.SetNulSubstChar( '\n' );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr1;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rStrm >> nLen;
rStrm.Ignore( 2 );
if( nLen > 0 )
@@ -758,7 +768,9 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
rStrm.SetNulSubstChar(); // back to default
// second formula
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScTokenArray > xTokArr2;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rStrm >> nLen;
rStrm.Ignore( 2 );
if( nLen > 0 )
@@ -1170,7 +1182,9 @@ void XclImpDocProtectBuffer::Apply() const
// If neither is set then the document is not protected at all.
return;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDocProtection> pProtect(new ScDocProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(true);
if (mnPassHash)
@@ -1273,7 +1287,9 @@ void XclImpSheetProtectBuffer::Apply() const
// This sheet is (for whatever reason) not protected.
continue;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(true);
// 16-bit hash password
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index d85d83fcfeb0..ec64e46d2c78 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -90,7 +90,9 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla
if (itrElem == maElemProps.end())
{
// new element
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<NamePropsType> p(new NamePropsType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
std::pair<ElemsType::iterator, bool> r = maElemProps.insert(aElem, p);
if (!r.second)
// insertion failed.
@@ -174,7 +176,9 @@ void ScHTMLStyles::insertProp(
if (itr == rStore.end())
{
// new element
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<PropsType> p(new PropsType);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
std::pair<NamePropsType::iterator, bool> r = rStore.insert(aName, p);
if (!r.second)
// insertion failed.
@@ -2182,7 +2186,9 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo )
{
// read needed options from the <td> tag
ScHTMLSize aSpanSize( 1, 1 );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> pValStr, pNumStr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
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;
@@ -2413,6 +2419,7 @@ void ScHTMLTable::CreateNewEntry( const ImportInfo& rInfo )
mxCurrEntry->aSel = rInfo.aSelection;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryPtr& rxEntry )
{
// HTML entry list does not own the entries
@@ -2420,7 +2427,9 @@ void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList& rEntryList, ScHTMLEntryP
// mrEEParseList (reference to member of ScEEParser) owns the entries
mrEEParseList.push_back( rxEntry.release() );
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
{
bool bPushed = false;
@@ -2448,6 +2457,7 @@ bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
}
return bPushed;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
bool ScHTMLTable::PushEntry( const ImportInfo& rInfo, bool bLastInCell )
{
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 55f33b6033e4..df7c09d7fd63 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -56,8 +56,10 @@ private:
virtual SvStream* ImplQueryPictureStream();
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::utl::TempFile > mxPicTempFile;
::std::auto_ptr< SvStream > mxPicStrm;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
// ============================================================================
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 1e1b9f39b4a1..10b245f61e66 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -70,7 +70,9 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm );
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< XclExpSstImpl > XclExpSstImplPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XclExpSstImplPtr mxImpl;
};
@@ -128,8 +130,10 @@ private:
virtual void WriteBody( XclExpStream& rStrm );
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< String > StringPtr;
typedef ::std::auto_ptr< SvStream > SvStreamPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScAddress maScPos; /// Position of the hyperlink.
StringPtr mxRepr; /// Cell representation text.
@@ -183,7 +187,9 @@ private:
virtual void WriteBody( XclExpStream& rStrm );
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< XclExpCFImpl > XclExpCFImplPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XclExpCFImplPtr mxImpl;
};
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index 6f43a38d02e6..c978e774bef4 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -68,7 +68,9 @@ public:
void Progress();
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef ::std::auto_ptr< ScfProgressBar > ScfProgressBarPtr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScfProgressBarPtr mxProgress; /// Progress bar implementation.
ScfProgressBar* mpSubProgress; /// Current sub progress bar.
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 560e18a19a2b..f162f8f7f18a 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -637,7 +637,9 @@ 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;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<rtl::OUString> mpFieldTotalName;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
explicit XclPTFieldExtInfo();
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index c12a421f741b..12153486dade 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -94,7 +94,9 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc,
if (!pCollection)
return;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pRefTokens(new vector<ScTokenRef>);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
ScRefTokenHelper::compileRangeRepresentation(
*pRefTokens, aRangeStr, pDoc, cSep, formula::FormulaGrammar::GRAM_ENGLISH);
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 44430d5ce758..9fe2a64c5dea 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -275,7 +275,9 @@ void ScXMLBodyContext::EndElement()
// #i37959# handle document protection after the sheet settings
if (bProtected)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocProtection> pProtection(new ScDocProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtection->setProtected(true);
uno::Sequence<sal_Int8> aPass;
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index d79dbed730e0..19066e0c5178 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -297,8 +297,10 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName)
if (!ScRangeStringConverter::GetRangeFromString(aRange, sRangeAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset))
return NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(
new ScDBData(rName, aRange.aStart.Tab(), aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pData->SetAutoFilter(bAutoFilter);
pData->SetKeepFmt(bKeepFormats);
@@ -480,7 +482,9 @@ void ScXMLDatabaseRangeContext::EndElement()
if (meRangeType == ScDBCollection::SheetAnonymous)
{
OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pData.get())
{
@@ -495,7 +499,9 @@ void ScXMLDatabaseRangeContext::EndElement()
else if (meRangeType == ScDBCollection::GlobalAnonymous)
{
OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(ConvertToDBData(aName));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pData.get())
{
@@ -511,7 +517,9 @@ void ScXMLDatabaseRangeContext::EndElement()
}
else if (meRangeType == ScDBCollection::GlobalNamed)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pData(ConvertToDBData(sDatabaseRangeName));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pData.get())
{
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index c40f93692aa2..f70ed4a34bbf 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -666,7 +666,9 @@ void ScMyTables::DeleteTable()
uno::Sequence<sal_Int8> aHash;
SvXMLUnitConverter::decodeBase64(aHash, maProtectionData.maPassword);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pProtect->setProtected(maProtectionData.mbProtected);
pProtect->setPasswordHash(aHash, maProtectionData.meHash1, maProtectionData.meHash2);
pProtect->setOption(ScTableProtection::SELECT_LOCKED_CELLS, maProtectionData.mbSelectProtectedCells);
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 83a7fb511cd7..881a895f5404 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -358,6 +358,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell)
return pDoc;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > ScAccessibleCell::CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos)
{
::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData
@@ -366,6 +367,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell)
return pEditSource;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
void ScAccessibleCell::FillDependends(utl::AccessibleRelationSetHelper* pRelationSet)
{
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 742bc9112dc8..cbe5c701f508 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1645,6 +1645,7 @@ Rectangle ScAccessibleCsvCell::implGetBoundingBox() const
return aRect;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > ScAccessibleCsvCell::implCreateEditSource()
{
ScCsvGrid& rGrid = implGetGrid();
@@ -1657,7 +1658,7 @@ Rectangle ScAccessibleCsvCell::implGetBoundingBox() const
::std::auto_ptr< SvxEditSource > pEditSource( new ScAccessibilityEditSource( pCsvTextData ) );
return pEditSource;
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
// ============================================================================
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index f8ef24858d6a..41db2d6e5576 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -150,9 +150,11 @@ ScNotesChilds::~ScNotesChilds()
{
::accessibility::AccessibleTextHelper* pTextHelper = NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData
(new ScAccessibleNoteTextData(mpViewShell, rString, aCellPos, bMarkNote));
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource);
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 9bedb9126725..7d06a69fdb5b 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -316,7 +316,9 @@ void ScAccessibleEditObject::CreateTextHelper()
{
if (!mpTextHelper)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > pAccessibleTextData;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (meObjectType == CellInEditMode || meObjectType == EditControl)
{
pAccessibleTextData.reset
@@ -328,7 +330,9 @@ void ScAccessibleEditObject::CreateTextHelper()
(new ScAccessibleEditLineTextData(NULL, mpWindow));
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleTextData));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource );
mpTextHelper->SetEventSource(this);
mpTextHelper->SetFocus(mbHasFocus);
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 452acbabb153..42e86b70daab 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -312,9 +312,11 @@ void ScAccessiblePageHeaderArea::CreateTextHelper()
{
if (!mpTextHelper)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > pAccessibleHeaderTextData
(new ScAccessibleHeaderTextData(mpViewShell, mpEditObj, mbHeader, meAdjust));
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleHeaderTextData));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource );
mpTextHelper->SetEventSource(this);
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index d7fd8b64202e..38b9d7b57d36 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -298,9 +298,11 @@ void ScAccessiblePreviewCell::CreateTextHelper()
{
if (!mpTextHelper)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewCellTextData
(new ScAccessiblePreviewCellTextData(mpViewShell, maCellAddress));
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewCellTextData));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpTextHelper = new ::accessibility::AccessibleTextHelper( pEditSource );
mpTextHelper->SetEventSource( this );
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 8e9af0dc45af..5c1abf1a9210 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -414,9 +414,11 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper()
{
if (!mpTextHelper)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData
(new ScAccessiblePreviewHeaderCellTextData(mpViewShell, String(getAccessibleName()), maCellPos, mbColumnHeader, mbRowHeader));
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource );
mpTextHelper->SetEventSource(this);
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 2e85f48b44bc..36e90728b912 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -970,7 +970,9 @@ IMPL_LINK(ScAccessibleCellTextData, NotifyHdl, EENotify*, aNotify)
{
if( aNotify )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( aHint.get() )
GetBroadcaster().Broadcast( *aHint.get() );
@@ -1082,7 +1084,9 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify*, aNotify)
{
if( aNotify )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( aHint.get() )
GetBroadcaster().Broadcast( *aHint.get() );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 6dad099859a0..a1d52140b79d 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3409,7 +3409,9 @@ void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScTableProtection pointer is NULL!");
if (pProtect)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScTableProtection> p(new ScTableProtection(*pProtect));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->setProtected(true); // just in case ...
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoTabProtect(&rDocShell, nTab, p) );
@@ -3439,7 +3441,9 @@ sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bAp
OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScDocProtection pointer is NULL!");
if (pProtect)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocProtection> p(new ScDocProtection(*pProtect));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->setProtected(true); // just in case ...
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoDocProtect(&rDocShell, p) );
@@ -3461,7 +3465,9 @@ sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bAp
OSL_ENSURE(pProtect, "ScDocFunc::Unprotect: ScTableProtection pointer is NULL!");
if (pProtect)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScTableProtection> p(new ScTableProtection(*pProtect));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->setProtected(true); // just in case ...
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoTabProtect(&rDocShell, nTab, p) );
@@ -3491,7 +3497,9 @@ sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bAp
return true;
// save the protection state before unprotect (for undo).
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocProtection> pProtectCopy(new ScDocProtection(*pDocProtect));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!pDocProtect->verifyPassword(rPassword))
{
@@ -3522,7 +3530,9 @@ sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bAp
return true;
// save the protection state before unprotect (for undo).
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScTableProtection> pProtectCopy(new ScTableProtection(*pTabProtect));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!pTabProtect->verifyPassword(rPassword))
{
if (!bApi)
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index c2d2958590db..a2d5ba50bcd4 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -920,8 +920,10 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s
if (bRecord)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<SCTAB> > pSrcList(new vector<SCTAB>(1, nSrcTab));
auto_ptr< vector<SCTAB> > pDestList(new vector<SCTAB>(1, nDestTab));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
GetUndoManager()->AddUndoAction(
new ScUndoCopyTab(this, pSrcList.release(), pDestList.release()));
}
@@ -984,8 +986,10 @@ sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, s
}
else if (bRecord)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<SCTAB> > pSrcList(new vector<SCTAB>(1, nSrcTab));
auto_ptr< vector<SCTAB> > pDestList(new vector<SCTAB>(1, nDestTab));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
GetUndoManager()->AddUndoAction(
new ScUndoMoveTab(this, pSrcList.release(), pDestList.release()));
}
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 62fe0dd6c288..c80653193daf 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1388,7 +1388,9 @@ static ScTokenArray* lcl_convertToTokenArray(const ScDocument* pSrcDoc, ScRange&
::boost::scoped_ptr<ScRange> pUsedRange;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTokenArray> pArray(new ScTokenArray);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bool bFirstTab = true;
vector<ScExternalRefCache::SingleRangeData>::iterator
itrCache = rCacheData.begin(), itrCacheEnd = rCacheData.end();
@@ -1503,7 +1505,9 @@ static ScTokenArray* lcl_fillEmptyMatrix(const ScRange& rRange)
xMat->PutEmpty(i, j);
ScMatrixToken aToken(xMat);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTokenArray> pArray(new ScTokenArray);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pArray->AddToken(aToken);
return pArray.release();
}
@@ -2228,7 +2232,9 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt
// make medium hidden to prevent assertion from progress bar
pSet->Put( SfxBoolItem(SID_HIDDEN, true) );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<SfxMedium> pMedium(new SfxMedium(aFile, STREAM_STD_READ, false, pFilter, pSet));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pMedium->GetError() != ERRCODE_NONE)
return NULL;
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index a5a18aa408e3..1c76505c01ec 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -333,7 +333,9 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
{
sal_Bool bResult = sal_True;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScFormulaCell> pFCell( new ScFormulaCell( pDoc, aCursorPos, rStrExp ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// HACK! um bei ColRowNames kein #REF! zu bekommen,
// wenn ein Name eigentlich als Bereich in die Gesamt-Formel
@@ -668,11 +670,13 @@ table::CellAddress ScFormulaDlg::getReferencePosition() const
return table::CellAddress(aCursorPos.Tab(),aCursorPos.Col(),aCursorPos.Row());
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<formula::FormulaTokenArray> ScFormulaDlg::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList)
{
::std::auto_ptr<formula::FormulaTokenArray> pArray(new ScTokenArray());
pArray->Fill( _aTokenList, pDoc->GetExternalRefManager());
return pArray;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index ae8042e3ab2d..b3d61a32a97e 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -83,8 +83,10 @@ private:
Edit maEdSepArrayRow;
PushButton maBtnSepReset;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocOptions> mpOldOptions;
::std::auto_ptr<ScDocOptions> mpNewOptions;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** Stores old separator value of currently focused separator edit box.
This value is used to revert undesired value change. */
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 0d26ac84f9f9..fece9f914c08 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -376,7 +376,9 @@ private:
class ScUndoDocProtect : public ScSimpleUndo
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScUndoDocProtect(ScDocShell* pShell, ::std::auto_ptr<ScDocProtection> pProtectSettings);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~ScUndoDocProtect();
virtual void Undo();
@@ -387,7 +389,9 @@ public:
virtual String GetComment() const;
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocProtection> mpProtectSettings;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void DoProtect(bool bProtect);
};
@@ -399,8 +403,10 @@ private:
class ScUndoTabProtect : public ScSimpleUndo
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab,
::std::auto_ptr<ScTableProtection> pProtectSettings);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~ScUndoTabProtect();
virtual void Undo();
@@ -412,7 +418,9 @@ public:
private:
SCTAB mnTab;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScTableProtection> mpProtectSettings;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void DoProtect(bool bProtect);
};
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 6a22a44e2731..7bbec8da9fcb 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -132,7 +132,9 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScRangeName::TabNameCopyMap::const_iterator itr = aOldNames.begin(), itrEnd = aOldNames.end();
for (; itr != itrEnd; ++itr)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScRangeName> p(new ScRangeName(*itr->second));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
maTabRangeNames.insert(itr->first, p);
}
@@ -508,7 +510,9 @@ void ScNameDlg::ScopeChanged()
ScRangeName::TabNameMap::iterator itr = maTabRangeNames.find(nTab);
if (itr == maTabRangeNames.end())
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScRangeName> p(new ScRangeName);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::std::pair<ScRangeName::TabNameMap::iterator, bool> r =
maTabRangeNames.insert(nTab, p);
itr = r.first;
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index a86e1bb1e1ee..838e140289d7 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -358,9 +358,11 @@ void ScHFEditPage::SetSelectDefinedList()
// default to customized
ScHFEntryId eSelectEntry = eEntryCount;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< EditTextObject > pLeftObj;
::std::auto_ptr< EditTextObject > pCenterObj;
::std::auto_ptr< EditTextObject > pRightObj;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XubString aLeftEntry;
XubString aCenterEntry;
@@ -564,7 +566,9 @@ bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj)
{
aSel.nStartPos = aSel.nEndPos;
aSel.nEndPos++;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< EditTextObject > pPageObj;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pPageObj.reset(pEngine->CreateTextObject(aSel));
if(pPageObj.get() && pPageObj->IsFieldObject() )
{
@@ -622,7 +626,9 @@ bool ScHFEditPage::IsExtFileNameEntry(EditTextObject* pTextObj)
void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
SvtUserOptions aUserOpt;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< EditTextObject > pTextObj;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
switch(eSel)
{
diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index d384bc8b91d3..5bbcd0b47852 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -55,13 +55,17 @@ ScUndoAllRangeNames::ScUndoAllRangeNames(
ScRangeName::TabNameCopyMap::const_iterator itr, itrEnd;
for (itr = rOldLocal.begin(), itrEnd = rOldLocal.end(); itr != itrEnd; ++itr)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScRangeName> p(new ScRangeName(*itr->second));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
maOldLocalNames.insert(itr->first, p);
}
for (itr = rNewLocal.begin(), itrEnd = rNewLocal.end(); itr != itrEnd; ++itr)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScRangeName> p(new ScRangeName(*itr->second));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
maNewLocalNames.insert(itr->first, p);
}
}
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 4c94b983fddf..1a2f9f58707e 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1247,11 +1247,13 @@ String ScUndoShowHideTab::GetComment() const
// ============================================================================
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScUndoDocProtect::ScUndoDocProtect(ScDocShell* pShell, auto_ptr<ScDocProtection> pProtectSettings) :
ScSimpleUndo(pShell),
mpProtectSettings(pProtectSettings)
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
ScUndoDocProtect::~ScUndoDocProtect()
{
@@ -1264,7 +1266,9 @@ void ScUndoDocProtect::DoProtect(bool bProtect)
if (bProtect)
{
// set protection.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScDocProtection> pCopy(new ScDocProtection(*mpProtectSettings));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pCopy->setProtected(true);
pDoc->SetDocProtection(pCopy.get());
}
@@ -1316,12 +1320,14 @@ String ScUndoDocProtect::GetComment() const
// ============================================================================
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScUndoTabProtect::ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, auto_ptr<ScTableProtection> pProtectSettings) :
ScSimpleUndo(pShell),
mnTab(nTab),
mpProtectSettings(pProtectSettings)
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
ScUndoTabProtect::~ScUndoTabProtect()
{
@@ -1334,7 +1340,9 @@ void ScUndoTabProtect::DoProtect(bool bProtect)
if (bProtect)
{
// set protection.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScTableProtection> pCopy(new ScTableProtection(*mpProtectSettings));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pCopy->setProtected(true);
pDoc->SetTabProtection(mnTab, pCopy.get());
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index b5ac0c8ce9d6..398bcfe5992d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -201,7 +201,9 @@ vector<ScTokenRef>* TokenTable::getColRanges(SCCOL nCol) const
if( mnRowCount<=0 )
return NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt32 nLast = getIndex(nCol, mnRowCount-1);
for (sal_uInt32 i = getIndex(nCol, 0); i <= nLast; ++i)
{
@@ -222,7 +224,9 @@ vector<ScTokenRef>* TokenTable::getRowRanges(SCROW nRow) const
if( mnColCount<=0 )
return NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt32 nLast = getIndex(mnColCount-1, nRow);
for (sal_uInt32 i = getIndex(0, nRow); i <= nLast; i += mnRowCount)
{
@@ -238,7 +242,9 @@ vector<ScTokenRef>* TokenTable::getRowRanges(SCROW nRow) const
vector<ScTokenRef>* TokenTable::getAllRanges() const
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pTokens(new vector<ScTokenRef>);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uInt32 nStop = mnColCount*mnRowCount;
for (sal_uInt32 i = 0; i < nStop; i++)
{
@@ -488,7 +494,9 @@ private:
private:
shared_ptr< vector<ScTokenRef> > mpRefTokens;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<Chart2PositionMap> mpPositionMap;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
GlueType meGlue;
SCCOL mnStartCol;
SCROW mnStartRow;
@@ -700,9 +708,11 @@ void Chart2Positioner::createPositionMap()
glueState();
bool bNoGlue = (meGlue == GLUETYPE_NONE);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<Table> pCols(new Table);
auto_ptr<FormulaToken> pNewAddress;
auto_ptr<Table> pNewRowTable(new Table);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Table* pCol = NULL;
SCROW nNoGlueRow = 0;
for (vector<ScTokenRef>::const_iterator itr = mpRefTokens->begin(), itrEnd = mpRefTokens->end();
@@ -1039,6 +1049,7 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
namespace
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFromTokens(
auto_ptr< vector< ScTokenRef > > pValueTokens, auto_ptr< vector< ScTokenRef > > pLabelTokens,
ScDocument* pDoc, const Reference< chart2::data::XDataProvider >& xDP, bool bIncludeHiddenCells )
@@ -1074,6 +1085,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro
}
return xResult;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
//----------------------------------------------------
/**
@@ -1435,14 +1447,18 @@ ScChart2DataProvider::createDataSource(
// Fill Categories
if( bCategories )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pValueTokens(NULL);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (bOrientCol)
pValueTokens.reset(pChartMap->getAllRowHeaderRanges());
else
pValueTokens.reset(pChartMap->getAllColHeaderRanges());
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pLabelTokens(NULL);
pLabelTokens.reset(pChartMap->getLeftUpperCornerRanges());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Reference< chart2::data::XLabeledDataSequence > xCategories = lcl_createLabeledDataSequenceFromTokens(
pValueTokens, pLabelTokens, m_pDocument, this, m_bIncludeHiddenCells ); //ownership of pointers is transfered!
@@ -1456,8 +1472,10 @@ ScChart2DataProvider::createDataSource(
sal_Int32 nCount = bOrientCol ? pChartMap->getDataColCount() : pChartMap->getDataRowCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pValueTokens(NULL);
auto_ptr< vector<ScTokenRef> > pLabelTokens(NULL);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (bOrientCol)
{
pValueTokens.reset(pChartMap->getDataColRanges(static_cast<SCCOL>(i)));
@@ -2681,7 +2699,9 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
OSL_ENSURE(m_pRangeIndices->size() == static_cast<size_t>(aRanges.size()),
"range list and range index list have different sizes.");
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScRangeList> pUndoRanges;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( m_pDocument->HasUnoRefUndo() )
pUndoRanges.reset(new ScRangeList(aRanges));
@@ -3125,7 +3145,9 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone()
{
SolarMutexGuard aGuard;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<ScTokenRef> > pTokensNew;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (m_pTokens.get())
{
// Clone tokens.
@@ -3139,7 +3161,9 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone()
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<ScChart2DataSequence> p(new ScChart2DataSequence(m_pDocument, m_xDataProvider, pTokensNew.release(), m_bIncludeHiddenCells));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
p->CopyData(*this);
Reference< util::XCloneable > xClone(p.release());
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index c7e241b90f0e..aaf883de396c 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -331,19 +331,23 @@ void ScSimpleEditSource::UpdateData()
//------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData )
: mpAccessibleTextData(pAccessibleCellTextData)
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
ScAccessibilityEditSource::~ScAccessibilityEditSource()
{
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
SvxEditSource* ScAccessibilityEditSource::Clone() const
{
return new ScAccessibilityEditSource(::std::auto_ptr < ScAccessibleTextData > (mpAccessibleTextData->Clone()));
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
SvxTextForwarder* ScAccessibilityEditSource::GetTextForwarder()
{
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index a963834ca09a..ad07f5463934 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -465,10 +465,12 @@ bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc,
// ============================================================================
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler)
: formula::FormulaOpCodeMapperObj(_pCompiler)
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
// ============================================================================
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index f5b22047d1b3..f139828319bd 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -44,7 +44,9 @@ class ScVbaAxis : public ScVbaAxis_BASE
sal_Bool bCrossesAreCustomized;
ScVbaChart* getChartPtr() throw( css::uno::RuntimeException );
sal_Bool isValueAxis() throw( css::script::BasicErrorException );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<ov::ShapeHelper> oShapeHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup );
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index cd06a53f33e2..5b54069bc199 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -50,7 +50,9 @@ class ScVbaChartObject : public ChartObjectImpl_BASE
css::uno::Reference< css::drawing::XShape > xShape;
css::uno::Reference< css::container::XNamed > xNamed;
rtl::OUString sPersistName;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<ov::ShapeHelper> oShapeHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
css::uno::Reference< css::container::XNamed > xNamedShape;
rtl::OUString getPersistName();
css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException );
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index 1d89ea01e6d3..1f955f4ee19a 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -48,7 +48,9 @@ typedef InheritedHelperInterfaceImpl< Ifc1 > BaseClass;
protected:
css::uno::Reference< css::drawing::XShape > xTitleShape;
css::uno::Reference< css::beans::XPropertySet > xShapePropertySet;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<ov::ShapeHelper> oShapeHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ScVbaPalette m_Palette;
public:
TitleImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ) : BaseClass( xParent, xContext ), xTitleShape( _xTitleShape )
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index a0e22f3ca60a..ee80993645f1 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1621,8 +1621,10 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
//! account for bAttrib during Undo !!!
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<ScDocument> pUndoDoc;
std::auto_ptr<ScMarkData> pUndoMark;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString aUndoStr;
if (bAddUndo)
{
@@ -2663,10 +2665,12 @@ void ScViewFunc::MoveTable(
// Move or copy within the same document.
SCTAB nTabCount = pDoc->GetTableCount();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr< vector<SCTAB> > pSrcTabs(new vector<SCTAB>);
auto_ptr< vector<SCTAB> > pDestTabs(new vector<SCTAB>);
auto_ptr< vector<OUString> > pTabNames(new vector<OUString>);
auto_ptr< vector<OUString> > pDestNames(NULL);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pSrcTabs->reserve(nTabCount);
pDestTabs->reserve(nTabCount);
pTabNames->reserve(nTabCount);
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 028b68cdb97d..64848e7c1925 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -436,7 +436,9 @@ sal_Bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRange
// TODO: What's this for?
break;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocument> pDocClip(new ScDocument(SCDOCMODE_CLIP));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// Check for geometrical feasibility of the ranges.
bool bValidRanges = true;
@@ -989,7 +991,9 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc,
ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip
ScDocument* pOrigClipDoc = NULL;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ScDocument > xTransClip;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( bTranspose )
{
SCCOL nX;
@@ -1556,7 +1560,9 @@ bool ScViewFunc::PasteMultiRangesFromClip(
return false;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocument> pTransClip(new ScDocument(SCDOCMODE_CLIP));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink);
pClipDoc = pTransClip.release();
SCCOL nTempColSize = nColSize;
@@ -1612,7 +1618,9 @@ bool ScViewFunc::PasteMultiRangesFromClip(
return false;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocument> pUndoDoc;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pDoc->IsUndoEnabled())
{
pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
@@ -1620,7 +1628,9 @@ bool ScViewFunc::PasteMultiRangesFromClip(
pDoc->CopyToDocument(aMarkedRange, nUndoFlags, false, pUndoDoc.get(), &aMark, true);
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDocument> pMixDoc;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( bSkipEmpty || nFunction )
{
if ( nFlags & IDF_CONTENTS )
@@ -1757,7 +1767,9 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
return false;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<ScDocument> pUndoDoc;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (pDoc->IsUndoEnabled())
{
pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
@@ -1769,7 +1781,9 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<ScDocument> pMixDoc;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (bSkipEmpty || nFunction)
{
if (nFlags & IDF_CONTENTS)
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 594ce2d96123..e9bb01a76386 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -597,7 +597,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
else
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- std::auto_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 )
@@ -667,7 +667,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
pOpt->SetStartWithTemplate(bStartWithTemplate);
if(bNewDocDirect && !bStartWithTemplate)
{
- std::auto_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() );
@@ -685,7 +685,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
if(bNewDocDirect && !bStartWithTemplate)
{
- std::auto_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() );
}
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index c2f05428e836..4d5f57b8f40f 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -509,7 +509,9 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane (
{
// Create the corresponding shell and determine the id of the child window.
sal_uInt16 nChildWindowId = 0;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxShell> pShell;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
switch (rDescriptor.mePaneId)
{
case LeftImpressPaneId:
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index a0337d739c4a..fb9b10a2e9d6 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -44,6 +44,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace sd { namespace framework {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
ChildWindowPane::ChildWindowPane (
const Reference<XResourceId>& rxPaneId,
sal_uInt16 nChildWindowId,
@@ -95,7 +96,7 @@ ChildWindowPane::ChildWindowPane (
}
}
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 8f379123dde2..8f1a5b67aa9a 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -100,7 +100,9 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (mpView->ISA(OutlineView))
{
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index f5d5d20e8786..dd82f13ca374 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -232,7 +232,9 @@ sal_Bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
{
mpWindow->GrabFocus();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( (nKeyGroup != KEYGROUP_CURSOR) && (nKeyGroup != KEYGROUP_FKEYS) )
aGuard.reset( new OutlineViewModelChangeGuard( *pOutlineView ) );
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 59d495a5d95c..675604529ccd 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -45,6 +45,8 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
+#include <boost/scoped_ptr.hpp>
+
namespace sd {
TYPEINIT1( FuTransform, FuPoor );
@@ -92,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- std::auto_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 );
@@ -112,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::auto_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/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index b3508bdbaace..8a4a55acfaff 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -483,14 +483,18 @@ protected:
::boost::shared_ptr<ScrollBar> mpHorizontalScrollBar;
/// Vertical scroll bar for whole document is always visible.
::boost::shared_ptr<ScrollBar> mpVerticalScrollBar;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
/// Horizontal ruler is not shown by default.
::std::auto_ptr<SvxRuler> mpHorizontalRuler;
/// Vertical ruler is not shown by default.
::std::auto_ptr<SvxRuler> mpVerticalRuler;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/// Filler of the little square enclosed by the two scroll bars.
::boost::shared_ptr<ScrollBarBox> mpScrollBarBox;
/// Layer tab bar.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<LayerTabBar> mpLayerTabBar;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/// This flag controls whether the rulers are visible.
bool mbHasRulers;
@@ -530,7 +534,9 @@ protected:
/// The type of the shell. Returned by GetShellType().
ShellType meShellType;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Implementation> mpImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// Support methods for centralized UNDO/REDO
virtual ::svl::IUndoManager* ImpGetUndoManager (void) const;
@@ -589,7 +595,9 @@ private:
with reference to the digit langugage used to display digits in text
shapes.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::sd::WindowUpdater> mpWindowUpdater;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** Code common to all constructors. It generally is a bad idea
to call this function from outside a constructor.
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index 3fad137c55ad..a7429a070690 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -106,7 +106,9 @@ private:
bool mbExpanded;
bool mbFocused;
// Size of the bounding box that encloses the title string.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<VirtualDevice> mpDevice;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bool mbIsExpandable;
/** Return whether this TitleBar object has an expansion indicator
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 531b01e57cc4..c7635efda428 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -461,7 +461,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache)
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<BitmapCache::CacheIndex> BitmapCache::GetCacheIndex (
bool bIncludePrecious,
bool bIncludeNoPreview) const
@@ -497,7 +497,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache)
pIndex->push_back(iIndexEntry->first);
return pIndex;
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index e1a9bf2cce37..ffd793c62d4c 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -99,7 +99,7 @@ private:
namespace sd { namespace slidesorter { namespace cache {
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<CacheCompactor> CacheCompactor::Create (
BitmapCache& rCache,
sal_Int32 nMaximalCacheSize)
@@ -138,6 +138,7 @@ namespace sd { namespace slidesorter { namespace cache {
return pCompactor;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -218,8 +219,10 @@ void CacheCompactionByCompression::Run (void)
mrCache.GetSize(), mnMaximalCacheSize);
#endif
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::sd::slidesorter::cache::BitmapCache::CacheIndex> pIndex (
mrCache.GetCacheIndex(false,false));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::sd::slidesorter::cache::BitmapCache::CacheIndex::iterator iIndex;
for (iIndex=pIndex->begin(); iIndex!=pIndex->end(); ++iIndex)
{
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
index 90a2932ad501..eef11a947011 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
@@ -62,9 +62,11 @@ public:
under this number. However, it is not guaranteed that this
works in all cases.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
static ::std::auto_ptr<CacheCompactor> Create (
BitmapCache& rCache,
sal_Int32 nMaximalCacheSize);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** Request a compaction of the off-screen previews in the bitmap
cache. This calls via a timer the Run() method.
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
index 36a49f720589..f2aad6dc2b02 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
@@ -29,8 +29,9 @@
#ifndef SD_SLIDESORTER_PAGE_ENUMERATION_HXX
#define SD_SLIDESORTER_PAGE_ENUMERATION_HXX
-#include "pres.hxx"
+#include <sal/types.h>
+#include "pres.hxx"
#include "model/SlsEnumeration.hxx"
#include "model/SlsSharedPageDescriptor.hxx"
@@ -89,7 +90,9 @@ public:
/** Create and return an exact copy of the called object.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
virtual ::std::auto_ptr<Enumeration<SharedPageDescriptor> > Clone (void);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
PageEnumeration& operator= (const PageEnumeration& rEnumeration);
@@ -112,12 +115,16 @@ public:
private:
/// Implementation object.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Enumeration<SharedPageDescriptor> > mpImpl;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/** This constructor expects an implementation object that holds
the predicate that filters the pages.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
PageEnumeration (::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// Default constructor not implemented.
PageEnumeration (void);
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 3eac80cbd5b0..8a135b322d95 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -46,7 +46,9 @@ public:
virtual ~PageEnumerationImpl (void);
/** Create a copy of the called enumeration object.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
virtual inline ::std::auto_ptr<Enumeration<SharedPageDescriptor> > Clone (void);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual inline bool HasMoreElements (void) const;
virtual inline SharedPageDescriptor GetNextElement (void);
@@ -84,7 +86,7 @@ private:
namespace sd { namespace slidesorter { namespace model {
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
PageEnumeration PageEnumeration::Create (
const SlideSorterModel& rModel,
const PagePredicate& rPredicate)
@@ -92,16 +94,16 @@ PageEnumeration PageEnumeration::Create (
return PageEnumeration(::std::auto_ptr<Enumeration<SharedPageDescriptor> >(
new PageEnumerationImpl(rModel, rPredicate)));
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
-
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
PageEnumeration::PageEnumeration (
::std::auto_ptr<Enumeration<SharedPageDescriptor> > pImpl)
: mpImpl(pImpl)
{
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -148,13 +150,13 @@ PageEnumeration& PageEnumeration::operator= (
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone (void)
{
return ::std::auto_ptr<Enumeration<SharedPageDescriptor> >(
new PageEnumeration (*this, true));
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -217,14 +219,14 @@ PageEnumerationImpl::~PageEnumerationImpl (void)
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Enumeration<SharedPageDescriptor> >
PageEnumerationImpl::Clone (void)
{
return ::std::auto_ptr<Enumeration<SharedPageDescriptor> >(
new PageEnumerationImpl(mrModel,maPredicate,mnIndex));
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 7c44d2c6a3fd..66e09620ed64 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -115,7 +115,7 @@ ScrollPanel::~ScrollPanel (void)
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
TitledControl* ScrollPanel::AddControl (
::std::auto_ptr<TreeNode> pControl,
const String& rTitle,
@@ -135,10 +135,10 @@ TitledControl* ScrollPanel::AddControl (
return pTitledControl;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
-
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void ScrollPanel::AddControl (::std::auto_ptr<TreeNode> pControl)
{
if (pControl.get() != NULL)
@@ -189,7 +189,7 @@ void ScrollPanel::AddControl (::std::auto_ptr<TreeNode> pControl)
ControlContainer::ES_EXPAND);
}
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx
index 584de24f7d82..f21416f4762b 100644
--- a/sd/source/ui/toolpanel/ToolPanel.cxx
+++ b/sd/source/ui/toolpanel/ToolPanel.cxx
@@ -65,11 +65,13 @@ namespace sd { namespace toolpanel
//= ToolPanel
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
ToolPanel::ToolPanel( ::std::auto_ptr< TreeNode >& i_rControl )
:ToolPanel_Base( m_aMutex )
,m_pControl( i_rControl )
{
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
//------------------------------------------------------------------------------------------------------------------
ToolPanel::~ToolPanel()
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 47453fcedcb0..3889d47aae82 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -282,7 +282,9 @@ private:
private:
ToolPanelViewShell& m_rPanelViewShell;
::boost::scoped_ptr< ::sfx2::ModuleTaskPane > m_pTaskPane;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::sfx2::TaskPaneController > m_pTaskPaneController;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::rtl::Reference< ConfigurationListener > m_pConfigListener;
bool m_bInitialized;
};
@@ -722,8 +724,10 @@ Reference< XUIElement > ToolPanelViewShell::CreatePanelUIElement( const Referenc
// a TreeNode which will resemble the panel
const PanelFactory aPanelFactory( lcl_describePanel( ePanelId ) );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ControlFactory > pControlFactory( (*aPanelFactory.pFactory)( *this ) );
::std::auto_ptr< TreeNode > pNode( pControlFactory->CreateControl( mpImpl->GetToolPanelDeck().GetPanelWindowAnchor() ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
ENSURE_OR_THROW( ( pNode.get() != NULL ) && ( pNode->GetWindow() != NULL ),
"illegal node returned by the control factory" );
pNode->GetWindow()->SetHelpId( aPanelFactory.sHelpID );
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index 4d6bbf3b8891..2aaa129dc9c6 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -117,7 +117,7 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize)
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<std::vector<MasterPageContainerChangeEvent::EventType> >
MasterPageDescriptor::Update (
const MasterPageDescriptor& rDescriptor)
@@ -184,7 +184,7 @@ Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize)
return pResult;
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 816b581e3eda..c191636b5f0b 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -798,7 +798,7 @@ void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken)
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList)
{
const ::osl::MutexGuard aGuard (maMutex);
@@ -836,7 +836,7 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList
if (GetParentNode() != NULL)
GetParentNode()->RequestResize();
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index 7b81dd3d8b5f..14186836f08b 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -72,7 +72,9 @@ IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer)
{
if (pTimer == &maTimer)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<AsynchronousFunction> pFunction (mpFunction);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpFunction.reset();
(*pFunction)();
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 8a95f112fad7..6a529e95bd25 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -304,7 +304,9 @@ public:
this method and that is either released at its end or assigned
to mpAsynchronousLock in order to be unlocked later.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void Update (::std::auto_ptr<LayouterLock> pLayouterLock);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
class UpdateLockImplementation
{
@@ -340,9 +342,11 @@ private:
(final) unlocking is usually done asynchronously *after* the
list of requested toolbars is updated.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<LayouterLock> mpSynchronousLayouterLock;
::std::auto_ptr<LayouterLock> mpAsynchronousLayouterLock;
::std::auto_ptr<ViewShellManager::UpdateLock> mpViewShellManagerLock;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uLong mnPendingUpdateCall;
sal_uLong mnPendingSetValidCall;
ToolBarRules maToolBarRules;
@@ -918,7 +922,7 @@ void ToolBarManager::Implementation::UnlockUpdate (void)
-
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void ToolBarManager::Implementation::Update (
::std::auto_ptr<LayouterLock> pLocalLayouterLock)
{
@@ -990,6 +994,7 @@ void ToolBarManager::Implementation::Update (
}
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 34b38028f837..c56790fc49a2 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -98,7 +98,9 @@ void TextObjectBar::Execute( SfxRequest &rReq )
sal_uInt16 nSlot = rReq.GetSlot();
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (mpView->ISA(OutlineView))
{
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index b29b5883e065..65d741d3d639 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -100,6 +100,7 @@ using namespace ::com::sun::star::linguistic2;
current clipboard content and the DrawViewShell.
The list is stored in a new instance of SvxClipboardFmtItem.
*/
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvxClipboardFmtItem> GetSupportedClipboardFormats (
TransferableDataHelper& rDataHelper)
{
@@ -180,6 +181,7 @@ using namespace ::com::sun::star::linguistic2;
return pResult;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
namespace sd {
@@ -197,7 +199,9 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
// exit immediately.
TransferableDataHelper aDataHelper (
TransferableDataHelper::CreateFromSystemClipboard(GetActiveWindow()));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvxClipboardFmtItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (mpDrawView == NULL)
return 0;
mpCurrentClipboardFormats = pFormats;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index acaad8ecf941..139b752ce642 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -499,7 +499,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
sal_Bool bPreviewState = sal_False;
sal_uLong nSlot = rReq.GetSlot();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( pOlView && (
(nSlot == SID_TRANSLITERATE_SENTENCE_CASE) ||
(nSlot == SID_TRANSLITERATE_TITLE_CASE) ||
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index e5175ac57a84..b23bad29b036 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -43,6 +43,8 @@
#include <sfx2/Metadatable.hxx>
#include <sfx2/XmlIdRegistry.hxx>
+#include <boost/scoped_ptr.hpp>
+
using namespace ::com::sun::star;
@@ -104,9 +106,9 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2)
void MetadatableTest::test()
{
OSL_TRACE("SwMetadatable test(): start");
- ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg(
+ boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pReg(
::sfx2::createXmlIdRegistry(false) );
- ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
+ boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
::sfx2::createXmlIdRegistry(true) );
MockMetadatable m1(*pReg);
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 76d512bc8114..40467b533940 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1422,8 +1422,10 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
DBG_ASSERT( eState != S_Init, "*SfxInternetPage::FillItemSet(): state init is not acceptable at this point!" );
sal_Bool bEnableReload = sal_False;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< String > aURL( NULL );
::std::auto_ptr< String > aFrame( NULL );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uIntPtr nDelay = 0;
switch( eState )
@@ -1432,16 +1434,20 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
break;
case S_Reload:
bEnableReload = sal_True;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
aURL = ::std::auto_ptr< String >( new String() );
aFrame = ::std::auto_ptr< String >( new String() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
nDelay = static_cast<sal_uIntPtr>(aNFReload.GetValue());
break;
case S_Forward:
DBG_ASSERT( aEDForwardURL.GetText().Len(), "+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward option!" );
bEnableReload = sal_True;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
aURL = ::std::auto_ptr< String >( new String( URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aEDForwardURL.GetText(), URIHelper::GetMaybeFileHdl(), true ) ) );
aFrame = ::std::auto_ptr< String >( new String( aCBFrame.GetText() ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
nDelay = static_cast<sal_uIntPtr>(aNFAfter.GetValue());
break;
default:
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 76589da3bcb2..673b562b4f88 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -889,7 +889,9 @@ namespace sfx2
DECL_LINK( OnToolboxClicked, ToolBox* );
DECL_LINK( OnMenuItemSelected, Menu* );
DECL_LINK( DockingChanged, TitledDockingWindow* );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< PopupMenu > impl_createPopupMenu() const;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/// sets the given layout for the panel selector
void impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce = false );
@@ -1015,7 +1017,9 @@ namespace sfx2
{
i_pToolBox->EndSelection();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) );
// pass toolbox button rect so the menu can stay open on button up
@@ -1216,6 +1220,7 @@ namespace sfx2
}
// ---------------------------------------------------------------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const
{
::std::auto_ptr<PopupMenu> pMenu( new PopupMenu );
@@ -1261,6 +1266,7 @@ namespace sfx2
return pMenu;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
//==================================================================================================================
//= TaskPaneController
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 3ed4325479bf..06a75a2ae007 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -121,7 +121,7 @@ gb_CXXFLAGS_WERROR := -Werror
endif
ifeq ($(HAVE_CXX0X),TRUE)
-gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
+gb_CXXFLAGS += -std=c++0x
endif
ifeq ($(ENABLE_LTO),TRUE)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 66d8e9e45850..ff4b4facc4d8 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -88,7 +88,7 @@ CFLAGSCXX= -pipe $(ARCH_FLAGS)
CFLAGSCXX+=-fvisibility-inlines-hidden
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
.IF "$(HAVE_CXX0X)" == "TRUE"
-CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
+CFLAGSCXX+=-std=c++0x
.ENDIF # "$(HAVE_CXX0X)" == "TRUE"
CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx
index 9018867b281a..05a84db4bc15 100644
--- a/stoc/source/registry_tdprovider/tdiface.cxx
+++ b/stoc/source/registry_tdprovider/tdiface.cxx
@@ -204,10 +204,13 @@ class InterfaceAttributeImpl : public WeakImplHelper1< XInterfaceAttributeTypeDe
sal_Bool _bBound;
sal_Int32 _nPosition;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > _getter;
std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > _setter;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
InterfaceAttributeImpl(
const Reference< XHierarchicalNameAccess > & xTDMgr,
const OUString & rTypeName,
@@ -232,6 +235,7 @@ public:
{
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~InterfaceAttributeImpl();
// XTypeDescription
@@ -475,10 +479,12 @@ Sequence< Reference< XInterfaceMemberTypeDescription > > InterfaceTypeDescriptio
typeName.appendAscii(RTL_CONSTASCII_STRINGPARAM("::"));
typeName.append(name);
RTFieldAccess flags = reader.getFieldFlags(i);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< stoc::registry_tdprovider::FunctionDescription >
getter;
std::auto_ptr< stoc::registry_tdprovider::FunctionDescription >
setter;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for (sal_uInt16 j = 0; j < methodCount; ++j) {
if (reader.getMethodName(j) == name) {
switch (reader.getMethodFlags(j)) {
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx
index 76c50932f22b..6b2896e59a90 100644
--- a/stoc/source/registry_tdprovider/tdservice.cxx
+++ b/stoc/source/registry_tdprovider/tdservice.cxx
@@ -245,9 +245,11 @@ ServiceTypeDescriptionImpl::getProperties()
_aBytes.getConstArray(), _aBytes.getLength(), false, TYPEREG_VERSION_1);
sal_uInt16 nFields = (sal_uInt16)aReader.getFieldCount();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< Sequence< Reference< XPropertyTypeDescription > > >
pTempProps(
new Sequence< Reference< XPropertyTypeDescription > >(nFields));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Reference< XPropertyTypeDescription > * pProps = pTempProps->getArray();
while ( nFields-- )
@@ -340,10 +342,12 @@ ServiceTypeDescriptionImpl::getConstructors() throw (RuntimeException) {
_aBytes.getConstArray(), _aBytes.getLength(), false,
TYPEREG_VERSION_1);
sal_uInt16 ctorCount = reader.getMethodCount();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< Sequence< Reference< XServiceConstructorDescription > > >
ctors(
new Sequence< Reference< XServiceConstructorDescription > >(
ctorCount));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for (sal_uInt16 i = 0; i < ctorCount; ++i) {
rtl::OUString name(reader.getMethodName(i));
if (reader.getMethodFlags(i) != RT_MODE_TWOWAY
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index ae9621565076..937561a04bd9 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -39,7 +39,7 @@
#include <vcl/bitmap.hxx>
#include <tools/color.hxx>
#include <rtl/ustring.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#define ROADMAP_INDENT_X 4
#define ROADMAP_INDENT_Y 27
@@ -919,11 +919,11 @@ namespace svt
RoadmapItem::~RoadmapItem( )
{
{
- ::std::auto_ptr<Control> aTemp(mpID);
+ boost::scoped_ptr<Control> xTakeOnership(mpID);
mpID = NULL;
}
{
- ::std::auto_ptr<Control> aTemp(mpDescription);
+ boost::scoped_ptr<Control> xTakeOnership(mpDescription);
mpDescription = NULL;
}
}
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 2cb6e87e1ec9..72dd4e132451 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -284,8 +284,10 @@ namespace accessibility
if( mrObj.GetModel() )
EndListening( *mrObj.GetModel() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > pProxySource( new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow) );
::std::auto_ptr< SvxEditSource > tmp = mpEditSource;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpEditSource = pProxySource;
pProxySource = tmp;
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 6de9d83f1a0f..13bedfa86339 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -185,13 +185,17 @@ void AccessibleShape::Init (void)
if( !pOutlinerParaObject )
{
// empty text -> use proxy edit source to delay creation of EditEngine
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvxEditSource> pEditSource( new AccessibleEmptyEditSource ( *pSdrObject, *pView, *pWindow) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpText = new AccessibleTextHelper( pEditSource );
}
else
{
// non-empty text -> use full-fledged edit source right away
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvxEditSource> pEditSource( new SvxTextEditSource ( *pSdrObject, 0, *pView, *pWindow) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpText = new AccessibleTextHelper( pEditSource );
}
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index b051b8bf468f..3b49a060c0b0 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -78,12 +78,14 @@ namespace accessibility
maEventQueue.push_back( new SvxEditSourceHint( rHint ) );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SfxHint > AccessibleTextEventQueue::PopFront()
{
::std::auto_ptr< SfxHint > aRes( *(maEventQueue.begin()) );
maEventQueue.pop_front();
return aRes;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bool AccessibleTextEventQueue::IsEmpty() const
{
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 11288f37823f..b780f9f4706f 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -123,7 +123,9 @@ namespace accessibility
uno::Reference< XAccessible > SAL_CALL getAccessibleAtPoint( const awt::Point& aPoint ) SAL_THROW((uno::RuntimeException));
SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
@@ -762,9 +764,12 @@ namespace accessibility
if( maEditSource.IsValid() )
EndListening( maEditSource.GetBroadcaster() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
maEditSource.SetEditSource( ::std::auto_ptr< SvxEditSource >(NULL) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void AccessibleTextHelper_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
{
DBG_CHKTHIS( AccessibleTextHelper_Impl, NULL );
@@ -788,6 +793,7 @@ namespace accessibility
UpdateVisibleChildren();
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void AccessibleTextHelper_Impl::SetOffset( const Point& rPoint )
{
@@ -1244,7 +1250,9 @@ namespace accessibility
while( !maEventQueue.IsEmpty() )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SfxHint > pHint( maEventQueue.PopFront() );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( pHint.get() )
{
const SfxHint& rHint = *(pHint.get());
@@ -1575,7 +1583,9 @@ namespace accessibility
EndListening( maEditSource.GetBroadcaster() );
// clear references
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
maEditSource.SetEditSource( ::std::auto_ptr< SvxEditSource >(NULL) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mxFrontEnd = NULL;
}
@@ -1714,6 +1724,7 @@ namespace accessibility
//
//------------------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
AccessibleTextHelper::AccessibleTextHelper( ::std::auto_ptr< SvxEditSource > pEditSource ) :
mpImpl( new AccessibleTextHelper_Impl() )
{
@@ -1721,6 +1732,7 @@ namespace accessibility
SetEditSource( pEditSource );
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
AccessibleTextHelper::~AccessibleTextHelper()
{
@@ -1741,6 +1753,7 @@ namespace accessibility
#endif
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void AccessibleTextHelper::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
{
#ifdef DBG_UTIL
@@ -1756,6 +1769,7 @@ namespace accessibility
mpImpl->CheckInvariants();
#endif
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
void AccessibleTextHelper::SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index a713dc83a650..5b43b6210e99 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1840,7 +1840,9 @@ String DbPatternField::impl_formatText( const String& _rText )
String DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
{
bool bIsForPaint = _rxField != m_rColumn.GetField();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::dbtools::FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( !rpFormatter.get() )
{
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index bc4310c7357c..d5bd1a431c90 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -320,6 +320,7 @@ namespace svxform
}
//----------------------------------------------------------------
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue(
const ::comphelper::ComponentContext& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn )
{
@@ -328,6 +329,7 @@ namespace svxform
pValue = getFactory()->createFormattedColumnValue( _rContext, _rxRowSet, _rxColumn );
return pValue;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
//........................................................................
} // namespace svxform
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index df6aa255cc62..6602b1846acf 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -102,6 +102,8 @@
#include <comphelper/property.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <boost/scoped_ptr.hpp>
+
// wird fuer Invalidate verwendet -> mitpflegen
// aufsteigend sortieren !!!!!!
sal_uInt16 ControllerSlotMap[] = // slots des Controllers
@@ -773,7 +775,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
DBG_ASSERT( pFact, "no dialog factory!" );
if ( pFact )
{
- ::std::auto_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
+ boost::scoped_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
DBG_ASSERT( dlg.get(), "Dialogdiet fail!" );
dlg->SetValue( rController->getCursor()->getRow() );
if ( dlg->Execute() == RET_OK )
@@ -1398,6 +1400,7 @@ namespace
}
//------------------------------------------------------------------------
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
{
::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter;
@@ -1407,6 +1410,7 @@ namespace
return pFilter;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
//------------------------------------------------------------------------
SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 044335f0315a..37828f35c71f 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1559,7 +1559,9 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
bool bNeedLabel = ( _nControlObjectID != OBJ_FM_CHECKBOX );
// the label
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SdrUnoObj > pLabel;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Reference< XPropertySet > xLabelModel;
if ( bNeedLabel )
{
@@ -1591,8 +1593,10 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
}
// the control
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SdrUnoObj > pControl( dynamic_cast< SdrUnoObj* >(
SdrObjFactory::MakeNewObject( _nInventor, _nControlObjectID, _pControlPage, _pModel ) ) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
OSL_ENSURE( pControl.get(), "FmXFormView::createControlLabelPair: could not create the control!" );
if ( !pControl.get() )
return false;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 5cd19569344b..4de354192788 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -560,8 +560,10 @@ private:
String impl_formatText( const String& _rText );
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter;
::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pPaintFormatter;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::comphelper::ComponentContext m_aContext;
};
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index db9dcd90e079..046804b4d35e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -190,7 +190,9 @@ class SvxFontNameBox_Impl : public FontNameBox
using Window::Update;
private:
const FontList* pFontList;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FontList> m_aOwnFontList;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Font aCurFont;
Size aLogicalSize;
String aCurText;
@@ -221,7 +223,9 @@ public:
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
- inline void SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; }
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ void SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; }
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
//========================================================================
@@ -555,7 +559,9 @@ sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl*
(SvxFontListItem*)pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
else
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<FontList> aFontList(new FontList( pBox ));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
*ppFontList = aFontList.get();
pBox->SetOwnFontList(aFontList);
bChanged = sal_True;
diff --git a/sw/inc/unoport.hxx b/sw/inc/unoport.hxx
index 12f93f6fcb56..59cb35ebc562 100644
--- a/sw/inc/unoport.hxx
+++ b/sw/inc/unoport.hxx
@@ -116,10 +116,12 @@ private:
m_xTextField;
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
m_xMeta;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::com::sun::star::uno::Any > m_pRubyText;
::std::auto_ptr< ::com::sun::star::uno::Any > m_pRubyStyle;
::std::auto_ptr< ::com::sun::star::uno::Any > m_pRubyAdjust;
::std::auto_ptr< ::com::sun::star::uno::Any > m_pRubyIsAbove;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const SwDepend m_FrameDepend;
SwFrmFmt * m_pFrameFmt;
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index c3c1a37a4c43..dd38bc0ad63f 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -766,7 +766,7 @@ public:
releaseBigPtrArrayContent(bparr);
}
- CPPUNIT_TEST_SUITE(BigPtrArrayUnittest);
+ SAL_CPPUNIT_TEST_SUITE(BigPtrArrayUnittest);
CPPUNIT_TEST(test_ctor);
CPPUNIT_TEST(test_insert_entries_at_front);
CPPUNIT_TEST(test_insert_entries_in_the_middle);
@@ -784,7 +784,7 @@ public:
CPPUNIT_TEST(test_for_some1);
CPPUNIT_TEST(test_for_some2);
CPPUNIT_TEST(test_for_some3);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
};
const char* START = "START: ";
@@ -849,7 +849,7 @@ public:
void test_insert_at_front_1000000()
{ test_insert_at_front("1000000"); }
- CPPUNIT_TEST_SUITE(BigPtrArrayPerformanceTest);
+ SAL_CPPUNIT_TEST_SUITE(BigPtrArrayPerformanceTest);
CPPUNIT_TEST(test_insert_at_end_1000);
CPPUNIT_TEST(test_insert_at_end_10000);
CPPUNIT_TEST(test_insert_at_end_100000);
@@ -858,7 +858,7 @@ public:
CPPUNIT_TEST(test_insert_at_front_10000);
CPPUNIT_TEST(test_insert_at_front_100000);
CPPUNIT_TEST(test_insert_at_front_1000000);
- CPPUNIT_TEST_SUITE_END();
+ SAL_CPPUNIT_TEST_SUITE_END();
private:
void test_insert_at_end(const char* numElements)
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 8496b06ff13c..ac5f18020aa6 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2391,7 +2391,9 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
throw (lang::IllegalArgumentException,
uno::RuntimeException)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<SwTextMarkupHelper> pTextMarkupHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
switch ( nTextMarkupType )
{
case text::TextMarkupType::TRACK_CHANGE_INSERTION:
@@ -2419,7 +2421,9 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
lang::IllegalArgumentException,
uno::RuntimeException)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<SwTextMarkupHelper> pTextMarkupHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
switch ( nTextMarkupType )
{
case text::TextMarkupType::TRACK_CHANGE_INSERTION:
@@ -2454,7 +2458,9 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL
throw lang::IndexOutOfBoundsException();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr<SwTextMarkupHelper> pTextMarkupHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
switch ( nTextMarkupType )
{
case text::TextMarkupType::TRACK_CHANGE_INSERTION:
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index b0388fd3da7c..a6fea0d76a54 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -968,7 +968,9 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
{
// Cursor als Kopie vom akt. und in den Ring aufnehmen
// Verkettung zeigt immer auf den zuerst erzeugten, also vorwaerts
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< SwCursor > pSav( Create( this ) ); // save the current cursor
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// wenn schon ausserhalb vom Bodytext, suche von der Position,
// ansonsten beginne mit der 1. GrundSection
@@ -1026,7 +1028,9 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
}
else if( FND_IN_SELALL & eFndRngs )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SwCursor> pSav( Create( this ) ); // save the current cursor
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const SwNode* pSttNd = ( FND_IN_BODYONLY & eFndRngs )
? rNds.GetEndOfContent().StartOfSectionNode()
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index a190c68a42ac..a867f991b965 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -102,17 +102,20 @@ namespace
pMark);
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
static inline auto_ptr<SwPosition> lcl_PositionFromCntntNode(SwCntntNode * const pCntntNode, const bool bAtEnd=false)
{
auto_ptr<SwPosition> pResult(new SwPosition(*pCntntNode));
pResult->nContent.Assign(pCntntNode, bAtEnd ? pCntntNode->Len() : 0);
return pResult;
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// return a position at the begin of rEnd, if it is a CntntNode
// else set it to the begin of the Node after rEnd, if there is one
// else set it to the end of the node before rStt
// else set it to the CntntNode of the Pos outside the Range
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
static inline auto_ptr<SwPosition> lcl_FindExpelPosition(const SwNodeIndex& rStt,
const SwNodeIndex& rEnd,
const SwPosition& rOtherPosition)
@@ -128,7 +131,8 @@ namespace
if(pNode)
return lcl_PositionFromCntntNode(pNode, bAtEnd);
return auto_ptr<SwPosition>(new SwPosition(rOtherPosition));
- };
+ }
+ SAL_WNODEPRECATED_DECLARATIONS_POP
static IMark* lcl_getMarkAfter(const IDocumentMarkAccess::container_t& rMarks, const SwPosition& rPos)
{
@@ -632,6 +636,7 @@ namespace sw { namespace mark
{
// the bookmark is partitially in the range
// move position of that is in the range out of it
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<SwPosition> pNewPos;
if(pEndIdx)
pNewPos = auto_ptr<SwPosition>(new SwPosition(
@@ -642,6 +647,7 @@ namespace sw { namespace mark
rStt,
rEnd,
isPosInRange ? pMark->GetOtherMarkPos() : pMark->GetMarkPos());
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// #i92125#
// no move of position for cross-reference bookmarks,
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 50555660c6e0..aa5d5ec2d265 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1265,7 +1265,9 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
SwSectionFmt* pSectFmt = pDoc->MakeSectionFmt( 0 );
pSectFmt->CopyAttrs( *GetSection().GetFmt() );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwTOXBase> pTOXBase;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (TOX_CONTENT_SECTION == GetSection().GetType())
{
OSL_ENSURE( GetSection().ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 3566eb8687de..2ad17e49498a 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -52,9 +52,11 @@ class SwEndNoteInfo;
class SwUndoAttr : public SwUndo, private SwUndRng
{
SfxItemSet m_AttrSet; // attributes for Redo
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwHistory> m_pHistory; // History for Undo
::std::auto_ptr<SwRedlineData> m_pRedlineData; // Redlining
::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uLong m_nNodeIndex; // Offset: for Redlining
const SetAttrMode m_nInsertFlags; // insert flags
@@ -78,7 +80,9 @@ public:
class SwUndoResetAttr : public SwUndo, private SwUndRng
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwHistory> m_pHistory;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
std::set<sal_uInt16> m_Ids;
const sal_uInt16 m_nFormatId; // Format-Id for Redo
@@ -102,7 +106,9 @@ class SwUndoFmtAttr : public SwUndo
{
friend class SwUndoDefaultAttr;
SwFmt * m_pFmt;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> m_pOldSet; // old attributes
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uLong m_nNodeIndex;
const sal_uInt16 m_nFmtWhich;
const bool m_bSaveDrawPt;
@@ -160,7 +166,9 @@ class SwUndoFmtResetAttr : public SwUndo
// which ID of the reset attribute
const sal_uInt16 m_nWhichId;
// old attribute which has been reset - needed for undo.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxPoolItem> m_pOldItem;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
class SwUndoDontExpandFmt : public SwUndo
@@ -179,7 +187,9 @@ public:
// helper class to receive changed attribute sets
class SwUndoFmtAttrHelper : public SwClient
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUndoFmtAttr> m_pUndo;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const bool m_bSaveDrawPt;
public:
@@ -195,7 +205,9 @@ public:
class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwHistory> m_pHistory;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const bool m_bModulus;
public:
@@ -216,8 +228,10 @@ public:
class SwUndoDefaultAttr : public SwUndo
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> m_pOldSet; // the old attributes
::std::auto_ptr<SvxTabStopItem> m_pTabStop;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
// registers at the format and saves old attributes
@@ -234,7 +248,9 @@ public:
class SwUndoChangeFootNote : public SwUndo, private SwUndRng
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwHistory> m_pHistory;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const String m_Text;
const sal_uInt16 m_nNumber;
const bool m_bEndNote;
@@ -253,7 +269,9 @@ public:
class SwUndoFootNoteInfo : public SwUndo
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwFtnInfo> m_pFootNoteInfo;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
SwUndoFootNoteInfo( const SwFtnInfo &rInfo );
@@ -266,7 +284,9 @@ public:
class SwUndoEndNoteInfo : public SwUndo
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwEndNoteInfo> m_pEndNoteInfo;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
SwUndoEndNoteInfo( const SwEndNoteInfo &rInfo );
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 8d914afde64c..c0187acd06b8 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -106,7 +106,9 @@ public:
class SwHistorySetFmt : public SwHistoryHint
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxPoolItem> m_pAttr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const sal_uLong m_nNodeIndex;
public:
@@ -130,7 +132,9 @@ public:
class SwHistorySetTxt : public SwHistoryHint
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxPoolItem> m_pAttr;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const sal_uLong m_nNodeIndex;
const xub_StrLen m_nStart;
const xub_StrLen m_nEnd;
@@ -144,10 +148,12 @@ public:
class SwHistorySetTxtFld : public SwHistoryHint
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
//!! beware of the order for the declation of the auto_ptrs.
//!! If they get destroyed in the wrong order sw may crash (namely mail-merge as well)
::std::auto_ptr<SwFieldType> m_pFldType;
const ::std::auto_ptr<SwFmtFld> m_pFld;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uLong m_nNodeIndex;
xub_StrLen m_nPos;
@@ -211,7 +217,9 @@ public:
class SwHistorySetFootnote : public SwHistoryHint
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwUndoSaveSection> m_pUndo;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const String m_FootnoteNumber;
sal_uLong m_nNodeIndex;
const xub_StrLen m_nStart;
@@ -241,7 +249,9 @@ public:
class SwHistoryTxtFlyCnt : public SwHistoryHint
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUndoDelLayFmt> m_pUndo;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
public:
SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt );
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 92333a46ca8a..1eb6587265d8 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -101,6 +101,7 @@ public:
SwXMeta(SwDoc *const pDoc);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
static ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable >
CreateXMeta(
@@ -109,6 +110,7 @@ public:
const& xParentText = 0,
::std::auto_ptr<TextRangeList_t const> pPortions =
::std::auto_ptr<TextRangeList_t const>(0));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/// init params with position of the attribute content (w/out CH_TXTATR)
bool SetContentRange(
@@ -256,12 +258,14 @@ private:
virtual ~SwXMetaField();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
friend ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable >
SwXMeta::CreateXMeta(::sw::Meta &,
::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
const&,
::std::auto_ptr<TextRangeList_t const> pPortions);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SwXMetaField(SwDoc *const pDoc, ::sw::Meta *const pMeta,
::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const&
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index f2646c2b4a9a..7ed18741304d 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -398,7 +398,9 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
// #i89179#
// tab portion representing the list tab of a list label gets the
// same font as the corresponding number portion
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< SwFontSave > pSave( 0 );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( GetLen() == 0 &&
rInf.GetLast() && rInf.GetLast()->InNumberGrp() &&
static_cast<SwNumberPortion*>(rInf.GetLast())->HasFont() )
@@ -584,7 +586,9 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
// #i89179#
// tab portion representing the list tab of a list label gets the
// same font as the corresponding number portion
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< SwFontSave > pSave( 0 );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( GetLen() == 0 )
{
const SwLinePortion* pPrevPortion =
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index b4a89a34cf24..0bcbbb5a27c2 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -61,6 +61,7 @@ using namespace ::com::sun::star;
namespace sw {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
UndoManager::UndoManager(::std::auto_ptr<SwNodes> pUndoNodes,
IDocumentDrawModelAccess & rDrawModelAccess,
IDocumentRedlineAccess & rRedlineAccess,
@@ -79,6 +80,7 @@ UndoManager::UndoManager(::std::auto_ptr<SwNodes> pUndoNodes,
// Undo is enabled by SwEditShell constructor
SfxUndoManager::EnableUndo(false);
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
SwNodes const& UndoManager::GetUndoNodes() const
{
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index dd9a6ce93c62..3f71c4640bfc 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -287,9 +287,11 @@ class SwUndoDelSection
: public SwUndo
{
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwSectionData> const m_pSectionData; /// section not TOX
::std::auto_ptr<SwTOXBase> const m_pTOXBase; /// set iff section is TOX
::std::auto_ptr<SfxItemSet> const m_pAttrSet;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::boost::shared_ptr< ::sfx2::MetadatableUndo > const m_pMetadataUndo;
sal_uLong const m_nStartNode;
sal_uLong const m_nEndNode;
@@ -400,8 +402,10 @@ class SwUndoUpdateSection
: public SwUndo
{
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwSectionData> m_pSectionData;
::std::auto_ptr<SfxItemSet> m_pAttrSet;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_uLong const m_nStartNode;
bool const m_bOnlyAttrChanged;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 776ffff8b75d..18df109424cd 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -339,7 +339,9 @@ SwUnoCursorHelper::SetPageDesc(
{
return false;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwFmtPageDesc> pNewDesc;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC, sal_True, &pItem ) )
{
@@ -461,7 +463,9 @@ lcl_setDropcapCharStyle(SwPaM & rPam, SfxItemSet & rItemSet,
{
throw lang::IllegalArgumentException();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwFmtDrop> pDrop;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SfxPoolItem const* pItem(0);
if (SFX_ITEM_SET ==
rItemSet.GetItemState(RES_PARATR_DROP, sal_True, &pItem))
@@ -486,7 +490,9 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue)
throw lang::IllegalArgumentException();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwFmtRuby> pRuby;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const SfxPoolItem* pItem;
if (SFX_ITEM_SET ==
rItemSet.GetItemState(RES_TXTATR_CJK_RUBY, sal_True, &pItem))
@@ -1928,8 +1934,10 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
uno::Sequence< beans::PropertyState > aRet(rPropertyNames.getLength());
beans::PropertyState* pStates = aRet.getArray();
SfxItemPropertyMap const*const pMap = rPropSet.getPropertyMap();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> pSet;
::std::auto_ptr<SfxItemSet> pSetParent;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for (sal_Int32 i = 0, nEnd = rPropertyNames.getLength(); i < nEnd; i++)
{
@@ -2049,7 +2057,9 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc,
// if we are reseting paragraph attributes, we need to select the full paragraph first
SwPosition aStart = *rPaM.Start();
SwPosition aEnd = *rPaM.End();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SwUnoCrsr > pTemp ( rDoc.CreateUnoCrsr(aStart, sal_False) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
{
pTemp->MovePara(fnParaCurr, fnParaStart);
@@ -2913,8 +2923,10 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException)
throw uno::RuntimeException();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUnoCrsr> pNewCrsr(
rUnoCursor.GetDoc()->CreateUnoCrsr(*rUnoCursor.GetPoint()) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (rUnoCursor.HasMark())
{
pNewCrsr->SetMark();
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 58a435f73259..3887efc13183 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -465,6 +465,7 @@ public:
bool m_bFirstParagraph;
uno::Reference< text::XTextContent > m_xNextPara;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
Impl( uno::Reference< text::XText > const& xParent,
::std::auto_ptr<SwUnoCrsr> pCursor,
const CursorType eType,
@@ -500,6 +501,7 @@ public:
rCursor.DeleteMark();
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
~Impl() {
// Impl owns the cursor; delete it here: SolarMutex is locked
@@ -525,6 +527,7 @@ void SwXParagraphEnumeration::Impl::Modify( const SfxPoolItem *pOld, const SfxPo
ClientModify(this, pOld, pNew);
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
SwXParagraphEnumeration::SwXParagraphEnumeration(
uno::Reference< text::XText > const& xParent,
::std::auto_ptr<SwUnoCrsr> pCursor,
@@ -534,6 +537,7 @@ SwXParagraphEnumeration::SwXParagraphEnumeration(
pStartNode, pTable) )
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
SwXParagraphEnumeration::~SwXParagraphEnumeration()
{
@@ -628,8 +632,10 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
(CURSOR_SELECTION_IN_TABLE == m_eCursorType)))
{
SwPosition* pStart = pUnoCrsr->Start();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwUnoCrsr> aNewCrsr(
pUnoCrsr->GetDoc()->CreateUnoCrsr(*pStart, sal_False) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// one may also go into tables here
if ((CURSOR_TBLTEXT != m_eCursorType) &&
(CURSOR_SELECTION_IN_TABLE != m_eCursorType))
@@ -1183,8 +1189,10 @@ SwXTextRange::CreateXTextRange(
{
const uno::Reference<text::XText> xParentText(
::sw::CreateParentXText(rDoc, rPos));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwUnoCrsr> pNewCrsr(
rDoc.CreateUnoCrsr(rPos, sal_False));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if(pMark)
{
pNewCrsr->SetMark();
@@ -1319,8 +1327,10 @@ throw (uno::RuntimeException)
throw uno::RuntimeException();
}
const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent());
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwUnoCrsr> pNewCrsr(
m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!GetPositions(*pNewCrsr))
{
throw uno::RuntimeException();
@@ -1341,8 +1351,10 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException)
throw uno::RuntimeException();
}
const SwPosition aPos(GetDoc()->GetNodes().GetEndOfContent());
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUnoCrsr> pNewCrsr(
m_pImpl->m_rDoc.CreateUnoCrsr(aPos, sal_False));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!GetPositions(*pNewCrsr))
{
throw uno::RuntimeException();
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 75ec0c841f5e..f7fb0a499657 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -172,7 +172,9 @@ namespace
const SwPosition& rEndPos = pBkmk->GetMarkEnd();
if(rEndPos.nNode == nOwnNode)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<SwPosition> pCrossRefEndPos;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const SwPosition* pEndPos = NULL;
if(hasOther)
{
@@ -181,7 +183,9 @@ namespace
else if (pCrossRefMark)
{
// Crossrefbookmarks only remember the start position but have to span the whole paragraph
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pCrossRefEndPos = auto_ptr<SwPosition>(new SwPosition(rEndPos));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pCrossRefEndPos->nContent = pCrossRefEndPos->nNode.GetNode().GetTxtNode()->Len();
pEndPos = pCrossRefEndPos.get();
}
@@ -466,6 +470,7 @@ lcl_CreateTOXMarkPortion(
return pPortion;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
static uno::Reference<text::XTextRange>
lcl_CreateMetaPortion(
uno::Reference<text::XText> const& xParent,
@@ -491,6 +496,7 @@ lcl_CreateMetaPortion(
}
return pPortion;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
static void
lcl_ExportBookmark(
@@ -685,8 +691,10 @@ lcl_ExportHints(
}
else
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<const TextRangeList_t>
pCurrentPortions(Top.first);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rPortionStack.pop();
const uno::Reference<text::XTextRange> xPortion(
lcl_CreateMetaPortion(xParent, pUnoCrsr,
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 74f96b3d1101..5242cdf1cd1b 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -176,8 +176,10 @@ uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration(void)
SolarMutexGuard aGuard;
SwPaM aPam(aNodeIndex);
aPam.Move(fnMoveForward, fnGoNode);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUnoCrsr> pUnoCursor(
GetDoc()->CreateUnoCrsr(*aPam.Start(), sal_False));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
return new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE);
}
@@ -578,8 +580,10 @@ uno::Reference< container::XEnumeration > SwXRedline::createEnumeration(void) t
{
SwPaM aPam(*pNodeIndex);
aPam.Move(fnMoveForward, fnGoNode);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUnoCrsr> pUnoCursor(
GetDoc()->CreateUnoCrsr(*aPam.Start(), sal_False));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
xRet = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE);
}
return xRet;
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 88321b587dc3..bca571021b2f 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -335,10 +335,12 @@ SwXReferenceMark::getAnchor() throw (uno::RuntimeException)
&m_pImpl->m_pDoc->GetNodes()))
{
SwTxtNode const& rTxtNode = pTxtMark->GetTxtNode();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ::std::auto_ptr<SwPaM> pPam( (pTxtMark->GetEnd())
? new SwPaM( rTxtNode, *pTxtMark->GetEnd(),
rTxtNode, *pTxtMark->GetStart())
: new SwPaM( rTxtNode, *pTxtMark->GetStart()) );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
return SwXTextRange::CreateXTextRange(
*m_pImpl->m_pDoc, *pPam->Start(), pPam->End());
@@ -675,7 +677,9 @@ class SwXMeta::Impl
public:
SwEventListenerContainer m_ListenerContainer;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<const TextRangeList_t> m_pTextPortions;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// 3 possible states: not attached, attached, disposed
bool m_bIsDisposed;
bool m_bIsDescriptor;
@@ -747,6 +751,7 @@ SwXMeta::~SwXMeta()
{
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
uno::Reference<rdf::XMetadatable>
SwXMeta::CreateXMeta(::sw::Meta & rMeta,
uno::Reference<text::XText> const& i_xParent,
@@ -802,6 +807,7 @@ SwXMeta::CreateXMeta(::sw::Meta & rMeta,
rMeta.SetXMeta(xMeta);
return xMeta;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
bool SwXMeta::SetContentRange(
SwTxtNode *& rpNode, xub_StrLen & rStart, xub_StrLen & rEnd ) const
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 9290344c4022..a4f3d9e5a131 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -79,6 +79,7 @@ struct SwTextSectionProperties_Impl
::rtl::OUString m_sSectionFilter;
::rtl::OUString m_sSectionRegion;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwFmtCol> m_pColItem;
::std::auto_ptr<SvxBrushItem> m_pBrushItem;
::std::auto_ptr<SwFmtFtnAtTxtEnd> m_pFtnItem;
@@ -87,6 +88,7 @@ struct SwTextSectionProperties_Impl
::std::auto_ptr<SwFmtNoBalancedColumns> m_pNoBalanceItem;
::std::auto_ptr<SvxFrameDirectionItem> m_pFrameDirItem;
::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bool m_bDDE;
bool m_bHidden;
@@ -119,7 +121,9 @@ public:
const bool m_bIndexHeader;
bool m_bIsDescriptor;
::rtl::OUString m_sName;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwTextSectionProperties_Impl> m_pProps;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
Impl( SwXTextSection & rThis,
SwSectionFmt *const pFmt, const bool bIndexHeader)
@@ -514,6 +518,7 @@ lcl_UpdateLinkType(SwSection & rSection, bool const bLinkUpdateAlways = true)
}
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
static void
lcl_UpdateSection(SwSectionFmt *const pFmt,
::std::auto_ptr<SwSectionData> const& pSectionData,
@@ -548,6 +553,7 @@ lcl_UpdateSection(SwSectionFmt *const pFmt,
}
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
void SwXTextSection::Impl::SetPropertyValues_Impl(
const uno::Sequence< OUString >& rPropertyNames,
@@ -566,12 +572,16 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
throw uno::RuntimeException();
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwSectionData> const pSectionData(
(pFmt) ? new SwSectionData(*pFmt->GetSection()) : 0);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
OUString const*const pPropertyNames = rPropertyNames.getConstArray();
uno::Any const*const pValues = rValues.getConstArray();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> pItemSet;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Bool bLinkModeChanged = sal_False;
sal_Bool bLinkMode = sal_False;
@@ -1501,10 +1511,12 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
static_cast<cppu::OWeakObject *>(this));
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwSectionData> const pSectionData(
(pFmt) ? new SwSectionData(*pFmt->GetSection()) : 0);
::std::auto_ptr<SfxItemSet> pNewAttrSet;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
bool bLinkModeChanged = false;
switch (pEntry->nWID)
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 860ffc71cd0f..594c3cf2d159 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -121,6 +121,7 @@ public:
bool CheckForOwnMember(const SwPaM & rPaM)
throw (lang::IllegalArgumentException, uno::RuntimeException);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
void ConvertCell(
const bool bFirstCell,
const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
@@ -128,6 +129,7 @@ public:
::std::auto_ptr< SwPaM > & rpFirstPaM,
SwPaM & rLastPaM,
bool & rbExcept);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
@@ -1552,7 +1554,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
}
uno::Reference< text::XTextContent > xRet;
SwUnoInternalPaM aStartPam(*GetDoc());
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< SwUnoInternalPaM > pEndPam(new SwUnoInternalPaM(*GetDoc()));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (!::sw::XTextRangeToSwPaM(aStartPam, xStart) ||
!::sw::XTextRangeToSwPaM(*pEndPam, xEnd))
{
@@ -1779,6 +1783,7 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 )
return abs( nPos1 - nPos2 ) < COL_POS_FUZZY;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
void SwXText::Impl::ConvertCell(
const bool bFirstCell,
const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
@@ -1938,6 +1943,7 @@ void SwXText::Impl::ConvertCell(
rpFirstPaM.reset(new SwPaM(*aStartCellPam.Start()));
}
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
typedef uno::Sequence< text::TableColumnSeparator > TableColumnSeparators;
@@ -2169,7 +2175,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
//at first collect the text ranges as SwPaMs
const uno::Sequence< uno::Sequence< uno::Reference< text::XTextRange > > >*
pTableRanges = rTableRanges.getConstArray();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr < SwPaM > pFirstPaM;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
std::vector< std::vector<SwNodeRange> > aTableNodes;
bool bExcept = false;
SwPaM aLastPaM(m_pImpl->m_pDoc->GetNodes());
@@ -2509,8 +2517,10 @@ throw (uno::RuntimeException)
SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent();
SwPosition aPos(rNode);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUnoCrsr> pUnoCursor(
GetDoc()->CreateUnoCrsr(aPos, sal_False));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pUnoCursor->Move(fnMoveBackward, fnGoDoc);
const uno::Reference< container::XEnumeration > xRet
= new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_BODY);
@@ -2785,8 +2795,10 @@ throw (uno::RuntimeException)
const SwFmtCntnt& rFlyCntnt = rHeadFootFmt.GetCntnt();
const SwNode& rNode = rFlyCntnt.GetCntntIdx()->GetNode();
SwPosition aPos(rNode);
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SwUnoCrsr> pUnoCursor(
GetDoc()->CreateUnoCrsr(aPos, sal_False));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
pUnoCursor->Move(fnMoveForward, fnGoNode);
aRef = new SwXParagraphEnumeration(this, pUnoCursor,
(m_pImpl->m_bIsHeader) ? CURSOR_HEADER : CURSOR_FOOTER);
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index 74f1e206c7f2..a6948c28f587 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -67,6 +67,7 @@
#include <svx/htmlmode.hxx>
#include <svx/dlgutil.hxx>
#include "swabstdlg.hxx"
+#include <boost/scoped_ptr.hpp>
void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
{
@@ -189,8 +190,8 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
IMPL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect )
{
- ::std::auto_ptr<SwSectionData> pSectionData(pSect);
- if (pSectionData.get())
+ boost::scoped_ptr<SwSectionData> xSectionData(pSect);
+ if (xSectionData.get())
{
SfxItemSet aSet(pThis->GetView().GetPool(),
RES_COL, RES_COL,
@@ -209,7 +210,7 @@ IMPL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect )
AbstractInsertSectionTabDialog* aTabDlg = pFact->CreateInsertSectionTabDialog( DLG_INSERT_SECTION,
&pThis->GetView().GetViewFrame()->GetWindow(),aSet , *pThis);
OSL_ENSURE(aTabDlg, "Dialogdiet fail!");
- aTabDlg->SetSectionData(*pSectionData);
+ aTabDlg->SetSectionData(*xSectionData);
aTabDlg->Execute();
delete aTabDlg;
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index e936496374e3..7431c3e847d8 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -62,6 +62,8 @@
#include <IDocumentUndoRedo.hxx>
#include <SwUndoField.hxx>
+#include <boost/scoped_ptr.hpp>
+
namespace sw { namespace annotation {
@@ -111,7 +113,7 @@ void SwAnnotationWin::UpdateData()
{
IDocumentUndoRedo & rUndoRedo(
DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo());
- ::std::auto_ptr<SwField> pOldField;
+ boost::scoped_ptr<SwField> pOldField;
if (rUndoRedo.DoesUndo())
{
pOldField.reset(mpFld->Copy());
@@ -250,7 +252,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
Engine()->SetModifyHdl( Link() );
IDocumentUndoRedo & rUndoRedo(
DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo());
- ::std::auto_ptr<SwField> pOldField;
+ boost::scoped_ptr<SwField> pOldField;
if (rUndoRedo.DoesUndo())
{
pOldField.reset(mpFld->Copy());
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index de6b1ff245e1..c7c5ebc05dbd 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -613,7 +613,9 @@ CachableContentProperties::CachableContentProperties(
void CachableContentProperties::addProperties(
const ContentProperties & rProps )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< PropertyValueMap > & props = rProps.getProperties();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
PropertyValueMap::const_iterator it = props->begin();
const PropertyValueMap::const_iterator end = props->end();
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 3d03500f02cd..ae70b69a7c21 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -549,7 +549,9 @@ uno::Any SAL_CALL Content::execute(
// {
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
@@ -690,7 +692,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
{
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
@@ -765,7 +769,9 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name,
try
{
// Set property value at server.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
@@ -859,7 +865,9 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name )
aProppatchValues.push_back( aValue );
// Remove property value from server.
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
@@ -1119,8 +1127,9 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else
{
// Append all standard UCB, DAV and HTTP properties.
-
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< PropertyValueMap > & xProps = rData.getProperties();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
PropertyValueMap::const_iterator it = xProps->begin();
PropertyValueMap::const_iterator end = xProps->end();
@@ -1153,9 +1162,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
throw ( uno::Exception )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ContentProperties > xProps;
std::auto_ptr< ContentProperties > xCachedProps;
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString aUnescapedTitle;
bool bHasAll = false;
uno::Reference< lang::XMultiServiceFactory > xSMgr;
@@ -1470,7 +1481,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
uno::Reference< ucb::XContentIdentifier > xIdentifier;
rtl::Reference< ContentProvider > xProvider;
sal_Bool bTransient;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -1963,7 +1976,9 @@ uno::Any Content::open(
// PUSH: write data
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::MutexGuard aGuard( m_aMutex );
@@ -2008,7 +2023,9 @@ uno::Any Content::open(
// PULL: wait for client read
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::MutexGuard aGuard( m_aMutex );
@@ -2078,7 +2095,9 @@ void Content::post(
{
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset(
@@ -2112,7 +2131,9 @@ void Content::post(
{
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::MutexGuard aGuard( m_aMutex );
xResAccess.reset(
@@ -2211,7 +2232,9 @@ void Content::insert(
{
sal_Bool bTransient, bCollection;
rtl::OUString aEscapedTitle;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -2456,7 +2479,9 @@ void Content::transfer(
uno::Reference< lang::XMultiServiceFactory > xSMgr;
uno::Reference< ucb::XContentIdentifier > xIdentifier;
uno::Reference< ucb::XContentProvider > xProvider;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -2754,7 +2779,9 @@ void Content::lock(
{
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
@@ -2794,7 +2821,9 @@ void Content::unlock(
{
try
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
@@ -3116,6 +3145,7 @@ void Content::cancelCommandExecution(
}
//=========================================================================
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
const rtl::OUString
Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess )
{
@@ -3222,6 +3252,7 @@ const Content::ResourceType & Content::getResourceType(
}
return m_eResourceType;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
//=========================================================================
const Content::ResourceType & Content::getResourceType(
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 051e6382e73f..2c02ab511c38 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -128,19 +128,23 @@ private:
exchangeIdentity( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& xNewId );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const rtl::OUString
getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
const ResourceType &
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv )
throw ( ::com::sun::star::uno::Exception );
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const ResourceType &
getResourceType( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv,
const std::auto_ptr< DAVResourceAccess > & rResAccess )
throw ( ::com::sun::star::uno::Exception );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// Command "open"
com::sun::star::uno::Any open(
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index ebcce7401676..ada05794f485 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -304,8 +304,10 @@ uno::Sequence< beans::Property > Content::getProperties(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
{
sal_Bool bTransient;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< DAVResourceAccess > xResAccess;
std::auto_ptr< ContentProperties > xCachedProps;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::Reference< ContentProvider > xProvider;
{
@@ -505,8 +507,10 @@ uno::Sequence< beans::Property > Content::getProperties(
const std::set< rtl::OUString >::const_iterator set_end
= aPropSet.end();
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
const std::auto_ptr< PropertyValueMap > & xProps
= xCachedProps->getProperties();
+ SAL_WNODEPRECATED_DECLARATIONS_POP
PropertyValueMap::const_iterator map_it = xProps->begin();
const PropertyValueMap::const_iterator map_end = xProps->end();
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 8ee1e12a7569..c76414334057 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -57,6 +57,8 @@
#include "iahndl.hxx"
+#include <boost/scoped_ptr.hpp>
+
using namespace com::sun::star;
namespace {
@@ -92,9 +94,9 @@ executeLoginDialog(
if (!bCanUseSysCreds)
nFlags |= LF_NO_USESYSCREDS;
- std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
+ boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
UniString aRealm(rRealm);
- std::auto_ptr< LoginDialog > xDialog(
+ boost::scoped_ptr< LoginDialog > xDialog(
new LoginDialog( pParent, nFlags, rInfo.GetServer(), &aRealm, xManager.get()));
if (rInfo.GetErrorText().Len() != 0)
xDialog->SetErrorText(rInfo.GetErrorText());
@@ -423,11 +425,11 @@ executeMasterPasswordDialog(
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
{
- std::auto_ptr< MasterPasswordCreateDialog > xDialog(
+ boost::scoped_ptr< MasterPasswordCreateDialog > xDialog(
new MasterPasswordCreateDialog(pParent, xManager.get()));
rInfo.SetResult(xDialog->Execute()
== RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
@@ -436,7 +438,7 @@ executeMasterPasswordDialog(
}
else
{
- std::auto_ptr< MasterPasswordDialog > xDialog(
+ boost::scoped_ptr< MasterPasswordDialog > xDialog(
new MasterPasswordDialog(pParent, nMode, xManager.get()));
rInfo.SetResult(xDialog->Execute()
== RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
@@ -526,13 +528,13 @@ executePasswordDialog(
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
{
if (bIsSimplePasswordRequest)
{
- std::auto_ptr< PasswordDialog > pDialog(
+ boost::scoped_ptr< PasswordDialog > pDialog(
new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
bIsPasswordToModify, bIsSimplePasswordRequest ) );
pDialog->SetMinLen(0);
@@ -546,7 +548,7 @@ executePasswordDialog(
VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify );
- std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
+ boost::scoped_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
rInfo.SetPassword( pDialog->GetPasswordToOpen() );
@@ -556,7 +558,7 @@ executePasswordDialog(
}
else // enter password or reenter password
{
- std::auto_ptr< PasswordDialog > pDialog(
+ boost::scoped_ptr< PasswordDialog > pDialog(
new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
bIsPasswordToModify, bIsSimplePasswordRequest ) );
pDialog->SetMinLen(0);
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 90c9188792fb..79917dee74e7 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -52,6 +52,8 @@
#include "iahndl.hxx"
+#include <boost/scoped_ptr.hpp>
+
#define UUI_DOC_LOAD_LOCK 0
#define UUI_DOC_OWN_LOAD_LOCK 1
#define UUI_DOC_SAVE_LOCK 2
@@ -82,7 +84,7 @@ handleLockedDocumentRequest_(
try
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
return;
@@ -103,7 +105,7 @@ handleLockedDocumentRequest_(
aMessage = UUIInteractionHelper::replaceMessageWithArguments(
aMessage, aArguments );
- std::auto_ptr< OpenLockedQueryBox > xDialog(new OpenLockedQueryBox(
+ boost::scoped_ptr< OpenLockedQueryBox > xDialog(new OpenLockedQueryBox(
pParent, xManager.get(), aMessage ) );
nResult = xDialog->Execute();
}
@@ -118,7 +120,7 @@ handleLockedDocumentRequest_(
aMessage = UUIInteractionHelper::replaceMessageWithArguments(
aMessage, aArguments );
- std::auto_ptr< TryLaterQueryBox > xDialog(
+ boost::scoped_ptr< TryLaterQueryBox > xDialog(
new TryLaterQueryBox( pParent, xManager.get(), aMessage ) );
nResult = xDialog->Execute();
}
@@ -133,7 +135,7 @@ handleLockedDocumentRequest_(
aMessage = UUIInteractionHelper::replaceMessageWithArguments(
aMessage, aArguments );
- std::auto_ptr< AlreadyOpenQueryBox > xDialog(
+ boost::scoped_ptr< AlreadyOpenQueryBox > xDialog(
new AlreadyOpenQueryBox( pParent,
xManager.get(),
aMessage,
@@ -173,12 +175,12 @@ handleChangedByOthersRequest_(
try
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
return;
- std::auto_ptr< FileChangedQueryBox > xDialog(
+ boost::scoped_ptr< FileChangedQueryBox > xDialog(
new FileChangedQueryBox( pParent, xManager.get() ) );
sal_Int32 nResult = xDialog->Execute();
@@ -212,12 +214,12 @@ handleLockFileIgnoreRequest_(
try
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
return;
- std::auto_ptr< LockFailedQueryBox > xDialog(
+ boost::scoped_ptr< LockFailedQueryBox > xDialog(
new LockFailedQueryBox( pParent, xManager.get() ) );
sal_Int32 nResult = xDialog->Execute();
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 7183fe8faa84..c57aa49007cd 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -50,6 +50,8 @@
#include "iahndl.hxx"
+#include <boost/scoped_ptr.hpp>
+
#define DESCRIPTION_1 1
#define DESCRIPTION_2 2
#define TITLE 3
@@ -154,9 +156,9 @@ executeUnknownAuthDialog(
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
- std::auto_ptr< UnknownAuthDialog > xDialog(
+ boost::scoped_ptr< UnknownAuthDialog > xDialog(
new UnknownAuthDialog( pParent,
rXCert,
xServiceFactory,
@@ -203,9 +205,9 @@ executeSSLWarnDialog(
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
- std::auto_ptr< SSLWarnDialog > xDialog(
+ boost::scoped_ptr< SSLWarnDialog > xDialog(
new SSLWarnDialog( pParent,
rXCert,
xServiceFactory,
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 3cda495e0afa..401228c7ea6e 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -93,6 +93,8 @@
#include "iahndl.hxx"
#include "nameclashdlg.hxx"
+#include <boost/scoped_ptr.hpp>
+
/** === begin UNO using === **/
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::UNO_QUERY;
@@ -1210,7 +1212,7 @@ NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParen
rtl::OUString & rProposedNewName,
bool bAllowOverwrite )
{
- std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
+ boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
if ( !xManager.get() )
return ABORT;
@@ -1320,7 +1322,7 @@ UUIInteractionHelper::handleGenericErrorRequest(
String aErrorString;
ErrorHandler::GetErrorString( nErrorCode, aErrorString );
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
::rtl::OUString aTitle;
@@ -1375,7 +1377,7 @@ UUIInteractionHelper::handleMacroConfirmRequest(
bool bApprove = false;
- std::auto_ptr< ResMgr > pResMgr(
+ boost::scoped_ptr< ResMgr > pResMgr(
ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
if ( pResMgr.get() )
{
@@ -1439,7 +1441,7 @@ UUIInteractionHelper::handleFutureDocumentVersionUpdateRequest(
if ( !s_bDeferredToNextSession )
{
- std::auto_ptr< ResMgr > pResMgr(
+ boost::scoped_ptr< ResMgr > pResMgr(
ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
if ( pResMgr.get() )
{
@@ -1510,7 +1512,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
::rtl::OUString aMessage;
{
SolarMutexGuard aGuard;
- std::auto_ptr< ResMgr > xManager(
+ boost::scoped_ptr< ResMgr > xManager(
ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
if (!xManager.get())
return;
diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx
index 93f670f1d5fe..693e94aa2857 100644
--- a/vbahelper/inc/vbahelper/vbashape.hxx
+++ b/vbahelper/inc/vbahelper/vbashape.hxx
@@ -45,9 +45,10 @@ typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
class VBAHELPER_DLLPUBLIC ScVbaShape : public ScVbaShape_BASE
{
-private:
protected:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ov::ShapeHelper > m_pShapeHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
css::uno::Reference< css::drawing::XShape > m_xShape;
css::uno::Reference< css::drawing::XShapes > m_xShapes;
css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index 28e9590fc06f..00c1fc09939e 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -42,7 +42,9 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::s
class ScVbaListBox : public ListBoxImpl_BASE
,public PropListener
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ListControlHelper > mpListHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString sSourceName;
rtl::OUString msDftPropName;
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index b43611e34b04..48ef658facda 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -35,6 +35,7 @@
#include <utility>
#include <vector>
#include <boost/unordered_map.hpp>
+#include <boost/shared_ptr.hpp>
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/io/XInputStream.hpp"
@@ -82,7 +83,7 @@ rtl::OUString createPath(
return b.makeStringAndClear();
}
-std::auto_ptr< SvStream > wrapStream(
+boost::shared_ptr< SvStream > wrapStream(
css::uno::Reference< css::io::XInputStream > const & stream)
{
// This could use SvInputStream instead if that did not have a broken
@@ -90,7 +91,7 @@ std::auto_ptr< SvStream > wrapStream(
// (cf. "@@@" at tags/DEV300_m37/svtools/source/misc1/strmadpt.cxx@264807
// l. 593):
OSL_ASSERT(stream.is());
- std::auto_ptr< SvStream > s(new SvMemoryStream);
+ boost::shared_ptr< SvStream > s(new SvMemoryStream);
for (;;) {
sal_Int32 const size = 2048;
css::uno::Sequence< sal_Int8 > data(size);
@@ -108,7 +109,7 @@ void loadFromStream(
css::uno::Reference< css::io::XInputStream > const & stream,
rtl::OUString const & path, BitmapEx & bitmap)
{
- std::auto_ptr< SvStream > s(wrapStream(stream));
+ boost::shared_ptr< SvStream > s(wrapStream(stream));
if (path.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(".png")))
{
vcl::PNGReader aPNGReader( *s );
diff --git a/vcl/source/gdi/rendergraphicrasterizer.cxx b/vcl/source/gdi/rendergraphicrasterizer.cxx
index 4c70d866245b..701457010d05 100644
--- a/vcl/source/gdi/rendergraphicrasterizer.cxx
+++ b/vcl/source/gdi/rendergraphicrasterizer.cxx
@@ -39,6 +39,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <boost/scoped_ptr.hpp>
+
#define VCL_SERVICENAME_RASTERIZER_SVG "com.sun.star.graphic.GraphicRasterizer_RSVG"
using namespace com::sun::star;
@@ -124,7 +126,7 @@ BitmapEx RenderGraphicRasterizer::GetReplacement() const
Size RenderGraphicRasterizer::GetPrefSize() const
{
const Size aSizePixel( GetDefaultSizePixel() );
- std::auto_ptr< VirtualDevice > apCompVDev;
+ boost::scoped_ptr< VirtualDevice > xCompVDev;
OutputDevice* pCompDev = NULL;
#ifndef NO_GETAPPWINDOW
@@ -133,8 +135,8 @@ Size RenderGraphicRasterizer::GetPrefSize() const
if( !pCompDev )
{
- apCompVDev.reset( new VirtualDevice );
- pCompDev = apCompVDev.get();
+ xCompVDev.reset( new VirtualDevice );
+ pCompDev = xCompVDev.get();
}
return( pCompDev->PixelToLogic( aSizePixel, GetPrefMapMode() ) );
@@ -247,7 +249,7 @@ void RenderGraphicRasterizer::InitializeRasterizer()
if( mxRasterizer.is() )
{
- std::auto_ptr< VirtualDevice > apCompVDev;
+ boost::scoped_ptr< VirtualDevice > xCompVDev;
OutputDevice* pCompDev = NULL;
#ifndef NO_GETAPPWINDOW
@@ -256,8 +258,8 @@ void RenderGraphicRasterizer::InitializeRasterizer()
if( !pCompDev )
{
- apCompVDev.reset( new VirtualDevice );
- pCompDev = apCompVDev.get();
+ xCompVDev.reset( new VirtualDevice );
+ pCompDev = xCompVDev.get();
}
const Size aDPI( pCompDev->LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index 246b203ce120..f452a83b5536 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
@@ -291,7 +291,9 @@ public:
/**
Pointer to a value.
*/
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef auto_ptr<Value> Pointer_t;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/**
Returns integer representation of the value.
@@ -336,7 +338,9 @@ public:
class WRITERFILTER_RESOURCEMODEL_DLLPUBLIC Sprm
{
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
typedef auto_ptr<Sprm> Pointer_t;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
enum Kind { UNKNOWN, CHARACTER, PARAGRAPH, TABLE };
/**
Returns id of the SPRM.
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index 008b8624515b..cb3df8354e06 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -375,10 +375,12 @@ WW8Value::Pointer_t createValue(int value)
return WW8Value::Pointer_t(new WW8IntValue(value));
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
WW8Value::Pointer_t createValue(WW8Value::Pointer_t value)
{
return value;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
int WW8StringValue::getInt() const
{
diff --git a/writerfilter/source/doctok/WW8Sttbf.cxx b/writerfilter/source/doctok/WW8Sttbf.cxx
index c2dc0e4122b6..0989962f3a80 100644
--- a/writerfilter/source/doctok/WW8Sttbf.cxx
+++ b/writerfilter/source/doctok/WW8Sttbf.cxx
@@ -104,10 +104,12 @@ string WW8SttbTableResource::getType() const
return "WW8SttbTableResource";
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
WW8StringProperty::WW8StringProperty(sal_uInt32 nId, WW8StringValue::Pointer_t pValue)
: mnId(nId), mpValue(pValue)
{
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
WW8StringProperty::~WW8StringProperty()
{
diff --git a/writerfilter/source/doctok/WW8Sttbf.hxx b/writerfilter/source/doctok/WW8Sttbf.hxx
index eec815c38283..07f9ff45cf47 100644
--- a/writerfilter/source/doctok/WW8Sttbf.hxx
+++ b/writerfilter/source/doctok/WW8Sttbf.hxx
@@ -107,7 +107,9 @@ class WW8StringProperty : public ::writerfilter::Reference<Properties>
WW8StringValue::Pointer_t mpValue;
public:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
WW8StringProperty(sal_uInt32 nId, WW8StringValue::Pointer_t pValue);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual ~WW8StringProperty();
void resolve(Properties & rProperties);
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index f920425e0d8e..6311db18c623 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -127,13 +127,19 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
XMLPropertyState* pFooterDynamic = NULL;
XMLPropertyState* pAllMarginProperty = NULL;
XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<XMLPropertyState> pNewMargins[4];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XMLPropertyState* pAllHeaderMarginProperty = NULL;
XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL };
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<XMLPropertyState> pNewHeaderMargins[4];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XMLPropertyState* pAllFooterMarginProperty = NULL;
XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL };
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<XMLPropertyState> pNewFooterMargins[4];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
::std::vector< XMLPropertyState >::iterator aEnd = rProperties.end();
for (::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != aEnd; ++aIter)
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 292a77f42465..0e420340d83a 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -207,6 +207,7 @@ template class XMLPropertyBackpatcher<OUString>;
struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
/// backpatcher for references to footnotes and endnotes
::std::auto_ptr< XMLPropertyBackpatcher<sal_Int16> >
m_pFootnoteBackpatcher;
@@ -217,7 +218,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl
::std::auto_ptr< XMLPropertyBackpatcher< ::rtl::OUString> >
m_pSequenceNameBackpatcher;
-
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
::boost::shared_ptr<XMLTextImportHelper::BackpatcherImpl>
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 4468c059e3f0..9a12573389f3 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -525,6 +525,7 @@ static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
: private ::boost::noncopyable
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLTokenMap> m_pTextElemTokenMap;
::std::auto_ptr<SvXMLTokenMap> m_pTextPElemTokenMap;
::std::auto_ptr<SvXMLTokenMap> m_pTextPAttrTokenMap;
@@ -539,6 +540,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
::std::auto_ptr<SvStringsDtor> m_pPrevFrmNames;
::std::auto_ptr<SvStringsDtor> m_pNextFrmNames;
::std::auto_ptr<XMLTextListsHelper> m_pTextListsHelper;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
SvXMLImportContextRef m_xAutoStyles;
SvXMLImportContextRef m_xFontDecls;
@@ -549,7 +551,9 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
UniReference< SvXMLImportPropertyMapper > m_xSectionImpPrMap;
UniReference< SvXMLImportPropertyMapper > m_xRubyImpPrMap;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvI18NMap> m_pRenameMap;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
/* Change and extend data structure:
- data structure contains candidates of paragraph styles, which
will be assigned to the outline style
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 64598e687615..0e22f4b88023 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -318,10 +318,14 @@ void XMLTextImportPropertyMapper::finished(
XMLPropertyState* pBackTransparent = NULL; // transparency as boolean
XMLPropertyState* pAllParaMargin = 0;
XMLPropertyState* pParaMargins[4] = { 0, 0, 0, 0 };
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<XMLPropertyState> pNewParaMargins[4];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
XMLPropertyState* pAllMargin = 0;
XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 };
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<XMLPropertyState> pNewMargins[4];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin();
aIter != rProperties.end();
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4e00ce513185..ad6eaeee6315 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -263,10 +263,12 @@ namespace xmloff
const BoundFrames* GetShapes() const
{ return m_pShapes.get(); };
private:
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<BoundFrames> m_pTexts;
auto_ptr<BoundFrames> m_pGraphics;
auto_ptr<BoundFrames> m_pEmbeddeds;
auto_ptr<BoundFrames> m_pShapes;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
};
}