loplugin:salcall handle static methods

Change-Id: Id6820abec4b8ca8bee26d62b333fd30b42a14aec
Reviewed-on: https://gerrit.libreoffice.org/46007
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-12-06 08:59:44 +02:00
parent caf1eb1583
commit dd0dceb511
67 changed files with 199 additions and 178 deletions

View File

@ -42,6 +42,9 @@ public:
// ignore this one. I can't get accurate source code from getCharacterData() for it. // ignore this one. I can't get accurate source code from getCharacterData() for it.
if (fn == SRCDIR "/sal/rtl/string.cxx") if (fn == SRCDIR "/sal/rtl/string.cxx")
return; return;
// clang returns completely bogus source range for something in this file
if (fn == SRCDIR "/sd/source/ui/unoidl/unomodel.cxx")
return;
m_phase = PluginPhase::FindAddressOf; m_phase = PluginPhase::FindAddressOf;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
m_phase = PluginPhase::Warning; m_phase = PluginPhase::Warning;
@ -206,7 +209,7 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
// @TODO For now, I am ignore free functions, since those are most likely to have their address taken. // @TODO For now, I am ignore free functions, since those are most likely to have their address taken.
// I'll do them later. They are harder to verify since MSVC does not verify when assigning to function pointers // I'll do them later. They are harder to verify since MSVC does not verify when assigning to function pointers
// that the calling convention of the function matches the calling convention of the function pointer! // that the calling convention of the function matches the calling convention of the function pointer!
if (!methodDecl || methodDecl->isStatic()) if (!methodDecl)
return true; return true;
// can only check when we have a definition since this is the most likely time // can only check when we have a definition since this is the most likely time
@ -268,6 +271,7 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
return true; return true;
} }
// if any of the overridden methods are SAL_CALL, we should be too
if (methodDecl) if (methodDecl)
{ {
for (auto iter = methodDecl->begin_overridden_methods(); for (auto iter = methodDecl->begin_overridden_methods();
@ -279,6 +283,23 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
} }
} }
// these often have their address taken
if (methodDecl && methodDecl->getIdentifier())
{
auto name = methodDecl->getName();
if (name == "getImplementationName_static" || name == "getSupportedServiceNames_static"
|| name == "getSupportedServiceNames_Static" || name == "Create" || name == "create"
|| name == "CreateInstance" || name == "getImplementationName_Static"
|| name == "getSingletonName_static" || name == "getLdapUserProfileBeName"
|| name == "getLdapUserProfileBeServiceNames" || name == "impl_staticCreateSelfInstance"
|| name == "impl_createInstance" || name == "impl_staticGetImplementationName"
|| name == "impl_staticGetSupportedServiceNames"
|| name == "impl_getStaticSupportedServiceNames"
|| name == "impl_getStaticImplementationName" || name == "getBackendName"
|| name == "getBackendServiceNames")
return true;
}
bool bOK = rewrite(rewriteLoc); bool bOK = rewrite(rewriteLoc);
if (bOK && canonicalDecl != decl) if (bOK && canonicalDecl != decl)
{ {

View File

@ -101,13 +101,13 @@ namespace connectivity
m_ColumnLabel = _aColumnName; m_ColumnLabel = _aColumnName;
} }
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t ,void* _pHint ) static void * operator new( size_t ,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* ) static void operator delete( void *,void* )
{ } { }
bool isAutoIncrement() const { return m_AutoIncrement; } bool isAutoIncrement() const { return m_AutoIncrement; }

View File

@ -43,13 +43,13 @@ namespace connectivity
,nType( css::sdbc::DataType::OTHER) ,nType( css::sdbc::DataType::OTHER)
{} {}
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ } { }
bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }

View File

@ -34,13 +34,13 @@ namespace connectivity
~OKeyValue(); ~OKeyValue();
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t,void* _pHint ) static void * operator new( size_t,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* ) static void operator delete( void *,void* )
{ } { }
static OKeyValue* createKeyValue(sal_Int32 nVal); static OKeyValue* createKeyValue(sal_Int32 nVal);

View File

