diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-13 13:44:06 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-07-13 14:12:13 +0000 |
| commit | 3b3dbb84cd0d80af230e6751303408750a7f4815 (patch) | |
| tree | bf730a5ffe89c0edc18e9e84b85b52f6135a2403 /sw | |
| parent | 579f5cbfc4636ae28e545b0d2e456e100b08b4ad (diff) | |
tdf#92668: Revert some implementation names, for backwards compatibility
These implementation names of Calc, Draw, Impress, and Writer documents are the
most likely to be checked by existing third-party code, so revert the
corresponding parts of 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 "Fix various
XServiceInfo implementations" (and instead add fixups in CppunitTest_serives).
Change-Id: I1a760adbf4c89a1b4477d6e628abba8d2028ccfe
(cherry picked from commit 61a3be76c221c822b189d20e9269ec5caf1aadcc)
Reviewed-on: https://gerrit.libreoffice.org/17010
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index b7cdf1d300fe..c19976c05289 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1768,11 +1768,14 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames() OUString SwXTextDocument::getImplementationName() throw( RuntimeException, std::exception ) { - return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr - ? OUString("com.sun.star.comp.Writer.GlobalDocument") - : PTR_CAST(SwWebDocShell, pDocShell) != nullptr - ? OUString("com.sun.star.comp.Writer.WebDocument") - : OUString("com.sun.star.comp.Writer.TextDocument"); + return OUString("SwXTextDocument"); + /* // Matching the .component information: + return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr + ? OUString("com.sun.star.comp.Writer.GlobalDocument") + : PTR_CAST(SwWebDocShell, pDocShell) != nullptr + ? OUString("com.sun.star.comp.Writer.WebDocument") + : OUString("com.sun.star.comp.Writer.TextDocument"); + */ } sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) |