Kaydet (Commit) dd0dceb5 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:salcall handle static methods

Change-Id: Id6820abec4b8ca8bee26d62b333fd30b42a14aec
Reviewed-on: https://gerrit.libreoffice.org/46007Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst caf1eb15
......@@ -42,6 +42,9 @@ public:
// ignore this one. I can't get accurate source code from getCharacterData() for it.
if (fn == SRCDIR "/sal/rtl/string.cxx")
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;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
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.
// 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!
if (!methodDecl || methodDecl->isStatic())
if (!methodDecl)
return true;
// 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;
}
// if any of the overridden methods are SAL_CALL, we should be too
if (methodDecl)
{
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);
if (bOK && canonicalDecl != decl)
{
......
......@@ -101,13 +101,13 @@ namespace connectivity
m_ColumnLabel = _aColumnName;
}
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* )
static void operator delete( void *,void* )
{ }
bool isAutoIncrement() const { return m_AutoIncrement; }
......
......@@ -43,13 +43,13 @@ namespace connectivity
,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 ); }
static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * 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; }
......
......@@ -34,13 +34,13 @@ namespace connectivity
~OKeyValue();
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* )
static void operator delete( void *,void* )
{ }
static OKeyValue* createKeyValue(sal_Int32 nVal);
......
......@@ -41,13 +41,13 @@ namespace connectivity
OSkipDeletedSet(IResultSetHelper* _pHelper);
~OSkipDeletedSet();
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* )
static void operator delete( void *,void* )
{ }
/**
......
......@@ -63,13 +63,13 @@ namespace connectivity
~OSortIndex();
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* )
static void operator delete( void *,void* )
{ }
......
......@@ -45,13 +45,13 @@ namespace connectivity
public:
OSQLAnalyzer(OConnection* _pConnection);
~OSQLAnalyzer();
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * 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; }
......
......@@ -53,13 +53,13 @@ namespace connectivity
OCode& operator=(const 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 ); }
static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
static void * operator new( size_t /*nSize*/,void* _pHint )
{ return _pHint; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
};
......
......@@ -48,13 +48,13 @@ namespace connectivity
virtual ~OPredicateCompiler() override;
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
static void operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
void dispose();
......
......@@ -89,7 +89,7 @@ private:
struct Base1: public css::uno::XInterface {
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(); }
};
struct Base2: public Base1 {
......
......@@ -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 );
}
......
......@@ -60,7 +60,7 @@ private:
OUString quotedPValue( );
OUString nonquotedPValue( );
void comment();
static bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange );
static bool isInRange( const OUString& aChr, const OUString& aRange );
private:
::osl::Mutex m_aMutex;
......
......@@ -77,7 +77,7 @@ namespace XSLT
xsltTransformContextPtr m_tcontext;
virtual void execute() override;
static void SAL_CALL registerExtensionModule();
static void registerExtensionModule();
};
/*
......
......@@ -97,8 +97,8 @@ public:
virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) override;
// 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 SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
void * operator new( size_t size ) throw() { return osl::Thread::operator new(size); }
void operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
private:
void impl_clearEventQueue();
......
......@@ -311,7 +311,7 @@ css::uno::Sequence<sal_Int8> Binding::getUnoTunnelID()
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 );
return xTunnel.is()
......
......@@ -258,7 +258,7 @@ public:
// the ID for XUnoTunnel calls
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:
......
......@@ -80,7 +80,7 @@ class PopupMenuDispatcher final : public ::cppu::WeakImplHelper<
/* Helper for registry */
/// @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::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
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;
......
......@@ -105,7 +105,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 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:
css::i18n::Boundary result; // for word break iterator
......
......@@ -176,7 +176,7 @@ private:
bool setupInternational( const css::lang::Locale& rLocale );
/// 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);
};
......
......@@ -70,7 +70,7 @@ private:
/// @throws css::uno::RuntimeException
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);
};
}
......
......@@ -53,7 +53,7 @@ public:
transliterateChar2Char( sal_Unicode inChar) override;
/// @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 );
struct Mapping {
......
......@@ -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) {
using namespace ::com::sun::star::i18n::KCharacterType;
......
......@@ -88,7 +88,7 @@ static ScriptTypeList typeList[] = {
{ UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, (sal_Int16)UnicodeScript_kScriptCount } // 88
};
sal_Char* SAL_CALL
sal_Char*
InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar)
{
css::i18n::UnicodeScript type = (css::i18n::UnicodeScript)unicode::getUnicodeScriptType( cChar, typeList, (sal_Int16)UnicodeScript_kScriptCount );
......
......@@ -88,7 +88,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos
return folding( inStr, startPos, nCount, offset);
}
Sequence< OUString > SAL_CALL
Sequence< OUString >
transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2,
XTransliteration& t1, XTransliteration& t2 )
{
......
......@@ -50,22 +50,22 @@ T getScriptType( const sal_Unicode ch, const L* typeList, T unknownType ) {
typeList[i].value : unknownType;
}
sal_Int16 SAL_CALL
sal_Int16
unicode::getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList* typeList, sal_Int16 unknownType ) {
return getScriptType(ch, typeList, unknownType);
}
sal_Unicode SAL_CALL
sal_Unicode
unicode::getUnicodeScriptStart( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeFrom];
}
sal_Unicode SAL_CALL
sal_Unicode
unicode::getUnicodeScriptEnd( UnicodeScript type) {
return UnicodeScriptType[(int)type][UnicodeScriptTypeTo];
}
sal_Int16 SAL_CALL
sal_Int16
unicode::getUnicodeType( const sal_Unicode ch ) {
static sal_Unicode c = 0x00;
static sal_Int16 r = 0x00;
......@@ -78,7 +78,7 @@ unicode::getUnicodeType( const sal_Unicode ch ) {
UnicodeTypeValue[((address - UnicodeTypeNumberBlock) << 8) + (ch & 0xff)]);
}
sal_uInt8 SAL_CALL
sal_uInt8
unicode::getUnicodeDirection( const sal_Unicode ch ) {
static sal_Unicode c = 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)|\
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)));
}
sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
sal_Int16 unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
{
//See unicode/uscript.h
static const sal_Int16 scriptTypes[] =
......@@ -186,7 +186,7 @@ sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
return nRet;
}
OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
{
OString sRet;
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
//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)
{
// get a currency formatter for this locale ID
......
......@@ -126,13 +126,13 @@ class COMPHELPER_DLLPUBLIC OInterfaceContainerHelper2
{
public:
// 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 ); }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void * SAL_CALL operator new( size_t, void * pMem )
static void * operator new( size_t, void * pMem )
{ return pMem; }
static void SAL_CALL operator delete( void *, void * )
static void operator delete( void *, void * )
{}
/**
......
......@@ -278,13 +278,13 @@ namespace connectivity
free();
}
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* )
static void operator delete( void *,void* )
{ }
ORowSetValue& operator=(const ORowSetValue& _rRH);
......
......@@ -158,13 +158,13 @@ namespace connectivity
const OSQLParser& _rParser );
~OSQLParseTreeIterator();
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* )
static void operator delete( void *,void* )
{ }
void dispose();
......
......@@ -44,13 +44,13 @@ namespace connectivity
OSQLScanner();
virtual ~OSQLScanner();
static void * SAL_CALL operator new( size_t nSize )
static void * operator new( size_t 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; }
static void SAL_CALL operator delete( void * pMem )
static void operator delete( void * pMem )
{ ::rtl_freeMemory( pMem ); }
static void SAL_CALL operator delete( void *,void* )
static void operator delete( void *,void* )
{ }
sal_Int32 SQLyygetc();
......
......@@ -37,25 +37,25 @@ class I18NUTIL_DLLPUBLIC unicode
{
public:
static sal_Int16 SAL_CALL getUnicodeType( const sal_Unicode ch );
static sal_Int16 SAL_CALL 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 SAL_CALL getUnicodeScriptEnd(css::i18n::UnicodeScript type);
static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch );
static sal_Int16 getUnicodeType( const sal_Unicode ch );
static sal_Int16 getUnicodeScriptType( const sal_Unicode ch, const ScriptTypeList *typeList, sal_Int16 unknownType = 0 );
static sal_Unicode getUnicodeScriptStart(css::i18n::UnicodeScript type);
static sal_Unicode getUnicodeScriptEnd(css::i18n::UnicodeScript type);
static sal_uInt8 getUnicodeDirection( 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 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
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
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
//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);
};
......
......@@ -40,7 +40,7 @@ namespace oox { namespace ppt {
public:
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:
TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw();
......
......@@ -206,7 +206,7 @@ public:
void DirectoryChanged();
virtual void ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
void DialogSizeChanged();
static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
static OUString HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
// XDialogClosedListener methods
void DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent );
......
......@@ -83,8 +83,8 @@ public:
virtual void SAL_CALL modified(const css::lang::EventObject& Source) override;
// 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 SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
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;
// 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 SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
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;
// 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 SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
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;
// 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 SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
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;
// 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 SAL_CALL operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
void * operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
void operator delete( void * p ) throw() { OWeakSubObject::operator delete(p); }
};
......
......@@ -41,7 +41,7 @@ public:
/// @throws css::uno::Exception
/// @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
static css::uno::Sequence< OUString >
concatServiceNames( css::uno::Sequence< OUString >& rServices1,
......
......@@ -216,8 +216,8 @@ public:
sal_uInt32 getShapeKind() const;
// styles need this
static bool SAL_CALL 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, SdrModel const * pModel );
static bool SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet );
/** same as SetFillAttribute but for property names instead of which ids,
and the property found is returned instead of set at the object
......
......@@ -670,7 +670,7 @@ public:
// css::awt::XLayoutConstrains
css::awt::Size SAL_CALL getMinimumSize() override;
/// @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 );
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
......
......@@ -683,21 +683,21 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
return nullptr;
}
OUString SAL_CALL Hyphenator::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
OUString Hyphenator::makeLowerCase(const OUString& aTerm, CharClass const * pCC)
{
if (pCC)
return pCC->lowercase(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)
return pCC->uppercase(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();
if