summaryrefslogtreecommitdiff
path: root/fpicker/source/win32
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-12-15 10:21:55 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-12-15 14:46:51 +0100
commitc3250baa4a8029817f0d7fcaee8b9ffe169c6cb7 (patch)
treecfdd547dfe4e3c9ae5bf22123a4f1d99ea84d94b /fpicker/source/win32
parent65ee299a0c0e9044d809e58c3c5e75d05ad76f0e (diff)
loplugin:salcall (clang-cl)
Change-Id: Idda630320bb5e02e1ea675b3b3786c9ec6ac166b Reviewed-on: https://gerrit.libreoffice.org/46504 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'fpicker/source/win32')
-rw-r--r--fpicker/source/win32/filepicker/FPentry.cxx6
-rw-r--r--fpicker/source/win32/filepicker/FilterContainer.cxx2
-rw-r--r--fpicker/source/win32/filepicker/FilterContainer.hxx2
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePicker.cxx2
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.cxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index f5ce7ba45e12..311186fd355a 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::registry;
using namespace ::cppu;
using ::com::sun::star::ui::dialogs::XFilePicker2;
-static Reference< XInterface > SAL_CALL createInstance(
+static Reference< XInterface > createInstance(
const Reference< XMultiServiceFactory >& rServiceManager )
{
Reference< XInterface > xDlg;
@@ -50,7 +50,7 @@ static Reference< XInterface > SAL_CALL createInstance(
return xDlg;
}
-static Reference< XInterface > SAL_CALL
+static Reference< XInterface >
createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager )
{
return Reference< XInterface >( static_cast< cppu::OWeakObject * >( new CFolderPicker( rServiceManager ) ) );
@@ -59,7 +59,7 @@ createInstance_fop( const Reference< XMultiServiceFactory >& rServiceManager )
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* fps_win32_component_getFactory(
const sal_Char* pImplName, void* pSrvManager, void* )
{
void* pRet = nullptr;
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index 07b9a9cea3ef..9545251d073f 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -235,7 +235,7 @@ void wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength
// format the Win32 API requires,
// e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
-OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )
+OUString makeWinFilterBuffer( CFilterContainer& aFilterContainer )
{
// calculate the required buffer size
sal_uInt32 reqBuffSize = getTotalFilterLength( aFilterContainer );
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 450072fecf88..ffbe327f6463 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -102,7 +102,7 @@ private:
// the Win32 API requires, e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
-OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer );
+OUString makeWinFilterBuffer( CFilterContainer& aFilterContainer );
#endif
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 15aa1474ff5d..4584a1edd3b4 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -54,7 +54,7 @@ namespace vista{
namespace
{
- css::uno::Sequence< OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
+ css::uno::Sequence< OUString > VistaFilePicker_getSupportedServiceNames()
{
css::uno::Sequence< OUString > aRet(2);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index c3b7b391f89a..ef74d8f182a7 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -39,7 +39,7 @@ using namespace com::sun::star::ui::dialogs;
namespace
{
- Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames()
+ Sequence< OUString > FolderPicker_getSupportedServiceNames()
{
Sequence< OUString > aRet { "com.sun.star.ui.dialogs.SystemFolderPicker" };
return aRet;