diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-12 15:23:31 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-02 14:48:25 +0000 |
| commit | e3ba28a55334c1eaa32714db7caad538486078fe (patch) | |
| tree | 735afbc546756df7735bd922e0092fa154f312fa /dtrans/source/win32/ftransl/ftransl.hxx | |
| parent | 24a0aa8d9c28624b4e0961726922e054554af705 (diff) | |
avoid name clash for CDataFormatTranslator in ftransl, tdf#100872
E.g.
http://crashreport.libreoffice.org/stats/signature/com::sun::star::datatransfer::DataFormatTranslator::create%28com::sun::star::uno::Reference%3Ccom::sun::star::uno::XComponentContext%3E%20const%20&%29
Reviewed-on: https://gerrit.libreoffice.org/27157
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 37204431c68a4725b4539fa35e9fcea4fe94c166)
Conflicts:
dtrans/source/win32/ftransl/ftransl.hxx
Change-Id: I55d7fc9a83526de0cc5f838f0ee2c7e4649dbe6b
Reviewed-on: https://gerrit.libreoffice.org/27180
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'dtrans/source/win32/ftransl/ftransl.hxx')
| -rw-r--r-- | dtrans/source/win32/ftransl/ftransl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 07e202c6446e..1acb863640f2 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -58,13 +58,13 @@ struct FormatEntry // CDataFormatTranslator -class CDataFormatTranslator : public +class CDataFormatTranslatorUNO : public cppu::WeakImplHelper< css::datatransfer::XDataFormatTranslator, css::lang::XServiceInfo > { public: - CDataFormatTranslator( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + CDataFormatTranslatorUNO( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XDataFormatTranslator |