summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-18 19:06:23 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-18 19:29:01 +0200
commit56396bd6dc63536608561ccb528377dc07023bc2 (patch)
tree22cbd5e5589367826532aebf576d8f4409ebd1ab
parent4c6721542a53e017e555c8c12bfcbb0e2b6e1b3c (diff)
Bin pointless __cplusplus ifdefs
Change-Id: I82974eb68e6daf1c6781e2133fd22d7e4e62de82
-rw-r--r--vcl/inc/salframe.hxx6
-rw-r--r--vcl/inc/salwtype.hxx20
2 files changed, 0 insertions, 26 deletions
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index f69f41afbdad..1132c38ce0d0 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -23,9 +23,7 @@
#include <tools/solar.h>
#include <vcl/dllapi.h>
-#ifdef __cplusplus
#include <vcl/ptrstyle.hxx>
-#endif // __cplusplus
#include <salwtype.hxx>
#include <salgeom.hxx>
@@ -96,8 +94,6 @@ typedef sal_uInt64 SalExtStyle;
#define SAL_FRAME_POSSIZE_WIDTH ((sal_uInt16)0x0004)
#define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008)
-#ifdef __cplusplus
-
using ::rtl::OUString;
using ::rtl::OString;
@@ -248,8 +244,6 @@ public: // public for Sal Implementation
{ return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
};
-#endif // __cplusplus
-
#endif // _SV_SALFRAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 7196326a2367..b2c54aa90301 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -187,8 +187,6 @@ struct SalMouseActivateEvent
long mnY; // Y-Position (Pixel, TopLeft-Output)
};
-#ifdef __cplusplus
-
// EXTTEXTINPUT
struct SalExtTextInputEvent
{
@@ -201,8 +199,6 @@ struct SalExtTextInputEvent
sal_Bool mbOnlyCursor; // sal_True: Only Cursor-Position has been changed
};
-#endif // __cplusplus
-
// EXTTEXTINPUTPOS
struct SalExtTextInputPosEvent
{
@@ -214,18 +210,12 @@ struct SalExtTextInputPosEvent
bool mbVertical; // true if in vertical mode
};
-#ifdef __cplusplus
-
// INPUTCONTEXTCHANGE
struct SalInputContextChangeEvent
{
LanguageType meLanguage; // new language
};
-#endif // __cplusplus
-
-#ifdef __cplusplus
-
// SURROUNDINGTEXTREQUEST
struct SalSurroundingTextRequestEvent
{
@@ -234,10 +224,6 @@ struct SalSurroundingTextRequestEvent
sal_uLong mnEnd; // The end index of selected range
};
-#endif // __cplusplus
-
-#ifdef __cplusplus
-
// SURROUNDINGTEXTSELECTIONCHANGE
struct SalSurroundingTextSelectionChangeEvent
{
@@ -245,8 +231,6 @@ struct SalSurroundingTextSelectionChangeEvent
sal_uLong mnEnd; // The end index of selected range
};
-#endif // __cplusplus
-
// ------------------
// - SalFrame-Types -
// ------------------
@@ -318,8 +302,6 @@ struct SalFrameState
#define SAL_INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uLong)0x00000008)
#define SAL_INPUTCONTEXT_CHANGELANGUAGE ((sal_uLong)0x00000010)
-#ifdef __cplusplus
-
struct SalInputContext
{
FontSelectPattern* mpFont;
@@ -327,8 +309,6 @@ struct SalInputContext
sal_uLong mnOptions;
};
-#endif // __cplusplus
-
typedef void (*SALTIMERPROC)();
#endif // _SV_SALWTYPE_HXX