basic/source/classes/propacc.cxx | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
New commits:
commit 9097611359d37003c9ac5b253dd592fed17e0aae
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Oct 12 09:45:17 2013 +0300
We already have SAL_CALL that means __cdecl on Windows
Not that there should be any need to use it here; it is the default anyway.
Also the extern "C" is bogus here as far as I know; that affects only the
external name of the function, and that a function is passed to bsearch()
doesn't set any requirements on the external name of it. It could be a
static
function with no global symbol name. But oh well.
Change-Id: Ia264bf2f952fd6f38aa36a25a084383d4d3f1bdc
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 81fd946..2ea51d4 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -33,13 +33,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace cppu;
-#ifdef WNT
-#define CDECL _cdecl
-#endif
-#if defined(UNX)
-#define CDECL
-#endif
-
struct SbCompare_UString_PropertyValue_Impl
{
bool operator() (const OUString& lhs, PropertyValue const & rhs)
@@ -58,7 +51,7 @@ struct SbCompare_UString_PropertyValue_Impl
#endif
};
-extern "C" int CDECL SbCompare_UString_Property_Impl( const void *arg1, const
void *arg2 )
+extern "C" int SAL_CALL SbCompare_UString_Property_Impl( const void *arg1,
const void *arg2 )
{
const OUString *pArg1 = (OUString*) arg1;
const Property *pArg2 = (Property*) arg2;
commit 7329fbd9c48a264bf917f43db3f50d3ab031ae64
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Oct 12 09:42:24 2013 +0300
Bin two unused functions
Change-Id: I8362bfa0152f84a425ea3d461653d45c07816b92
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 48e56c2..81fd946 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -40,11 +40,6 @@ using namespace cppu;
#define CDECL
#endif
-int CDECL SbCompare_PropertyValues_Impl( const void *arg1, const void *arg2 )
-{
- return ((PropertyValue*)arg1)->Name.compareTo( ((PropertyValue*)arg2)->Name
);
-}
-
struct SbCompare_UString_PropertyValue_Impl
{
bool operator() (const OUString& lhs, PropertyValue const & rhs)
@@ -63,11 +58,6 @@ struct SbCompare_UString_PropertyValue_Impl
#endif
};
-int CDECL SbCompare_Properties_Impl( const void *arg1, const void *arg2 )
-{
- return ((Property*)arg1)->Name.compareTo( ((Property*)arg2)->Name );
-}
-
extern "C" int CDECL SbCompare_UString_Property_Impl( const void *arg1, const
void *arg2 )
{
const OUString *pArg1 = (OUString*) arg1;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
