diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 12:25:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-17 12:25:11 +0100 |
| commit | 3099c70b11c7e5b80fe4dbe3dc99171fb38c6fc2 (patch) | |
| tree | 63699b525800b2c6708e90b817853bb60be5f6d8 /shell | |
| parent | 5229726b4d4e7d76f410d221f8f8cd8abcfd5a19 (diff) | |
Fix various XServiceInfo implementations
...to match what is recorded in the .component files
Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.cxx | 8 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 10 | ||||
| -rw-r--r-- | shell/source/win32/SysShExec.cxx | 2 |
3 files changed, 4 insertions, 16 deletions
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index a5e05d2bf4f1..07da391c5601 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -60,12 +60,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::configuration; -#define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail2" - - -// helper functions - - namespace // private { Sequence< OUString > SAL_CALL Component_getSupportedServiceNames() @@ -313,7 +307,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM OUString SAL_CALL CmdMailSuppl::getImplementationName( ) throw( RuntimeException, std::exception ) { - return OUString(COMP_IMPL_NAME); + return OUString("com.sun.star.comp.system.SimpleCommandMail"); } // XServiceInfo diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 34bef4081f24..0239a668f1ff 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -55,18 +55,12 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::system::SystemShellExecuteFlags; using namespace cppu; -#define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute2" - - -// helper functions - - namespace // private { Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.sys.shell.SystemShellExecute"; + aRet[0] = "com.sun.star.system.SystemShellExecute"; return aRet; } } @@ -273,7 +267,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar OUString SAL_CALL ShellExec::getImplementationName( ) throw( RuntimeException, std::exception ) { - return OUString(SHELLEXEC_IMPL_NAME ); + return OUString("com.sun.star.comp.system.SystemShellExecute"); } // XServiceInfo diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 9dd0efddf2a5..18e78fc8e40f 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -68,7 +68,7 @@ namespace // private Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.sys.shell.SystemShellExecute"; + aRet[0] = "com.sun.star.system.SystemShellExecute"; return aRet; } |