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 /xmloff/source/text/txtimp.cxx | |
parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'xmloff/source/text/txtimp.cxx')
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 4468c059e3f0..9a12573389f3 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -525,6 +525,7 @@ static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = struct SAL_DLLPRIVATE XMLTextImportHelper::Impl : private ::boost::noncopyable { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SvXMLTokenMap> m_pTextElemTokenMap; ::std::auto_ptr<SvXMLTokenMap> m_pTextPElemTokenMap; ::std::auto_ptr<SvXMLTokenMap> m_pTextPAttrTokenMap; @@ -539,6 +540,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl ::std::auto_ptr<SvStringsDtor> m_pPrevFrmNames; ::std::auto_ptr<SvStringsDtor> m_pNextFrmNames; ::std::auto_ptr<XMLTextListsHelper> m_pTextListsHelper; + SAL_WNODEPRECATED_DECLARATIONS_POP SvXMLImportContextRef m_xAutoStyles; SvXMLImportContextRef m_xFontDecls; @@ -549,7 +551,9 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl UniReference< SvXMLImportPropertyMapper > m_xSectionImpPrMap; UniReference< SvXMLImportPropertyMapper > m_xRubyImpPrMap; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<SvI18NMap> m_pRenameMap; + SAL_WNODEPRECATED_DECLARATIONS_POP /* Change and extend data structure: - data structure contains candidates of paragraph styles, which will be assigned to the outline style |