svx/source/form/fmPropBrw.cxx | 2 +- svx/source/unodraw/recoveryui.cxx | 6 +++--- vcl/source/app/brand.cxx | 4 ++-- xmloff/source/transform/XMLFilterRegistration.cxx | 2 +- xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 7a0b8decb7d81fefced39ee04368dd0112e8ac28 Author: Wastack <btom...@gmail.com> Date: Fri Mar 11 00:43:10 2016 +0100 tdf#97966: Remove 'static' keywords Change-Id: Id70f9e55fb4ad7d3a501399b055208ea10369c82 Reviewed-on: https://gerrit.libreoffice.org/23131 Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Tested-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index aff1df1..af7487d 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -491,7 +491,7 @@ IMPL_LINK_NOARG_TYPED( FmPropBrw, OnAsyncGetFocus, void*, void ) namespace { - static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) + bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 7f436f9..ef3701b 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -176,7 +176,7 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& } -static OUString GetCrashConfigDir() +OUString GetCrashConfigDir() { #if defined(_WIN32) @@ -202,14 +202,14 @@ static OUString GetCrashConfigDir() #endif -static OUString GetUnsentURL() +OUString GetUnsentURL() { OUString aURL = GetCrashConfigDir() + "/" LCKFILE; return aURL; } -static bool delete_pending_crash() +bool delete_pending_crash() { OUString aUnsentURL = GetUnsentURL(); return ( FileBase::E_None == File::remove( aUnsentURL ) ); diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 5a7bd2d..236ddea 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -29,7 +29,7 @@ #include <vcl/svgdata.hxx> namespace { - static bool loadPng( const OUString & rPath, BitmapEx &rBitmap) + bool loadPng( const OUString & rPath, BitmapEx &rBitmap) { INetURLObject aObj( rPath ); SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ ); @@ -41,7 +41,7 @@ namespace { else return false; } - static bool tryLoadPng( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap ) + bool tryLoadPng( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap ) { return loadPng( rBaseDir + "/" LIBO_ETC_FOLDER + rName, rBitmap); } diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index e87ea6a..4b7ce03 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -43,7 +43,7 @@ namespace CreateInstance createInstance; }; - static const ServiceDescriptor* getServiceDescriptors() + const ServiceDescriptor* getServiceDescriptors() { static const ServiceDescriptor aDescriptors[] = { diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx index 1815770..50dcade 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx @@ -64,7 +64,7 @@ sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( ::com::sun::star::uno::R namespace { // Helper functions from nss/lib/certdb/genname.c - static int GetNamesLength(CERTGeneralName *names) + int GetNamesLength(CERTGeneralName *names) { int length = 0; CERTGeneralName *first; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits