diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-09-12 23:08:14 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-09-12 23:29:32 +0300 |
commit | 01755200f6c01afc5c5970141501aea084e8b770 (patch) | |
tree | 188839c69a1b40be80c1e4e841a270f4ffdcc24f /shell | |
parent | 5177666536f65915c3ca07090a4b561b57ae6f63 (diff) |
Bin some noise comments and superfluous vertical whitespace
Change-Id: I3c19457bb29cd1392f14598fc8798aed4b1a1a7f
Diffstat (limited to 'shell')
-rw-r--r-- | shell/source/backends/macbe/macbackend.mm | 19 | ||||
-rw-r--r-- | shell/source/backends/wininetbe/wininetbackend.cxx | 13 | ||||
-rw-r--r-- | shell/source/cmdmail/cmdmailentry.cxx | 18 | ||||
-rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.cxx | 20 | ||||
-rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 12 | ||||
-rw-r--r-- | shell/source/unix/exec/shellexecentry.cxx | 8 | ||||
-rw-r--r-- | shell/source/win32/SysShExec.cxx | 17 | ||||
-rw-r--r-- | shell/source/win32/SysShentry.cxx | 19 | ||||
-rw-r--r-- | shell/source/win32/simplemail/smplmailentry.cxx | 19 | ||||
-rw-r--r-- | shell/source/win32/simplemail/smplmailmsg.cxx | 20 | ||||
-rw-r--r-- | shell/source/win32/simplemail/smplmailsuppl.cxx | 4 |
11 files changed, 29 insertions, 140 deletions
diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index 458446f7dee4..8f4e0883e591 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -50,10 +50,7 @@ typedef enum { } ServiceType; -// helper functions - - -namespace // private +namespace { /* @@ -149,29 +146,21 @@ bool GetProxySetting(ServiceType sType, char *host, size_t hostSize, UInt16 *por return result; } -} // end private namespace - - +} // unnamed namespace MacOSXBackend::MacOSXBackend() { } - - MacOSXBackend::~MacOSXBackend(void) { } - - MacOSXBackend* MacOSXBackend::createInstance() { return new MacOSXBackend; } - - rtl::OUString CFStringToOUString(const CFStringRef sOrig) { CFRetain(sOrig); @@ -435,15 +424,11 @@ css::uno::Any MacOSXBackend::getPropertyValue( } } - - rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void) { return rtl::OUString("com.sun.star.comp.configuration.backend.MacOSXBackend"); } - - rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void) throw (uno::RuntimeException, std::exception) { diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 8ba2d95867b6..1a9f9989986b 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -57,10 +57,7 @@ typedef struct } ProxyEntry; -// helper functions - - -namespace // private +namespace { ProxyEntry ReadProxyEntry(const OUString& aProxy, sal_Int32& i) { @@ -98,8 +95,7 @@ namespace // private return ProxyEntry(); } -} // end private namespace - +} // unnamed namespace WinInetBackend::WinInetBackend() { @@ -295,18 +291,15 @@ WinInetBackend::WinInetBackend() } } - WinInetBackend::~WinInetBackend() { } - WinInetBackend* WinInetBackend::createInstance() { return new WinInetBackend; } - void WinInetBackend::setPropertyValue( OUString const &, css::uno::Any const &) throw ( @@ -356,12 +349,10 @@ css::uno::Any WinInetBackend::getPropertyValue( } } - OUString SAL_CALL WinInetBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; } - OUString SAL_CALL WinInetBackend::getImplementationName() throw (uno::RuntimeException) { diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index d53347e056cc..006b3cf92c63 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -22,21 +22,16 @@ #include <osl/diagnose.h> #include "cmdmailsuppl.hxx" - -// namespace directives - - -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::registry ; -using namespace ::cppu ; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::registry; +using namespace ::cppu; using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail" #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) @@ -48,9 +43,6 @@ namespace extern "C" { -// component_getFactory - - SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 919516f6ba1c..621da5f290e2 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -40,10 +40,6 @@ #include <errno.h> #include <unistd.h> - -// namespace directives - - using com::sun::star::beans::PropertyValue; using com::sun::star::system::XSimpleMailClientSupplier; using com::sun::star::system::XSimpleMailClient; @@ -58,7 +54,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::configuration; -namespace // private +namespace { Sequence< OUString > SAL_CALL Component_getSupportedServiceNames() { @@ -66,8 +62,7 @@ namespace // private return aRet; } -} // end private namespace - +} CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : WeakImplHelper< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >() @@ -75,30 +70,22 @@ CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : m_xConfigurationProvider = theDefaultProvider::get(xContext); } - // XSimpleMailClientSupplier - Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient( ) throw (RuntimeException, std::exception) { return static_cast < XSimpleMailClient * > (this); } - // XSimpleMailClient - Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage( ) throw (css::uno::RuntimeException, std::exception) { return Reference< XSimpleMailMessage >( new CmdMailMsg( ) ); } - -// XSimpleMailClient - - namespace { void appendShellWord(OStringBuffer & buffer, OUString const & word, bool strict) @@ -300,20 +287,19 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } // XServiceInfo + OUString SAL_CALL CmdMailSuppl::getImplementationName( ) throw( RuntimeException, std::exception ) { return OUString("com.sun.star.comp.system.SimpleCommandMail"); } -// XServiceInfo sal_Bool SAL_CALL CmdMailSuppl::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } -// XServiceInfo Sequence< OUString > SAL_CALL CmdMailSuppl::getSupportedServiceNames( ) throw( RuntimeException, std::exception ) { diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 7f12a80b76ef..71f01e764a56 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -42,20 +42,15 @@ #include <errno.h> #include <unistd.h> - -// namespace directives - - using com::sun::star::system::XSystemShellExecute; using com::sun::star::system::SystemShellExecuteException; - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::system::SystemShellExecuteFlags; using namespace cppu; -namespace // private +namespace { Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames() { @@ -78,7 +73,6 @@ void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) } } - ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : WeakImplHelper< XSystemShellExecute, XServiceInfo >(), m_xContext(xContext) @@ -100,7 +94,6 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : } } - void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException, std::exception) { @@ -217,20 +210,19 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar } // XServiceInfo + OUString SAL_CALL ShellExec::getImplementationName( ) throw( RuntimeException, std::exception ) { return OUString("com.sun.star.comp.system.SystemShellExecute"); } -// XServiceInfo sal_Bool SAL_CALL ShellExec::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } -// XServiceInfo Sequence< OUString > SAL_CALL ShellExec::getSupportedServiceNames( ) throw( RuntimeException, std::exception ) { diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 5c1fc4f49c36..2478f8c17808 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -21,10 +21,6 @@ #include <osl/diagnose.h> #include "shellexec.hxx" - -// namespace directives - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; @@ -34,7 +30,6 @@ using com::sun::star::system::XSystemShellExecute; #define SHELLEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute" #define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute" - namespace { Reference< XInterface > SAL_CALL createInstance(const Reference< XComponentContext >& xContext) @@ -46,9 +41,6 @@ namespace extern "C" { -// component_getFactory - - SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, SAL_UNUSED_PARAMETER void* /*pSrvManager*/, diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 55cbb90a5782..fe6a82620369 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -39,10 +39,6 @@ #pragma warning(pop) #endif - -// namespace directives - - using com::sun::star::uno::Reference; using com::sun::star::uno::RuntimeException; using com::sun::star::uno::Sequence; @@ -56,11 +52,7 @@ using namespace cppu; #define SYSSHEXEC_IMPL_NAME "com.sun.star.sys.shell.SystemShellExecute" - -// helper functions - - -namespace // private +namespace { Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames() { @@ -234,8 +226,7 @@ namespace // private } } -} // end namespace - +} CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext ) : WeakComponentImplHelper< XSystemShellExecute, XServiceInfo >( m_aMutex ), @@ -252,7 +243,6 @@ CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext CoInitialize( NULL ); } - void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) { @@ -336,20 +326,19 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa } // XServiceInfo + OUString SAL_CALL CSysShExec::getImplementationName( ) throw( RuntimeException ) { return OUString(SYSSHEXEC_IMPL_NAME ); } -// XServiceInfo sal_Bool SAL_CALL CSysShExec::supportsService( const OUString& ServiceName ) throw( RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// XServiceInfo Sequence< OUString > SAL_CALL CSysShExec::getSupportedServiceNames( ) throw( RuntimeException ) { diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 0f2d91332872..fd37cef26a16 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -22,21 +22,16 @@ #include <osl/diagnose.h> #include "SysShExec.hxx" - -// namespace directives - - -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::registry ; -using namespace ::cppu ; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::registry; +using namespace ::cppu; using com::sun::star::system::XSystemShellExecute; #define SYSSHEXEC_SERVICE_NAME "com.sun.star.system.SystemShellExecute" #define SYSSHEXEC_IMPL_NAME "com.sun.star.sys.shell.SystemShellExecute" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) @@ -48,10 +43,6 @@ namespace extern "C" { -// component_getFactory -// returns a factory to create XFilePicker-Services - - SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, void*, void* /*pRegistryKey*/ ) { diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index bf797489f54b..f40cda9d1fff 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -22,21 +22,16 @@ #include <osl/diagnose.h> #include "smplmailsuppl.hxx" - -// namespace directives - - -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::registry ; -using namespace ::cppu ; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::registry; +using namespace ::cppu; using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_SERVICE_NAME "com.sun.star.system.SimpleSystemMail" #define COMP_IMPL_NAME "com.sun.star.sys.shell.SimpleSystemMail" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& ) @@ -48,10 +43,6 @@ namespace extern "C" { -// component_getFactory -// returns a factory to create XFilePicker-Services - - SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index 31e837701bba..5d6d46e5390b 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -22,20 +22,12 @@ #include <osl/file.h> #include "smplmailmsg.hxx" - -// namespace directives - - using com::sun::star::uno::RuntimeException; using com::sun::star::uno::Sequence; using com::sun::star::lang::IllegalArgumentException; using namespace cppu; - -// helper functions - - CSmplMailMsg::CSmplMailMsg( ) { } @@ -52,84 +44,72 @@ void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody ) return m_aBody; } - void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) { m_aRecipient = aRecipient; } - OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) { return m_aRecipient; } - void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) { m_CcRecipients = aCcRecipient; } - Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) throw (RuntimeException) { return m_CcRecipients; } - void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) { m_BccRecipients = aBccRecipient; } - Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) throw (RuntimeException) { return m_BccRecipients; } - void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) { m_aOriginator = aOriginator; } - OUString SAL_CALL CSmplMailMsg::getOriginator( ) throw (RuntimeException) { return m_aOriginator; } - void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) { m_aSubject = aSubject; } - OUString SAL_CALL CSmplMailMsg::getSubject( ) throw (RuntimeException) { return m_aSubject; } - void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) { m_Attachements = aAttachement; } - Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement( ) throw (RuntimeException) { diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx index 82610e8f854d..4976f325c5a5 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.cxx +++ b/shell/source/win32/simplemail/smplmailsuppl.cxx @@ -33,7 +33,7 @@ using namespace cppu; #define COMP_IMPL_NAME "com.sun.star.sys.shell.SimpleSystemMail" -namespace // private +namespace { Sequence< OUString > SAL_CALL Component_getSupportedServiceNames() { @@ -41,7 +41,7 @@ namespace // private return aRet; } -} // end private namespace +} CSmplMailSuppl::CSmplMailSuppl() : WeakComponentImplHelper<XSimpleMailClientSupplier, XServiceInfo>(m_aMutex) |