diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-15 15:35:44 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-16 15:34:23 +0100 |
commit | 31ebd9f475f94fb4f05bbeaa8077122a2635d528 (patch) | |
tree | 0f3eb9182102e613ee08706750e2b72fd1db239e /xmlscript | |
parent | 21b2cb540aaa308ea1911af34dc4862a24dcb545 (diff) |
boost->std
Change-Id: Ic18be8b86727dd1179a7e39c70493d088ed00557
Diffstat (limited to 'xmlscript')
-rw-r--r-- | xmlscript/source/xmldlg_imexp/imp_share.hxx | 24 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index e09a72b9c2df..78754058167e 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -41,8 +41,8 @@ #include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <osl/diagnose.h> +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> namespace xmlscript { @@ -118,8 +118,8 @@ struct DialogImport css::uno::Reference< css::uno::XComponentContext > _xContext; css::uno::Reference< css::util::XNumberFormatsSupplier > _xSupplier; - ::boost::shared_ptr< ::std::vector< OUString > > _pStyleNames; - ::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > _pStyles; + std::shared_ptr< std::vector< OUString > > _pStyleNames; + std::shared_ptr< std::vector< css::uno::Reference< css::xml::input::XElement > > > _pStyles; css::uno::Reference< css::container::XNameContainer > _xDialogModel; css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory; @@ -151,8 +151,8 @@ public: css::uno::Reference<css::uno::XComponentContext> const & xContext, css::uno::Reference<css::container::XNameContainer> const & xDialogModel, - ::boost::shared_ptr< ::std::vector< OUString > >& pStyleNames, - ::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles, + std::shared_ptr< std::vector< OUString > >& pStyleNames, + std::shared_ptr< std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles, css::uno::Reference<css::frame::XModel> const & xDoc ) : _xContext( xContext ) , _pStyleNames( pStyleNames ) @@ -330,8 +330,8 @@ public: class MenuPopupElement : public ElementBase { - ::std::vector< OUString > _itemValues; - ::std::vector< sal_Int16 > _itemSelected; + std::vector< OUString > _itemValues; + std::vector< sal_Int16 > _itemSelected; public: css::uno::Sequence< OUString > getItemValues(); css::uno::Sequence< sal_Int16 > getSelectedItems(); @@ -359,7 +359,7 @@ class ControlElement protected: sal_Int32 _nBasePosX, _nBasePosY; - ::std::vector< css::uno::Reference< css::xml::input::XElement > > _events; + std::vector< css::uno::Reference< css::xml::input::XElement > > _events; OUString getControlId( css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ); @@ -369,7 +369,7 @@ protected: css::uno::Reference< css::xml::input::XElement > getStyle( css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ); public: - ::std::vector<css::uno::Reference< css::xml::input::XElement> >& getEvents() + std::vector<css::uno::Reference< css::xml::input::XElement> >& getEvents() { return _events; } ControlElement( @@ -404,7 +404,7 @@ public: css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, bool supportPrintable = true ); void importEvents( - ::std::vector< css::uno::Reference< css::xml::input::XElement > > + std::vector< css::uno::Reference< css::xml::input::XElement > > const & rEvents ); bool importStringProperty( @@ -669,7 +669,7 @@ public: class RadioGroupElement : public ControlElement { - ::std::vector< css::uno::Reference< css::xml::input::XElement > > _radios; + std::vector< css::uno::Reference< css::xml::input::XElement > > _radios; public: virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( @@ -691,7 +691,7 @@ class TitledBoxElement : public BulletinBoardElement { OUString _label; - ::std::vector< css::uno::Reference< css::xml::input::XElement > > _radios; + std::vector< css::uno::Reference< css::xml::input::XElement > > _radios; public: virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 4619050c910c..e5ad4dc3dee8 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1450,7 +1450,7 @@ extern StringTriple const * const g_pEventTranslations; StringTriple const * const g_pEventTranslations = s_aEventTranslations; void ImportContext::importEvents( - ::std::vector< Reference< xml::input::XElement > > const & rEvents ) + std::vector< Reference< xml::input::XElement > > const & rEvents ) { Reference< script::XScriptEventsSupplier > xSupplier( _xControlModel, UNO_QUERY ); @@ -1826,8 +1826,8 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel( Reference< XModel > const & xDocument ) { // single set of styles and stylenames apply to all containees - :: boost::shared_ptr< ::std::vector< OUString > > pStyleNames( new ::std::vector< OUString > ); - :: boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new ::std::vector< css::uno::Reference< css::xml::input::XElement > > ); + std::shared_ptr< std::vector< OUString > > pStyleNames( new std::vector< OUString > ); + std::shared_ptr< std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new std::vector< css::uno::Reference< css::xml::input::XElement > > ); return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new DialogImport( xContext, xDialogModel, pStyleNames, pStyles, xDocument ) ) ); |