@ -41,13 +41,13 @@ namespace connectivity
OSkipDeletedSet(IResultSetHelper* _pHelper); OSkipDeletedSet(IResultSetHelper* _pHelper);
~OSkipDeletedSet(); ~OSkipDeletedSet();
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t,void* _pHint ) static void * operator new( size_t,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* ) static void operator delete( void *,void* )
{ } { }
/** /**

View File

@ -63,13 +63,13 @@ namespace connectivity
~OSortIndex(); ~OSortIndex();
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t,void* _pHint ) static void * operator new( size_t,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* ) static void operator delete( void *,void* )
{ } { }

View File

@ -45,13 +45,13 @@ namespace connectivity
public: public:
OSQLAnalyzer(OConnection* _pConnection); OSQLAnalyzer(OConnection* _pConnection);
~OSQLAnalyzer(); ~OSQLAnalyzer();
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ } { }
OConnection* getConnection() const { return m_pConnection; } OConnection* getConnection() const { return m_pConnection; }

View File

@ -53,13 +53,13 @@ namespace connectivity
OCode& operator=(const OCode&) = default; OCode& operator=(const OCode&) = default;
OCode& operator=(OCode&&) = default; OCode& operator=(OCode&&) = default;
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ } { }
}; };

View File

@ -48,13 +48,13 @@ namespace connectivity
virtual ~OPredicateCompiler() override; virtual ~OPredicateCompiler() override;
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ } { }
void dispose(); void dispose();

View File

@ -89,7 +89,7 @@ private:
struct Base1: public css::uno::XInterface { struct Base1: public css::uno::XInterface {
virtual ~Base1() = delete; virtual ~Base1() = delete;
static ::css::uno::Type const & SAL_CALL static_type(void * = nullptr) // loplugin:refcounting static ::css::uno::Type const & static_type(void * = nullptr) // loplugin:refcounting
{ return ::cppu::UnoType<Base1>::get(); } { return ::cppu::UnoType<Base1>::get(); }
}; };
struct Base2: public Base1 { struct Base2: public Base1 {

View File

@ -333,7 +333,7 @@ void CMimeContentType::comment()
} }
} }
bool SAL_CALL CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange ) bool CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange )
{ {
return ( aRange.indexOf( aChr ) > -1 ); return ( aRange.indexOf( aChr ) > -1 );
} }

View File

@ -60,7 +60,7 @@ private:
OUString quotedPValue( ); OUString quotedPValue( );
OUString nonquotedPValue( ); OUString nonquotedPValue( );
void comment(); void comment();
static bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange ); static bool isInRange( const OUString& aChr, const OUString& aRange );
private: private:
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;

View File

@ -77,7 +77,7 @@ namespace XSLT
xsltTransformContextPtr m_tcontext; xsltTransformContextPtr m_tcontext;
virtual void execute() override; virtual void execute() override;
static void SAL_CALL registerExtensionModule(); static void registerExtensionModule();
}; };
/* /*

View File

@ -97,8 +97,8 @@ public:
virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) override; virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) override;
// Resolve ambiguity: both OWeakObject and OObject have these memory operators // Resolve ambiguity: both OWeakObject and OObject have these memory operators
void * SAL_CALL operator new( size_t size ) throw() { return osl::Thread::operator new(size); } void * operator new( size_t size ) throw() { return osl::Thread::operator new(size); }
void SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); } void operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
private: private:
void impl_clearEventQueue(); void impl_clearEventQueue();

View File

@ -311,7 +311,7 @@ css::uno::Sequence<sal_Int8> Binding::getUnoTunnelID()
return aImplementationId.getImplementationId(); return aImplementationId.getImplementationId();
} }
Binding* SAL_CALL Binding::getBinding( const Reference<XPropertySet>& xPropertySet ) Binding* Binding::getBinding( const Reference<XPropertySet>& xPropertySet )
{ {
Reference<XUnoTunnel> xTunnel( xPropertySet, UNO_QUERY ); Reference<XUnoTunnel> xTunnel( xPropertySet, UNO_QUERY );
return xTunnel.is() return xTunnel.is()

View File

@ -258,7 +258,7 @@ public:
// the ID for XUnoTunnel calls // the ID for XUnoTunnel calls
static css::uno::Sequence<sal_Int8> getUnoTunnelID(); static css::uno::Sequence<sal_Int8> getUnoTunnelID();
static Binding* SAL_CALL getBinding( const css::uno::Reference<css::beans::XPropertySet>& ); static Binding* getBinding( const css::uno::Reference<css::beans::XPropertySet>& );
private: private:

View File

@ -80,7 +80,7 @@ class PopupMenuDispatcher final : public ::cppu::WeakImplHelper<
/* Helper for registry */ /* Helper for registry */
/// @throws css::uno::Exception /// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XInitialization // XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override; virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;

View File

@ -105,7 +105,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar); static sal_Int16 getScriptClass(sal_uInt32 currentChar);
protected: protected:
css::i18n::Boundary result; // for word break iterator css::i18n::Boundary result; // for word break iterator

View File

@ -176,7 +176,7 @@ private:
bool setupInternational( const css::lang::Locale& rLocale ); bool setupInternational( const css::lang::Locale& rLocale );
/// Implementation of getCharacterType() for one single character /// Implementation of getCharacterType() for one single character
static sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment); static sal_Int32 getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
}; };

View File

@ -70,7 +70,7 @@ private:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(sal_Char const * rLanguage); css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(sal_Char const * rLanguage);
static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar); static sal_Char* getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
}; };
} }

View File

