diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /sc/inc | |
parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/chart2uno.hxx | 4 | ||||
-rw-r--r-- | sc/inc/dpsave.hxx | 6 | ||||
-rw-r--r-- | sc/inc/dptabsrc.hxx | 6 | ||||
-rw-r--r-- | sc/inc/editsrc.hxx | 4 | ||||
-rw-r--r-- | sc/inc/segmenttree.hxx | 6 | ||||
-rw-r--r-- | sc/inc/tokenuno.hxx | 2 |
6 files changed, 28 insertions, 0 deletions
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 705a7c328c6e..a670f10d3d35 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -448,9 +448,11 @@ private: sal_Bool m_bIncludeHiddenCells; // internals + SAL_WNODEPRECATED_DECLARATIONS_PUSH typedef ::std::auto_ptr< ::std::vector<ScTokenRef> > TokenListPtr; typedef ::std::auto_ptr< ::std::vector<sal_uInt32> > RangeIndexMapPtr; typedef ::std::auto_ptr<ExternalRefListener> ExtRefListenerPtr; + SAL_WNODEPRECATED_DECLARATIONS_POP sal_Int64 m_nObjectId; ScDocument* m_pDocument; @@ -460,7 +462,9 @@ private: com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; SfxItemPropertySet m_aPropSet; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<HiddenRangeListener> m_pHiddenListener; + SAL_WNODEPRECATED_DECLARATIONS_POP ScLinkListener* m_pValueListener; XModifyListenerArr_Impl m_aValueListeners; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 0458332d1e3d..e17c5c3901eb 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -62,7 +62,9 @@ class ScDPSaveMember { private: ::rtl::OUString aName; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table. + SAL_WNODEPRECATED_DECLARATIONS_POP sal_uInt16 nVisibleMode; sal_uInt16 nShowDetailsMode; @@ -106,8 +108,10 @@ class SC_DLLPUBLIC ScDPSaveDimension private: ::rtl::OUString aName; ::rtl::OUString* pSelectedPage; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP bool bIsDataLayout; bool bDupFlag; sal_uInt16 nOrientation; @@ -251,7 +255,9 @@ private: * created. */ bool mbDimensionMembersBuilt; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpGrandTotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP public: SC_DLLPUBLIC ScDPSaveData(); diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index c19bdfaf426f..0519bd20b1ac 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -133,7 +133,9 @@ private: std::vector<ScDPLevel*> aRowLevelList; sal_Bool bResultOverflow; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpGrandTotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP void CreateRes_Impl(); void FillMemberResults(); @@ -337,8 +339,10 @@ private: long nUsedHier; sal_uInt16 nFunction; // enum GeneralFunction String aName; // if empty, take from source + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; + SAL_WNODEPRECATED_DECLARATIONS_POP long nSourceDim; // >=0 if dup'ed ::com::sun::star::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" @@ -748,7 +752,9 @@ private: SCROW mnDataId; // String aCaption; // visible name (changeable by user) + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<rtl::OUString> mpLayoutName; + SAL_WNODEPRECATED_DECLARATIONS_POP sal_Int32 nPosition; // manual sorting sal_Bool bVisible; diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index 15ed5ba554dc..b8c8180c4cec 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -176,10 +176,14 @@ public: class ScAccessibilityEditSource : public SvxEditSource { private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > mpAccessibleTextData; + SAL_WNODEPRECATED_DECLARATIONS_POP public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~ScAccessibilityEditSource(); virtual SvxEditSource* Clone() const; diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx index 1c6b36c57950..667e80c20e1f 100644 --- a/sc/inc/segmenttree.hxx +++ b/sc/inc/segmenttree.hxx @@ -86,7 +86,9 @@ public: SCROW findLastNotOf(bool bValue) const; private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP }; class ScFlatBoolColSegments @@ -109,7 +111,9 @@ public: void insertSegment(SCCOL nCol, SCCOL nSize, bool bSkipStartBoundary); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP }; class ScFlatUInt16SegmentsImpl; @@ -156,7 +160,9 @@ public: void enableTreeSearch(bool bEnable); private: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScFlatUInt16SegmentsImpl> mpImpl; + SAL_WNODEPRECATED_DECLARATIONS_POP }; #endif diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index e213e797a76f..8f68d0762db4 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -150,7 +150,9 @@ public: class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj { public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler); + SAL_WNODEPRECATED_DECLARATIONS_POP }; // ============================================================================ |