[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/a11y/atkutil.cxx |2 ++
vcl/unx/gtk/a11y/atkwindow.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit da966e07c6fb26f54e3538ccaf0a13f857ed2993
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Oct 9 23:11:28 2013 +0200
Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2
Change-Id: Id3691ab81af466dd21cc86592c5ac0c2c7a1c8f7
Reviewed-on: https://gerrit.libreoffice.org/6244
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 2f8757e961d6156d529c2ab9131747071236f085)
Reviewed-on: https://gerrit.libreoffice.org/7362
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index e1cb134..adeda2b 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -86,7 +86,9 @@ atk_wrapper_focus_idle_handler (gpointer data)
#ifdef ENABLE_TRACING
fprintf(stderr, notifying focus event for %p\n, atk_obj);
#endif
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_focus_tracker_notify(atk_obj);
+SAL_WNODEPRECATED_DECLARATIONS_POP
// #i93269#
// emit text_caret_moved event for XAccessibleText object,
// if cursor is inside the XAccessibleText object.
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index fd396c8..0bddf07 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -122,7 +122,9 @@ static gint
ooo_window_wrapper_clear_focus(gpointer)
{
SolarMutexGuard aGuard;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_focus_tracker_notify( NULL );
+SAL_WNODEPRECATED_DECLARATIONS_POP
return FALSE;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 23e8d0417c664fcb9b3f281f60629521153d6e55
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Fri Dec 6 20:43:24 2013 +
fdo#60705 Don't discard valid printing options.
PPDValue::m_aValue is simply an optional parameter description, whereas
m_aOption is the actual option being passed to cups.
For example, for the key PageSize (which was previously passed
without problem), a typical PPDValue could be:
m_aOption = A4
m_aValue = /PageSize[595.3 841.9]/ImagingBBox nullsetpagedevice
However for the key InputSlot (which was previously not passed
to the printer), a typical PPDValue could be:
m_aOption = RearPaperFeedSlot
m_aValue =
(cherry picked from commit 4c160e3d54ec1c6c04bc80c6cec7ee58e20af3bb)
Conflicts:
vcl/unx/generic/printer/cupsmgr.cxx
Change-Id: I7959317c9f9d67bfafd911e710927a70edfa8792
Reviewed-on: https://gerrit.libreoffice.org/6963
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index fe163bb..6b06596 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -618,7 +618,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const
JobData rJob, bool bBanner
{
const PPDKey* pKey = aKeys[i];
const PPDValue* pValue = rJob.m_aContext.getValue( pKey );
-if(pValue pValue-m_eType == eInvocation
pValue-m_aValue.Len() )
+if(pValue pValue-m_eType == eInvocation
pValue-m_aOption.Len() )
{
OString aKey = OUStringToOString( pKey-getKey(),
RTL_TEXTENCODING_ASCII_US );
OString aValue = OUStringToOString( pValue-m_aOption,
RTL_TEXTENCODING_ASCII_US );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 67 -
1 file changed, 45 insertions(+), 22 deletions(-)
New commits:
commit d77483f0ab1a7f97ec41adfac66d98696adeef70
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 22 13:20:12 2013 +
Related: fdo#41169 fix GTK non-Latin keyboard layout with Latin shortcuts
See also rhbz#958300
Change-Id: I5c3cf9652adb7b1c9ec53a32ed39f231a09ae1d7
(cherry picked from commit 8cef6c7ec67aec88b339ca647e784afbabf190f8)
Reviewed-on: https://gerrit.libreoffice.org/6759
Reviewed-by: Khaled Hosny khaledho...@eglug.org
Tested-by: Khaled Hosny khaledho...@eglug.org
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index fef8407..7db5649 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -323,6 +323,14 @@ static sal_uInt16 GetKeyCode( guint keyval )
return nCode;
}
+static guint GetKeyValFor(GdkKeymap* pKeyMap, guint16 hardware_keycode, guint8
group)
+{
+guint updated_keyval = 0;
+gdk_keymap_translate_keyboard_state(pKeyMap, hardware_keycode,
+(GdkModifierType)0, group, updated_keyval, NULL, NULL, NULL);
+return updated_keyval;
+}
+
// F10 means either KEY_F10 or KEY_MENU, which has to be decided
// in the independent part.
struct KeyAlternate
@@ -373,7 +381,7 @@ struct DamageTracker : public
basebmp::IBitmapDeviceDamageTracker
void GtkSalFrame::doKeyCallback( guint state,
guint keyval,
guint16 hardware_keycode,
- guint8 /*group*/,
+ guint8 group,
guint32 time,
sal_Unicode aOrigCode,
bool bDown,
@@ -405,33 +413,48 @@ void GtkSalFrame::doKeyCallback( guint state,
}
#endif
-/* #i42122# translate all keys with Ctrl and/or Alt to group 0
-* else shortcuts (e.g. Ctrl-o) will not work but be inserted by
-* the application
-*/
-/* #i52338# do this for all keys that the independent part has no key code
for
-*/
+/*
+ * #i42122# translate all keys with Ctrl and/or Alt to group 0 else
+ * shortcuts (e.g. Ctrl-o) will not work but be inserted by the
+ * application
+ *
+ * #i52338# do this for all keys that the independent part has no key code
+ * for
+ *
+ * fdo#41169 rather than use group 0, detect if there is a group which can
+ * be used to input Latin text and use that if possible
+ */
aEvent.mnCode = GetKeyCode( keyval );
if( aEvent.mnCode == 0 )
{
-// check other mapping
-gint eff_group, level;
-GdkModifierType consumed;
-guint updated_keyval = 0;
-// use gdk_keymap_get_default instead of NULL;
-// workaround a crahs fixed in gtk 2.4
-if( gdk_keymap_translate_keyboard_state( gdk_keymap_get_default(),
- hardware_keycode,
- (GdkModifierType)0,
- 0,
- updated_keyval,
- eff_group,
- level,
- consumed ) )
+gint best_group = SAL_MAX_INT32;
+
+// Try and find Latin layout
+GdkKeymap* keymap = gdk_keymap_get_default();
+GdkKeymapKey *keys;
+gint n_keys;
+if (gdk_keymap_get_entries_for_keyval(keymap, GDK_A, keys, n_keys))
{
-aEvent.mnCode = GetKeyCode( updated_keyval );
+// Find the lowest group that supports Latin layout
+for (gint i = 0; i n_keys; ++i)
+{
+if (keys[i].level != 0 keys[i].level != 1)
+continue;
+best_group = std::min(best_group, keys[i].group);
+if (best_group == 0)
+break;
+}
+g_free(keys);
}
+
+//Unavailable, go with original group then I suppose
+if (best_group == SAL_MAX_INT32)
+best_group = group;
+
+guint updated_keyval = GetKeyValFor(keymap, hardware_keycode,
best_group);
+aEvent.mnCode = GetKeyCode(updated_keyval);
}
+
aEvent.mnCode |= GetKeyModCode( state );
if( bDown )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/a11y/atklistener.cxx | 25 - 1 file changed, 20 insertions(+), 5 deletions(-) New commits: commit c7ca663e1a839781589dfd6a49d8540dde2b12cc Author: Michael Meeks michael.me...@collabora.com Date: Wed Oct 2 23:03:38 2013 +0200 rhbz#1001768: AtkListener::disposing(): delay notification Frame #10 in libatk-bridge.so calls atk_misc_threads_enter(), and having a look at the RHEL 6.5 at-spi package in ./at-spi-1.28.1/atk-bridge/bridge.c there is always the same call pattern: bridge_threads_leave (); [one function call] bridge_threads_enter (); ... so the bridge_threads_leave() has called the VCL gtk-plug function GtkHookedYieldMutex::ThreadsLeave() which releases the SolarMutex. This is of course not a good idea while there is a Window being deleted, and is the reason why the same Window is being deleted in thread 1 and thread 2: 31 0x0fff94a5fc00 in Window::~Window (this=0xfff702b2d30, __in_chrg=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/vcl/source/window/window.cxx:4272 16 0x0fff94a5fc00 in Window::~Window (this=0xfff702b2d30, __in_chrg=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/vcl/source/window/window.cxx:4272 Try to avoid the problem by delaying the atk_object_notify_state_change() that will release SolarMutex until idle, when deletion of the Window is finished. Thread 2 (Thread 0xfff4cbcf110 (LWP 17011)): 2 0x008013c6e718 in .pthread_mutex_lock () from /lib64/libc.so.6 3 0x00801576e4fc in osl_acquireMutex (Mutex=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/sal/osl/unx/mutex.c:114 4 0x0fff963a7908 in acquire (this=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/solver/unxlngppc64.pro/inc/osl/mutex.hxx:58 5 ClearableGuard (this=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/solver/unxlngppc64.pro/inc/osl/mutex.hxx:177 6 cppu::WeakAggComponentImplHelperBase::dispose (this=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/cppuhelper/source/implbase.cxx:392 7 0x0fff5f1b3444 in comphelper::disposeComponentcom::sun::star::accessibility::XAccessible (_rxComp=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/solver/unxlngppc64.pro/inc/comphelper/types.hxx:114 8 0x0fff5f273ba8 in VCLXAccessibleToolBox::implReleaseToolboxItem (this=value optimized out, _rMapPos=value optimized out, _bNotifyRemoval=value optimized out, _bDispose=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/accessibility/source/standard/vclxaccessibletoolbox.cxx:326 9 0x0fff5f2747e4 in VCLXAccessibleToolBox::ProcessWindowEvent (this=0xfff5f8b8fe0, rVclWindowEvent=...) at /usr/src/debug/libreoffice-4.0.4.2/accessibility/source/standard/vclxaccessibletoolbox.cxx:612 10 0x0fff951e4ad4 in VCLXAccessibleComponent::WindowEventListener (this=0xfff5f8b8fe0, pEvent=0xfff4cbcc950) at /usr/src/debug/libreoffice-4.0.4.2/toolkit/source/awt/vclxaccessiblecomponent.cxx:136 11 0x0fff951e4b20 in VCLXAccessibleComponent::LinkStubWindowEventListener (pThis=value optimized out, pCaller=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/toolkit/source/awt/vclxaccessiblecomponent.cxx:121 12 0x0fff946dd420 in Call (this=0xfff702b32a0, pEvent=0xfff4cbcc950) at /usr/src/debug/libreoffice-4.0.4.2/solver/unxlngppc64.pro/inc/tools/link.hxx:123 13 VclEventListeners::Call (this=0xfff702b32a0, pEvent=0xfff4cbcc950) at /usr/src/debug/libreoffice-4.0.4.2/vcl/source/app/vclevent.cxx:66 14 0x0fff94a4bab0 in Window::CallEventListeners (this=0xfff702b2d30, nEvent=value optimized out, pData=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/vcl/source/window/window.cxx:5272 15 0x0fff94a4bc80 in Window::ImplCallEventListeners (this=value optimized out, nEvent=value optimized out, pData=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/vcl/source/window/window.cxx:5255 16 0x0fff94a5fc00 in Window::~Window (this=0xfff702b2d30, __in_chrg=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/vcl/source/window/window.cxx:4272 17 0x0fff94a61138 in Window::~Window (this=value optimized out, __in_chrg=value optimized out) at /usr/src/debug/libreoffice-4.0.4.2/vcl/source/window/window.cxx:4683 18 0x0fff951efcf0 in VCLXDevice::DestroyOutputDevice (this=0xfff6801f010) at /usr/src/debug/libreoffice-4.0.4.2/toolkit/source/awt/vclxdevice.cxx:56 19 0x0fff952347a8 in VCLXWindow::dispose (this=0xfff6801f010) at /usr/src/debug/libreoffice-4.0.4.2/toolkit/source/awt/vclxwindow.cxx:957 20 0x0fff953c5f28 in UnoWrapper::WindowDestroyed (this=value optimized out, pWindow=0xfff70115a80) at /usr/src/debug/libreoffice-4.0.4.2/toolkit/source/helper/unowrapper.cxx:263 21 0x0fff94a60130 in Window::~Window
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/gdi/salprn-gtk.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit f8f5c9eaab6cd3675358064feec68c7481a38154
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date: Sun Sep 15 17:54:06 2013 +0200
Fix fdo#69381 by skipping empty option groups
Change-Id: Idaf0f0a3f5430a5aea6f77a003e205116a87cc67
Reviewed-on: https://gerrit.libreoffice.org/5949
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/5972
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 228413b..b94397d 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -483,6 +483,11 @@ GtkPrintDialog::impl_initCustomTab()
GtkWidget* pGroup = NULL;
bool bGtkInternal = false;
+//Fix fdo#69381
+//Next options if this one is empty
+if ( aOptProp.getLength() == 0)
+continue;
+
for (int n = 0; n != aOptProp.getLength(); n++)
{
const beans::PropertyValue rEntry(aOptProp[ n ]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/generic/desktopdetect/desktopdetector.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4065524c3fa0167f195146cc4858fc9013a01cbb
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 5 11:08:23 2013 +0200
Consistently use rtl_getAppCommandArg here
...2a9c1d1a75b7d4e79dfbc6be3dada1a1e959e58e Make dialogs fail with an
exception
in headless tests missed one of the osl_getCommandArg calls, which can
lead to
problems when there are any -env: arguments preceeding the --display
argument.
Reported by renduly on IRC.
Change-Id: I98dd24be840d561dce51034088f3e44adff9f2ff
(cherry picked from commit 379a53017447fbf2a459f82ae8905b6683e80e8d)
Reviewed-on: https://gerrit.libreoffice.org/5821
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index f1d6c26..bdec96d3 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -315,7 +315,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType
get_desktop_environment()
rtl_getAppCommandArg( i, aParam.pData );
if( i nParams-1 (aParam == -display || aParam ==
--display ) )
{
-osl_getCommandArg( i+1, aParam.pData );
+rtl_getAppCommandArg( i+1, aParam.pData );
aBParm = OUStringToOString( aParam,
osl_getThreadTextEncoding() );
pDisplayStr = aBParm.getStr();
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce7aeaa358dcdbcaf43c55670345fad8ee86
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 3 12:24:34 2013 +0100
Resolves: rhbz#993963 NULL m_pWindow on firefox deleted plugin
Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67
(cherry picked from commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de)
Reviewed-on: https://gerrit.libreoffice.org/5773
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 0f53e93..fef8407 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2698,7 +2698,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed,
SalX11Screen nXScreen )
{
-bool bWasVisible = IS_WIDGET_MAPPED(m_pWindow);
+bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false;
if( bWasVisible )
Show( sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e59c8de22549b623a06216f4f5e8568aa8fd3312 Author: Caolán McNamara caol...@redhat.com Date: Tue Aug 20 14:25:22 2013 +0100 Resolves: rhbz#998136 different index to gWidgetData vs NWEnsureGTKNotebook Change-Id: Ib3ebbfda09cd05477b65c1d81ac77e977b2a11e5 (cherry picked from commit 0aa3a73c9463f4d1e8918383b21131352635fe75) Reviewed-on: https://gerrit.libreoffice.org/5545 Reviewed-by: Thorsten Behrens tbehr...@suse.com Tested-by: Thorsten Behrens tbehr...@suse.com diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index d8c645a..53fce0a 100755 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1607,8 +1607,8 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) w = aAreaRect.GetWidth(); h = aAreaRect.GetHeight(); -gint xthickness = gWidgetData[0].gNotebookWidget-style-xthickness; -gint ythickness = gWidgetData[0].gNotebookWidget-style-ythickness; +gint xthickness = gWidgetData[nScreen].gNotebookWidget-style-xthickness; +gint ythickness = gWidgetData[nScreen].gNotebookWidget-style-ythickness; x -= xthickness; y -= ythickness; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 262caa3bdefc8add38a0fa221099fb59b64b5b3d
Author: David Tardon dtar...@redhat.com
Date: Thu Jul 11 09:25:16 2013 +0200
rhbz#980387 fix filter selection from file ext.
... for filters that have more than one extension associated with them
(e.g., JPEG).
Change-Id: Ic6b16d3b4aa17580404d02a9fb7b087b9aa52fc2
(cherry picked from commit 70376f610a7eb876739829e1f362bc94b21cb82f)
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4823
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 50ec20c..d854d46 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -36,6 +36,7 @@
#include com/sun/star/ui/dialogs/TemplateDescription.hpp
#include com/sun/star/ui/dialogs/ControlActions.hpp
#include com/sun/star/uno/Any.hxx
+#include comphelper/string.hxx
#include osl/mutex.hxx
#include unx/gtk/gtkinst.hxx
@@ -790,6 +791,25 @@ uno::SequenceOUString SAL_CALL
SalGtkFilePicker::getFiles() throw( uno::Runtim
return aFiles;
}
+namespace
+{
+
+bool lcl_matchFilter( const rtl::OUString rFilter, const rtl::OUString rExt )
+{
+const int nCount = comphelper::string::getTokenCount( rFilter, ';' );
+
+for ( int n = 0; n != nCount; ++n )
+{
+const rtl::OUString aToken = comphelper::string::getToken( rFilter, n,
';' );
+if ( aToken == rExt )
+return true;
+}
+
+return false;
+}
+
+}
+
uno::SequenceOUString SAL_CALL SalGtkFilePicker::getSelectedFiles() throw(
uno::RuntimeException )
{
SolarMutexGuard g;
@@ -852,7 +872,7 @@ uno::SequenceOUString SAL_CALL
SalGtkFilePicker::getSelectedFiles() throw( uno
++aListIter
)
{
-if( aListIter-getFilter().equalsIgnoreAsciiCase(
aStarDot+sExtension ) )
+if( lcl_matchFilter( aListIter-getFilter(),
aStarDot+sExtension ) )
{
if( aNewFilter.isEmpty() )
aNewFilter = aListIter-getTitle();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/generic/gdi/salgdi2.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 5ef3c40ff0e70704cbc7d846722db9618d01ca53
Author: David Tardon dtar...@redhat.com
Date: Tue Jun 18 11:55:59 2013 +0200
fdo#65844 use right colors from palette
It is not correct to expect that the palette will always be the same as
default-constructed from VCL. For example, 1bit PICT images use reversed
white and black.
Change-Id: I6b5e7cd19af98202e80f4cff17fddaa3a3f0e3af
(cherry picked from commit 1b3a39bfa10177aed40a4a9a69d0fe1970229422)
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 0288e05..3a54d53 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -471,8 +471,10 @@ void X11SalGraphics::drawBitmap( const SalTwoRect*
pPosAry, const SalBitmap rSa
const BitmapPalette rPalette = pBitmapBuffer-maPalette;
if (rPalette.GetEntryCount() == 2)
{
-aNewVal.foreground =
rColMap.GetPixel(ImplColorToSal(rPalette[0]));
-aNewVal.background =
rColMap.GetPixel(ImplColorToSal(rPalette[1]));
+const BitmapColor aBlack( rPalette[rPalette.GetBestIndex(
Color( COL_BLACK ) )] );
+const BitmapColor aWhite( rPalette[rPalette.GetBestIndex(
Color( COL_WHITE ) )] );
+aNewVal.foreground = rColMap.GetPixel(ImplColorToSal(aWhite));
+aNewVal.background = rColMap.GetPixel(ImplColorToSal(aBlack));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/generic/dtrans/X11_selection.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 76a325a1fdd2d2ecdf00da878d40995fb05efd8a Author: Mark Wielaard m...@klomp.org Date: Fri Jun 7 09:11:17 2013 +0200 Fix memory leak in SelectionManager::getXdndVersion. Release XListProperties atom properties of window after inspection. Change-Id: I89d86509babd7a9d8ec65dbabe0a062bf69fc493 Reviewed-on: https://gerrit.libreoffice.org/4186 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com (cherry picked from commit 222119cde3d6e3d9f0a6acba24c188500d1b6103) diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 9cd2c0b..db613f3 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -3017,6 +3017,9 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window rProxy ) break; } } +if ( pProperties ) +XFree (pProperties); + XLIB_Window aAwareWindow = rProxy != None ? rProxy : aWindow; XGetWindowProperty( m_pDisplay, aAwareWindow, m_nXdndAware, 0, 1, False, XA_ATOM, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 99afbfdad1d53d65f22a4ea22a5cee43f98a44b9 Author: Mark Wielaard m...@klomp.org Date: Tue Jun 4 22:00:45 2013 +0200 Fix memory leak in SalGtkFilePicker::SalGtkFilePicker. The result of gtk_widget_create_pango_layout should be unrefed when done. Change-Id: I46c220a933a2dac42ec21e9e2904938bc4649dbd Reviewed-on: https://gerrit.libreoffice.org/4157 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 4450d6bbd10fbf57f18912095f58c4a79b20bcb7) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 88cb3de..50ec20c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -301,6 +301,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference uno::XComponentContext PangoRectangle row_height; pango_layout_set_markup (layout, All Files, -1); pango_layout_get_pixel_extents (layout, NULL, row_height); +g_object_unref (layout); + g_object_get (cell, ypad, ypad, (char *)NULL); guint height = (row_height.height + 2*ypad) * 5; gtk_widget_set_size_request (m_pFilterView, -1, height); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit baa6b7f1a86a0014c9ce176b687bf6ac3edf933d
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jun 3 09:27:26 2013 +0100
fdo#56583 - avoid setting user time on unrealized windows.
Change-Id: Iab776088b1d168295d636069e1a92ba948241653
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 041a8a0..0f53e93 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1013,9 +1013,17 @@ static void lcl_set_user_time( GtkWindow* i_pWindow,
guint32 i_nTime )
bGetSetUserTimeFn = false;
p_gdk_x11_window_set_user_time =
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin,
gdk_x11_window_set_user_time );
}
+bool bSet = false;
if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time(
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
-else
+{
+GdkWindow* pWin = widget_get_window(GTK_WIDGET(i_pWindow));
+if( pWin ) // only if the window is realized.
+{
+p_gdk_x11_window_set_user_time( pWin, i_nTime );
+bSet = true;
+}
+}
+if( !bSet )
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 5e0733e904d25b45a08fd410c0f94b196322cf94 Author: Abdulaziz A Alayed aala...@kacst.edu.sa Date: Fri May 24 13:11:31 2013 +0300 fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab opened with LTR UI. Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 Reviewed-on: https://gerrit.libreoffice.org/4024 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com (cherry picked from commit 898a3e84807bccbb876e3f5583728f6d24e05e9a) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx old mode 100644 new mode 100755 index 7e16bfb..0a0fe89 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1048,8 +1048,9 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - -returnVal = true; +//fdo#63254 horizontal scrool bar isn't displayed in RTL tab +// with LTR UI in calc +returnVal =Application::GetSettings().GetLayoutRTL(); //See fdo#44582, Horizontal scrollbar in navigator window is broken if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) Application::GetSettings().GetLayoutRTL()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
