[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c921fc0ae2b20de1953e7558fce6b9ddb94c56d3
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Aug 1 11:11:44 2012 +0200
do not let LO's autoextension handling interfere with
KFileDialog's(fdo#52546)
Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
Signed-off-by: Tomas Chvatal tchva...@suse.cz
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index df08ed7..4917bf7 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16
controlId, sal_Int16 )
switch (controlId)
{
case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
-// we ignore this one and rely on KFileDialog to provide the
function,
-// always return true, here meaning it's been taken care of
-res = uno::Any( true );
+// We ignore this one and rely on KFileDialog to provide the
function.
+// Always return false, to pretend we do not support this,
otherwise
+// LO core would try to be smart and cut the extension in some
places,
+// interfering with KFileDialog's handling of it. KFileDialog also
+// saves the value of the setting, so LO core is not needed for
that either.
+res = uno::Any( false );
break;
case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1d1a6411d69f300a864012e6b07ccf27551ff561
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jul 10 15:15:45 2012 +0200
correctly paint toolbar separators with gtk-2.8 (bnc#770013)
wide_separators = 0 would be enough because the value was not modified if
the
property did not exist.
Anyway, I added also #if GTK_CHECK_VERSION(2,10,0) because it helps to avoid
the GTK warning about non-existing property 'wide-separators'.
Change-Id: If93928821d951dc15da967519cb207efdaa30cf7
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2b5d3c8..e1c8e2d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2871,7 +2871,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
}
else if( nPart == PART_SEPARATOR_HORZ || nPart ==
PART_SEPARATOR_VERT )
{
-gint separator_height, separator_width, wide_separators;
+const double shim = 0.2;
+
+#if GTK_CHECK_VERSION(2,10,0)
+gint separator_height, separator_width, wide_separators = 0;
gtk_widget_style_get (gWidgetData[m_nXScreen].gSeparator,
wide-separators, wide_separators,
@@ -2879,8 +2882,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
separator-height, separator_height,
NULL);
-const double shim = 0.2;
-
if (wide_separators)
{
if (nPart == PART_SEPARATOR_VERT)
@@ -2897,6 +2898,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
w * (1 - 2*shim), separator_width);
}
else
+#endif
{
if (nPart == PART_SEPARATOR_VERT)
gtk_paint_vline
(gWidgetData[m_nXScreen].gSeparator-style, gdkDrawable,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/unx
vcl/unx/gtk/app/gtksys.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8443397ccf73e8d905f56a1049f3334325d63ed7 Author: Ruslan Kabatsayev b7.10110...@gmail.com Date: Sat Jun 16 03:49:20 2012 +0400 Fix arguments of Rectangle constructor Change-Id: I8f288e55694ac85f8dcd2884a53ff4b5b9eef02f diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index 179bf58..cc921b8 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -245,7 +245,7 @@ Rectangle GtkSalSystem::GetDisplayScreenPosSizePixel (unsigned int nScreen) if (!pScreen) return Rectangle(); gdk_screen_get_monitor_geometry (pScreen, nMonitor, aRect); -return Rectangle (aRect.x, aRect.y, aRect.width, aRect.height); +return Rectangle (Point(aRect.x, aRect.y), Size(aRect.width, aRect.height)); } Rectangle GtkSalSystem::GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/unx
vcl/unx/gtk/app/gtkdata.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 3a15168ae587cdc8f329ae049d0c1d1e9d9de21a Author: Ruslan Kabatsayev b7.10110...@gmail.com Date: Mon Jun 18 17:23:46 2012 +0400 GTK: don't crash on X errors Change-Id: I5b1353b409bc7043d2d1c313a3606ed807eced4b Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 4d58110..07beacc 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -668,6 +668,7 @@ void GtkData::Init() // init gtk/gdk gtk_init_check( nParams, pCmdLineAry ); +gdk_error_trap_push(); for (i = 0; i nParams; i++ ) g_free( pCmdLineAry[i] ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/unx
vcl/unx/generic/app/saldisp.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 2036e842ccd906b5725eec3e66abb856a14e08b8 Author: Thomas Arnhold tho...@arnhold.org Date: Sun Jun 10 17:36:05 2012 +0200 Remove bogus header Thanks to Rene Engelhard for pointing this out. Change-Id: I6a6c91f6675ec8034c0af85dcb89bcbfaa7a18d8 Signed-off-by: Rene Engelhard r...@debian.org diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 2c34fd0..90bdf83 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -66,9 +66,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); #include tools/postx.h -#include svtools/langhelp.hxx #include vcl/svapp.hxx - #include unx/salunx.h #include sal/types.h #include unx/i18n_im.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
