diff --git a/0001-Remove-SalDisplay-GetKeyboardName.patch b/0001-Remove-SalDisplay-GetKeyboardName.patch deleted file mode 100644 index 037845b..0000000 --- a/0001-Remove-SalDisplay-GetKeyboardName.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 04b9c2f633f0be1b676933943bdd0b1dc58b5471 Mon Sep 17 00:00:00 2001 -From: Thomas Arnhold -Date: Fri, 27 Jan 2012 16:51:04 +0100 -Subject: [PATCH] Remove SalDisplay::GetKeyboardName - -This method seems to be useless. The return value (keyboard name) isn't -used at any point. And I don't see any point in this method where some -implicit call is done to refresh mappings... ---- - vcl/inc/unx/saldisp.hxx | 2 - - vcl/unx/generic/app/keysymnames.cxx | 90 ----------------------------------- - vcl/unx/generic/app/saldisp.cxx | 8 +-- - vcl/unx/gtk/app/gtkdata.cxx | 7 +-- - 4 files changed, 3 insertions(+), 104 deletions(-) - -diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx -index 3e4eb4e..8c44784 100644 ---- a/vcl/unx/inc/saldisp.hxx -+++ b/vcl/unx/inc/saldisp.hxx -@@ -371,7 +371,6 @@ - KeySym nShiftKeySym_; // first shift modifier - KeySym nCtrlKeySym_; // first control modifier - KeySym nMod1KeySym_; // first mod1 modifier -- ByteString m_aKeyboardName; - - vcl_sal::WMAdaptor* m_pWMAdaptor; - DtIntegrator* m_pDtIntegrator; -@@ -493,7 +492,6 @@ - { mpInputMethod = pInputMethod; } - void SetKbdExtension(SalI18N_KeyboardExtension *pKbdExtension) - { mpKbdExtension = pKbdExtension; } -- const char* GetKeyboardName( bool bRefresh = false ); - ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; } - DtIntegrator* getDtIntegrator() const { return m_pDtIntegrator; } - bool IsXinerama() const { return m_bXinerama; } -diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx -index ce6a7e7..f4955a5 100644 ---- a/vcl/unx/source/app/keysymnames.cxx -+++ b/vcl/unx/source/app/keysymnames.cxx -@@ -594,99 +594,4 @@ - }; - #endif - -- --#if OSL_DEBUG_LEVEL > 1 --#include --#endif -- --const char* SalDisplay::GetKeyboardName( bool bRefresh ) --{ -- if( bRefresh || ! m_aKeyboardName.Len() ) -- { --#if defined(SOLARIS) -- if( IsLocal() ) -- { -- int kbd = open( "/dev/kbd", O_RDONLY ); -- if( kbd >= 0 ) -- { -- int kbd_type = 0; -- if( ! ioctl( kbd, KIOCTYPE, &kbd_type ) ) -- { -- int kbd_layout = 0; -- if( ! ioctl( kbd, KIOCLAYOUT, &kbd_layout ) ) -- { -- const keyboard_layout *p_layout = NULL; -- switch( kbd_type ) -- { -- case KB_KLUNK: p_layout = type0_layout; break; -- case KB_SUN3: p_layout = type3_layout; break; -- case KB_SUN4: p_layout = type4_layout; break; -- case KB_USB: p_layout = type6_layout; break; -- case KB_PC: p_layout = type101_layout; break; -- } -- -- if( p_layout ) -- { -- while( p_layout->n_layout != -1 ) -- { -- if ( p_layout->n_layout == kbd_layout ) -- { -- m_aKeyboardName = p_layout->p_description; -- break; -- } -- p_layout++; -- } -- } -- } -- } -- close(kbd); -- } -- } --#elif !defined(AIX) -- int opcode, event, error; -- int major = XkbMajorVersion, minor = XkbMinorVersion; -- if( XkbQueryExtension( GetDisplay(), &opcode, &event,&error, &major, &minor ) ) -- { -- XkbDescPtr pXkbDesc = NULL; -- // try X keyboard extension -- if( (pXkbDesc = XkbGetKeyboard( GetDisplay(), XkbAllComponentsMask, XkbUseCoreKbd )) ) -- { -- const char* pAtom = NULL; -- if( pXkbDesc->names->groups[0] ) -- { -- pAtom = XGetAtomName( GetDisplay(), pXkbDesc->names->groups[0] ); -- m_aKeyboardName = pAtom; -- XFree( (void*)pAtom ); -- } -- else -- m_aKeyboardName = ""; --#if OSL_DEBUG_LEVEL > 1 --#define PRINT_ATOM( x ) { if( pXkbDesc->names->x ) { pAtom = XGetAtomName( GetDisplay(), pXkbDesc->names->x ); fprintf( stderr, "%s: %s\n", #x, pAtom ); XFree( (void*)pAtom ); } else fprintf( stderr, "%s: \n", #x ); } -- -- PRINT_ATOM( keycodes ); -- PRINT_ATOM( geometry ); -- PRINT_ATOM( symbols ); -- PRINT_ATOM( types ); -- PRINT_ATOM( compat ); -- PRINT_ATOM( phys_symbols ); -- --#define PRINT_ATOM_2( x ) { if( pXkbDesc->names->x[i] ) { pAtom = XGetAtomName( GetDisplay(), pXkbDesc->names->x[i] ); fprintf( stderr, "%s[%d]: %s\n", #x, i, pAtom ); XFree( (void*)pAtom ); } else fprintf( stderr, "%s[%d]: \n", #x, i ); } -- int i; -- for( i = 0; i < XkbNumVirtualMods; i++ ) -- PRINT_ATOM_2( vmods ); -- for( i = 0; i < XkbNumIndicators; i++ ) -- PRINT_ATOM_2( indicators ); -- for( i = 0; i < XkbNumKbdGroups; i++ ) -- PRINT_ATOM_2( groups ); --#endif -- XkbFreeKeyboard( pXkbDesc, XkbAllComponentsMask, True ); -- } -- } --#endif -- if( ! m_aKeyboardName.Len() ) -- m_aKeyboardName = ""; -- } -- return m_aKeyboardName.GetBuffer(); --} -- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx -index 41b509b..cae3fafa 100644 ---- a/vcl/unx/source/app/saldisp.cxx -+++ b/vcl/unx/source/app/saldisp.cxx -@@ -2170,14 +2170,10 @@ long SalX11Display::Dispatch( XEvent *pEvent ) - } - break; - case MappingNotify: -- if( MappingKeyboard == pEvent->xmapping.request || -- MappingModifier == pEvent->xmapping.request ) -+ if( MappingModifier == pEvent->xmapping.request ) - { - XRefreshKeyboardMapping( &pEvent->xmapping ); -- if( MappingModifier == pEvent->xmapping.request ) -- ModifierMapping(); -- if( MappingKeyboard == pEvent->xmapping.request ) // refresh mapping -- GetKeyboardName( true ); -+ ModifierMapping(); - } - break; - case ButtonPress: -diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx -index 3685d11..b1bcf8e 100644 ---- a/vcl/unx/gtk/app/gtkdata.cxx -+++ b/vcl/unx/gtk/app/gtkdata.cxx -@@ -124,7 +124,7 @@ - void signalKeysChanged( GdkKeymap*, gpointer data ) - { - GtkSalDisplay* pDisp = (GtkSalDisplay*)data; -- pDisp->GetKeyboardName(true); -+#warning signalKeysChanged called - } - - void signalScreenSizeChanged( GdkScreen* pScreen, gpointer data ) diff --git a/0001-Remove-further-code-belonging-to-SalDisplay-GetKeybo.patch b/0001-Remove-further-code-belonging-to-SalDisplay-GetKeybo.patch deleted file mode 100644 index 5d3e395..0000000 --- a/0001-Remove-further-code-belonging-to-SalDisplay-GetKeybo.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 9a7605b8f08dfcfbc99bc0c635014eac8e41e932 Mon Sep 17 00:00:00 2001 -From: Thomas Arnhold -Date: Fri, 27 Jan 2012 19:33:03 +0100 -Subject: [PATCH] Remove further code belonging to SalDisplay::GetKeyboardName - ---- - vcl/Library_vclplug_gen.mk | 1 - - vcl/inc/unx/saldisp.hxx | 10 -- - vcl/unx/generic/app/saldisp.cxx | 127 -------------------- - vcl/unx/gtk/app/gtkdata.cxx | 8 -- - 5 files changed, 0 insertions(+), 364 deletions(-) - -diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk -index e402914..e29266d 100644 ---- a/vcl/unx/source/app/makefile.mk -+++ b/vcl/unx/source/app/makefile.mk -@@ -53,7 +53,6 @@ - $(SLO)$/i18n_status.obj \ - $(SLO)$/i18n_wrp.obj \ - $(SLO)$/i18n_xkb.obj \ -- $(SLO)$/keysymnames.obj \ - $(SLO)$/randrwrapper.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/saldisp.obj \ -diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx -index 8c44784..547f1f8 100644 ---- a/vcl/unx/inc/saldisp.hxx -+++ b/vcl/unx/inc/saldisp.hxx -@@ -353,9 +353,6 @@ - srv_vendor_t meServerVendor; - SalWM eWindowManager_; - sal_uLong nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE -- sal_Bool bLocal_; // Server==Client? Init -- // in SalDisplay::IsLocal() -- sal_Bool mbLocalIsValid; // bLocal_ is valid ? - // until x bytes - - oslMutex hEventGuard_; -@@ -439,8 +436,6 @@ - XLIB_Cursor GetPointer( int ePointerStyle ); - virtual int CaptureMouse( SalFrame *pCapture ); - -- sal_Bool IsLocal(); -- - void Remove( XEvent *pEvent ); - - virtual void initScreen( int nScreen ) const; -diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx -index cae3fafa..21812ce 100644 ---- a/vcl/unx/source/app/saldisp.cxx -+++ b/vcl/unx/source/app/saldisp.cxx -@@ -234,122 +234,6 @@ - } - - // --------------------------------------------------------------------------- -- --// check wether displaystring is in format N.M or N. or just N --// with N and M beeing natural numbers --static sal_Bool --sal_IsDisplayNumber( const char *pDisplayString ) --{ -- if ( ! isdigit(*pDisplayString) ) -- return sal_False; -- while ( isdigit(*(++pDisplayString)) ) -- ; /* do nothing */ -- -- if ( *pDisplayString == '.' ) -- { -- while ( isdigit(*(++pDisplayString)) ) -- ; /* do nothing */ -- } -- -- return (*pDisplayString == '\0'); --} -- --// check whether host1 and host2 point to the same ip address --static sal_Bool --sal_EqualHosts( const OUString& Host1, const OUString& Host2) --{ -- oslSocketAddr pHostAddr1; -- oslSocketAddr pHostAddr2; -- sal_Bool bEqualAddress = sal_False; -- -- if ( Host1.toChar() >= '0' && Host1.toChar() <= '9' ) -- pHostAddr1 = osl_createInetSocketAddr( Host1.pData, 0 ); -- else -- pHostAddr1 = osl_resolveHostname( Host1.pData ); -- -- if ( Host2.toChar() >= '0' && Host2.toChar() <= '9' ) -- pHostAddr2 = osl_createInetSocketAddr( Host2.pData, 0 ); -- else -- pHostAddr2 = osl_resolveHostname( Host2.pData ); -- -- if( pHostAddr1 && pHostAddr2 ) -- bEqualAddress = osl_isEqualSocketAddr( pHostAddr1, pHostAddr2 ) ? sal_True : sal_False; -- -- if( pHostAddr1 ) -- osl_destroySocketAddr( pHostAddr1 ); -- if( pHostAddr2 ) -- osl_destroySocketAddr( pHostAddr2 ); -- -- return bEqualAddress; --} -- --static sal_Bool --sal_IsLocalDisplay( Display *pDisplay ) --{ -- const char *pDisplayString = DisplayString( pDisplay ); -- -- // no string, no idea -- if ( pDisplayString == NULL || pDisplayString[ 0 ] == '\0') -- return sal_False; -- -- // check for ":x.y" -- if ( pDisplayString[ 0 ] == ':' ) -- return sal_IsDisplayNumber( pDisplayString + 1 ); -- -- // check for fixed token which all mean localhost:x.y -- const char pLocal[] = "localhost:"; -- const int nLocalLen = sizeof(pLocal) - 1; -- if ( strncmp(pDisplayString, pLocal, nLocalLen) == 0 ) -- return sal_IsDisplayNumber( pDisplayString + nLocalLen ); -- -- const char pUnix[] = "unix:"; -- const int nUnixLen = sizeof(pUnix) - 1; -- if ( strncmp(pDisplayString, pUnix, nUnixLen) == 0 ) -- return sal_IsDisplayNumber( pDisplayString + nUnixLen ); -- -- const char pLoopback[] = "127.0.0.1:"; -- const int nLoopbackLen= sizeof(pLoopback) - 1; -- if ( strncmp(pDisplayString, pLoopback, nLoopbackLen) == 0 ) -- return sal_IsDisplayNumber( pDisplayString + nLoopbackLen ); -- -- // compare local hostname to displaystring, both may be ip address or -- // hostname -- sal_Bool bEqual = sal_False; -- char *pDisplayHost = strdup( pDisplayString ); -- char *pPtr = strrchr( pDisplayHost, ':' ); -- -- if( pPtr != NULL ) -- { -- const OUString& rLocalHostname( GetX11SalData()->GetLocalHostName() ); -- if( rLocalHostname.getLength() ) -- { -- *pPtr = '\0'; -- OUString aDisplayHostname( pDisplayHost, strlen( pDisplayHost ), osl_getThreadTextEncoding() ); -- bEqual = sal_EqualHosts( rLocalHostname, aDisplayHostname ); -- bEqual = bEqual && sal_IsDisplayNumber( pPtr + 1 ); -- } -- } -- free( pDisplayHost ); -- -- return bEqual; --} -- --// --------------------------------------------------------------------------- --// IsLocal means soffice is running on the same host as the xserver --// since it is not called very often and sal_IsLocalDisplay() is relative --// expensive bLocal_ is initialized on first call -- --sal_Bool SalDisplay::IsLocal() --{ -- if ( ! mbLocalIsValid ) -- { -- bLocal_ = sal_IsLocalDisplay( pDisp_ ); -- mbLocalIsValid = sal_True; -- } -- return (sal_Bool)bLocal_; --} -- --// --------------------------------------------------------------------------- - extern "C" srv_vendor_t - sal_GetServerVendor( Display *p_display ) - { -@@ -850,9 +734,6 @@ - X11SalBitmap::ImplCreateCache(); - - hEventGuard_ = osl_createMutex(); -- bLocal_ = sal_False; /* dont care, initialize later by -- calling SalDisplay::IsLocal() */ -- mbLocalIsValid = sal_False; /* bLocal_ is not yet initialized */ - - // - - - - - - - - - - Synchronize - - - - - - - - - - - - - - if( getenv( "SAL_SYNCHRONIZE" ) ) -diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx -index b1bcf8e..e118f56 100644 ---- a/vcl/unx/gtk/app/gtkdata.cxx -+++ b/vcl/unx/gtk/app/gtkdata.cxx -@@ -121,12 +121,6 @@ - - extern "C" { - --void signalKeysChanged( GdkKeymap*, gpointer data ) --{ -- GtkSalDisplay* pDisp = (GtkSalDisplay*)data; --#warning signalKeysChanged called --} -- - void signalScreenSizeChanged( GdkScreen* pScreen, gpointer data ) - { - GtkSalDisplay* pDisp = (GtkSalDisplay*)data; -@@ -709,8 +703,6 @@ - - m_pGtkSalDisplay->SetKbdExtension( pKbdExtension ); - -- g_signal_connect( G_OBJECT(gdk_keymap_get_default()), "keys_changed", G_CALLBACK(signalKeysChanged), m_pGtkSalDisplay ); -- - // add signal handler to notify screen size changes - int nScreens = gdk_display_get_n_screens( pGdkDisp ); - for( int n = 0; n < nScreens; n++ ) diff --git a/libreoffice.spec b/libreoffice.spec index 5404b28..a1b333b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -221,8 +221,6 @@ Patch102: 0001-fix-support-for-embedded-images-for-basic-Dialogs-fd.patch Patch103: 0001-fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch Patch104: 0001-fdo-39657-fix-crash-when-parsing-XML-signatures.patch Patch105: 0001-rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch -Patch106: 0001-Remove-SalDisplay-GetKeyboardName.patch -Patch107: 0001-Remove-further-code-belonging-to-SalDisplay-GetKeybo.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -1127,8 +1125,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch103 -p1 -b .fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch %patch104 -p1 -b .fdo-39657-fix-crash-when-parsing-XML-signatures.patch %patch105 -p1 -b .rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch -%patch106 -p1 -b .0001-Remove-SalDisplay-GetKeyboardName.patch -%patch107 -p1 -b .0001-Remove-further-code-belonging-to-SalDisplay-GetKeybo.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2439,7 +2435,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Wed Feb 22 2012 Caolán McNamara - 3.4.5.2-6 +* Thu Feb 23 2012 Caolán McNamara - 3.4.5.2-6 - ensure non broken xml help.tree files - ensure gdb .py files have the same timstamps so that multilib .pyc's and .pyo's have the same content (timestamp in binary cache) @@ -2453,7 +2449,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : - Resolves: fdo#39510 fix yet more layout crashes in ~SwRootFrm - Resolves: fdo#39657 fix crash when parsing XML signatures - Resolves: rhbz#794679 use proper Indian Rupee currency symbol U+20B9 -- Resolves: rhbz#796234 remove dangling XkbUseExtension code * Thu Feb 09 2012 Caolán McNamara - 3.4.5.2-5 - Resolves: fdo#38595 border width lost in ODF import