[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source framework/inc framework/source i18npool/source i18nutil/source include/framework include/i18nutil xmloff/source
Stephan Bergmann
sbergman at redhat.com
Wed Dec 13 11:47:12 UTC 2017
compilerplugins/clang/salcall.cxx | 160 +++++++++++----
compilerplugins/clang/test/salcall.cxx | 11 -
dbaccess/source/ui/inc/sbamultiplex.hxx | 4
framework/inc/dispatch/mailtodispatcher.hxx | 2
framework/inc/dispatch/oxt_handler.hxx | 2
framework/inc/dispatch/servicehandler.hxx | 2
framework/inc/dispatch/systemexec.hxx | 2
framework/inc/jobs/helponstartup.hxx | 2
framework/inc/jobs/shelljob.hxx | 2
framework/inc/macros/registration.hxx | 2
framework/inc/macros/xserviceinfo.hxx | 4
framework/inc/recording/dispatchrecorder.hxx | 2
framework/inc/recording/dispatchrecordersupplier.hxx | 2
framework/inc/services/mediatypedetectionhelper.hxx | 2
framework/inc/services/uriabbreviation.hxx | 2
framework/inc/tabwin/tabwinfactory.hxx | 2
framework/inc/uielement/fontmenucontroller.hxx | 2
framework/inc/uielement/fontsizemenucontroller.hxx | 2
framework/inc/uielement/footermenucontroller.hxx | 2
framework/inc/uielement/headermenucontroller.hxx | 2
framework/inc/uielement/langselectionmenucontroller.hxx | 2
framework/inc/uielement/macrosmenucontroller.hxx | 2
framework/inc/uielement/newmenucontroller.hxx | 2
framework/inc/uielement/notebookbarmenucontroller.hxx | 2
framework/inc/uielement/toolbarmodemenucontroller.hxx | 2
framework/inc/uielement/toolbarsmenucontroller.hxx | 2
framework/source/inc/dispatch/dispatchdisabler.hxx | 2
i18npool/source/registerservices/registerservices.cxx | 4
i18nutil/source/utility/unicode.cxx | 2
include/framework/dispatchhelper.hxx | 4
include/i18nutil/unicode.hxx | 6
xmloff/source/draw/sdxmlexp.cxx | 6
xmloff/source/draw/sdxmlimp.cxx | 6
xmloff/source/transform/OOo2Oasis.cxx | 6
xmloff/source/transform/XMLFilterRegistration.hxx | 162 ++++++++--------
35 files changed, 250 insertions(+), 171 deletions(-)
New commits:
commit a987aa3be73ec29917567d16886c017ac9a0a3d8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 13 08:46:01 2017 +0100
Make loplugin:salcall look into macros too
"Indirect" calls to isSallCallFunction (for canonic and overridden
FunctionDecls) already needed to handle many cases of FunctionDecls spanning
macros, so it isn't that much more work to make that also work for cases called
directly from VisitFunctionDecl.
Change-Id: I529f148c8872b86aa1ef082c6cb73db8ab1866e7
Reviewed-on: https://gerrit.libreoffice.org/46367
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx
index 16657e848d5a..61fb4e1a5f0b 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -173,11 +173,6 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
compiler.getSourceManager().getSpellingLoc(canonicalDecl->getLocation())))
return true;
- // macros make getCharacterData() extremely unreliable
- if (compiler.getSourceManager().isMacroArgExpansion(decl->getLocation())
- || compiler.getSourceManager().isMacroBodyExpansion(decl->getLocation()))
- return true;
-
SourceLocation rewriteLoc;
SourceLocation rewriteCanonicalLoc;
bool bDeclIsSalCall = isSalCallFunction(decl, &rewriteLoc);
@@ -398,9 +393,8 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
while (SM.isMacroArgExpansion(endLoc, &endLoc))
{
}
- while (endLoc.isMacroID() && SM.isAtStartOfImmediateMacroExpansion(endLoc))
+ while (endLoc.isMacroID() && SM.isAtStartOfImmediateMacroExpansion(endLoc, &endLoc))
{
- endLoc = SM.getImmediateMacroCallerLoc(endLoc);
}
endLoc = SM.getSpellingLoc(endLoc);
@@ -442,13 +436,21 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
// that parameter in the remainder of the replacement text will be false positives.
assert(SM.isMacroBodyExpansion(startLoc));
auto const startLoc2 = SM.getImmediateExpansionRange(startLoc).second;
- auto const MI
- = compiler.getPreprocessor()
- .getMacroDefinitionAtLoc(
- &compiler.getASTContext().Idents.get(
- Lexer::getImmediateMacroName(startLoc, SM, compiler.getLangOpts())),
- SM.getSpellingLoc(startLoc))
- .getMacroInfo();
+ auto name = Lexer::getImmediateMacroName(startLoc, SM, compiler.getLangOpts());
+ while (name.startswith("\\\n"))
+ {
+ name = name.drop_front(2);
+ while (!name.empty()
+ && (name.front() == ' ' || name.front() == '\t' || name.front() == '\n'
+ || name.front() == '\v' || name.front() == '\f'))
+ {
+ name = name.drop_front(1);
+ }
+ }
+ auto const MI = compiler.getPreprocessor()
+ .getMacroDefinitionAtLoc(&compiler.getASTContext().Idents.get(name),
+ SM.getSpellingLoc(startLoc))
+ .getMacroInfo();
assert(MI != nullptr);
auto endLoc1 = MI->getDefinitionEndLoc();
assert(endLoc1.isFileID());
@@ -465,15 +467,61 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
}
if (!startAfterReturnType)
{
+ // Stop searching for "SAL_CALL" at the start of the function declaration's name (for
+ // qualified names this will point after the qualifiers, but needlessly including those in
+ // the search should be harmless):
+ endLoc = functionDecl->getNameInfo().getLocStart();
+ while (endLoc.isMacroID() && SM.isAtStartOfImmediateMacroExpansion(endLoc, &endLoc))
+ {
+ }
+
+ SourceRange macroRange;
+ if (SM.isMacroBodyExpansion(endLoc))
+ {
+ auto name = Lexer::getImmediateMacroName(endLoc, SM, compiler.getLangOpts());
+ while (name.startswith("\\\n"))
+ {
+ name = name.drop_front(2);
+ while (!name.empty()
+ && (name.front() == ' ' || name.front() == '\t' || name.front() == '\n'
+ || name.front() == '\v' || name.front() == '\f'))
+ {
+ name = name.drop_front(1);
+ }
+ }
+ auto const MI = compiler.getPreprocessor()
+ .getMacroDefinitionAtLoc(&compiler.getASTContext().Idents.get(name),
+ SM.getSpellingLoc(endLoc))
+ .getMacroInfo();
+ assert(MI != nullptr);
+ macroRange = SourceRange(MI->getDefinitionLoc(), MI->getDefinitionEndLoc());
+ if (isDebugMode() && macroRange.isInvalid())
+ {
+ report(DiagnosticsEngine::Fatal, "TODO: unexpected failure #4, needs investigation",
+ functionDecl->getLocation())
+ << functionDecl->getSourceRange();
+ }
+ }
+
+ endLoc = SM.getSpellingLoc(endLoc);
+
// Ctors/dtors/conversion functions don't have a return type, start searching for "SAL_CALL"
// at the start of the function declaration:
startLoc = functionDecl->getSourceRange().getBegin();
- while (startLoc.isMacroID() && SM.isAtStartOfImmediateMacroExpansion(startLoc))
+ while (startLoc.isMacroID()
+ && !(macroRange.isValid()
+ && compat::isPointWithin(SM, SM.getSpellingLoc(startLoc), macroRange.getBegin(),
+ macroRange.getEnd()))
+ && SM.isAtStartOfImmediateMacroExpansion(startLoc, &startLoc))
{
- startLoc = SM.getImmediateMacroCallerLoc(startLoc);
}
+#if !defined _WIN32
+ auto const macroStartLoc = startLoc;
+#endif
startLoc = SM.getSpellingLoc(startLoc);
+
#if !defined _WIN32
+ startLoc = SM.getSpellingLoc(startLoc);
// When the SAL_CALL macro expands to nothing, it may even precede the function
// declaration's source range, so go back one token (unless the declaration is known to
// start with a token that must precede a possible "SAL_CALL", like "virtual" or
@@ -487,40 +535,64 @@ bool SalCall::isSalCallFunction(FunctionDecl const* functionDecl, SourceLocation
|| (isa<CXXConversionDecl>(functionDecl)
&& cast<CXXConversionDecl>(functionDecl)->isExplicitSpecified())))
{
- for (;;)
+ SourceLocation endLoc1;
+ if (macroStartLoc.isMacroID()
+ && SM.isAtStartOfImmediateMacroExpansion(macroStartLoc, &endLoc1))
{
- startLoc = Lexer::GetBeginningOfToken(startLoc.getLocWithOffset(-1), SM,
- compiler.getLangOpts());
- auto const s
- = StringRef(SM.getCharacterData(startLoc),
- Lexer::MeasureTokenLength(startLoc, SM, compiler.getLangOpts()));
- // When looking backward at least through a function-like macro replacement like
- //
- // | foo\ |
- // | barbaz##X |
- //
- // starting at "barbaz" in the second line, the next token reported will start at "\"
- // in the first line and include the intervening spaces and (part of? looks like an
- // error in Clang) "barbaz", so just skip any tokens starting with backslash-newline
- // when looking backwards here, without even trying to look at their content:
- if (!(s.empty() || s.startswith("/*") || s.startswith("//")
- || s.startswith("\\\n")))
+ // startLoc is at the start of a macro body; two source ranges, first one is looking
+ // backwards one token from the call site of the macro:
+ auto startLoc1 = endLoc1;
+ for (;;)
{
- break;
+ startLoc1 = Lexer::GetBeginningOfToken(startLoc1.getLocWithOffset(-1), SM,
+ compiler.getLangOpts());
+ auto const s = StringRef(
+ SM.getCharacterData(startLoc1),
+ Lexer::MeasureTokenLength(startLoc1, SM, compiler.getLangOpts()));
+ // When looking backward at least through a function-like macro replacement like
+ //
+ // | foo\ |
+ // | barbaz##X |
+ //
+ // starting at "barbaz" in the second line, the next token reported will start at "\"
+ // in the first line and include the intervening spaces and (part of? looks like an
+ // error in Clang) "barbaz", so just skip any tokens starting with backslash-newline
+ // when looking backwards here, without even trying to look at their content:
+ if (!(s.empty() || s.startswith("/*") || s.startswith("//")
+ || s.startswith("\\\n")))
+ {
+ break;
+ }
+ }
+ ranges.emplace_back(startLoc1, endLoc1);
+ }
+ else
+ {
+ for (;;)
+ {
+ startLoc = Lexer::GetBeginningOfToken(startLoc.getLocWithOffset(-1), SM,
+ compiler.getLangOpts());
+ auto const s = StringRef(
+ SM.getCharacterData(startLoc),
+ Lexer::MeasureTokenLength(startLoc, SM, compiler.getLangOpts()));
+ // When looking backward at least through a function-like macro replacement like
+ //
+ // | foo\ |
+ // | barbaz##X |
+ //
+ // starting at "barbaz" in the second line, the next token reported will start at "\"
+ // in the first line and include the intervening spaces and (part of? looks like an
+ // error in Clang) "barbaz", so just skip any tokens starting with backslash-newline
+ // when looking backwards here, without even trying to look at their content:
+ if (!(s.empty() || s.startswith("/*") || s.startswith("//")
+ || s.startswith("\\\n")))
+ {
+ break;
+ }
}
}
}
#endif
-
- // Stop searching for "SAL_CALL" at the start of the function declaration's name (for
- // qualified names this will point after the qualifiers, but needlessly including those in
- // the search should be harmless):
- endLoc = functionDecl->getNameInfo().getLocStart();
- while (endLoc.isMacroID() && SM.isAtStartOfImmediateMacroExpansion(endLoc))
- {
- endLoc = SM.getImmediateMacroCallerLoc(endLoc);
- }
- endLoc = SM.getSpellingLoc(endLoc);
}
ranges.emplace_back(startLoc, endLoc);
diff --git a/compilerplugins/clang/test/salcall.cxx b/compilerplugins/clang/test/salcall.cxx
index 99995a30fb0f..e424432c4036 100644
--- a/compilerplugins/clang/test/salcall.cxx
+++ b/compilerplugins/clang/test/salcall.cxx
@@ -117,13 +117,20 @@ class Class8_3 : public Class8_1, public Class8_2
virtual ~Class8_3();
};
-#define M1(m) void m
+#define M1(m) VOID m
class Class9
{
+ Class9(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
M1(method1)(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
void method2(); // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}}
};
-void SAL_CALL Class9::method1() {} // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
+#define MC(num) \
+ Class##num::Class##num() {}
+SAL_CALL MC(9) // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
+ ; // to appease clang-format
+void SAL_CALL Class9::method1() // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
+{
+}
#define M2(T) T SAL_CALL
M2(void) Class9::method2() {} // expected-error {{SAL_CALL inconsistency [loplugin:salcall]}}
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index ddc5297554ae..75fffbff1718 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -85,8 +85,8 @@ namespace dbaui
#define END_DECLARE_LISTENER_MULTIPLEXER() \
/* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators */ \
- void * SAL_CALL operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \
- void SAL_CALL operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \
+ void * operator new( size_t size ) throw() { return OSbaWeakSubObject::operator new(size); } \
+ void operator delete( void * p ) throw() { OSbaWeakSubObject::operator delete(p); } \
}; \
// implementation of a listener multiplexer class
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index afcea61455b9..2e15607cf70b 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -69,7 +69,7 @@ class MailToDispatcher : 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 );
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index ccdc70d29366..71ff88902eb6 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -64,7 +64,7 @@ class Oxt_Handler : 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 );
// XNotifyingDispatch
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index c8fd1ec24de6..14eb8fd9bccb 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -73,7 +73,7 @@ class ServiceHandler : 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 );
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 8d373ac8094a..d90fbecec3ad 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -71,7 +71,7 @@ class SystemExec : 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 );
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index b260f4365619..4550f962e2e7 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -94,7 +94,7 @@ class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css
/* 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 );
// css.task.XJob
virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) override;
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 921ce93fd3f9..4ff90039cac9 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -77,7 +77,7 @@ class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::tas
/* 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 );
// css.task.XJob
virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) override;
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index d65d8d12e305..a413e8a2964e 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -52,7 +52,7 @@ ________________________________________________________________________________
// define method to instantiate new services
#define COMPONENTGETFACTORY( LIB, IFFACTORIES ) \
- extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL LIB##_component_getFactory( const sal_Char* pImplementationName, \
+ extern "C" SAL_DLLPUBLIC_EXPORT void* LIB##_component_getFactory( const sal_Char* pImplementationName, \
void* pServiceManager , \
void* /*pRegistryKey*/ ) \
{ \
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 8127651fabc0..dd159460dcab 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -147,7 +147,7 @@ namespace framework{
static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \
static OUString SAL_CALL impl_getStaticImplementationName ( ); \
/* Helper for initialization of service by using own reference! */ \
- void SAL_CALL impl_initService ( ); \
+ void impl_initService ( ); \
#define DEFINE_XSERVICEINFO_MULTISERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \
PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \
@@ -176,7 +176,7 @@ namespace framework{
// }
// )
#define DEFINE_INIT_SERVICE( CLASS, FUNCTIONBODY ) \
- void SAL_CALL CLASS::impl_initService() \
+ void CLASS::impl_initService() \
{ \
FUNCTIONBODY \
}
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 79166fb8c87f..361c3f868b5f 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -64,7 +64,7 @@ class DispatchRecorder
/* 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 );
// XDispatchRecorder
virtual void SAL_CALL startRecording ( const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index 1c7653e6375f..685d91770a0d 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -68,7 +68,7 @@ class DispatchRecorderSupplier : 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 );
// XDispatchRecorderSupplier
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index d558abd65826..6265071ae285 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -71,7 +71,7 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper< css::util::XS
/* 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 );
// XStringMapping
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 36961cbdee86..f0f881435095 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -41,7 +41,7 @@ public:
/* 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 );
// css::util::XStringAbbreviation:
virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) override;
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 66772209c33c..6680e3dd3e42 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -48,7 +48,7 @@ class TabWinFactory : public ::cppu::WeakImplHelper< css::lang::XSingleComponen
/* 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 );
// XSingleComponentFactory
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index bbea2d450e42..b01246101c01 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -49,7 +49,7 @@ namespace framework
/* 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 );
// XPopupMenuController
virtual void SAL_CALL updatePopupMenu() override;
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 2bf35223ca84..c3654f5c465d 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -53,7 +53,7 @@ namespace framework
/* 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 );
// XPopupMenuController
virtual void SAL_CALL updatePopupMenu() override;
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index cd952bb056c6..1609ca557c5d 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -40,7 +40,7 @@ namespace framework
/* 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 );
};
}
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index ae3e85e86ccf..1b7cf4b72aa7 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -49,7 +49,7 @@ namespace framework
/* 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 );
// XPopupMenuController
virtual void SAL_CALL updatePopupMenu() override;
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 76e73c1ffbc1..4f2d9b4c9644 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -51,7 +51,7 @@ namespace framework
/* 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 );
// XPopupMenuController
virtual void SAL_CALL updatePopupMenu() override;
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index ea9a74fe5572..616470ae2811 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -50,7 +50,7 @@ namespace framework
/* 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 );
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 43b0b6910bf7..58a001ed7c11 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -54,7 +54,7 @@ namespace framework
/* 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 >& aArguments ) override;
diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx
index 6d0f2b7c0a1b..d06b84f766b8 100644
--- a/framework/inc/uielement/notebookbarmenucontroller.hxx
+++ b/framework/inc/uielement/notebookbarmenucontroller.hxx
@@ -51,7 +51,7 @@ namespace framework
/* 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 );
// XPopupMenuController
virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index a6d13f13eea6..c341781c4d31 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -51,7 +51,7 @@ namespace framework
/* 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 );
// XPopupMenuController
virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 1745c7796259..6328ed60c0c1 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -55,7 +55,7 @@ namespace framework
/* 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 );
// XPopupMenuController
virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;
diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx
index cbc7dffaf13c..9ae44931b289 100644
--- a/framework/source/inc/dispatch/dispatchdisabler.hxx
+++ b/framework/source/inc/dispatch/dispatchdisabler.hxx
@@ -92,7 +92,7 @@ public:
/* 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 );
};
} // namespace framework
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index fe731e736331..0a3fa328d9aa 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -65,7 +65,7 @@ using namespace i18npool;
#define IMPL_CREATEINSTANCE( ImplName ) \
uno::Reference< uno::XInterface > \
- SAL_CALL ImplName##_CreateInstance( \
+ ImplName##_CreateInstance( \
SAL_UNUSED_PARAMETER const uno::Reference< \
lang::XMultiServiceFactory >& ) \
{ \
@@ -76,7 +76,7 @@ using namespace i18npool;
#define IMPL_CREATEINSTANCE_CTX( ImplName ) \
uno::Reference< uno::XInterface > \
- SAL_CALL ImplName##_CreateInstance( \
+ ImplName##_CreateInstance( \
const uno::Reference< \
lang::XMultiServiceFactory >& rxMSF ) \
{ \
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 1ece83ed8f64..96c0194a9149 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -114,7 +114,7 @@ unicode::getUnicodeDirection( const sal_Unicode ch ) {
bit(UnicodeType::PARAGRAPH_SEPARATOR)
#define IsType(func, mask) \
-bool SAL_CALL func( const sal_Unicode ch) {\
+bool func( const sal_Unicode ch) {\
return (bit(getUnicodeType(ch)) & (mask)) != 0;\
}
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index 283cf2d34dc8..7805a83d89aa 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -80,12 +80,12 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( );
static OUString SAL_CALL impl_getStaticImplementationName ( );
// Helper for initialization of service by using own reference!
- void SAL_CALL impl_initService ( );
+ void impl_initService ( );
// 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 );
// XDispatchHelper
diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index 6175e19fffd9..b3563e529a38 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -42,9 +42,9 @@ public:
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 isControl( const sal_Unicode ch);
+ static bool isAlpha( const sal_Unicode ch);
+ static bool isSpace( const sal_Unicode ch);
static bool isWhiteSpace( const sal_Unicode ch);
//Map an ISO 15924 script code to Latin/Asian/Complex/Weak
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 53a8727fc87a..931667c57f1b 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2684,15 +2684,15 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
}
#define SERVICE( classname, servicename, implementationname, draw, flags )\
-uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
+uno::Sequence< OUString > classname##_getSupportedServiceNames() throw()\
{\
return uno::Sequence< OUString > { servicename };\
}\
-OUString SAL_CALL classname##_getImplementationName() throw()\
+OUString classname##_getImplementationName() throw()\
{\
return OUString( implementationname );\
}\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
+uno::Reference< uno::XInterface > classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
{\
return static_cast<cppu::OWeakObject*>(new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
}
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index ed2848036239..3d5e91ea814e 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -235,15 +235,15 @@ SvXMLImportContextRef SdXMLFlatDocContext_Impl::CreateChildContext(
}
#define SERVICE(classname,servicename,implementationname,draw,flags)\
-uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
+uno::Sequence< OUString > classname##_getSupportedServiceNames() throw()\
{\
return uno::Sequence< OUString > { servicename };\
}\
-OUString SAL_CALL classname##_getImplementationName() throw()\
+OUString classname##_getImplementationName() throw()\
{\
return OUString( implementationname );\
}\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
+uno::Reference< uno::XInterface > classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
{\
return static_cast<cppu::OWeakObject*>(new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
}
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 6756fb50199d..7548ccbe5974 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -2004,19 +2004,19 @@ Reference< XInterface > OOo2OasisTransformer_createInstance(
}
#define OOO_IMPORTER( className, implName, subServiceName ) \
-OUString SAL_CALL className##_getImplementationName() throw() \
+OUString className##_getImplementationName() throw() \
{ \
return OUString( implName ); \
} \
\
-Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw()\
+Sequence< OUString > className##_getSupportedServiceNames() throw()\
{ \
const OUString aServiceName( className##_getImplementationName() ); \
const Sequence< OUString > aSeq( &aServiceName, 1 ); \
return aSeq; \
} \
\
-Reference< XInterface > SAL_CALL className##_createInstance( \
+Reference< XInterface > className##_createInstance( \
const Reference< XMultiServiceFactory > & ) \
{ \
return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer( implName, \
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
index 767bcfae4a7b..2baee48de757 100644
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -34,166 +34,166 @@ css::uno::Sequence< OUString > Oasis2OOoTransformer_getSupportedServiceNames() t
css::uno::Reference< css::uno::XInterface > Oasis2OOoTransformer_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
+OUString XMLAutoTextEventImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLAutoTextEventImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLAutoTextEventImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLMathSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLMathSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLMathSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLMathSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLMathSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLMathMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLMathMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLMathMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLMathMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLMathMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLCalcImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLCalcImportOOO_getSupportedServiceNames() throw();
+OUString XMLCalcImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLCalcImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLCalcImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLWriterImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLWriterImportOOO_getSupportedServiceNames() throw();
+OUString XMLWriterImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLWriterImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLWriterImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLChartContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLChartContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLChartContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLChartContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLChartContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLChartStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLChartStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLChartStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLChartStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLChartStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLChartImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLChartImportOOO_getSupportedServiceNames() throw();
+OUString XMLChartImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLChartImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLChartImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLDrawImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLDrawImportOOO_getSupportedServiceNames() throw();
+OUString XMLDrawImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLDrawImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLDrawImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressSettingsImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressSettingsImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressSettingsImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressSettingsImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressSettingsImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressMetaImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressMetaImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressMetaImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressMetaImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressMetaImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressContentImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressContentImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressContentImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressContentImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressContentImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressStylesImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressStylesImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressStylesImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressStylesImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressStylesImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
-OUString SAL_CALL XMLImpressImportOOO_getImplementationName() throw();
-css::uno::Sequence< OUString > SAL_CALL XMLImpressImportOOO_getSupportedServiceNames() throw();
+OUString XMLImpressImportOOO_getImplementationName() throw();
+css::uno::Sequence< OUString > XMLImpressImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressImportOOO_createInstance(
+css::uno::Reference< css::uno::XInterface > XMLImpressImportOOO_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
#endif
More information about the Libreoffice-commits
mailing list