diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-15 12:10:06 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | d3756b8b7318ecae4eaf0552aea3cde940e91490 (patch) | |
| tree | 266d82b888950bf415cf6aeddce2c1bdb7329591 /xmlhelp | |
| parent | replace a OClareableGuard on the SolarMutex by a SolarClearableMutex (diff) | |
| download | core-d3756b8b7318ecae4eaf0552aea3cde940e91490.tar.gz core-d3756b8b7318ecae4eaf0552aea3cde940e91490.zip | |
merge vosremoval-reference.diff
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/content.hxx | 1 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultset.cxx | 2 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultset.hxx | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx index 21bd24afb254..6fab171c09e2 100644 --- a/xmlhelp/source/cxxhelp/provider/content.hxx +++ b/xmlhelp/source/cxxhelp/provider/content.hxx @@ -28,7 +28,6 @@ #ifndef _CONTENT_HXX #define _CONTENT_HXX -#include <vos/ref.hxx> #include <ucbhelper/contenthelper.hxx> #include <com/sun/star/io/XInputStream.hpp> diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx index 1a398f430cc4..bdc593325862 100644 --- a/xmlhelp/source/cxxhelp/provider/resultset.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx @@ -51,7 +51,7 @@ using namespace chelp; DynamicResultSet::DynamicResultSet( const Reference< XMultiServiceFactory >& rxSMgr, - const vos::ORef< Content >& rxContent, + const rtl::Reference< Content >& rxContent, const OpenCommandArgument2& rCommand, const Reference< XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ) diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx index db5dbc6c0736..58c3b554cbe6 100644 --- a/xmlhelp/source/cxxhelp/provider/resultset.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx @@ -29,7 +29,7 @@ #define _RESULTSET_HXX #include <ucbhelper/resultsethelper.hxx> -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include "content.hxx" @@ -39,7 +39,7 @@ namespace chelp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { - vos::ORef< Content > m_xContent; + rtl::Reference< Content > m_xContent; com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; @@ -52,7 +52,7 @@ namespace chelp { DynamicResultSet( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const vos::ORef< Content >& rxContent, + const rtl::Reference< Content >& rxContent, const com::sun::star::ucb::OpenCommandArgument2& rCommand, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv, |