[Libreoffice-commits] .: 10 commits - accessibility/source basctl/source basegfx/test binaryurp/source bridges/source chart2/source codemaker/source comphelper/inc comphelper/source connectivity/source cppcanvas/source cppuhelper/source cui/source dbaccess/source desktop/source editeng/inc editeng/source extensions/source filter/inc filter/source forms/source formula/inc formula/source framework/inc framework/source idlc/source l10ntools/inc l10ntools/source linguistic/inc linguistic/Library_lng.mk linguistic/source lotuswordpro/source oox/inc registry/source reportdesign/source sal/inc sal/qa sc/inc sc/source sd/source sfx2/qa sfx2/source solenv/gbuild solenv/inc stoc/source svtools/bmpmaker svtools/inc svtools/source svx/source sw/inc sw/qa sw/source ucb/source unusedcode.easy uui/source vbahelper/inc vbahelper/source vcl/source writerfilter/inc writerfilter/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Sep 22 07:04:26 PDT 2011
accessibility/source/extended/textwindowaccessibility.cxx | 2
basctl/source/basicide/bastype2.cxx | 4
basctl/source/basicide/moduldlg.cxx | 9 -
basegfx/test/basegfx2d.cxx | 60 +++----
basegfx/test/basegfx3d.cxx | 20 +-
binaryurp/source/reader.cxx | 8
bridges/source/jni_uno/jni_bridge.cxx | 4
bridges/source/jni_uno/jni_data.cxx | 14 +
bridges/source/jni_uno/jni_helper.h | 2
bridges/source/jni_uno/jni_uno2java.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 6
chart2/source/controller/inc/AxisItemConverter.hxx | 2
chart2/source/controller/inc/CharacterPropertyItemConverter.hxx | 4
chart2/source/controller/inc/DataPointItemConverter.hxx | 2
chart2/source/controller/inc/LegendItemConverter.hxx | 2
chart2/source/controller/inc/MultipleChartConverters.hxx | 6
chart2/source/controller/inc/RegressionEquationItemConverter.hxx | 2
chart2/source/controller/inc/TitleDialogData.hxx | 4
chart2/source/controller/inc/TitleItemConverter.hxx | 2
chart2/source/controller/inc/dlg_CreationWizard.hxx | 2
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 8
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx | 3
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx | 6
chart2/source/controller/main/ChartController_Properties.cxx | 4
chart2/source/controller/main/ChartController_Tools.cxx | 6
chart2/source/view/axes/VCartesianAxis.cxx | 21 ++
chart2/source/view/inc/VDataSeries.hxx | 2
chart2/source/view/main/ChartView.cxx | 14 +
chart2/source/view/main/VDataSeries.cxx | 10 +
codemaker/source/javamaker/javatype.cxx | 38 ++++
comphelper/inc/comphelper/listenernotification.hxx | 15 -
comphelper/source/misc/anycompare.cxx | 2
connectivity/source/commontools/predicateinput.cxx | 5
connectivity/source/simpledbt/dbtfactory.cxx | 2
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 8
cppuhelper/source/unourl.cxx | 26 +--
cui/source/dialogs/scriptdlg.cxx | 41 +++-
cui/source/inc/hangulhanjadlg.hxx | 4
dbaccess/source/core/api/KeySet.cxx | 4
dbaccess/source/core/api/KeySet.hxx | 4
dbaccess/source/core/api/OptimisticSet.cxx | 4
dbaccess/source/core/api/RowSetCache.cxx | 2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 6
dbaccess/source/filter/xml/xmlExport.cxx | 8
dbaccess/source/filter/xml/xmlfilter.hxx | 3
dbaccess/source/ui/app/AppController.cxx | 20 ++
dbaccess/source/ui/app/AppControllerDnD.cxx | 3
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 6
dbaccess/source/ui/app/AppView.cxx | 6
dbaccess/source/ui/browser/unodatbr.cxx | 6
dbaccess/source/ui/control/FieldDescControl.cxx | 4
dbaccess/source/ui/control/toolboxcontroller.cxx | 6
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 4
dbaccess/source/ui/querydesign/JoinTableView.cxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 12 +
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 4
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 6
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 6
dbaccess/source/ui/uno/copytablewizard.cxx | 6
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 5
editeng/inc/editeng/AccessibleStaticTextBase.hxx | 6
editeng/inc/editeng/hangulhanja.hxx | 2
editeng/inc/editeng/unoedhlp.hxx | 2
editeng/inc/editeng/unoedprx.hxx | 4
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 8
editeng/source/items/frmitems.cxx | 11 -
editeng/source/uno/unoedprx.cxx | 4
editeng/source/uno/unonrule.cxx | 3
extensions/source/propctrlr/defaultforminspection.hxx | 2
extensions/source/propctrlr/eformshelper.cxx | 4
extensions/source/propctrlr/formlinkdialog.hxx | 2
extensions/source/propctrlr/propertycomposer.hxx | 2
extensions/source/propctrlr/propertyhandler.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 7
filter/inc/filter/msfilter/escherex.hxx | 4
filter/source/msfilter/eschesdo.cxx | 2
filter/source/msfilter/svdfppt.cxx | 4
forms/source/inc/controlfeatureinterception.hxx | 2
forms/source/inc/formnavigation.hxx | 4
forms/source/misc/InterfaceContainer.cxx | 8
forms/source/xforms/datatypes.cxx | 2
forms/source/xforms/submission/replace.cxx | 5
formula/inc/formula/FormulaOpCodeMapperObj.hxx | 4
formula/inc/formula/formula.hxx | 4
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 5
framework/inc/framework/bmkmenu.hxx | 5
framework/inc/uiconfiguration/moduleimagemanager.hxx | 2
framework/inc/xml/imagesconfiguration.hxx | 8
framework/source/fwe/classes/bmkmenu.cxx | 16 -
framework/source/xml/imagesconfiguration.cxx | 73 --------
idlc/source/astexpression.cxx | 4
l10ntools/inc/export.hxx | 3
l10ntools/source/export.cxx | 14 -
linguistic/Library_lng.mk | 1
linguistic/inc/thesdta.hxx | 84 ----------
linguistic/source/thesdta.cxx | 82 ---------
lotuswordpro/source/filter/lwpoverride.cxx | 4
lotuswordpro/source/filter/lwppara1.cxx | 10 +
lotuswordpro/source/filter/lwpparaborderoverride.cxx | 2
lotuswordpro/source/filter/lwpparastyle.cxx | 2
oox/inc/oox/vml/vmldrawing.hxx | 2
oox/inc/oox/vml/vmlshape.hxx | 4
registry/source/regimpl.cxx | 4
reportdesign/source/filter/xml/xmlExport.cxx | 4
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 4
reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx | 2
reportdesign/source/filter/xml/xmlfilter.hxx | 3
reportdesign/source/ui/dlg/Formula.cxx | 6
reportdesign/source/ui/inc/DataProviderHandler.hxx | 2
reportdesign/source/ui/inc/GeometryHandler.hxx | 2
reportdesign/source/ui/inc/ReportComponentHandler.hxx | 2
reportdesign/source/ui/misc/UITools.cxx | 11 +
reportdesign/source/ui/report/DesignView.cxx | 8
reportdesign/source/ui/report/ReportController.cxx | 8
sal/inc/osl/diagnose.h | 8
sal/inc/sal/macros.h | 5
sal/inc/sal/precppunit.hxx | 13 +
sal/inc/sal/types.h | 21 ++
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 23 ++
sal/qa/osl/condition/osl_Condition.cxx | 20 +-
sal/qa/osl/file/osl_old_test_file.cxx | 80 ---------
sal/qa/rtl/alloc/rtl_alloc.cxx | 8
sc/inc/chart2uno.hxx | 4
sc/inc/dpsave.hxx | 6
sc/inc/dptabsrc.hxx | 6
sc/inc/editsrc.hxx | 4
sc/inc/segmenttree.hxx | 6
sc/inc/tokenuno.hxx | 2
sc/source/core/data/dpobject.cxx | 6
sc/source/core/data/funcdesc.cxx | 4
sc/source/core/data/validat.cxx | 4
sc/source/core/tool/dbdata.cxx | 6
sc/source/core/tool/interpr1.cxx | 14 +
sc/source/core/tool/interpr4.cxx | 2
sc/source/core/tool/rangenam.cxx | 6
sc/source/filter/excel/read.cxx | 4
sc/source/filter/excel/xecontent.cxx | 4
sc/source/filter/excel/xichart.cxx | 12 +
sc/source/filter/excel/xicontent.cxx | 16 +
sc/source/filter/html/htmlpars.cxx | 10 +
sc/source/filter/inc/xcl97esc.hxx | 2
sc/source/filter/inc/xecontent.hxx | 6
sc/source/filter/inc/xehelper.hxx | 2
sc/source/filter/inc/xlpivot.hxx | 2
sc/source/filter/xml/XMLTableShapeResizer.cxx | 2
sc/source/filter/xml/xmlbodyi.cxx | 2
sc/source/filter/xml/xmldrani.cxx | 8
sc/source/filter/xml/xmlsubti.cxx | 2
sc/source/ui/Accessibility/AccessibleCell.cxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 3
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 4
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 4
sc/source/ui/docshell/docfunc.cxx | 10 +
sc/source/ui/docshell/docsh5.cxx | 4
sc/source/ui/docshell/externalrefmgr.cxx | 6
sc/source/ui/formdlg/formula.cxx | 4
sc/source/ui/inc/tpformula.hxx | 2
sc/source/ui/inc/undotab.hxx | 8
sc/source/ui/namedlg/namedlg.cxx | 4
sc/source/ui/pagedlg/scuitphfedit.cxx | 6
sc/source/ui/undo/undorangename.cxx | 4
sc/source/ui/undo/undotab.cxx | 8
sc/source/ui/unoobj/chart2uno.cxx | 24 ++
sc/source/ui/unoobj/editsrc.cxx | 4
sc/source/ui/unoobj/tokenuno.cxx | 2
sc/source/ui/vba/vbaaxis.hxx | 2
sc/source/ui/vba/vbachartobject.hxx | 2
sc/source/ui/vba/vbatitle.hxx | 2
sc/source/ui/view/viewfun2.cxx | 4
sc/source/ui/view/viewfun3.cxx | 14 +
sd/source/ui/app/sdmod1.cxx | 6
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 2
sd/source/ui/framework/factories/ChildWindowPane.cxx | 3
sd/source/ui/func/fuolbull.cxx | 2
sd/source/ui/func/fuoltext.cxx | 2
sd/source/ui/func/futransf.cxx | 6
sd/source/ui/inc/ViewShell.hxx | 8
sd/source/ui/inc/taskpane/TitleBar.hxx | 2
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 4
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 5
sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx | 2
sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx | 9 -
sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 18 +-
sd/source/ui/toolpanel/ScrollPanel.cxx | 8
sd/source/ui/toolpanel/ToolPanel.cxx | 2
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4
sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx | 4
sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 4
sd/source/ui/tools/AsynchronousCall.cxx | 2
sd/source/ui/view/ToolBarManager.cxx | 7
sd/source/ui/view/drtxtob1.cxx | 2
sd/source/ui/view/drviews7.cxx | 4
sd/source/ui/view/outlnvsh.cxx | 2
sfx2/qa/cppunit/test_metadatable.cxx | 6
sfx2/source/dialog/dinfdlg.cxx | 6
sfx2/source/dialog/taskpane.cxx | 6
solenv/gbuild/platform/unxgcc.mk | 2
solenv/inc/unxgcc.mk | 2
stoc/source/registry_tdprovider/tdiface.cxx | 6
stoc/source/registry_tdprovider/tdservice.cxx | 4
svtools/bmpmaker/bmpsum.cxx | 12 -
svtools/inc/svtools/grfmgr.hxx | 10 -
svtools/source/control/calendar.cxx | 15 +
svtools/source/control/roadmap.cxx | 6
svtools/source/graphic/graphicunofactory.cxx | 2
svtools/source/graphic/grfcache.cxx | 10 -
svtools/source/graphic/grfcache.hxx | 4
svtools/source/graphic/grfmgr.cxx | 8
svtools/source/graphic/grfmgr2.cxx | 4
svtools/source/misc/imap2.cxx | 15 +
svtools/source/svhtml/htmlout.cxx | 43 ++---
svtools/source/svrtf/parrtf.cxx | 39 +---
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 2
svx/source/accessibility/AccessibleShape.cxx | 4
svx/source/accessibility/AccessibleTextEventQueue.cxx | 2
svx/source/accessibility/AccessibleTextHelper.cxx | 14 +
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/dbtoolsclient.cxx | 2
svx/source/form/fmshell.cxx | 6
svx/source/form/fmvwimp.cxx | 4
svx/source/inc/gridcell.hxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 8
svx/source/unodraw/XPropertyTable.cxx | 4
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap4.cxx | 6
svx/source/xml/xmlgrhlp.cxx | 12 -
svx/source/xoutdev/xattrbmp.cxx | 7
sw/inc/unoport.hxx | 2
sw/qa/core/Test-BigPtrArray.cxx | 8
sw/source/core/access/accpara.cxx | 6
sw/source/core/crsr/swcrsr.cxx | 4
sw/source/core/doc/docbm.cxx | 8
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 3
sw/source/core/inc/UndoAttribute.hxx | 20 ++
sw/source/core/inc/rolbck.hxx | 10 +
sw/source/core/inc/unometa.hxx | 4
sw/source/core/text/txttab.cxx | 4
sw/source/core/undo/docundo.cxx | 2
sw/source/core/undo/unsect.cxx | 4
sw/source/core/unocore/unoframe.cxx | 9 -
sw/source/core/unocore/unoobj.cxx | 12 +
sw/source/core/unocore/unoobj2.cxx | 12 +
sw/source/core/unocore/unoportenum.cxx | 8
sw/source/core/unocore/unoredline.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 6
sw/source/core/unocore/unosect.cxx | 12 +
sw/source/core/unocore/unotext.cxx | 12 +
sw/source/ui/dialog/regionsw.cxx | 7
sw/source/ui/docvw/AnnotationWin.cxx | 6
ucb/source/ucp/webdav/ContentProperties.cxx | 2
ucb/source/ucp/webdav/webdavcontent.cxx | 33 +++
ucb/source/ucp/webdav/webdavcontent.hxx | 4
ucb/source/ucp/webdav/webdavcontentcaps.cxx | 4
unusedcode.easy | 5
uui/source/iahndl-authentication.cxx | 20 +-
uui/source/iahndl-locking.cxx | 18 +-
uui/source/iahndl-ssl.cxx | 10 -
uui/source/iahndl.cxx | 12 -
vbahelper/inc/vbahelper/vbashape.hxx | 3
vbahelper/source/msforms/vbalistbox.hxx | 2
vcl/source/gdi/impimagetree.cxx | 7
vcl/source/gdi/rendergraphicrasterizer.cxx | 14 -
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 4
writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 2
writerfilter/source/doctok/WW8Sttbf.cxx | 2
writerfilter/source/doctok/WW8Sttbf.hxx | 2
xmloff/source/style/PageMasterImportPropMapper.cxx | 6
xmloff/source/text/XMLPropertyBackpatcher.cxx | 3
xmloff/source/text/txtimp.cxx | 4
xmloff/source/text/txtimppr.cxx | 4
xmloff/source/text/txtparae.cxx | 2
280 files changed, 1474 insertions(+), 674 deletions(-)
New commits:
commit 871426533f7afe31bc451fa6b407b83db8e52827
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 22 15:00:08 2011 +0100
just silence the auto_ptr deprecations in isolation
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 622ef04..3fdae83 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 3f8ecf1..9820cc1 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 b7258cf..c3912bd 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 0d14638..e888fe5 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 c488f97..c9309b7 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 d305baf..b304dbe 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 d15f05a..cf9f5c2 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 aca455d..5edb238 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 293bf82..f124dd3 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 5fa8fa3..17f6d9c 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 eb43cb9..1951185 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 51b91c0..7928467 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 9f9d617..b334de1 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 9ec794a..3f5a07d 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 a4f08c6..d42231c 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 799189f..323bfe1 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 6e29af8..fc2ff60 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 cb149ff..bb26683 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 ac45b98..f6a740e 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 f2ad9b2..449ca56 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 4597499..386a2e6 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 1c494c9..18d8b5a 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 75f2254..43b7fd3 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 46d5269..7ab399d 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 0244bc6..12290d7 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 2dd9d87..f6cb3c8 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 a84dccb..6de3c53 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 22418d3..6ac3219 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 111982d..51cb016 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 4f811a6..a7738e7 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 779c574..72f1a4a 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 e63dba5..4748eff 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 4b99ef9..0d53452 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 98143f1..46ae73a 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 a86174d..f776b36 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 06c743d..d315aa5 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 d3e8f52..89f457c 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 482b2a4..93f83e7 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 eff9f8a..a30cbc5 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 2072b29..8c0a373 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 94543a8..f6554bb 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 f5e8e9c..28c6828 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 22a56da..30afda2 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 7255a47..e086ea5 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 4471370..2fdaffd 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 2942f5c..9437111 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 3d4d2ab..783d9df 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 c4e2a16..854f792 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 9c34963..e02e187 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 7e8f569..f0e8ae7 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
}
// -----------------------------------------------------------------------------
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list