@ -53,7 +53,7 @@ public:
transliterateChar2Char( sal_Unicode inChar) override; transliterateChar2Char( sal_Unicode inChar) override;
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > SAL_CALL static css::uno::Sequence< OUString >
transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 ); transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 );
struct Mapping { struct Mapping {

View File

@ -145,7 +145,7 @@ cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) {
} }
sal_Int32 SAL_CALL sal_Int32
cclass_Unicode::getCharType( const OUString& Text, sal_Int32* nPos, sal_Int32 increment) { cclass_Unicode::getCharType( const OUString& Text, sal_Int32* nPos, sal_Int32 increment) {
using namespace ::com::sun::star::i18n::KCharacterType; using namespace ::com::sun::star::i18n::KCharacterType;

View File

@ -88,7 +88,7 @@ static ScriptTypeList typeList[] = {
{ UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, (sal_Int16)UnicodeScript_kScriptCount } // 88 { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, (sal_Int16)UnicodeScript_kScriptCount } // 88
}; };
sal_Char* SAL_CALL sal_Char*
InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar) InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar)
{ {
css::i18n::UnicodeScript type = (css::i18n::UnicodeScript)unicode::getUnicodeScriptType( cChar, typeList, (sal_Int16)UnicodeScript_kScriptCount ); css::i18n::UnicodeScript type = (css::i18n::UnicodeScript)unicode::getUnicodeScriptType( cChar, typeList, (sal_Int16)UnicodeScript_kScriptCount );

View File

@ -88,7 +88,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos
return folding( inStr, startPos, nCount, offset); return folding( inStr, startPos, nCount, offset);
} }
Sequence< OUString > SAL_CALL Sequence< OUString >
transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2, transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2,
XTransliteration& t1, XTransliteration& t2 ) XTransliteration& t1, XTransliteration& t2 )
{ {

View File

@ -50,22 +50,22 @@ T getScriptType( const sal_Unicode ch, const L* typeList, T unknownType ) {
typeList[i].value : unknownType; typeList[i].value : unknownType;
} }
sal_Int16 SAL_CALL sal_Int16
unicode::getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList* typeList, sal_Int16 unknownType ) { unicode::getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList* typeList, sal_Int16 unknownType ) {
return getScriptType(ch, typeList, unknownType); return getScriptType(ch, typeList, unknownType);
} }
sal_Unicode SAL_CALL sal_Unicode
unicode::getUnicodeScriptStart( UnicodeScript type) { unicode::getUnicodeScriptStart( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeFrom]; return UnicodeScriptType[(int)type][UnicodeScriptTypeFrom];
} }
sal_Unicode SAL_CALL sal_Unicode
unicode::getUnicodeScriptEnd( UnicodeScript type) { unicode::getUnicodeScriptEnd( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeTo]; return UnicodeScriptType[(int)type][UnicodeScriptTypeTo];
} }
sal_Int16 SAL_CALL sal_Int16
unicode::getUnicodeType( const sal_Unicode ch ) { unicode::getUnicodeType( const sal_Unicode ch ) {
static sal_Unicode c = 0x00; static sal_Unicode c = 0x00;
static sal_Int16 r = 0x00; static sal_Int16 r = 0x00;
@ -78,7 +78,7 @@ unicode::getUnicodeType( const sal_Unicode ch ) {
UnicodeTypeValue[((address - UnicodeTypeNumberBlock) << 8) + (ch & 0xff)]); UnicodeTypeValue[((address - UnicodeTypeNumberBlock) << 8) + (ch & 0xff)]);
} }
sal_uInt8 SAL_CALL sal_uInt8
unicode::getUnicodeDirection( const sal_Unicode ch ) { unicode::getUnicodeDirection( const sal_Unicode ch ) {
static sal_Unicode c = 0x00; static sal_Unicode c = 0x00;
static sal_uInt8 r = 0x00; static sal_uInt8 r = 0x00;
@ -125,11 +125,11 @@ IsType(unicode::isSpace, SPACEMASK)
#define CONTROLSPACE bit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\ #define CONTROLSPACE bit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\
bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f) bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f)
bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode ch) { bool unicode::isWhiteSpace( const sal_Unicode ch) {
return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) & (CONTROLSPACE))); return (ch != 0xa0 && isSpace(ch)) || (ch <= 0x1F && (bit(ch) & (CONTROLSPACE)));
} }
sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript) sal_Int16 unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
{ {
//See unicode/uscript.h //See unicode/uscript.h
static const sal_Int16 scriptTypes[] = static const sal_Int16 scriptTypes[] =
@ -186,7 +186,7 @@ sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
return nRet; return nRet;
} }
OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
{ {
OString sRet; OString sRet;
switch (eScript) switch (eScript)
@ -733,7 +733,7 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
//Format a number as a percentage according to the rules of the given //Format a number as a percentage according to the rules of the given
//language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE //language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE
OUString SAL_CALL unicode::formatPercent(double dNumber, OUString unicode::formatPercent(double dNumber,
const LanguageTag &rLangTag) const LanguageTag &rLangTag)
{ {
// get a currency formatter for this locale ID // get a currency formatter for this locale ID

View File

@ -126,13 +126,13 @@ class COMPHELPER_DLLPUBLIC OInterfaceContainerHelper2
{ {
public: public:
// these are here to force memory de/allocation to sal lib. // these are here to force memory de/allocation to sal lib.
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void * SAL_CALL operator new( size_t, void * pMem ) static void * operator new( size_t, void * pMem )
{ return pMem; } { return pMem; }
static void SAL_CALL operator delete( void *, void * ) static void operator delete( void *, void * )
{} {}
/** /**

View File

@ -278,13 +278,13 @@ namespace connectivity
free(); free();
} }
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t,void* _pHint ) static void * operator new( size_t,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* ) static void operator delete( void *,void* )
{ } { }
ORowSetValue& operator=(const ORowSetValue& _rRH); ORowSetValue& operator=(const ORowSetValue& _rRH);

View File

@ -158,13 +158,13 @@ namespace connectivity
const OSQLParser& _rParser ); const OSQLParser& _rParser );
~OSQLParseTreeIterator(); ~OSQLParseTreeIterator();
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t,void* _pHint ) static void * operator new( size_t,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* ) static void operator delete( void *,void* )
{ } { }
void dispose(); void dispose();

View File

@ -44,13 +44,13 @@ namespace connectivity
OSQLScanner(); OSQLScanner();
virtual ~OSQLScanner(); virtual ~OSQLScanner();
static void * SAL_CALL operator new( size_t nSize ) static void * operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); } { return ::rtl_allocateMemory( nSize ); }
static void * SAL_CALL operator new( size_t,void* _pHint ) static void * operator new( size_t,void* _pHint )
{ return _pHint; } { return _pHint; }
static void SAL_CALL operator delete( void * pMem ) static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); } { ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* ) static void operator delete( void *,void* )
{ } { }
sal_Int32 SQLyygetc(); sal_Int32 SQLyygetc();

View File

@ -37,25 +37,25 @@ class I18NUTIL_DLLPUBLIC unicode
{ {
public: public:
static sal_Int16 SAL_CALL getUnicodeType( const sal_Unicode ch ); static sal_Int16 getUnicodeType( const sal_Unicode ch );
static sal_Int16 SAL_CALL getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList *typeList, sal_Int16 unknownType = 0 ); static sal_Int16 getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList *typeList, sal_Int16 unknownType = 0 );
static sal_Unicode SAL_CALL getUnicodeScriptStart(css::i18n::UnicodeScript type); static sal_Unicode getUnicodeScriptStart(css::i18n::UnicodeScript type);
static sal_Unicode SAL_CALL getUnicodeScriptEnd(css::i18n::UnicodeScript type); static sal_Unicode getUnicodeScriptEnd(css::i18n::UnicodeScript type);
static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch ); static sal_uInt8 getUnicodeDirection( const sal_Unicode ch );
static bool SAL_CALL isControl( const sal_Unicode ch); static bool SAL_CALL isControl( const sal_Unicode ch);
static bool SAL_CALL isAlpha( const sal_Unicode ch); static bool SAL_CALL isAlpha( const sal_Unicode ch);
static bool SAL_CALL isSpace( const sal_Unicode ch); static bool SAL_CALL isSpace( const sal_Unicode ch);
static bool SAL_CALL isWhiteSpace( const sal_Unicode ch); static bool isWhiteSpace( const sal_Unicode ch);
//Map an ISO 15924 script code to Latin/Asian/Complex/Weak //Map an ISO 15924 script code to Latin/Asian/Complex/Weak
static sal_Int16 SAL_CALL getScriptClassFromUScriptCode(UScriptCode eScript); static sal_Int16 getScriptClassFromUScriptCode(UScriptCode eScript);
//Return a language that can be written in a given ISO 15924 script code //Return a language that can be written in a given ISO 15924 script code
static OString SAL_CALL getExemplarLanguageForUScriptCode(UScriptCode eScript); static OString getExemplarLanguageForUScriptCode(UScriptCode eScript);
//Format a number as a percentage according to the rules of the given //Format a number as a percentage according to the rules of the given
//language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE //language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE
static OUString SAL_CALL formatPercent(double dNumber, static OUString formatPercent(double dNumber,
const LanguageTag &rLangTag); const LanguageTag &rLangTag);
}; };

View File

@ -40,7 +40,7 @@ namespace oox { namespace ppt {
public: public:
virtual ~TimeNodeContext() throw() override; virtual ~TimeNodeContext() throw() override;
static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ); static TimeNodeContext * makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
protected: protected:
TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw(); TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw();

View File

@ -206,7 +206,7 @@ public:
void DirectoryChanged(); void DirectoryChanged();
virtual void ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); virtual void ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
void DialogSizeChanged(); void DialogSizeChanged();
static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ); static OUString HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
// XDialogClosedListener methods // XDialogClosedListener methods
void DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent ); void DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent );

View File

@ -83,8 +83,8 @@ public:
virtual void SAL_CALL modified(const css::lang::EventObject& Source) override; virtual void SAL_CALL modified(const css::lang::EventObject& Source) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
}; };
@ -108,8 +108,8 @@ public:
virtual void SAL_CALL updated(const css::lang::EventObject &) override; virtual void SAL_CALL updated(const css::lang::EventObject &) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
}; };
@ -132,8 +132,8 @@ public:
virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override; virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
}; };
@ -156,8 +156,8 @@ public:
virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override; virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
}; };
@ -181,8 +181,8 @@ public:
virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override; virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
// resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
void SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); } void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
}; };

View File

@ -41,7 +41,7 @@ public:
/// @throws css::uno::Exception /// @throws css::uno::Exception
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static css::uno::Reference< css::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier ); static css::uno::Reference< css::uno::XInterface > createTextField( const OUString& aServiceSpecifier );
// internal // internal
static css::uno::Sequence< OUString > static css::uno::Sequence< OUString >
concatServiceNames( css::uno::Sequence< OUString >& rServices1, concatServiceNames( css::uno::Sequence< OUString >& rServices1,

View File

@ -216,8 +216,8 @@ public:
sal_uInt32 getShapeKind() const; sal_uInt32 getShapeKind() const;
// styles need this // styles need this
static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel ); static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel );
static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ); static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
/** same as SetFillAttribute but for property names instead of which ids, /** same as SetFillAttribute but for property names instead of which ids,
and the property found is returned instead of set at the object and the property found is returned instead of set at the object

View File

@ -670,7 +670,7 @@ public:
// css::awt::XLayoutConstrains // css::awt::XLayoutConstrains
css::awt::Size SAL_CALL getMinimumSize() override; css::awt::Size SAL_CALL getMinimumSize() override;
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window const * p ); static css::awt::Size implGetMinimumSize( vcl::Window const * p );
static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }

View File

@ -683,21 +683,21 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
return nullptr; return nullptr;
} }
OUString SAL_CALL Hyphenator::makeLowerCase(const OUString& aTerm, CharClass const * pCC) OUString Hyphenator::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
{ {
if (pCC) if (pCC)
return pCC->lowercase(aTerm); return pCC->lowercase(aTerm);
return aTerm; return aTerm;
} }
OUString SAL_CALL Hyphenator::makeUpperCase(const OUString& aTerm, CharClass const * pCC) OUString Hyphenator::makeUpperCase(const OUString& aTerm, CharClass const * pCC)
{ {
if (pCC) if (pCC)
return pCC->uppercase(aTerm); return pCC->uppercase(aTerm);
return aTerm; return aTerm;
} }
OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass const * pCC) OUString Hyphenator::makeInitCap(const OUString& aTerm, CharClass const * pCC)
{ {
sal_Int32 tlen = aTerm.getLength(); sal_Int32 tlen = aTerm.getLength();
if (pCC && tlen) if (pCC && tlen)

View File

@ -119,9 +119,9 @@ public:
static Sequence< OUString > getSupportedServiceNames_Static() throw(); static Sequence< OUString > getSupportedServiceNames_Static() throw();
private: private:
static OUString SAL_CALL makeLowerCase(const OUString&, CharClass const *); static OUString makeLowerCase(const OUString&, CharClass const *);
static OUString SAL_CALL makeUpperCase(const OUString&, CharClass const *); static OUString makeUpperCase(const OUString&, CharClass const *);
static OUString SAL_CALL makeInitCap(const OUString&, CharClass const *); static OUString makeInitCap(const OUString&, CharClass const *);
}; };
inline OUString Hyphenator::getImplementationName_Static() throw() inline OUString Hyphenator::getImplementationName_Static() throw()

View File

@ -549,21 +549,21 @@ void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
} }
} }
OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass const * pCC) OUString Thesaurus::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
{ {
if (pCC) if (pCC)
return pCC->lowercase(aTerm); return pCC->lowercase(aTerm);
return aTerm; return aTerm;
} }
OUString SAL_CALL Thesaurus::makeUpperCase(const OUString& aTerm, CharClass const * pCC) OUString Thesaurus::makeUpperCase(const OUString& aTerm, CharClass const * pCC)
{ {
if (pCC) if (pCC)
return pCC->uppercase(aTerm); return pCC->uppercase(aTerm);
return aTerm; return aTerm;
} }
OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass const * pCC) OUString Thesaurus::makeInitCap(const OUString& aTerm, CharClass const * pCC)
{ {
sal_Int32 tlen = aTerm.getLength(); sal_Int32 tlen = aTerm.getLength();
if (pCC && tlen) if (pCC && tlen)

View File

@ -120,9 +120,9 @@ public:
getSupportedServiceNames_Static() throw(); getSupportedServiceNames_Static() throw();
private: private:
static OUString SAL_CALL makeLowerCase(const OUString&, CharClass const *); static OUString makeLowerCase(const OUString&, CharClass const *);
static OUString SAL_CALL makeUpperCase(const OUString&, CharClass const *); static OUString makeUpperCase(const OUString&, CharClass const *);
static OUString SAL_CALL makeInitCap(const OUString&, CharClass const *); static OUString makeInitCap(const OUString&, CharClass const *);
}; };
inline OUString Thesaurus::getImplementationName_Static() throw() inline OUString Thesaurus::getImplementationName_Static() throw()

View File

@ -847,7 +847,7 @@ void SpellCheckerDispatcher::setCharClass(const LanguageTag& rLanguageTag)
} }
OUString SAL_CALL SpellCheckerDispatcher::makeLowerCase(const OUString& aTerm, CharClass const * pCC) OUString SpellCheckerDispatcher::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
{ {
if (pCC) if (pCC)
return pCC->lowercase(aTerm); return pCC->lowercase(aTerm);

View File

@ -113,7 +113,7 @@ public:
private: private:
void setCharClass(const LanguageTag& rLanguageTag); void setCharClass(const LanguageTag& rLanguageTag);
static OUString SAL_CALL makeLowerCase(const OUString&, CharClass const *); static OUString makeLowerCase(const OUString&, CharClass const *);
}; };

View File

@ -210,14 +210,14 @@ public:
@throw RuntimeException in case the thread is not attached or the runtime @throw RuntimeException in case the thread is not attached or the runtime
has not been initialized. has not been initialized.
*/ */
static void SAL_CALL initialize( static void initialize(
const css::uno::Reference< css::uno::XComponentContext > & ctx ); const css::uno::Reference< css::uno::XComponentContext > & ctx );
/** Checks, whether the uno runtime is already initialized in the current python interpreter. /** Checks, whether the uno runtime is already initialized in the current python interpreter.
@throws css::uno::RuntimeException @throws css::uno::RuntimeException
*/ */
static bool SAL_CALL isInitialized(); static bool isInitialized();
/** converts something contained in an UNO Any to a Python object /** converts something contained in an UNO Any to a Python object

View File

@ -43,7 +43,7 @@ public:
bool lookupTimer(const salhelper::Timer* pTimer); bool lookupTimer(const salhelper::Timer* pTimer);
/// retrieves the "Singleton" TimerManager Instance /// retrieves the "Singleton" TimerManager Instance
static TimerManager* SAL_CALL getTimerManager(); static TimerManager* getTimerManager();
protected: protected:
/// worker-function of thread /// worker-function of thread

View File

@ -2582,7 +2582,7 @@ void FileDialogHelper::DirectoryChanged()
mpImpl->handleDirectoryChanged(); mpImpl->handleDirectoryChanged();
} }
OUString SAL_CALL FileDialogHelper::HelpRequested( const FilePickerEvent& aEvent ) OUString FileDialogHelper::HelpRequested( const FilePickerEvent& aEvent )
{ {
return sfx2::FileDialogHelper_Impl::handleHelpRequested( aEvent ); return sfx2::FileDialogHelper_Impl::handleHelpRequested( aEvent );
} }

View File

@ -50,7 +50,7 @@ std::vector< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequ
} }
void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::Reference< io::XOutputStream >& xOutStream, const std::vector< beans::StringPair >& aSequence, const uno::Reference< uno::XComponentContext >& xContext ) void DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::Reference< io::XOutputStream >& xOutStream, const std::vector< beans::StringPair >& aSequence, const uno::Reference< uno::XComponentContext >& xContext )
{ {
if ( !xOutStream.is() ) if ( !xOutStream.is() )
throw uno::RuntimeException(); throw uno::RuntimeException();
@ -92,7 +92,7 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R
} }
std::vector< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext >& xContext ) std::vector< beans::StringPair > DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext >& xContext )
{ {
if ( !xContext.is() || !xInStream.is() ) if ( !xContext.is() || !xInStream.is() )
throw uno::RuntimeException(); throw uno::RuntimeException();

View File

@ -37,7 +37,7 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper < css::xml::sax::XDocum
std::vector< css::beans::StringPair > const & GetParsingResult(); std::vector< css::beans::StringPair > const & GetParsingResult();
/// @throws css::uno::Exception /// @throws css::uno::Exception
static std::vector< css::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext >& xContext ); static std::vector< css::beans::StringPair > ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext >& xContext );
public: public:
virtual ~DocTemplLocaleHelper() override; virtual ~DocTemplLocaleHelper() override;
@ -53,7 +53,7 @@ public:
// writes sequence of elements ( GroupName, GroupUIName ) // writes sequence of elements ( GroupName, GroupUIName )
/// @throws css::uno::Exception /// @throws css::uno::Exception
static static
void SAL_CALL WriteGroupLocalizationSequence( void WriteGroupLocalizationSequence(
const css::uno::Reference< css::io::XOutputStream >& xOutStream, const css::uno::Reference< css::io::XOutputStream >& xOutStream,
const std::vector< css::beans::StringPair >& aSequence, const std::vector< css::beans::StringPair >& aSequence,
const css::uno::Reference< css::uno::XComponentContext >& xContext ); const css::uno::Reference< css::uno::XComponentContext >& xContext );

View File

@ -1339,7 +1339,7 @@ Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const R
return Reference< XInterface >( *new PasswordContainer( xServiceManager ) ); return Reference< XInterface >( *new PasswordContainer( xServiceManager ) );
} }
Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) Reference< XSingleServiceFactory > PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
{ {
Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager, Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
PasswordContainer::impl_getStaticImplementationName(), PasswordContainer::impl_getStaticImplementationName(),

View File

@ -315,7 +315,7 @@ public:
static css::uno::Sequence< OUString > SAL_CALL static css::uno::Sequence< OUString > SAL_CALL
impl_getStaticSupportedServiceNames( ); impl_getStaticSupportedServiceNames( );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL static css::uno::Reference< css::lang::XSingleServiceFactory >
impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager ); impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static css::uno::Reference< css::uno::XInterface > SAL_CALL static css::uno::Reference< css::uno::XInterface > SAL_CALL

View File

@ -201,7 +201,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(
return create(rServiceSpecifier, ""); return create(rServiceSpecifier, "");
} }
uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) uno::Reference< uno::XInterface > SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier )
{ {
return SvxUnoTextCreateTextField( ServiceSpecifier ); return SvxUnoTextCreateTextField( ServiceSpecifier );
} }

View File

@ -1418,7 +1418,7 @@ bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName )
} }
bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel ) bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel const * pModel )
{ {
// check if an item with the given name and which id is inside the models // check if an item with the given name and which id is inside the models
// pool or the stylesheet pool, if found it's put in the itemset // pool or the stylesheet pool, if found it's put in the itemset
@ -1530,7 +1530,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
} }
bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ) bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet )
{ {
OUString aName = SvxUnogetInternalNameForItem((sal_Int16)nWID, rName); OUString aName = SvxUnogetInternalNameForItem((sal_Int16)nWID, rName);

View File

@ -237,8 +237,8 @@ public:
//XPropertySet //XPropertySet
virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
void * SAL_CALL operator new( size_t ) throw(); void * operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw(); void operator delete( void * ) throw();
}; };
typedef cppu::ImplInheritanceHelper typedef cppu::ImplInheritanceHelper
@ -268,8 +268,8 @@ public:
// XEventsSupplier // XEventsSupplier
virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override;
void * SAL_CALL operator new( size_t ) throw(); void * operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw(); void operator delete( void * ) throw();
}; };
class SwOLENode; class SwOLENode;
@ -309,8 +309,8 @@ public:
// XEventsSupplier // XEventsSupplier
virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override;
void * SAL_CALL operator new( size_t ) throw(); void * operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw(); void operator delete( void * ) throw();
}; };
class SwXOLEListener : public cppu::WeakImplHelper<css::util::XModifyListener>, class SwXOLEListener : public cppu::WeakImplHelper<css::util::XModifyListener>,

View File

@ -447,8 +447,8 @@ public:
SwDocShell* GetDocShell() {return pDocShell;} SwDocShell* GetDocShell() {return pDocShell;}
void * SAL_CALL operator new( size_t ) throw(); void * operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw(); void operator delete( void * ) throw();
}; };

View File

@ -3351,12 +3351,12 @@ uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames()
return aRet; return aRet;
} }
void * SAL_CALL SwXTextFrame::operator new( size_t t) throw() void * SwXTextFrame::operator new( size_t t) throw()
{ {
return SwXTextFrameBaseClass::operator new( t); return SwXTextFrameBaseClass::operator new( t);
} }
void SAL_CALL SwXTextFrame::operator delete( void * p) throw() void SwXTextFrame::operator delete( void * p) throw()
{ {
SwXTextFrameBaseClass::operator delete(p); SwXTextFrameBaseClass::operator delete(p);
} }
@ -3432,12 +3432,12 @@ uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames()
return aRet; return aRet;
} }
void * SAL_CALL SwXTextGraphicObject::operator new( size_t t) throw() void * SwXTextGraphicObject::operator new( size_t t) throw()
{ {
return SwXTextGraphicObjectBaseClass::operator new(t); return SwXTextGraphicObjectBaseClass::operator new(t);
} }
void SAL_CALL SwXTextGraphicObject::operator delete( void * p) throw() void SwXTextGraphicObject::operator delete( void * p) throw()
{ {
SwXTextGraphicObjectBaseClass::operator delete(p); SwXTextGraphicObjectBaseClass::operator delete(p);
} }
@ -3581,12 +3581,12 @@ uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames()
return aRet; return aRet;
} }
void * SAL_CALL SwXTextEmbeddedObject::operator new( size_t t) throw() void * SwXTextEmbeddedObject::operator new( size_t t) throw()
{ {
return SwXTextEmbeddedObjectBaseClass::operator new(t); return SwXTextEmbeddedObjectBaseClass::operator new(t);
} }
void SAL_CALL SwXTextEmbeddedObject::operator delete( void * p) throw() void SwXTextEmbeddedObject::operator delete( void * p) throw()
{ {
SwXTextEmbeddedObjectBaseClass::operator delete(p); SwXTextEmbeddedObjectBaseClass::operator delete(p);
} }

View File

@ -3638,12 +3638,12 @@ void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_I
#endif #endif
} }
void * SAL_CALL SwXTextDocument::operator new( size_t t) throw() void * SwXTextDocument::operator new( size_t t) throw()
{ {
return SwXTextDocumentBaseClass::operator new(t); return SwXTextDocumentBaseClass::operator new(t);
} }
void SAL_CALL SwXTextDocument::operator delete( void * p) throw() void SwXTextDocument::operator delete( void * p) throw()
{ {
SwXTextDocumentBaseClass::operator delete(p); SwXTextDocumentBaseClass::operator delete(p);
} }

View File

@ -3706,7 +3706,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
} }
} }
css::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window const * p ) css::awt::Size VCLXScrollBar::implGetMinimumSize( vcl::Window const * p )
{ {
long n = p->GetSettings().GetStyleSettings().GetScrollBarSize(); long n = p->GetSettings().GetStyleSettings().GetScrollBarSize();
return css::awt::Size( n, n ); return css::awt::Size( n, n );

View File

@ -381,7 +381,7 @@ private:
sal_Int32 sal_Int32
impl_getPos( const OUString& rName ) const; impl_getPos( const OUString& rName ) const;
static bool SAL_CALL static bool
impl_isMyPropertyName( const OUString& rName ); impl_isMyPropertyName( const OUString& rName );
public: public:
@ -585,7 +585,7 @@ bool CCRS_PropertySetInfo
} }
//static //static
bool SAL_CALL CCRS_PropertySetInfo bool CCRS_PropertySetInfo
::impl_isMyPropertyName( const OUString& rPropertyName ) ::impl_isMyPropertyName( const OUString& rPropertyName )
{ {
return ( rPropertyName == g_sPropertyNameForCount return ( rPropertyName == g_sPropertyNameForCount

View File

@ -432,21 +432,21 @@ void CachedContentResultSetStub
// XFetchProviderForContentAccess methods. // XFetchProviderForContentAccess methods.
void SAL_CALL CachedContentResultSetStub void CachedContentResultSetStub
::impl_getCurrentContentIdentifierString( Any& rAny ::impl_getCurrentContentIdentifierString( Any& rAny
, const Reference< XContentAccess >& xContentAccess ) , const Reference< XContentAccess >& xContentAccess )
{ {
rAny <<= xContentAccess->queryContentIdentifierString(); rAny <<= xContentAccess->queryContentIdentifierString();
} }
void SAL_CALL CachedContentResultSetStub void CachedContentResultSetStub
::impl_getCurrentContentIdentifier( Any& rAny ::impl_getCurrentContentIdentifier( Any& rAny
, const Reference< XContentAccess >& xContentAccess ) , const Reference< XContentAccess >& xContentAccess )
{ {
rAny <<= xContentAccess->queryContentIdentifier(); rAny <<= xContentAccess->queryContentIdentifier();
} }
void SAL_CALL CachedContentResultSetStub void CachedContentResultSetStub
::impl_getCurrentContent( Any& rAny ::impl_getCurrentContent( Any& rAny
, const Reference< XContentAccess >& xContentAccess ) , const Reference< XContentAccess >& xContentAccess )
{ {

View File

@ -61,19 +61,19 @@ private:
impl_getColumnCount(); impl_getColumnCount();
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static void SAL_CALL static void
impl_getCurrentContentIdentifierString( impl_getCurrentContentIdentifierString(
css::uno::Any& rAny css::uno::Any& rAny
, const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static void SAL_CALL static void
impl_getCurrentContentIdentifier( impl_getCurrentContentIdentifier(
css::uno::Any& rAny css::uno::Any& rAny
, const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static void SAL_CALL static void
impl_getCurrentContent( impl_getCurrentContent(
css::uno::Any& rAny css::uno::Any& rAny
, const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );

View File

@ -2007,7 +2007,7 @@ void TaskManager::insertDefaultProperties( const OUString& aUnqPath )
/******************************************************************************/ /******************************************************************************/
bool SAL_CALL TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq ) bool TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq )
{ {
if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" ) if ( Url == "file:///" || Url == "file://localhost/" || Url == "file://127.0.0.1/" )
{ {
@ -2028,7 +2028,7 @@ bool SAL_CALL TaskManager::getUnqFromUrl( const OUString& Url, OUString& Unq )
} }
bool SAL_CALL TaskManager::getUrlFromUnq( const OUString& Unq,OUString& Url ) bool TaskManager::getUrlFromUnq( const OUString& Unq,OUString& Url )
{ {
bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url ); bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url );
@ -2650,7 +2650,7 @@ TaskManager::getContentDeletedEventListeners( const OUString& aName )
} }
void SAL_CALL void
TaskManager::notifyInsert( std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName ) TaskManager::notifyInsert( std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName )
{ {
std::vector< ContentEventNotifier* >::iterator it = listeners->begin(); std::vector< ContentEventNotifier* >::iterator it = listeners->begin();
@ -2664,7 +2664,7 @@ TaskManager::notifyInsert( std::vector< ContentEventNotifier* >* listeners,const
} }
void SAL_CALL void
TaskManager::notifyContentDeleted( std::vector< ContentEventNotifier* >* listeners ) TaskManager::notifyContentDeleted( std::vector< ContentEventNotifier* >* listeners )
{ {
std::vector< ContentEventNotifier* >::iterator it = listeners->begin(); std::vector< ContentEventNotifier* >::iterator it = listeners->begin();
@ -2678,7 +2678,7 @@ TaskManager::notifyContentDeleted( std::vector< ContentEventNotifier* >* listene
} }
void SAL_CALL void
TaskManager::notifyContentRemoved( std::vector< ContentEventNotifier* >* listeners, TaskManager::notifyContentRemoved( std::vector< ContentEventNotifier* >* listeners,
const OUString& aChildName ) const OUString& aChildName )
{ {
@ -2716,7 +2716,7 @@ TaskManager::getPropertySetListeners( const OUString& aName )
} }
void SAL_CALL void
TaskManager::notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >* listeners, TaskManager::notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName ) const OUString& aPropertyName )
{ {
@ -2731,7 +2731,7 @@ TaskManager::notifyPropertyAdded( std::vector< PropertySetInfoChangeNotifier* >*
} }
void SAL_CALL void
TaskManager::notifyPropertyRemoved( std::vector< PropertySetInfoChangeNotifier* >* listeners, TaskManager::notifyPropertyRemoved( std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName ) const OUString& aPropertyName )
{ {
@ -2844,7 +2844,7 @@ TaskManager::getContentExchangedEventListeners( const OUString& aOldPrefix,
} }
void SAL_CALL void
TaskManager::notifyContentExchanged( std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec ) TaskManager::notifyContentExchanged( std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec )
{ {
for( std::vector< ContentEventNotifier* >* listeners : *listeners_vec) for( std::vector< ContentEventNotifier* >* listeners : *listeners_vec)
@ -2885,7 +2885,7 @@ TaskManager::getPropertyChangeNotifier( const OUString& aName )
} }
void SAL_CALL TaskManager::notifyPropertyChanges( std::vector< PropertyChangeNotifier* >* listeners, void TaskManager::notifyPropertyChanges( std::vector< PropertyChangeNotifier* >* listeners,
const uno::Sequence< beans::PropertyChangeEvent >& seqChanged ) const uno::Sequence< beans::PropertyChangeEvent >& seqChanged )
{ {
std::vector< PropertyChangeNotifier* >::iterator it = listeners->begin(); std::vector< PropertyChangeNotifier* >::iterator it = listeners->begin();
@ -3061,7 +3061,7 @@ uno::Sequence< ucb::ContentInfo > TaskManager::queryCreatableContentsInfo()
/* */ /* */
/*******************************************************************************/ /*******************************************************************************/
void SAL_CALL void
TaskManager::getScheme( OUString& Scheme ) TaskManager::getScheme( OUString& Scheme )
{ {
Scheme = "file"; Scheme = "file";

View File

@ -499,9 +499,9 @@ namespace fileaccess
/* */ /* */
/******************************************************************************/ /******************************************************************************/
static bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq ); static bool getUnqFromUrl( const OUString& Url, OUString& Unq );
static bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url ); static bool getUrlFromUnq( const OUString& Unq, OUString& Url );
bool m_bWithConfig; bool m_bWithConfig;
@ -537,28 +537,28 @@ namespace fileaccess
/* notify eventListeners */ /* notify eventListeners */
/********************************************************************************/ /********************************************************************************/
static void SAL_CALL notifyPropertyChanges( static void notifyPropertyChanges(
std::vector< PropertyChangeNotifier* >* listeners, std::vector< PropertyChangeNotifier* >* listeners,
const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged ); const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged );
static void SAL_CALL notifyContentExchanged( static void notifyContentExchanged(
std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec ); std::vector< std::vector< ContentEventNotifier* >* >* listeners_vec );
static void SAL_CALL notifyInsert( static void notifyInsert(
std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName ); std::vector< ContentEventNotifier* >* listeners,const OUString& aChildName );
static void SAL_CALL notifyContentDeleted( static void notifyContentDeleted(
std::vector< ContentEventNotifier* >* listeners ); std::vector< ContentEventNotifier* >* listeners );
static void SAL_CALL notifyContentRemoved( static void notifyContentRemoved(
std::vector< ContentEventNotifier* >* listeners, std::vector< ContentEventNotifier* >* listeners,
const OUString& aChildName ); const OUString& aChildName );
static void SAL_CALL notifyPropertyAdded( static void notifyPropertyAdded(
std::vector< PropertySetInfoChangeNotifier* >* listeners, std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName ); const OUString& aPropertyName );
static void SAL_CALL notifyPropertyRemoved( static void notifyPropertyRemoved(
std::vector< PropertySetInfoChangeNotifier* >* listeners, std::vector< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName ); const OUString& aPropertyName );
@ -680,7 +680,7 @@ namespace fileaccess
// Miscellaneous: // Miscellaneous:
// Methods for "writeComponentInfo" and "createComponentFactory" // Methods for "writeComponentInfo" and "createComponentFactory"
static void SAL_CALL getScheme( OUString& Scheme ); static void getScheme( OUString& Scheme );
static OUString SAL_CALL getImplementationName_static(); static OUString SAL_CALL getImplementationName_static();

View File

@ -136,7 +136,7 @@ FileProvider::getSupportedServiceNames()
return fileaccess::TaskManager::getSupportedServiceNames_static(); return fileaccess::TaskManager::getSupportedServiceNames_static();
} }
Reference< XSingleServiceFactory > SAL_CALL Reference< XSingleServiceFactory >
FileProvider::createServiceFactory( FileProvider::createServiceFactory(
const Reference< XMultiServiceFactory >& rxServiceMgr ) const Reference< XMultiServiceFactory >& rxServiceMgr )
{ {

View File

@ -73,7 +73,7 @@ namespace fileaccess {
getSupportedServiceNames() override; getSupportedServiceNames() override;
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL static css::uno::Reference< css::lang::XSingleServiceFactory >
createServiceFactory( createServiceFactory(
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ); const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr );

View File

@ -111,7 +111,7 @@ public:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
bool hasByName( const OUString& aName ); bool hasByName( const OUString& aName );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static css::uno::Type SAL_CALL getElementType( ); static css::uno::Type getElementType( );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
bool hasElements() const; bool hasElements() const;
OUString const & GetEventName( GlobalEventId nID ) const; OUString const & GetEventName( GlobalEventId nID ) const;
@ -300,7 +300,7 @@ bool GlobalEventConfig_Impl::hasByName( const OUString& aName )
return pos != m_supportedEvents.end(); return pos != m_supportedEvents.end();
} }
Type SAL_CALL GlobalEventConfig_Impl::getElementType( ) Type GlobalEventConfig_Impl::getElementType( )
{ {
//DF definitely not sure about this?? //DF definitely not sure about this??
return cppu::UnoType<Sequence<beans::PropertyValue>>::get(); return cppu::UnoType<Sequence<beans::PropertyValue>>::get();

View File

@ -73,7 +73,7 @@ class TVFactory: public cppu::WeakImplHelper <
static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL static css::uno::Reference< css::lang::XSingleServiceFactory >
createServiceFactory( createServiceFactory(
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ); const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr );

View File

@ -138,7 +138,7 @@ TVFactory::getSupportedServiceNames_static()
return seq; return seq;
} }
Reference< XSingleServiceFactory > SAL_CALL Reference< XSingleServiceFactory >
TVFactory::createServiceFactory( TVFactory::createServiceFactory(
const Reference< XMultiServiceFactory >& rxServiceMgr ) const Reference< XMultiServiceFactory >& rxServiceMgr )
{ {

View File

@ -39,7 +39,7 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI
Map certMap; Map certMap;
Map certTrustMap; Map certTrustMap;
static bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap ); static bool searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
bool isTemporaryCertificate( const OUString & url, const OUString & certificate_name ); bool isTemporaryCertificate( const OUString & url, const OUString & certificate_name );
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException