instsetoo_native/util/makefile.mk | 6 ++--
tools/inc/tools/prex.h | 9 ------
vcl/unx/generic/app/i18n_xkb.cxx | 54 +++++++-------------------------------
3 files changed, 15 insertions(+), 54 deletions(-)
New commits:
commit 9d4445e4ca17b09ddc6c6fe774dc064884b0193a
Author: Andre Fischer <a...@apache.org>
Date: Tue Dec 17 13:49:43 2013 +0000
123532: Added list of known package formats.
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 27b5bc3..d995239 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -90,10 +90,12 @@ help .PHONY :
@echo " patch-check check if patch can be created (part of
patch-create)"
@echo
@echo "Most targets (all except aoo_srcrelease and updatepack) accept
suffixes"
- @echo " add _<language> to build a target for one language only"
+ @echo " append _<language> to build a target for one language only"
@echo " the default set of languages is alllangiso=$(alllangiso)"
- @echo " add .<package_format> to build a target for one package format
only"
+ @echo " append .<package_format> to build a target for one package
format only"
@echo " the default set of package formats is archive and
PKGFORMAT=$(PKGFORMAT)"
+ @echo " known package formats are: "
+ @echo " archive, bsd, deb, dmg, installed, msi, native, osx, pkg,
portable, rpm"
LOCALPYFILES= \
commit ed609e7d76aa27d82818a405afd1c58fe5136d1e
Author: Herbert Dürr <h...@apache.org>
Date: Tue Dec 17 12:31:19 2013 +0000
#i123865# enable XKB for all X11-based display targets
diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
index 3204ddb..846d7aa 100644
--- a/tools/inc/tools/prex.h
+++ b/tools/inc/tools/prex.h
@@ -39,20 +39,13 @@
extern "C" {
#endif
-#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really
check for xfree86 or for X11R6.1 and higher
-#define __XKeyboardExtension__ 1
-#else
-#define __XKeyboardExtension__ 0
-#endif
-
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/StringDefs.h>
#include <X11/extensions/Xrender.h>
-#if __XKeyboardExtension__
#include <X11/XKBlib.h>
-#endif
+
typedef unsigned long Pixel;
#undef DestroyAll
diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx
index 50be5437..951eb88 100644
--- a/vcl/unx/generic/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -31,16 +31,10 @@
#include "unx/saldata.hxx"
#include "unx/i18n_xkb.hxx"
-SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display*
-#if __XKeyboardExtension__
-pDisplay
-#endif
-)
- : mbUseExtension( (sal_Bool)__XKeyboardExtension__ ),
- mnDefaultGroup( 0 )
+SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay)
+: mbUseExtension( true ),
+, mnDefaultGroup( 0 )
{
- #if __XKeyboardExtension__
-
mpDisplay = pDisplay;
// allow user to set the default keyboard group idx or to disable the usage
@@ -89,19 +83,11 @@ pDisplay
XkbGetState( mpDisplay, XkbUseCoreKbd, &aStateRecord );
mnGroup = aStateRecord.group;
}
-
- #endif // __XKeyboardExtension__
}
void
-SalI18N_KeyboardExtension::Dispatch( XEvent*
-#if __XKeyboardExtension__
-pEvent
-#endif
-)
+SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent)
{
- #if __XKeyboardExtension__
-
// must the event be handled?
if ( !mbUseExtension
|| (pEvent->type != mnEventBase) )
@@ -119,41 +105,21 @@ pEvent
default:
- #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "Got unrequested XkbAnyEvent %#x/%i\n",
- static_cast<unsigned int>(nXKBType),
static_cast<int>(nXKBType) );
- #endif
+ static_cast<unsigned int>(nXKBType),
static_cast<int>(nXKBType) );
+#endif
break;
}
- #endif // __XKeyboardExtension__
}
-#if __XKeyboardExtension__
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState,
- sal_uInt32 nGroup ) const
-#else
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup(
sal_uInt32,sal_uInt32,sal_uInt32 ) const
-#endif
+sal_uInt32 SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
+ sal_uInt32 nShiftState, sal_uInt32 nGroup ) const
{
- #if __XKeyboardExtension__
-
- if ( !mbUseExtension )
- return NoSymbol;
-
nShiftState &= ShiftMask;
- KeySym nKeySymbol;
- nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState
);
+ KeySym nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup,
nShiftState );
return nKeySymbol;
-
- #else
-
- return NoSymbol;
-
- #endif // __XKeyboardExtension__
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
