diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-16 15:45:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-24 16:49:49 +0200 |
| commit | f252b332dd2652abb02851ba0c2521c045787801 (patch) | |
| tree | 0b582426682ff576908b73e1d57ade8ae105e598 /toolkit | |
| parent | 4970e292fb44f482e84822fa97188bcbdfce2ed4 (diff) | |
fdo#46808, renamet awt::XToolkit2 to XToolkitExperimental..
..because we want to use the name for the new merged interface
for the Toolkit service.
Change-Id: Ib1e193c7d04729f6420ee6984231fd50181e59d3
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/awt/vclxtoolkit.hxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx index 3423066cf815..d8bd1c91878c 100644 --- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx +++ b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/XSystemChildFactory.hpp> -#include <com/sun/star/awt/XToolkit2.hpp> +#include <com/sun/star/awt/XToolkitExperimental.hpp> #include <com/sun/star/awt/XDataTransferProviderAccess.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/awt/XExtendedToolkit.hpp> @@ -70,7 +70,7 @@ protected: class VCLXToolkit : public VCLXToolkit_Impl, public cppu::WeakComponentImplHelper7< - ::com::sun::star::awt::XToolkit2, + ::com::sun::star::awt::XToolkitExperimental, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::awt::XSystemChildFactory, ::com::sun::star::awt::XMessageBoxFactory, @@ -118,7 +118,7 @@ public: VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); ~VCLXToolkit(); - // ::com::sun::star::awt::XToolkit2 + // ::com::sun::star::awt::XToolkitExperimental ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL createScreenCompatibleDeviceUsingBuffer( sal_Int32 Width, sal_Int32 Height, sal_Int32 ScaleNumerator, sal_Int32 ScaleDenominator, sal_Int32 XOffset, sal_Int32 YOffset, sal_Int64 AddressOfMemoryBufferForSharedArrayWrapper ) throw (::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 4ee90412da7a..173d23cfbadf 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -464,7 +464,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) // contructor, which might initialize VCL VCLXToolkit::VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ): cppu::WeakComponentImplHelper7< - ::com::sun::star::awt::XToolkit2, + ::com::sun::star::awt::XToolkitExperimental, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::awt::XSystemChildFactory, ::com::sun::star::awt::XMessageBoxFactory, |