[Libreoffice-commits] .: 3 commits - hwpfilter/source vcl/inc vcl/source
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Mar 1 12:29:30 PST 2012
hwpfilter/source/hiodev.cxx | 4 --
hwpfilter/source/hiodev.h | 4 --
hwpfilter/source/htags.cxx | 4 --
hwpfilter/source/htags.h | 4 --
hwpfilter/source/lexer.cxx | 81 ------------------------------------------
hwpfilter/source/mzstring.cxx | 4 --
hwpfilter/source/mzstring.h | 4 --
vcl/inc/vcl/animate.hxx | 2 -
vcl/inc/vcl/cursor.hxx | 2 -
vcl/inc/vcl/edit.hxx | 2 -
vcl/inc/vcl/menu.hxx | 2 -
vcl/inc/vcl/menubtn.hxx | 2 -
vcl/inc/vcl/msgbox.hxx | 2 -
vcl/inc/vcl/scrbar.hxx | 2 -
vcl/inc/vcl/seleng.hxx | 2 -
vcl/inc/vcl/tabctrl.hxx | 2 -
vcl/inc/vcl/toolbox.hxx | 2 -
vcl/source/window/msgbox.cxx | 2 -
18 files changed, 11 insertions(+), 116 deletions(-)
New commits:
commit 945a2863fec0941431c082e9bd0e37ed925714c0
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Mar 1 22:20:15 2012 +0200
IMPL_LINK_NOARG follow-up to bd205223ec029a875c662474bb6d423d3cdd1994
diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx
index e2a0af2..392b9ef 100644
--- a/vcl/inc/vcl/animate.hxx
+++ b/vcl/inc/vcl/animate.hxx
@@ -153,7 +153,7 @@ class VCL_DLLPUBLIC Animation
SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout );
- DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer* );
+ DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, void* );
public:
diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx
index 7e886dd..cb4eff2 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/vcl/inc/vcl/cursor.hxx
@@ -68,7 +68,7 @@ private:
public:
SAL_DLLPRIVATE void ImplDraw();
SAL_DLLPRIVATE void ImplRestore();
- DECL_DLLPRIVATE_LINK( ImplTimerHdl, AutoTimer* );
+ DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* );
SAL_DLLPRIVATE void ImplShow( bool bDrawDirect = true );
SAL_DLLPRIVATE void ImplHide();
SAL_DLLPRIVATE void ImplResume( bool bRestore = false );
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 0263daa..9ca82bd 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -93,7 +93,7 @@ private:
Link maUpdateDataHdl;
Link maAutocompleteHdl;
- DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, Timer* );
+ DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* );
SAL_DLLPRIVATE bool ImplTruncateToMaxLen( rtl::OUString&, sal_uInt32 nSelectionLen ) const;
SAL_DLLPRIVATE void ImplInitEditData();
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index c2d1047..87ae47b 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -188,7 +188,7 @@ protected:
SAL_DLLPRIVATE void ImplSelect();
SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem );
SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos );
- DECL_DLLPRIVATE_LINK( ImplCallSelect, Menu* );
+ DECL_DLLPRIVATE_LINK( ImplCallSelect, void* );
SAL_DLLPRIVATE void ImplFillLayoutData() const;
SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; }
diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx
index b9bdd81..4488753 100644
--- a/vcl/inc/vcl/menubtn.hxx
+++ b/vcl/inc/vcl/menubtn.hxx
@@ -60,7 +60,7 @@ private:
SAL_DLLPRIVATE void ImplInitMenuButtonData();
SAL_DLLPRIVATE void ImplExecuteMenu();
- DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer* );
+ DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* );
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE MenuButton( const MenuButton & );
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 1c1dcee..4e963a3 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -107,7 +107,7 @@ public:
virtual Size GetOptimalSize(WindowSizeType eType) const;
- DECL_LINK( ClickHdl, Button* );
+ DECL_LINK( ClickHdl, void* );
};
// -----------
diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index 6e894bc..36c31b6 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.hxx
@@ -95,7 +95,7 @@ private:
SAL_DLLPRIVATE sal_Bool ImplDrawNative( sal_uInt16 nDrawFlags );
SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos );
DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* );
- DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, AutoTimer* );
+ DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* );
public:
ScrollBar( Window* pParent, WinBits nStyle = WB_VERT );
diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx
index b4ed978..a5850db 100644
--- a/vcl/inc/vcl/seleng.hxx
+++ b/vcl/inc/vcl/seleng.hxx
@@ -96,7 +96,7 @@ private:
sal_uInt16 nMouseSensitivity;
sal_uInt16 nLockedMods;
sal_uInt16 nFlags;
- DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer * );
+ DECL_DLLPRIVATE_LINK( ImpWatchDog, void* );
inline sal_Bool ShouldDeselect( sal_Bool bModifierKey1 ) const;
// determines to deselect or not when Ctrl-key is pressed on CursorPosChanging
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 970044a..fd064db 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -86,7 +86,7 @@ private:
SAL_DLLPRIVATE void ImplFreeLayoutData();
SAL_DLLPRIVATE long ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
- DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, ListBox* );
+ DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, void* );
DECL_DLLPRIVATE_LINK( ImplWindowEventListener, VclSimpleEvent* );
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index c750eec..75ff319 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -298,7 +298,7 @@ private:
DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* );
DECL_DLLPRIVATE_LINK( ImplResetAutoSizeTriesHdl, void* );
DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* );
- DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, ToolBox* );
+ DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, void* );
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE ToolBox (const ToolBox &);
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 3293929..220a067 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -413,7 +413,7 @@ void MessBox::ImplPosControls()
SetPageSizePixel( aPageSize );
}
-IMPL_LINK( MessBox, ClickHdl, Button*, pBtn )
+IMPL_LINK_NOARG( MessBox, ClickHdl )
{
Edit aCopyHelper( this );
aCopyHelper.SetText( maMessText, Selection( 0, maMessText.Len() ) );
commit b1b3008bc83506edac139c6b8f7f26723785c2d4
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Mar 1 21:43:24 2012 +0200
WaE: function 'yyinput' is not needed and will not be emitted
diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx
index 3c73a66..5d7fe3c 100644
--- a/hwpfilter/source/lexer.cxx
+++ b/hwpfilter/source/lexer.cxx
@@ -1064,14 +1064,6 @@ static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
static int yy_flex_strlen YY_PROTO(( yyconst char * ));
#endif
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
#if YY_STACK_USED
static int yy_start_stack_ptr = 0;
static int yy_start_stack_depth = 0;
@@ -1836,79 +1828,6 @@ yy_state_type yy_current_state;
return yy_is_jam ? 0 : yy_current_state;
}
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
- {
- int c;
-
- *yy_c_buf_p = yy_hold_char;
-
- if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
- {
- /* yy_c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
- /* This was really a NUL. */
- *yy_c_buf_p = '\0';
-
- else
- { /* need more input */
- int offset = yy_c_buf_p - yytext_ptr;
- ++yy_c_buf_p;
-
- switch ( yy_get_next_buffer() )
- {
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- yyrestart( yyin );
-
- /* fall through */
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( yywrap() )
- return EOF;
-
- if ( ! yy_did_buffer_switch_on_eof )
- YY_NEW_FILE;
-#ifdef __cplusplus
- return yyinput();
-#else
- return input();
-#endif
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext_ptr + offset;
- break;
- }
- }
- }
-
- c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
- *yy_c_buf_p = '\0'; /* preserve yytext */
- yy_hold_char = *++yy_c_buf_p;
-
-
- return c;
- }
-
-
#ifdef YY_USE_PROTOS
void yyrestart( FILE *input_file )
#else
commit 9e1ce8350a40887cb5307595991e1e12f38ee9a4
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Mar 1 21:15:47 2012 +0200
#pragma interface and #pragma implementation are obsolete and pointless
diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx
index 0416a96..e2c8352 100644
--- a/hwpfilter/source/hiodev.cxx
+++ b/hwpfilter/source/hiodev.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-#ifdef __GNUG__
-#pragma implementation "hiodev.h"
-#endif
-
#include <stdio.h>
#include <errno.h>
// DVO: add zlib/ prefix
diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h
index f0fd1b1..8857321 100644
--- a/hwpfilter/source/hiodev.h
+++ b/hwpfilter/source/hiodev.h
@@ -34,10 +34,6 @@
#ifndef _HIODEV_H_
#define _HIODEV_H_
-#ifdef __GNUG__
-#pragma interface
-#endif
-
#include <stdio.h>
#include "hwplib.h"
/**
diff --git a/hwpfilter/source/htags.cxx b/hwpfilter/source/htags.cxx
index 94cc050..bd3ae34 100644
--- a/hwpfilter/source/htags.cxx
+++ b/hwpfilter/source/htags.cxx
@@ -28,10 +28,6 @@
#include "precompile.h"
-#ifdef __GNUG__
-#pragma implementation "htags.h"
-#endif
-
#include <string.h>
#include "hwplib.h"
diff --git a/hwpfilter/source/htags.h b/hwpfilter/source/htags.h
index 21c610d..97435b8 100644
--- a/hwpfilter/source/htags.h
+++ b/hwpfilter/source/htags.h
@@ -29,10 +29,6 @@
#ifndef _HTAGS_H_
#define _HTAGS_H_
-#ifdef __GNUG__
-#pragma interface
-#endif
-
class HWPFile;
/**
* @short Embeded image
diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx
index c8d7e97..090265d 100644
--- a/hwpfilter/source/mzstring.cxx
+++ b/hwpfilter/source/mzstring.cxx
@@ -30,10 +30,6 @@
* supposed to be used instead of std::string
*/
-#ifdef __GNUG__
-#pragma implementation "mzstring.h"
-#endif
-
#include "mzstring.h"
#ifndef WIN32
diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h
index 95b1614..699c7cb 100644
--- a/hwpfilter/source/mzstring.h
+++ b/hwpfilter/source/mzstring.h
@@ -29,10 +29,6 @@
#ifndef _MZSTRING_H_
#define _MZSTRING_H_
-#ifdef __GNUG__
-# pragma interface
-#endif
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
More information about the Libreoffice-commits
mailing list