diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-05-24 10:50:21 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-06-04 13:04:33 +0200 |
| commit | a4492e92c42222392a96b6fb542572cf49f8cbb1 (patch) | |
| tree | d8566bdd4211832c0146f89872660e2d7c611a79 /svtools/source/svhtml | |
| parent | 3ceeddf4b38e9fd9340ecb66790048ee8d027382 (diff) | |
Removed lines from merge conflicts
Diffstat (limited to 'svtools/source/svhtml')
| -rw-r--r-- | svtools/source/svhtml/htmlkywd.cxx | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx index b88466c803ec..0565b52f9f4c 100644 --- a/svtools/source/svhtml/htmlkywd.cxx +++ b/svtools/source/svhtml/htmlkywd.cxx @@ -549,15 +549,7 @@ static HTML_CharEntry aHTMLCharNameTab[] = { extern "C" { -<<<<<<< HEAD -static int -#if defined( WNT ) - __cdecl -#endif - HTMLCharNameCompare( const void *pFirst, const void *pSecond) -======= static int SAL_CALL HTMLCharNameCompare( const void *pFirst, const void *pSecond) ->>>>>>> Use SAL_CALL / refurbish #include's (IWYU) / sal_Bool->bool { int nRet = 0; if( USHRT_MAX == ((HTML_CharEntry*)pFirst)->cChar ) @@ -1006,15 +998,7 @@ static HTML_ColorEntry aHTMLColorNameTab[] = { extern "C" { -<<<<<<< HEAD -static int -#if defined( WNT ) - __cdecl -#endif - HTMLColorNameCompare( const void *pFirst, const void *pSecond) -======= static int SAL_CALL HTMLColorNameCompare( const void *pFirst, const void *pSecond) ->>>>>>> Use SAL_CALL / refurbish #include's (IWYU) / sal_Bool->bool { int nRet = 0; if( HTML_NO_COLOR == ((HTML_ColorEntry*)pFirst)->nColor ) |