diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /shell/source | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'shell/source')
32 files changed, 0 insertions, 127 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 5a6311f068d2..9aea14ea2419 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -204,26 +204,22 @@ static OUString ImplGetLocale(int category) #endif - LocaleBackend::LocaleBackend() { } - LocaleBackend::~LocaleBackend() { } - LocaleBackend* LocaleBackend::createInstance() { return new LocaleBackend; } - OUString LocaleBackend::getLocale() { #if defined WNT @@ -236,7 +232,6 @@ OUString LocaleBackend::getLocale() } - OUString LocaleBackend::getUILocale() { #if defined WNT @@ -249,7 +244,6 @@ OUString LocaleBackend::getUILocale() } - OUString LocaleBackend::getSystemLocale() { // note: the implementation differs from getLocale() only on Windows @@ -301,7 +295,6 @@ css::uno::Any LocaleBackend::getPropertyValue( } - OUString SAL_CALL LocaleBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; } diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 6d79a0101e2e..c4216e0a6c37 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -26,7 +26,6 @@ namespace uno = com::sun::star::uno ; - static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( SAL_UNUSED_PARAMETER const uno::Reference<uno::XComponentContext>&){ @@ -34,7 +33,6 @@ static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -49,7 +47,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, @@ -63,5 +60,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 8073f69c037e..3cf519809043 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -27,7 +27,6 @@ namespace uno = com::sun::star::uno; - static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend( const uno::Reference<uno::XComponentContext>&) { @@ -35,7 +34,6 @@ static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend( } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -50,7 +48,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = }; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { @@ -62,5 +59,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( con } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 1069b643bdf9..8ba2d95867b6 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -101,7 +101,6 @@ namespace // private } // end private namespace - WinInetBackend::WinInetBackend() { Library hWinInetDll( LoadLibrary( WININET_DLL_NAME ) ); @@ -297,20 +296,17 @@ WinInetBackend::WinInetBackend() } - WinInetBackend::~WinInetBackend() { } - WinInetBackend* WinInetBackend::createInstance() { return new WinInetBackend; } - void WinInetBackend::setPropertyValue( OUString const &, css::uno::Any const &) throw ( @@ -361,13 +357,11 @@ 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/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 8958ac1dc596..e34ddaa31298 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -27,7 +27,6 @@ namespace uno = com::sun::star::uno ; - static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend( const uno::Reference<uno::XComponentContext>&){ @@ -35,7 +34,6 @@ static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend( } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -50,7 +48,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { @@ -63,5 +60,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 71cdb6b1b650..d53347e056cc 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -37,7 +37,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 32a744846332..9a432519507d 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -71,7 +71,6 @@ namespace // private } // end private namespace - CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : WeakImplHelper< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >() { diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 46cd6d14c41e..7dadfd213e24 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -79,7 +79,6 @@ void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) } - ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : WeakImplHelper< XSystemShellExecute, XServiceInfo >(), m_xContext(xContext) @@ -102,7 +101,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) { diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 6a26ef0b25e3..5c1fc4f49c36 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -35,7 +35,6 @@ using com::sun::star::system::XSystemShellExecute; #define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute" - namespace { Reference< XInterface > SAL_CALL createInstance(const Reference< XComponentContext >& xContext) diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx index 1a48b180d54a..c1a624fa1f66 100644 --- a/shell/source/unix/exec/urltest.cxx +++ b/shell/source/unix/exec/urltest.cxx @@ -27,7 +27,6 @@ #include <strings.h> - int main(int argc, const char *argv[]) { int ret = 0; diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx index 86092f99ee86..2bf7d7eb30b0 100644 --- a/shell/source/unix/sysshell/recently_used_file.cxx +++ b/shell/source/unix/sysshell/recently_used_file.cxx @@ -130,6 +130,4 @@ bool recently_used_file::eof() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 441cfc50451b..baecf1a133fa 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -172,7 +172,6 @@ namespace // private #define E_UNKNOWN_EXEC_ERROR -1 - bool is_system_path(const OUString& path_or_uri) { OUString url; @@ -201,7 +200,6 @@ namespace // private } - bool is_existing_file(const OUString& file_name) { OSL_ASSERT(is_system_path(file_name)); @@ -242,7 +240,6 @@ namespace // private } // end namespace - CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext ) : WeakComponentImplHelper< XSystemShellExecute, XServiceInfo >( m_aMutex ), m_xContext(xContext) @@ -259,7 +256,6 @@ CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext } - void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) { diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index d6d2bf403d86..0f2d91332872 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -37,7 +37,6 @@ using com::sun::star::system::XSystemShellExecute; #define SYSSHEXEC_IMPL_NAME "com.sun.star.sys.shell.SystemShellExecute" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx index 7035c8d714ec..823618a1349f 100644 --- a/shell/source/win32/ooofilereader/basereader.cxx +++ b/shell/source/win32/ooofilereader/basereader.cxx @@ -32,26 +32,22 @@ m_ZipFile( DocumentName ) } - CBaseReader::CBaseReader(StreamInterface * sw): m_ZipFile( sw ) { } - CBaseReader::~CBaseReader() { } - void CBaseReader::start_document() { } - void CBaseReader::end_document() { } diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 977b3ce8168e..9ca1efedfaf0 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -31,11 +31,9 @@ using ::std::min; #include "internal/shlxthdl.hxx" - long CClassFactory::s_ServerLocks = 0; - CClassFactory::CClassFactory(const CLSID& clsid) : m_RefCnt(1), m_Clsid(clsid) @@ -44,7 +42,6 @@ CClassFactory::CClassFactory(const CLSID& clsid) : } - CClassFactory::~CClassFactory() { InterlockedDecrement(&g_DllRefCnt); @@ -70,14 +67,12 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_ } - ULONG STDMETHODCALLTYPE CClassFactory::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CClassFactory::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -128,7 +123,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( } - HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) { if (fLock) @@ -140,7 +134,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) } - bool CClassFactory::IsLocked() { return (s_ServerLocks > 0); diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index ac45cb7faf62..8f3f11e5a4b7 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -43,7 +43,6 @@ namespace /* private */ } - CColumnInfo::CColumnInfo(long RefCnt) : m_RefCnt(RefCnt) { @@ -51,7 +50,6 @@ CColumnInfo::CColumnInfo(long RefCnt) : } - CColumnInfo::~CColumnInfo() { InterlockedDecrement(&g_DllRefCnt); @@ -77,14 +75,12 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA } - ULONG STDMETHODCALLTYPE CColumnInfo::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CColumnInfo::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -188,7 +184,6 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOL } - bool CColumnInfo::IsOOFileExtension(wchar_t* Extension) const { for (size_t i = 0; i < OOFileExtensionTableSize; i++) diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index 4d6241a40ca1..6f309485c93d 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -39,7 +39,6 @@ const std::wstring WSPACE = std::wstring(SPACE); - CInfoTip::CInfoTip(long RefCnt) : m_RefCnt(RefCnt) { @@ -48,7 +47,6 @@ CInfoTip::CInfoTip(long RefCnt) : } - CInfoTip::~CInfoTip() { InterlockedDecrement(&g_DllRefCnt); @@ -83,14 +81,12 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR * } - ULONG STDMETHODCALLTYPE CInfoTip::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CInfoTip::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -301,7 +297,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws } - HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoFlags(DWORD * /*pdwFlags*/ ) { return E_NOTIMPL; @@ -346,28 +341,24 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ } - HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty() { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fRemember*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE CInfoTip::GetCurFile(LPOLESTR __RPC_FAR * /*ppszFileName*/) { return E_NOTIMPL; diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index a4d038fe7599..ea266ac613d7 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -18,7 +18,6 @@ */ - // File: ooofilt.cxx // Contents: Filter Implementation for OpenOffice.Org Document using // Indexing Service @@ -959,7 +958,6 @@ STDAPI DllRegisterServer() } - STDAPI DllUnregisterServer() { return S_OK; diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index b9c586442097..b842234bfba1 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -59,7 +59,6 @@ PROPERTYMAP g_rgPROPERTYMAP[] = size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]); - CPropertyHdl::CPropertyHdl( long nRefCnt ) : m_RefCnt( nRefCnt ), m_pCache( NULL ) @@ -69,7 +68,6 @@ CPropertyHdl::CPropertyHdl( long nRefCnt ) : } - CPropertyHdl::~CPropertyHdl() { if ( m_pCache ) diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx index 45a747784600..1a4a21d6c7ab 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx @@ -26,8 +26,6 @@ #include "internal/metainforeader.hxx" - - struct statistic_item { statistic_item(); @@ -47,20 +45,17 @@ struct statistic_item }; - typedef std::vector<statistic_item> statistic_item_list_t; typedef std::pair<std::wstring, statistic_item_list_t> statistic_group_t; typedef std::vector<statistic_group_t> statistic_group_list_t; - class document_statistic_reader; typedef std::unique_ptr<document_statistic_reader> document_statistic_reader_ptr; document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor); - class document_statistic_reader { public: @@ -86,7 +81,6 @@ private: }; - class writer_document_statistic_reader : public document_statistic_reader { protected: @@ -99,7 +93,6 @@ protected: }; - class calc_document_statistic_reader : public document_statistic_reader { protected: @@ -112,7 +105,6 @@ protected: }; - class draw_impress_math_document_statistic_reader : public document_statistic_reader { protected: diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 7984f2dc22dc..90d6b7fd9d1d 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -32,7 +32,6 @@ #include "internal/resource.h" - list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2) { @@ -43,7 +42,6 @@ list_view_builder_ptr create_list_view_builder( } - list_view_builder::list_view_builder( HWND hwnd_list_view, const std::wstring& column1_title, @@ -56,13 +54,11 @@ list_view_builder::list_view_builder( } - list_view_builder::~list_view_builder() { } - void list_view_builder::build(statistic_group_list_t& gl) { setup_list_view(); @@ -84,7 +80,6 @@ void list_view_builder::build(statistic_group_list_t& gl) } - void list_view_builder::setup_list_view() { HIMAGELIST h_ils = ImageList_Create(16,15,ILC_MASK, 7, 0); @@ -114,14 +109,12 @@ void list_view_builder::setup_list_view() } - void list_view_builder::insert_group(const std::wstring& /*title*/) { insert_item(L"", L"", false); } - void list_view_builder::insert_item(const std::wstring& title, const std::wstring& value, bool is_editable) { LVITEM lvi; @@ -154,14 +147,12 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin } - HWND list_view_builder::get_list_view() const { return hwnd_list_view_; } - winxp_list_view_builder::winxp_list_view_builder( HWND hwnd_list_view, const std::wstring& column1_title, @@ -173,7 +164,6 @@ winxp_list_view_builder::winxp_list_view_builder( } - void winxp_list_view_builder::setup_list_view() { list_view_builder::setup_list_view(); @@ -182,7 +172,6 @@ void winxp_list_view_builder::setup_list_view() } - void winxp_list_view_builder::insert_group(const std::wstring& name) { LVGROUP lvg; @@ -201,7 +190,6 @@ void winxp_list_view_builder::insert_group(const std::wstring& name) } - void winxp_list_view_builder::insert_item( const std::wstring& title, const std::wstring& value, bool is_editable) { diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx index 870c33c1dd87..bb0072f49da4 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx @@ -33,7 +33,6 @@ #include "document_statistic.hxx" - class list_view_builder; typedef std::unique_ptr<list_view_builder> list_view_builder_ptr; @@ -42,7 +41,6 @@ list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2); - class list_view_builder { public: @@ -74,7 +72,6 @@ private: }; - class winxp_list_view_builder : public list_view_builder { protected: diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 6d1a146bfd34..aa938e53a405 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -53,7 +53,6 @@ ----------------------------------------------*/ - CPropertySheet::CPropertySheet(long RefCnt) : m_RefCnt(RefCnt) { @@ -62,7 +61,6 @@ CPropertySheet::CPropertySheet(long RefCnt) : } - CPropertySheet::~CPropertySheet() { OutputDebugStringFormat("CPropertySheet::DTor [%d], [%d]", m_RefCnt, g_DllRefCnt ); @@ -98,7 +96,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( } - ULONG STDMETHODCALLTYPE CPropertySheet::AddRef() { OutputDebugStringFormat("CPropertySheet::AddRef [%d]", m_RefCnt ); @@ -106,7 +103,6 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef() } - ULONG STDMETHODCALLTYPE CPropertySheet::Release() { OutputDebugStringFormat("CPropertySheet::Release [%d]", m_RefCnt ); @@ -248,7 +244,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP } - HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/) { @@ -256,7 +251,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( } - UINT CALLBACK CPropertySheet::PropPageSummaryCallback( HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE ppsp) { @@ -274,8 +268,6 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback( } - - BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { switch (uiMsg) @@ -293,7 +285,6 @@ BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM } - BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { switch (uiMsg) diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 2983b381a1ab..821e91b2f747 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -295,7 +295,6 @@ namespace /* private */ } // namespace /* private */ - // COM exports diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index a1eb85fbebda..84e77f25bb41 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -288,8 +288,6 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Clone(IStream **) { return E_NOTIMPL; } - - CThumbviewer::CThumbviewer(long RefCnt) : ref_count_(RefCnt) { diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 2ee68f3b5f42..b827e5c896c8 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -22,7 +22,6 @@ #include <sal/macros.h> - const std::string WRITER_FILE_EXTENSIONS = "sxwstwsxgodtottodm"; const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots"; const std::string DRAW_FILE_EXTENSIONS = "sxdstdodgotg"; diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 2e2838c1f805..ed000debeff9 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -58,7 +58,6 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co } - bool DeleteRegistryKey(HKEY RootKey, const char* KeyName) { HKEY hKey; @@ -157,7 +156,6 @@ std::string ClsidToString(const CLSID& clsid) } - bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, char *pszData, DWORD dwBufLen) { HKEY hKey; diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 651aba743d87..bf797489f54b 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -37,7 +37,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_IMPL_NAME "com.sun.star.sys.shell.SimpleSystemMail" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& ) diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index 1870b16ad3b0..bb79921bcf67 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -56,7 +56,6 @@ void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody ) } - void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) { @@ -64,7 +63,6 @@ void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) } - OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) { @@ -72,7 +70,6 @@ OUString SAL_CALL CSmplMailMsg::getRecipient( ) } - void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) { @@ -80,7 +77,6 @@ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecip } - Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) throw (RuntimeException) { @@ -88,7 +84,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) } - void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) { @@ -96,7 +91,6 @@ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRec } - Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) throw (RuntimeException) { @@ -104,7 +98,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) } - void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) { @@ -112,7 +105,6 @@ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) } - OUString SAL_CALL CSmplMailMsg::getOriginator( ) throw (RuntimeException) { @@ -120,7 +112,6 @@ OUString SAL_CALL CSmplMailMsg::getOriginator( ) } - void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) { @@ -128,7 +119,6 @@ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) } - OUString SAL_CALL CSmplMailMsg::getSubject( ) throw (RuntimeException) { @@ -136,7 +126,6 @@ OUString SAL_CALL CSmplMailMsg::getSubject( ) } - void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) { @@ -144,7 +133,6 @@ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttache } - Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement( ) throw (RuntimeException) { diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index f2a28953327d..d01fff0c5707 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -41,7 +41,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setRecipient( const OUString& aRecipient ) throw (css::uno::RuntimeException); @@ -49,7 +48,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient ) throw (css::uno::RuntimeException); @@ -57,7 +55,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient ) throw (css::uno::RuntimeException); @@ -65,7 +62,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setOriginator( const OUString& aOriginator ) throw (css::uno::RuntimeException); @@ -73,7 +69,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setSubject( const OUString& aSubject ) throw (css::uno::RuntimeException); @@ -81,7 +76,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index a33e7a81d4f2..74db0a71a695 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -58,7 +58,6 @@ Reference< XMultiServiceFactory > g_xFactory; // main - // int SAL_CALL main(int nArgc, char* Argv[], char* pEnv[] ) // make Warning free, leave out typename int SAL_CALL main(int , char*, char* ) diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index 72d352a4774e..693e81dca2c4 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -57,11 +57,9 @@ using namespace com::sun::star::system; Reference< XMultiServiceFactory > g_xFactory; - // main - // int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) int SAL_CALL main(int nArgc, char* Argv[], char* ) { |