[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit e8e82bd2109b82ddd535cdac30303249c6b62942
Author: Abdulaziz A Alayed aala...@kacst.edu.sa
Date: Tue Jan 22 11:43:30 2013 +0300
fdo#44582 fixing horizontal scroll bar in sub windows
Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075
Reviewed-on: https://gerrit.libreoffice.org/1806
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 736834a..e15fbfa 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1041,7 +1041,12 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
if (!rNativeContentRegion.GetHeight())
rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-returnVal = sal_True;
+
+returnVal = true;
+
+//See fdo#44582, Horizontal scrollbar in navigator window is broken
+if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT)
Application::GetSettings().GetLayoutRTL())
+returnVal = false;
}
if( (nType == CTRL_MENUBAR) (nPart == PART_ENTIRE_CONTROL) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/fpicker/SalGtkPicker.cxx |8 1 file changed, 8 deletions(-) New commits: commit 4aa908cf3a63bf4117357a8fbaeb2fd8dd5be310 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jan 23 15:33:28 2013 +0100 Unused #includes Change-Id: I624f35026b8ee847d70d429c61cd93d6a603d8b0 diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 9928143..6d5a9c6 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -23,19 +23,11 @@ #undef _LINUX_SOURCE_COMPAT #endif -#include com/sun/star/lang/DisposedException.hpp #include com/sun/star/lang/XMultiComponentFactory.hpp #include com/sun/star/uri/XExternalUriReferenceTranslator.hpp -#include com/sun/star/lang/SystemDependent.hpp -#include com/sun/star/awt/XSystemDependentWindowPeer.hpp -#include com/sun/star/awt/SystemDependentXWindow.hpp -#include com/sun/star/beans/NamedValue.hpp -#include com/sun/star/container/XNameAccess.hpp #include comphelper/processfactory.hxx -#include cppuhelper/interfacecontainer.h #include rtl/process.h #include osl/diagnose.h -#include com/sun/star/uno/Any.hxx #include osl/mutex.hxx #include vcl/svapp.hxx #include tools/urlobj.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/keysymnames.cxx | 36
1 file changed, 36 insertions(+)
New commits:
commit b35b7f8285b60271eeae257ea350a615523391a4
Author: Martin Srebotnjak mi...@filmsi.net
Date: Tue Jan 22 13:21:46 2013 +0100
Translate keyboard shortcuts also for Linux
Change-Id: I4d2f85106045a22be61c6b42fad941e4d4cf88d5
diff --git a/vcl/unx/generic/app/keysymnames.cxx
b/vcl/unx/generic/app/keysymnames.cxx
index 05c37d4..7fd127b 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -281,6 +281,41 @@ namespace vcl_sal {
{ SunXK_Cut, Cut },
};
+static const struct KeysymNameReplacement aImplReplacements_Slovenian[] =
+{
+{ XK_Control_L, Krmilka },
+{ XK_Control_R, Krmilka },
+{ XK_Shift_L, Dvigalka },
+{ XK_Shift_R, Dvigalka },
+{ XK_Alt_L, Izmenjalka },
+{ XK_Alt_R, Desna izmenjalka },
+{ XK_Page_Up, Prejšnja stranf },
+{ XK_Page_Down, Naslednja stran },
+{ XK_End, Konec },
+{ XK_Home, ZaÄetek },
+{ XK_Insert, Vstavljalka },
+{ XK_Delete, Brisalka },
+{ XK_Escape, Ubežnica },
+{ XK_Right, Desno },
+{ XK_Left, Levo },
+{ XK_Up, Navzgor },
+{ XK_Down, Navzdol },
+{ XK_BackSpace, VraÄalka },
+{ XK_Return, Vnašalka },
+{ XK_slash, Poševnica },
+{ XK_space, Preslednica },
+{ SunXK_Stop, Ustavi },
+{ SunXK_Again, Ponovi },
+{ SunXK_Props, Lastnosti },
+{ SunXK_Undo, Razveljavi },
+{ SunXK_Front, Ospredje },
+{ SunXK_Copy, Kopiraj },
+{ SunXK_Open, Odpri },
+{ SunXK_Paste, Prilepi },
+{ SunXK_Find, Najdi },
+{ SunXK_Cut, Izreži },
+};
+
static const struct KeysymNameReplacement aImplReplacements_Spanish[] =
{
{ XK_Shift_L, Mayús },
@@ -375,6 +410,7 @@ namespace vcl_sal {
{
{ ca, aImplReplacements_Catalan,
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
{ de, aImplReplacements_German,
SAL_N_ELEMENTS(aImplReplacements_German) },
+{ sl, aImplReplacements_Slovenian,
SAL_N_ELEMENTS(aImplReplacements_Slovenian) },
{ es, aImplReplacements_Spanish,
SAL_N_ELEMENTS(aImplReplacements_Spanish) },
{ et, aImplReplacements_Estonian,
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
{ fr, aImplReplacements_French,
SAL_N_ELEMENTS(aImplReplacements_French) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/keysymnames.cxx | 37
1 file changed, 37 insertions(+)
New commits:
commit 67eaa6c9f1cb599c158df008ccb75afb60bb8bef
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Jan 19 22:08:10 2013 +0200
Add Lithuanian translations of keyboard shortcuts (related to fdo#50415)
Change-Id: Ie5df8819c59135625f504f7d5b6736ddab7aab53
Reviewed-on: https://gerrit.libreoffice.org/1774
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/unx/generic/app/keysymnames.cxx
b/vcl/unx/generic/app/keysymnames.cxx
index 7fd127b..b733c73 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -406,6 +406,42 @@ namespace vcl_sal {
{ SunXK_Cut, Retalla },
};
+static const struct KeysymNameReplacement aImplReplacements_Lithuanian[] =
+{
+{ XK_Control_L, Vald },
+{ XK_Control_R, Vald },
+{ XK_Shift_L, Lyg2 },
+{ XK_Shift_R, Lyg2 },
+{ XK_Alt_L, Alt },
+{ XK_Alt_R, Lyg3 },
+{ XK_Page_Up, Pslâ },
+{ XK_Page_Down, Pslâ },
+{ XK_End, Pab },
+{ XK_Home, Prad },
+{ XK_Insert, Įterpti },
+{ XK_Delete, Å al },
+{ XK_Escape, Gr },
+{ XK_Right, DeÅ¡inÄn },
+{ XK_Left, KairÄn },
+{ XK_Up, Aukštyn },
+{ XK_Down, Žemyn },
+{ XK_BackSpace, Naikinti },
+{ XK_Return, Įvesti },
+{ XK_asterisk, ŽvaigždutÄ },
+{ XK_slash, Dešininis brūkšnys },
+{ XK_space, Tarpas },
+{ SunXK_Stop, Stabdyti },
+{ SunXK_Again, Kartoti },
+{ SunXK_Props, SavybÄs },
+{ SunXK_Undo, Atšaukti },
+{ SunXK_Front, Priekinis planas },
+{ SunXK_Copy, Kopijuoti },
+{ SunXK_Open, Atverti },
+{ SunXK_Paste, Ä®dÄti },
+{ SunXK_Find, Ieškoti },
+{ SunXK_Cut, IÅ¡kirpti },
+};
+
static const struct KeyboardReplacements aKeyboards[] =
{
{ ca, aImplReplacements_Catalan,
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
@@ -415,6 +451,7 @@ namespace vcl_sal {
{ et, aImplReplacements_Estonian,
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
{ fr, aImplReplacements_French,
SAL_N_ELEMENTS(aImplReplacements_French) },
{ it, aImplReplacements_Italian,
SAL_N_ELEMENTS(aImplReplacements_Italian) },
+{ lt, aImplReplacements_Lithuanian,
SAL_N_ELEMENTS(aImplReplacements_Lithuanian) },
{ nl, aImplReplacements_Dutch,
SAL_N_ELEMENTS(aImplReplacements_Dutch) },
{ no, aImplReplacements_Norwegian,
SAL_N_ELEMENTS(aImplReplacements_Norwegian) },
{ pt, aImplReplacements_Portuguese,
SAL_N_ELEMENTS(aImplReplacements_Portuguese) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/keysymnames.cxx | 31 +++
1 file changed, 31 insertions(+)
New commits:
commit 5dcb323352b175bfdcd994c4941433df98ffd4dd
Author: Jesús Corrius jcorr...@gmail.com
Date: Fri Jan 4 16:17:23 2013 +0100
fdo#50415: Add Catalan translations of keyboard shortcuts
Change-Id: Ieeab5b84674d26e4d29324614641813d8b65c517
Reviewed-on: https://gerrit.libreoffice.org/1543
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/vcl/unx/generic/app/keysymnames.cxx
b/vcl/unx/generic/app/keysymnames.cxx
index 69aee0d..05c37d4 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -341,8 +341,39 @@ namespace vcl_sal {
{ SunXK_Cut, Lõika },
};
+static const struct KeysymNameReplacement aImplReplacements_Catalan[] =
+{
+{ XK_Shift_L, Maj },
+{ XK_Shift_R, Maj },
+{ XK_Page_Up, Re PÃ g },
+{ XK_Page_Down, Av PÃ g },
+{ XK_End, Fi },
+{ XK_Home, Inici },
+{ XK_Delete, Supr },
+{ XK_Escape, Esc },
+{ XK_Right, Dreta },
+{ XK_Left, Esquerra },
+{ XK_Up, Amunt },
+{ XK_Down, Avall },
+{ XK_BackSpace, Retrocés },
+{ XK_Return, Retorn },
+{ XK_space, Espai },
+{ XK_KP_Enter, Retorn },
+{ SunXK_Stop, Atura },
+{ SunXK_Again, Repeteix },
+{ SunXK_Props, Props },
+{ SunXK_Undo, Desfés },
+{ SunXK_Front, Davant },
+{ SunXK_Copy, Còpia },
+{ SunXK_Open, Obre },
+{ SunXK_Paste, Enganxa },
+{ SunXK_Find, Cerca },
+{ SunXK_Cut, Retalla },
+};
+
static const struct KeyboardReplacements aKeyboards[] =
{
+{ ca, aImplReplacements_Catalan,
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
{ de, aImplReplacements_German,
SAL_N_ELEMENTS(aImplReplacements_German) },
{ es, aImplReplacements_Spanish,
SAL_N_ELEMENTS(aImplReplacements_Spanish) },
{ et, aImplReplacements_Estonian,
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 28e4c0250e67a344b4d6088bdca2e680a4bffad0
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Dec 19 13:33:15 2012 +0100
fix KDE file dialog setting checkboxes to true
No idea how long this has been broken, or if it ever worked,
but inserting a picture sets the 'link' and 'preview' checkboxes to true
for the next time (as getValue() returns void*, which gets silently
converted to bool *sigh*).
Change-Id: I6af0e09ac5e475fc9ff04cd7f937af0bc7aeea77
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 95f9de3..5759414 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -362,7 +362,7 @@ void SAL_CALL KDE4FilePicker::setValue( sal_Int16
controlId, sal_Int16, const un
case ExtendedFilePickerElementIds::CHECKBOX_SELECTION:
{
QCheckBox* cb = dynamic_castQCheckBox*(widget);
-cb-setChecked(value.getValue());
+cb-setChecked(value.getbool());
break;
}
case ExtendedFilePickerElementIds::PUSHBUTTON_PLAY:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salprn-gtk.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 6bfc84d14c056818345320b2918963a39cceafba
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 28 20:09:05 2012 +
get vcl building on RHEL-5
Change-Id: I01dc490d09fbe4bd0cce34b7e93afd36dd517f25
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index e51c552..79a9432 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -347,9 +347,15 @@ lcl_setHelpText(
const uno::Sequencertl::OUString i_rHelpTexts,
const sal_Int32 i_nIndex)
{
+#if GTK_CHECK_VERSION(2,12,0)
if (i_nIndex = 0 i_nIndex i_rHelpTexts.getLength())
gtk_widget_set_tooltip_text(io_pWidget,
rtl::OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex],
RTL_TEXTENCODING_UTF8).getStr());
+#else
+(void)io_pWidget;
+(void)i_rHelpTexts;
+(void)i_nIndex;
+#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 +-
vcl/unx/kde/salnativewidgets-kde.cxx |8
vcl/unx/kde4/KDESalFrame.cxx | 10 +-
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 6344b00ea1d0ceed64212172f7f2b7c7a77cdabf
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Nov 22 13:06:17 2012 +0100
Adapt some GetUILocale leftovers
Change-Id: I0400858249d4722a3b5583febd82200e62a64b20
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1037d9d..7d99c32 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1304,7 +1304,7 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
fprintf( stderr, font name BEFORE system match: \%s\\n,
aFamily.getStr() );
// match font to e.g. resolve Sans
-psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
+psp::PrintFontManager::get().matchFont( aInfo,
rSettings.GetUILanguageTag().getLocale() );
fprintf( stderr, font match %s, name AFTER: \%s\\n,
aInfo.m_nID != 0 ? succeeded : failed,
rtl::OUStringToOString( aInfo.m_aStyleName,
RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx
b/vcl/unx/kde/salnativewidgets-kde.cxx
index ea8cbc4..1440b84 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1873,7 +1873,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
pKey = titleFont;
if ( pConfig-hasKey( pKey ) )
{
-Font aFont = toFont( pConfig-readFontEntry( pKey ),
rSettings.GetUILocale() );
+Font aFont = toFont( pConfig-readFontEntry( pKey ),
rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetTitleFont( aFont );
bSetTitleFont = true;
}
@@ -1934,7 +1934,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
aStyleSettings.SetHighlightTextColor( toColor(
qColorGroup.highlightedText() ) );
// Font
-Font aFont = toFont( kapp-font(), rSettings.GetUILocale() );
+Font aFont = toFont( kapp-font(),
rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetAppFont( aFont );
aStyleSettings.SetHelpFont( aFont );
@@ -2005,7 +2005,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
ImplGetSVData()-maNWFData.maMenuBarHighlightTextColor = aMenuFore;
// Font
-aFont = toFont( pMenuBar-font(), rSettings.GetUILocale() );
+aFont = toFont( pMenuBar-font(),
rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetMenuFont( aFont );
}
@@ -2013,7 +2013,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
KToolBar *pToolBar = qMainWindow.toolBar();
if ( pToolBar )
{
-aFont = toFont( pToolBar-font(), rSettings.GetUILocale() );
+aFont = toFont( pToolBar-font(),
rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetToolFont( aFont );
}
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 1242a3c..6f3fe53 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -192,7 +192,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
pKey = titleFont;
if ( aGroup.hasKey( pKey ) )
{
-Font aFont = toFont( aGroup.readEntry( pKey, QFont() ),
rSettings.GetUILocale() );
+Font aFont = toFont( aGroup.readEntry( pKey, QFont() ),
rSettings.GetUILanguageTag().getLocale() );
style.SetTitleFont( aFont );
bSetTitleFont = true;
}
@@ -207,7 +207,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
pKey = toolbarFont;
if ( aGroup.hasKey( pKey ) )
{
-Font aFont = toFont( aGroup.readEntry( pKey, QFont() ),
rSettings.GetUILocale() );
+Font aFont = toFont( aGroup.readEntry( pKey, QFont() ),
rSettings.GetUILanguageTag().getLocale() );
style.SetToolFont( aFont );
}
}
@@ -263,7 +263,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
style.SetHelpTextColor( toColor( QToolTip::palette().color(
QPalette::Active, QPalette::ToolTipText )));
// Font
-Font aFont = toFont( kapp-font(), rSettings.GetUILocale() );
+Font aFont = toFont( kapp-font(),
rSettings.GetUILanguageTag().getLocale() );
style.SetAppFont( aFont );
@@ -284,7 +284,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
}
style.SetFloatTitleFont( aFont );
-style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILocale()));
+style.SetHelpFont( toFont( QToolTip::font(),
rSettings.GetUILanguageTag().getLocale()));
int flash_time = QApplication::cursorFlashTime();
style.SetCursorBlinkTime(
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/saldisp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fe71e7bd0c7630b6452e418df14d780dd87ba946
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 19 12:39:56 2012 +0100
SalColormap: -Werror=conversion-null
That is actually XID, not a pointer.
Change-Id: I9fa807fc4f33c07b2b4ebbb5e1b7163eb53411c3
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b010359..3310e6d 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2687,7 +2687,7 @@ SalColormap::SalColormap( sal_uInt16 nDepth )
SalColormap::~SalColormap()
{
#ifdef DBG_UTIL
-m_hColormap = NULL;
+m_hColormap = None;
m_pDisplay = NULL;
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e059883fb343471fa651f4601f59acc5f37333b6 Author: Ivan Timofeev timofeev@gmail.com Date: Sat Nov 17 23:51:48 2012 +0400 gtk: don't make editboxes taller than needed Change-Id: I248d6668d1e9c5ec834cd8268d853ec03a2f859b diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index d8c1f69..5a1d376 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1144,7 +1144,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, GtkRequisition aReq; gtk_widget_size_request( widget, aReq ); Rectangle aEditRect = rControlRegion; -long nHeight = (aEditRect.GetHeight() aReq.height+1) ? aEditRect.GetHeight() : aReq.height+1; +long nHeight = (aEditRect.GetHeight() aReq.height) ? aEditRect.GetHeight() : aReq.height; aEditRect = Rectangle( aEditRect.TopLeft(), Size( aEditRect.GetWidth(), nHeight ) ); rNativeBoundingRegion = aEditRect; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14ad313a242ec8791956e3e4a9460f743c0c8d7a
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 14 13:40:55 2012 +
hud_activated here surely should have been hud_active
Change-Id: Id324a31295b0c6836a1e9516ac070d4042c5c3f2
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index c4fa0df..88ac7f2 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -518,7 +518,7 @@ static void ObjectDestroyedNotify( gpointer data )
static void hud_activated( gboolean hud_active, gpointer user_data )
{
-if ( hud_activated )
+if ( hud_active )
{
SolarMutexGuard aGuard;
GtkSalFrame* pSalFrame = reinterpret_cast GtkSalFrame* ( user_data );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit a4053378b7a98d8a18415ba5acd8b69ba28793a2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Nov 13 14:04:58 2012 +0100
Solve scope issues with older gtk
Change-Id: Icceb9586b4051009a8843b4672b79daf22e07830
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index c1bdf3c..d8c1f69 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -4028,9 +4028,14 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) =
(cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol(
GetSalData()-m_pPlugin, gdk_screen_get_font_options );
if( gdk_screen_get_font_options != NULL )
-#endif
+{
const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options(
pScreen );
+aStyleSet.SetCairoFontOptions( pNewOptions );
+}
+#else
+const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options(
pScreen );
aStyleSet.SetCairoFontOptions( pNewOptions );
+#endif
// finally update the collected settings
rSettings.SetStyleSettings( aStyleSet );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 776f0184d11965ccf8232ff47206d1e1566a6fd2
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Nov 12 18:53:52 2012 +0400
Related: fdo#56198 avoid gtk warning, take 3
We need to check at run time, not at compile.
Thanks to Michael Meeks for spotting!
Change-Id: Ic8175d6af0bb8ec167f108925aaaf31f970fbd05
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 4455c2b..c1bdf3c 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3990,10 +3990,14 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
gboolean showmenuicons = true, primarybuttonwarps = false;
g_object_get( pSettings,
gtk-menu-images, showmenuicons,
-#if GTK_CHECK_VERSION(2,24,13)
-gtk-primary-button-warps-slider, primarybuttonwarps,
-#endif
(char *)NULL );
+if( g_object_class_find_property(
+G_OBJECT_GET_CLASS(pSettings), gtk-primary-button-warps-slider) )
+{
+g_object_get( pSettings,
+gtk-primary-button-warps-slider, primarybuttonwarps,
+(char *)NULL );
+}
aStyleSet.SetPreferredUseImagesInMenus(showmenuicons);
aStyleSet.SetPrimaryButtonWarpsSlider(primarybuttonwarps);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 0292fbde1763e4a406be15b1771780a6a0c9aa47 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Nov 11 15:17:19 2012 +0400 Related: fdo#56198 avoid gtk warning Change-Id: I230c2923960862f7e705f03a5c8a5763c002256b diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 1451476..da3c181 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3990,7 +3990,9 @@ void GtkSalGraphics::updateSettings( AllSettings rSettings ) gboolean showmenuicons = true, primarybuttonwarps = false; g_object_get( pSettings, gtk-menu-images, showmenuicons, +#if GTK_CHECK_VERSION(2,24,0) gtk-primary-button-warps-slider, primarybuttonwarps, +#endif (char *)NULL ); aStyleSet.SetPreferredUseImagesInMenus(showmenuicons); aStyleSet.SetPrimaryButtonWarpsSlider(primarybuttonwarps); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1e3e415dbe877666e1575128a7ec3d5d9c076ffa Author: Ivan Timofeev timofeev@gmail.com Date: Sun Nov 11 16:36:14 2012 +0400 Related: fdo#56198 avoid gtk warning, take 2 from http://developer.gnome.org/gtk/2.24/GtkSettings.html The gtk-primary-button-warps-slider property ... Since: 2.24 but it is 2.24.13 indeed: https://mail.gnome.org/archives/ftp-release-list/2012-September/msg00195.html News * Implement a gtk-primary-button-warps-slider setting that lets us adjust scale and scrollbar behaviour according to platform. Change-Id: I4d3170801973e3e6101736971de58d70b673fd58 diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index da3c181..4455c2b 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3990,7 +3990,7 @@ void GtkSalGraphics::updateSettings( AllSettings rSettings ) gboolean showmenuicons = true, primarybuttonwarps = false; g_object_get( pSettings, gtk-menu-images, showmenuicons, -#if GTK_CHECK_VERSION(2,24,0) +#if GTK_CHECK_VERSION(2,24,13) gtk-primary-button-warps-slider, primarybuttonwarps, #endif (char *)NULL ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDEXLib.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b32f67d1ab25905fd8866ba10ce39a287b86381 Author: Michael Meeks michael.me...@suse.com Date: Tue Nov 6 13:16:02 2012 + add missing ki18n helper. diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 3fc53a0..fc3eafd 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -99,7 +99,7 @@ void KDEXLib::Init() 3.6.0, ki18n( LibreOffice with KDE Native Widget Support. ), KAboutData::License_File, -(c) 2003-2012 Novell, Inc and Apache Software Foundation, +ki18n( (c) 2003-2012 Novell, Inc and Apache Software Foundation ), ki18n( LibreOffice is an office suite.\n ), http://libreoffice.org;, libreoffice@lists.freedesktop.org); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde/kdedata.cxx |2 +- vcl/unx/kde4/KDEXLib.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 6e4d4adc5638d8d51d1df05e22def0c8a32c679f Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Nov 6 15:52:47 2012 +0100 use the generic LO claim from the about dialog for KDE's internal data It's not really visible anywhere anyway. diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index e521c37..e66475d 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -122,7 +122,7 @@ void KDEXLib::Init() 3.4.0, I18N_NOOP( LibreOffice with KDE Native Widget Support. ), KAboutData::License_File, -(c) 2003, 2004 Novell, Inc and Apache Software Foundation, +I18N_NOOP( Copyright (C) 2000 - 2012 LibreOffice contributors and/or their affiliates ), I18N_NOOP( LibreOffice is an office suite.\n ), http://libreoffice.org;, libreoffice@lists.freedesktop.org); diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index fc3eafd..dbd6664 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -99,7 +99,7 @@ void KDEXLib::Init() 3.6.0, ki18n( LibreOffice with KDE Native Widget Support. ), KAboutData::License_File, -ki18n( (c) 2003-2012 Novell, Inc and Apache Software Foundation ), +ki18n(Copyright (c) 2000 - 2012 LibreOffice contributors and/or their affiliates ), ki18n( LibreOffice is an office suite.\n ), http://libreoffice.org;, libreoffice@lists.freedesktop.org); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtkinst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b0ec8d8683c800b689a208ca2d44128e2cecefb8
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Oct 25 17:08:57 2012 +0200
vcl: don't print gtk version on startup
All the other messages are already 1, makes no sense to have this as
0.
Change-Id: I816239903cef650f34d9c57446018843e2acb64a
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 845e2fc..5d67fa1 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -140,7 +140,7 @@ extern C
VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance( oslModule pModule )
{
-#if OSL_DEBUG_LEVEL 0
+#if OSL_DEBUG_LEVEL 1
fprintf( stderr, create vcl plugin instance with gtk version %d %d
%d\n,
(int) gtk_major_version, (int) gtk_minor_version,
(int) gtk_micro_version );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit b339e4e2ba2b833903956cbcebf64a2a99dba176
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Oct 21 12:29:58 2012 +0200
Fix Variable 'eState' is reassigned a value before the old one has been used
See
http://nabble.documentfoundation.org/Cppcheck-report-in-vcl-unx-gtk-gdi-salnativewidgets-gtk-cxx-td4014513.html
Change-Id: I9f59ed1fa0cd325d65f5574332b19625b27f8900
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 5870070..56a9b0a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3448,7 +3448,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKSlider(
: GTK_WIDGET(gWidgetData[m_nXScreen].gVScale);
const gchar* pDetail = (nPart == PART_TRACK_HORZ_AREA) ? hscale :
vscale;
GtkOrientation eOri = (nPart == PART_TRACK_HORZ_AREA) ?
GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
-GtkStateType eState = (nState CTRL_STATE_ENABLED) ? GTK_STATE_ACTIVE :
GTK_STATE_INSENSITIVE;
gint slider_width = 10;
gint slider_length = 10;
gint trough_border = 0;
@@ -3458,7 +3457,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKSlider(
trough-border, trough_border,
NULL);
-eState = (nState CTRL_STATE_ENABLED) ? GTK_STATE_NORMAL :
GTK_STATE_INSENSITIVE;
+GtkStateType eState = (nState CTRL_STATE_ENABLED) ? GTK_STATE_NORMAL :
GTK_STATE_INSENSITIVE;
if( nPart == PART_TRACK_HORZ_AREA )
{
gtk_paint_box( pWidget-style,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 681e894b1ffa536ea3ccb5071465fbd1b0e34cc3
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Oct 13 14:09:45 2012 +0400
brain fog: logic error
Change-Id: I1ebfad03dca16b7530a44dfc7576ff5b73f681aa
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 0b0c0a0..945ae0b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2243,7 +2243,7 @@ static void NWPaintOneEditBox(SalX11Screen nScreen,
interior-focus, bInteriorFocus,
focus-line-width, nFocusLineWidth,
(char *)NULL);
-if ( bInteriorFocus )
+if ( !bInteriorFocus )
{
xborder += nFocusLineWidth;
yborder += nFocusLineWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit b19ff316441fb2d1f0537e008ea8b6fdec307224 Author: Ivan Timofeev timofeev@gmail.com Date: Thu Oct 11 15:01:52 2012 +0400 fdo#45651: gtk: fix text color with dark themes Change-Id: I959b7791151fd345c250016ae8ad315a4615a871 diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index ce14634..6fd600b 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -3736,13 +3736,14 @@ void GtkSalGraphics::updateSettings( AllSettings rSettings ) // text colors Color aTextColor = getColor( pStyle-text[GTK_STATE_NORMAL] ); aStyleSet.SetDialogTextColor( aTextColor ); +aStyleSet.SetWindowTextColor( aTextColor ); +aStyleSet.SetFieldTextColor( aTextColor ); +aTextColor = getColor( pStyle-fg[GTK_STATE_NORMAL] ); aStyleSet.SetButtonTextColor( aTextColor ); aStyleSet.SetRadioCheckTextColor( aTextColor ); aStyleSet.SetGroupTextColor( aTextColor ); aStyleSet.SetLabelTextColor( aTextColor ); aStyleSet.SetInfoTextColor( aTextColor ); -aStyleSet.SetWindowTextColor( aTextColor ); -aStyleSet.SetFieldTextColor( aTextColor ); // Tooltip colors GtkStyle* pTooltipStyle = gtk_widget_get_style( gWidgetData[m_nXScreen].gTooltipPopup ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/wmadaptor.cxx |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit 72411fca4852f4395cf4bf206016a041bee6c53a Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Sep 17 02:36:51 2012 +0200 don't add invalid UTF-8 to _NET_WM_NAME and _NET_WM_ICON_NAME time to get rid of workarounds for broken window managers that were introduced more than 10 years ago. Change-Id: I43b4c7aeab1b86b3d4a290a1d1d64c6fcb9a57ef Reviewed-on: https://gerrit.libreoffice.org/633 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 784cf10..e920ae7 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -1124,7 +1124,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String rWMName ) const 8, PropModeReplace, (unsigned char*)aTitle.getStr(), - aTitle.getLength()+1 ); + aTitle.getLength() ); if( m_aWMAtoms[ NET_WM_ICON_NAME ] ) XChangeProperty( m_pDisplay, (XLIB_Window)pEnv-aShellWindow, @@ -1133,11 +1133,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String rWMName ) const 8, PropModeReplace, (unsigned char*)aTitle.getStr(), - aTitle.getLength()+1 ); -// The +1 copies the terminating null byte. Although -// the spec says, this should not be necessary -// at least the kwin implementation seems to depend -// on the null byte + aTitle.getLength() ); } /* ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/saldata.cxx |6 ++
vcl/unx/gtk/app/gtkdata.cxx | 14 ++
2 files changed, 20 insertions(+)
New commits:
commit b0759366fc6cdda2db2f2cb4208df36c1b1fe8fc
Author: Caolán McNamara caol...@redhat.com
Date: Wed Sep 12 13:44:09 2012 +0100
Resolves: rhbz#855541 XIOError handler multithread woes
We have two threads using X, on an XIOError both
threads call their XIOError handlers and two
calls to exit trample all over eachother.
Change-Id: I20defc6f84cc6ea2372a0d6c979e8078fe920a88
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 1fb6a7a..0596dce 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -322,6 +322,12 @@ int X11SalData::XErrorHdl( Display *pDisplay, XErrorEvent
*pEvent )
int X11SalData::XIOErrorHdl( Display * )
{
+if (::osl::Thread::getCurrentIdentifier() !=
Application::GetMainThreadIdentifier())
+{
+pthread_exit(NULL);
+return 0;
+}
+
/* #106197# hack: until a real shutdown procedure exists
* _exit ASAP
*/
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 8f3151c..867883f 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -526,6 +526,18 @@ GtkData::GtkData( SalInstance *pInstance )
m_aDispatchCondition = osl_createCondition();
}
+XIOErrorHandler aOrigXIOErrorHandler = NULL;
+
+int XIOErrorHdl(Display *pDisplay)
+{
+if (::osl::Thread::getCurrentIdentifier() !=
Application::GetMainThreadIdentifier())
+{
+pthread_exit(NULL);
+return 0;
+}
+return aOrigXIOErrorHandler ? aOrigXIOErrorHandler(pDisplay) : 0;
+}
+
GtkData::~GtkData()
{
Yield( true, true );
@@ -545,6 +557,7 @@ GtkData::~GtkData()
osl_destroyCondition( m_aDispatchCondition );
osl_releaseMutex( m_aDispatchMutex );
osl_destroyMutex( m_aDispatchMutex );
+XSetIOErrorHandler(aOrigXIOErrorHandler);
}
void GtkData::Dispose()
@@ -664,6 +677,7 @@ void GtkData::Init()
// init gtk/gdk
gtk_init_check( nParams, pCmdLineAry );
gdk_error_trap_push();
+aOrigXIOErrorHandler = XSetIOErrorHandler(XIOErrorHdl);
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] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 17 +
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 14 ++
2 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 58d757fd295d48bcd2eef51c2f41f5014c1cda21
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Aug 28 14:58:34 2012 +0400
gtk: sumulate native insensitivity of scrollbar buttons
Change-Id: I13ac2c43aadd494389586166771b1d0e6bfb9ea6
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index f28cb0a..011e755 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1948,11 +1948,17 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar(
ControlType, ControlPart nPart,
GTK_WIDGET(scrollbarWidget)-allocation.width = w;
GTK_WIDGET(scrollbarWidget)-allocation.height = h;
+bool backwardButtonInsensitive =
+pScrollbarVal-mnCur == pScrollbarVal-mnMin;
+bool forwardButtonInsensitive = pScrollbarVal-mnMax == 0 ||
+pScrollbarVal-mnCur + pScrollbarVal-mnVisibleSize =
pScrollbarVal-mnMax;
+
// - BUTTON 1 //
if ( has_backward )
{
NWConvertVCLStateToGTKState( pScrollbarVal-mnButton1State,
stateType, shadowType );
-if ( stateType == GTK_STATE_INSENSITIVE )stateType =
GTK_STATE_NORMAL;
+if ( backwardButtonInsensitive )
+stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType,
gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag,
x+hShim+button11BoundRect.Left(),
y+vShim+button11BoundRect.Top(),
@@ -1967,7 +1973,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar(
ControlType, ControlPart nPart,
if ( has_forward2 )
{
NWConvertVCLStateToGTKState( pScrollbarVal-mnButton2State,
stateType, shadowType );
-if ( stateType == GTK_STATE_INSENSITIVE )stateType =
GTK_STATE_NORMAL;
+if ( forwardButtonInsensitive )
+stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType,
gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag,
x+hShim+button12BoundRect.Left(),
y+vShim+button12BoundRect.Top(),
@@ -1983,7 +1990,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar(
ControlType, ControlPart nPart,
if ( has_backward2 )
{
NWConvertVCLStateToGTKState( pScrollbarVal-mnButton1State,
stateType, shadowType );
-if ( stateType == GTK_STATE_INSENSITIVE )stateType =
GTK_STATE_NORMAL;
+if ( backwardButtonInsensitive )
+stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect,
GTK_WIDGET(scrollbarWidget), scrollbarTag,
x+hShim+button21BoundRect.Left(),
y+vShim+button21BoundRect.Top(),
@@ -1998,7 +2006,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar(
ControlType, ControlPart nPart,
if ( has_forward )
{
NWConvertVCLStateToGTKState( pScrollbarVal-mnButton2State,
stateType, shadowType );
-if ( stateType == GTK_STATE_INSENSITIVE )stateType =
GTK_STATE_NORMAL;
+if ( forwardButtonInsensitive )
+stateType = GTK_STATE_INSENSITIVE;
gtk_paint_box( style, gdkDrawable, stateType, shadowType, gdkRect,
GTK_WIDGET(scrollbarWidget), scrollbarTag,
x+hShim+button22BoundRect.Left(),
y+vShim+button22BoundRect.Top(),
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 45e8977..0774699 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -431,10 +431,18 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
gtk_style_context_restore(context);
}
+
+bool backwardButtonInsensitive =
+pScrollbarVal-mnCur == pScrollbarVal-mnMin;
+bool forwardButtonInsensitive = pScrollbarVal-mnMax == 0 ||
+pScrollbarVal-mnCur + pScrollbarVal-mnVisibleSize =
pScrollbarVal-mnMax;
+
// - BUTTON 1 //
if ( has_backward )
{
NWConvertVCLStateToGTKState( pScrollbarVal-mnButton1State,
stateFlags, shadowType );
+if ( backwardButtonInsensitive )
+stateFlags = GTK_STATE_FLAG_INSENSITIVE;
gtk_style_context_save(context);
gtk_style_context_set_state(context, stateFlags);
@@ -459,6 +467,8 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext
*context,
if ( has_forward2 )
{
NWConvertVCLStateToGTKState( pScrollbarVal-mnButton2State,
stateFlags, shadowType );
+if ( forwardButtonInsensitive )
+stateFlags = GTK_STATE_FLAG_INSENSITIVE;
gtk_style_context_save(context);
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/plugadapt/salplug.cxx |3 -
vcl/unx/kde/UnxFilePicker.cxx |8 ++
vcl/unx/kde/fpicker/kdefilepicker.cxx | 27 -
vcl/unx/kde/fpicker/kdefilepicker.hxx |4 +
vcl/unx/kde/salnativewidgets-kde.cxx | 92 --
5 files changed, 101 insertions(+), 33 deletions(-)
New commits:
commit af4ca5a8c6e2848cb855a15986d5c4c9991140bf
Author: Timothy Pearson kb9...@pearsoncomputing.net
Date: Mon Aug 20 12:40:33 2012 +0100
Fix TDE VCL interface
Change-Id: Ifd28ab758ba8be89a57c152d3fb9d361715bb33f
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 4af49cd..67b806e 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -189,10 +189,7 @@ static SalInstance* autodetect_plugin()
else if ( desktop == DESKTOP_GNOME )
pList = pStandardFallbackList;
else if( desktop == DESKTOP_TDE )
-{
pList = pTDEFallbackList;
-nListEntry = 1;
-}
else if( desktop == DESKTOP_KDE )
{
pList = pKDEFallbackList;
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index f217720..5c06e25 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -81,7 +81,11 @@ namespace
uno::Sequencertl::OUString aRet(3);
aRet[0] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ui.dialogs.FilePicker));
aRet[1] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ui.dialogs.SystemFilePicker));
+#ifdef ENABLE_TDE
+aRet[2] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ui.dialogs.TDEFilePicker));
+#else // ENABLE_TDE
aRet[2] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ui.dialogs.KDEFilePicker));
+#endif // ENABLE_TDE
return aRet;
}
}
@@ -717,7 +721,11 @@ void UnxFilePicker::initFilePicker()
#endif
// The executable name
+#ifdef ENABLE_TDE
+rtl::OUString helperurl(
RTL_CONSTASCII_USTRINGPARAM(${ORIGIN}/tdefilepicker));
+#else // ENABLE_TDE
rtl::OUString helperurl(
RTL_CONSTASCII_USTRINGPARAM(${ORIGIN}/kdefilepicker));
+#endif // ENABLE_TDE
rtl::Bootstrap::expandMacros( helperurl );
rtl::OUString helperpath;
osl::FileBase::getSystemPathFromFileURL( helperurl, helperpath );
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx
b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index d52a6a7..6b5bba1 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -85,6 +85,14 @@
#endif // ENABLE_TDE
+#ifdef ENABLE_TDE
+#define QCheckBox_StringTQCheckBox
+#define QComboBox_StringTQComboBox
+#else // ENABLE_TDE
+#define QCheckBox_StringQCheckBox
+#define QComboBox_StringQComboBox
+#endif // ENABLE_TDE
+
#include algorithm
#include iostream
@@ -104,8 +112,13 @@ KDEFileDialog::KDEFileDialog( const QString startDir,
const QString filter,
m_bIsExecuting( false ),
m_bCanNotifySelection( true )
{
+#ifdef ENABLE_TDE
+connect( this, SIGNAL( fileHighlighted( const TQString ) ),
+ this, SLOT( fileHighlightedCommand( const TQString ) ) );
+#else // ENABLE_TDE
connect( this, SIGNAL( fileHighlighted( const QString ) ),
this, SLOT( fileHighlightedCommand( const QString ) ) );
+#endif // ENABLE_TDE
connect( this, SIGNAL( selectionChanged() ),
this, SLOT( selectionChangedCommand() ) );
@@ -434,7 +447,7 @@ void KDEFileDialog::getValue( const QString rId, const
QString rAction )
if ( pWidget )
{
QCString qClassName = pWidget-className();
-if ( qClassName == QCheckBox )
+if ( qClassName == QCheckBox_String )
{
QCheckBox *pCheckBox = static_cast QCheckBox* ( pWidget );
@@ -443,7 +456,7 @@ void KDEFileDialog::getValue( const QString rId, const
QString rAction )
else
qString.append( bool false );
}
-else if ( qClassName == QComboBox )
+else if ( qClassName == QComboBox_String )
{
QComboBox *pComboBox = static_cast QComboBox* ( pWidget );
if ( rAction == getItems )
@@ -480,14 +493,14 @@ void KDEFileDialog::setValue( const QString rId, const
QString rAction, const
if ( pWidget )
{
QCString qClassName = pWidget-className();
-if ( qClassName == QCheckBox )
+if ( qClassName == QCheckBox_String )
{
QCheckBox *pCheckBox = static_cast QCheckBox* ( pWidget );
bool bValue = ( !rValue.isEmpty() ) ( rValue.front().lower() ==
true );
pCheckBox-setChecked( bValue );
}
-else if ( qClassName == QComboBox )
+else if ( qClassName == QComboBox_String )
{
QComboBox *pComboBox = static_cast QComboBox* ( pWidget );
if ( rAction == addItem )
@@ -562,7 +575,7 @@ QString
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/i18n_wrp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4de603d28ce884fb2a3720b6d132465b6dcc98a9
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Aug 5 13:49:37 2012 +0200
Clang:Null pointer passed as an argument to a 'nonnull' parameter
Change-Id: Ia07c50f4822af256b3b35f39f46dc442750c8439
diff --git a/vcl/unx/generic/app/i18n_wrp.cxx b/vcl/unx/generic/app/i18n_wrp.cxx
index 05dfd10..e152135 100644
--- a/vcl/unx/generic/app/i18n_wrp.cxx
+++ b/vcl/unx/generic/app/i18n_wrp.cxx
@@ -235,7 +235,7 @@ Status XvaCloseIM(XIM)
{
Status s = False;
-if (!g_dlmodule)
+if (g_dlmodule)
{
/* assuming one XvaOpenIM call */
dlclose(g_dlmodule);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 92e00f2e536ce0458961d329a3c676acc86249e6
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu Aug 2 16:06:33 2012 +0400
cairo uses pre-multiplied alpha
Change-Id: I6cf04b10bfdd6c7b16761b2aa2f31c1392c49546
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 5e0972f..4298493 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -972,9 +972,9 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr,
for (int x = 0; x awidth y aheight; ++x)
{
double alpha = ((float)cairo_data[x*4 + 3])/255.0;
-src[x*3 + 0] = src[x*3 + 0] * (1.0 - alpha) + cairo_data[x*4+0] *
alpha;
-src[x*3 + 1] = src[x*3 + 1] * (1.0 - alpha) + cairo_data[x*4+1] *
alpha;
-src[x*3 + 2] = src[x*3 + 2] * (1.0 - alpha) + cairo_data[x*4+2] *
alpha;
+src[x*3 + 0] = src[x*3 + 0] * (1.0 - alpha) + cairo_data[x*4+0];
+src[x*3 + 1] = src[x*3 + 1] * (1.0 - alpha) + cairo_data[x*4+1];
+src[x*3 + 2] = src[x*3 + 2] * (1.0 - alpha) + cairo_data[x*4+2];
}
src += nStride;
cairo_data += cairo_stride;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit e62c67d8d47231e3ff0df440642dfcabac4f3f81
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
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] .: vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 78f1e95df4b8bd1fbc32ed4192676fd4f176f5bf Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Aug 1 12:08:03 2012 +0200 workaround for KFileDialog remembering its settings Change-Id: I6f473c246408684c5d952a2161645e4fe76873ea diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 4917bf7..4bd2836 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -200,6 +200,11 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute() mutexrelease = Application::ReleaseSolarMutex(); //block and wait for user input int result = _dialog-exec(); +// HACK: KFileDialog uses KConfig(kdeglobals) for saving some settings +// (such as the auto-extension flag), but that doesn't update KGlobal::config() +// (which is probably a KDE bug), so force reading the new configuration, +// otherwise the next opening of the dialog would use the old settings. +KGlobal::config()-reparseConfiguration(); if( !qApp-clipboard()-property( useEventLoopWhenWaiting ).toBool()) Application::AcquireSolarMutex( mutexrelease ); if( result == KFileDialog::Accepted) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 18e48959de7774f0e2bf194594809b74ee26ab93
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 7735a74..96b702b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2865,7 +2865,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,
@@ -2873,8 +2876,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
separator-height, separator_height,
NULL);
-const double shim = 0.2;
-
if (wide_separators)
{
if (nPart == PART_SEPARATOR_VERT)
@@ -2891,6 +2892,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] .: vcl/unx
vcl/unx/gtk/app/gtkdata.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a7f69caf25662d72b685a2c3412f3a352a0c5a88 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] .: vcl/unx
vcl/unx/generic/app/saldisp.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 2432083b50ea7481247c303187bb3922714f93d5 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 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
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 161 ---
1 file changed, 87 insertions(+), 74 deletions(-)
New commits:
commit 71daa69351f6903d6a94b7af15fce53361f79c6d
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date: Thu May 31 23:47:19 2012 +0400
GTK theming plugin: convert big if statement to switch structure
Change-Id: I1220d80bdba4835db3674271f8a060af50af998f
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 9d9dee6..b86e91f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -544,81 +544,94 @@ void GtkSalGraphics::copyBits( const SalTwoRect* pPosAry,
*/
sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType,
ControlPart nPart )
{
-if (
-((nType==CTRL_PUSHBUTTON) (nPart==PART_ENTIRE_CONTROL)) ||
- ((nType==CTRL_RADIOBUTTON) (nPart==PART_ENTIRE_CONTROL))||
-((nType==CTRL_CHECKBOX) (nPart==PART_ENTIRE_CONTROL))||
-((nType==CTRL_SCROLLBAR)
-( (nPart==PART_DRAW_BACKGROUND_HORZ)
-|| (nPart==PART_DRAW_BACKGROUND_VERT)
-|| (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==HAS_THREE_BUTTONS) ) )||
-((nType==CTRL_EDITBOX)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==HAS_BACKGROUND_TEXTURE) ) )||
-((nType==CTRL_MULTILINE_EDITBOX)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==HAS_BACKGROUND_TEXTURE) ) )||
-((nType==CTRL_SPINBOX)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==PART_ALL_BUTTONS)
-|| (nPart==HAS_BACKGROUND_TEXTURE) ))||
-((nType==CTRL_SPINBUTTONS)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==PART_ALL_BUTTONS)))||
-((nType==CTRL_COMBOBOX)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==HAS_BACKGROUND_TEXTURE)))||
-(((nType==CTRL_TAB_ITEM) || (nType==CTRL_TAB_PANE) ||
- (nType==CTRL_TAB_BODY) || (nType==CTRL_FIXEDBORDER))
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==PART_TABS_DRAW_RTL) ))||
-((nType==CTRL_LISTBOX)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==PART_WINDOW)
-|| (nPart==HAS_BACKGROUND_TEXTURE) )) ||
-((nType == CTRL_TOOLBAR)
- ((nPart==PART_ENTIRE_CONTROL)
-|| (nPart==PART_DRAW_BACKGROUND_HORZ)
-|| (nPart==PART_DRAW_BACKGROUND_VERT)
-|| (nPart==PART_THUMB_HORZ)
-|| (nPart==PART_THUMB_VERT)
-|| (nPart==PART_BUTTON)
-|| (nPart==PART_SEPARATOR_HORZ)
-|| (nPart==PART_SEPARATOR_VERT)
-)
-) ||
-((nType == CTRL_MENUBAR)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==PART_MENU_ITEM)
-)
-) ||
-((nType == CTRL_TOOLTIP)
-( (nPart==PART_ENTIRE_CONTROL) ) ) ||
-((nType == CTRL_MENU_POPUP)
-( (nPart==PART_ENTIRE_CONTROL)
-|| (nPart==PART_MENU_ITEM)
-|| (nPart==PART_MENU_ITEM_CHECK_MARK)
-|| (nPart==PART_MENU_ITEM_RADIO_MARK)
-|| (nPart==PART_MENU_SEPARATOR)
-|| (nPart==PART_MENU_SUBMENU_ARROW)
-)
-) ||
-((nType == CTRL_PROGRESS)
-( (nPart == PART_ENTIRE_CONTROL) )
-) ||
-((nType == CTRL_LISTNODE || nType == CTRL_LISTNET)
-( (nPart == PART_ENTIRE_CONTROL) )
-) ||
-((nType == CTRL_SLIDER)
-( (nPart == PART_TRACK_HORZ_AREA)
-|| (nPart == PART_TRACK_VERT_AREA)
+switch(nType)
+{
+case CTRL_PUSHBUTTON:
+case CTRL_RADIOBUTTON:
+case CTRL_CHECKBOX:
+case CTRL_TOOLTIP:
+case CTRL_PROGRESS:
+case CTRL_LISTNODE:
+case CTRL_LISTNET:
+if(nPart==PART_ENTIRE_CONTROL)
+return true;
+break;
+
+case CTRL_SCROLLBAR:
+if(nPart==PART_DRAW_BACKGROUND_HORZ ||
nPart==PART_DRAW_BACKGROUND_VERT ||
+ nPart==PART_ENTIRE_CONTROL || nPart==HAS_THREE_BUTTONS)
+return true;
+break;
+
+case CTRL_EDITBOX:
+
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 4ba8147f61fadb4e8ae7abc0ad5c9e928edf4baa
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date: Thu May 31 16:59:16 2012 +0400
Gtk theming: pass tab prelight state to theme
Change-Id: I9b924d83d4da638d17af14a66a618ce7128968e7
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index b86e91f..e9101bf 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -46,6 +46,7 @@
#include vcl/vclenum.hxx
#include vcl/fontmanager.hxx
typedef struct _cairo_font_options cairo_font_options_t;
+const char* const tabPrelitDataName=libreoffice-tab-is-prelit;
// initialize statics
sal_Bool GtkSalGraphics::bThemeChanged = sal_True;
@@ -2461,10 +2462,15 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType
nType, ControlPart,
case CTRL_TAB_ITEM:
stateType = ( nState CTRL_STATE_SELECTED ) ? GTK_STATE_NORMAL :
GTK_STATE_ACTIVE;
+if( nState CTRL_STATE_ROLLOVER )
+
g_object_set_data(G_OBJECT(pixmap),tabPrelitDataName,(gpointer)TRUE);
+
gtk_paint_extension(
gWidgetData[m_nXScreen].gNotebookWidget-style, pixmap, stateType,
GTK_SHADOW_OUT, NULL, gWidgetData[m_nXScreen].gNotebookWidget,
(char *)tab, (tabRect.Left() - pixmapRect.Left()),
(tabRect.Top() - pixmapRect.Top()),
tabRect.GetWidth(), tabRect.GetHeight(), GTK_POS_BOTTOM );
+g_object_steal_data(G_OBJECT(pixmap),tabPrelitDataName);
+
if ( nState CTRL_STATE_SELECTED )
{
gtk_paint_flat_box( m_pWindow-style, pixmap, stateType,
GTK_SHADOW_NONE, NULL, m_pWindow,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 21f8ec1c49efd716669ca55ab946fadd5c97bb7e Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Sun May 20 00:25:07 2012 +0200 fdo#50173: fix Styles and Formatting gtk crasher - when using the gtk vcl plugin, pressing F11 in writer crashes libreoffice on some systems with an X error - related: fdo#46687 Change-Id: I235cf327d812b606a357de859b1a959be728d2a1 diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index eb77e75..36be0b2 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -3248,6 +3248,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) XSetInputFocus( pThis-getDisplay()-GetDisplay(), widget_get_xid(pWidget), RevertToParent, CurrentTime ); +XSync( pThis-getDisplay()-GetDisplay(), False ); GetGenericData()-ErrorTrapPop(); } #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx | 76 +++-
1 file changed, 15 insertions(+), 61 deletions(-)
New commits:
commit ef48b58387fdc04050c3362440ffe3ca0037d8d0
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri May 18 20:52:15 2012 +0200
Revert fix for #i86306# prepare against really broken CUPS
installations...
...from 8046a87ecc879651ee9cf344211cdd198a419cab. At least sometimes in
sw_complex test (with various bundled Java extensions enabled) under load,
this
code reports Signal 11 during cups initialization called, ignoring cups
and
in-process JVM aborts in panic. Looks like a legitimate SIGSEGV (to be
translated into java.lang.NullPointerException) from JVM code is erroneously
caught by the temporary lcl_signal_action in cupsmgr.cxx instead. As there
is
no non-cooperative way to have different signal handlers for different
threads
(at least under POSIX), and
https://issues.apache.org/ooo/show_bug.cgi?id=86306 office crashes at
startup
on Solaris Intel suggests this signal-catching business is only there to
work
around a completely broken machine, I think it is best to simply remove it
again.
Change-Id: I55b95a71d622f83c975989a4ffb1d95ef5737075
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index a0e020a..0f45b46 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -43,8 +43,6 @@
#include rtl/ustrbuf.hxx
#include algorithm
-#include setjmp.h
-#include signal.h
#define CUPS_LIB_NAME libcups.so.2
@@ -442,17 +440,6 @@ void CUPSManager::runDestThread( void* pThis )
((CUPSManager*)pThis)-runDests();
}
-static sigjmp_buf aViolationBuffer;
-
-extern C
-{
-static void lcl_signal_action(int nSignal)
-{
-fprintf( stderr, Signal %d during cups initialization called,
ignoring cups\n, nSignal );
-siglongjmp( aViolationBuffer, 1 );
-}
-}
-
void CUPSManager::runDests()
{
#if OSL_DEBUG_LEVEL 1
@@ -460,62 +447,29 @@ void CUPSManager::runDests()
#endif
cups_dest_t* pDests = NULL;
-// #i86306# prepare against really broken CUPS installations / missing
servers
-
-// install signal handler for SEGV, BUS and ABRT
-struct sigaction act;
-struct sigaction oact[3];
-
-act.sa_handler = lcl_signal_action;
-act.sa_flags = 0;
-sigemptyset((act.sa_mask));
-
-int nSegvSignalInstalled = sigaction(SIGSEGV, act, oact[0]);
-int nBusSignalInstalled = sigaction(SIGBUS, act, oact[1]);
-int nAbortSignalInstalled = sigaction(SIGABRT, act, oact[2]);
-
-// prepare against a signal during FcInit or FcConfigGetCurrent
-if( sigsetjmp( aViolationBuffer, ~0 ) == 0 )
+// n#722902 - do a fast-failing check for cups working *at all* first
+http_t* p_http;
+if( (p_http=m_pCUPSWrapper-httpConnectEncrypt(
+ m_pCUPSWrapper-cupsServer(),
+ m_pCUPSWrapper-ippPort(),
+ m_pCUPSWrapper-cupsEncryption())) != NULL )
{
-// n#722902 - do a fast-failing check for cups working *at
-// all* first
-http_t* p_http;
-if( (p_http=m_pCUPSWrapper-httpConnectEncrypt(
- m_pCUPSWrapper-cupsServer(),
- m_pCUPSWrapper-ippPort(),
- m_pCUPSWrapper-cupsEncryption())) != NULL )
-{
-// neat, cups is up, clean up the canary
-m_pCUPSWrapper-httpClose(p_http);
+// neat, cups is up, clean up the canary
+m_pCUPSWrapper-httpClose(p_http);
-int nDests = m_pCUPSWrapper-cupsGetDests( pDests );
+int nDests = m_pCUPSWrapper-cupsGetDests( pDests );
#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, came out of cupsGetDests\n );
+fprintf( stderr, came out of cupsGetDests\n );
#endif
-osl::MutexGuard aGuard( m_aCUPSMutex );
-m_nDests = nDests;
-m_pDests = pDests;
-m_bNewDests = true;
+osl::MutexGuard aGuard( m_aCUPSMutex );
+m_nDests = nDests;
+m_pDests = pDests;
+m_bNewDests = true;
#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, finished cupsGetDests\n );
+fprintf( stderr, finished cupsGetDests\n );
#endif
-}
}
-else
-{
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, cupsGetDests crashed, not using CUPS\n );
-#endif
-}
-
-// restore old signal handlers
-if( nSegvSignalInstalled == 0 )
-sigaction( SIGSEGV, oact[0], NULL );
-if( nBusSignalInstalled == 0 )
-sigaction( SIGBUS, oact[1], NULL );
-if( nAbortSignalInstalled == 0 )
-sigaction( SIGABRT, oact[2], NULL );
}
void CUPSManager::initialize()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/saldisp.cxx |6 +++---
vcl/unx/generic/dtrans/X11_selection.cxx |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 18e6e7d929c2be209407ed2e56b8ec4d5e6c4900
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon May 14 18:59:35 2012 +0200
WaE : XKeycodeToKeysym deprecated
Replaced by XkbKeycodeToKeysym
(cf
http://nabble.documentfoundation.org/PATCH-Proposed-patch-for-XKeycodeToKeysym-deprecated-td3978158.html)
Change-Id: Ide8331705369d0c38e72bfe693102625e62a87e1
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d6060d5..ee4f094 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -782,9 +782,9 @@ inline KeySym sal_XModifier2Keysym( Display
*pDisplay,
XModifierKeymap *pXModMap,
int n )
{
-return XKeycodeToKeysym( pDisplay,
+return XkbKeycodeToKeysym( pDisplay,
pXModMap-modifiermap[n*pXModMap-max_keypermod],
- 0 );
+ 0,0 );
}
void SalDisplay::ModifierMapping()
@@ -1483,7 +1483,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent*pEvent,
// Now get the unmodified KeySym for KeyCode retrieval
// try to strip off modifiers, e.g. Ctrl-$ becomes Ctrl-Shift-4
-*pUnmodifiedKeySym = XKeycodeToKeysym( GetDisplay(), pEvent-keycode, 0);
+*pUnmodifiedKeySym = XkbKeycodeToKeysym( GetDisplay(), pEvent-keycode,
0, 0);
return nKeySym;
}
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 0bb3527..1c4faae 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -2731,7 +2731,7 @@ bool SelectionManager::handleDragEvent( XEvent rMessage )
else if( rMessage.type == XLIB_KeyPress || rMessage.type == KeyRelease )
{
bHandled = true;
-KeySym aKey = XKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0 );
+KeySym aKey = XkbKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode,
0, 0 );
if( aKey == XK_Escape )
{
// abort drag
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 5df9e10d27a071f878ed160f99129a7f3c34f5ed
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu May 10 18:29:12 2012 +0200
do not prepend \n twice, it confuses KFileDialog (rhbz#820439)
Draw - Export - filetype combo was broken.
Change-Id: I9349749274498d5834dd63e73f3856434b1ab8d9
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 140af9c..3537bfe 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -342,9 +342,6 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString , const
uno::Sequencebeans::StringPair filters)
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
-if (!_filter.isNull())
-_filter.append(QString(\n));
-
const sal_uInt16 length = filters.getLength();
for (sal_uInt16 i = 0; i length; ++i)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 20 ++--
1 file changed, 6 insertions(+), 14 deletions(-)
New commits:
commit c1ac12f52776c625c7a091ab864b9e99e3bc3d67
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat May 5 14:34:47 2012 +0400
gtk: fix drawing of disabled menu-item checkmarks and submenu arrows
Change-Id: Ic9929de974b1dd806dee294e574ad9f561468eb4
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 447ca92..7c06d6a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2851,19 +2851,15 @@ sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu(
gWidgetData[m_nXScreen].gMenuItemCheckMenuWidget :
gWidgetData[m_nXScreen].gMenuItemRadioMenuWidget;
-GtkStateType nStateType = GTK_STATE_NORMAL;
+GtkStateType nStateType;
GtkShadowType nShadowType;
+NWConvertVCLStateToGTKState( nState, nStateType, nShadowType );
-if ( nState CTRL_STATE_SELECTED )
+if ( (nState CTRL_STATE_SELECTED) (nState
CTRL_STATE_ENABLED) )
nStateType = GTK_STATE_PRELIGHT;
NWSetWidgetState( pWidget, nState, nStateType );
-if ( nState CTRL_STATE_PRESSED )
-nShadowType = GTK_SHADOW_IN;
-else
-nShadowType = GTK_SHADOW_OUT;
-
if ( nPart == PART_MENU_ITEM_CHECK_MARK )
{
gtk_paint_check( pWidget-style,
@@ -2899,20 +2895,16 @@ sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu(
}
else if( nPart == PART_MENU_SUBMENU_ARROW )
{
-GtkStateType nStateType = GTK_STATE_NORMAL;
+GtkStateType nStateType;
GtkShadowType nShadowType;
+NWConvertVCLStateToGTKState( nState, nStateType, nShadowType );
-if ( nState CTRL_STATE_SELECTED )
+if ( (nState CTRL_STATE_SELECTED) (nState
CTRL_STATE_ENABLED) )
nStateType = GTK_STATE_PRELIGHT;
NWSetWidgetState( gWidgetData[m_nXScreen].gMenuItemMenuWidget,
nState, nStateType );
-if ( nState CTRL_STATE_PRESSED )
-nShadowType = GTK_SHADOW_IN;
-else
-nShadowType = GTK_SHADOW_OUT;
-
GtkArrowType eArrow;
if( Application::GetSettings().GetLayoutRTL() )
eArrow = GTK_ARROW_LEFT;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtksys.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 85211f1ef30b07927d768348ce28ac34ade62f03 Author: David Tardon dtar...@redhat.com Date: Wed May 2 14:26:11 2012 +0200 fdo#49365 correctly map monitor index back to screen Change-Id: I396b34119a2686011640d5f15de616fe2a166237 diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index 3927dbf..538107f 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -92,7 +92,7 @@ GtkSalSystem::getScreenMonitorFromIdx (GdkDisplay *pDisplay, int nIdx, gint nMo pScreen = gdk_display_get_screen (pDisplay, i); if (!pScreen) break; -if (nIdx gdk_screen_get_n_monitors (pScreen)) +if (nIdx = gdk_screen_get_n_monitors (pScreen)) nIdx -= gdk_screen_get_n_monitors (pScreen); else break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtkdata.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bb36072c92687a954a38aeca7fb9945f8e7cca13
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 30 13:54:01 2012 +0100
g_source_get_current_time has been deprecated since version 2.28
g_source_get_current_time has been deprecated since version 2.28 and should
not
be used in newly-written code. ... This function ignores source and is
otherwise the same as g_get_current_time()
not using g_source_get_time seeing as our baseline isn't there yet
Change-Id: I9f389cbb8d23353c0a12eacb215d61256b28f643
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 776313b..5189174 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -770,7 +770,7 @@ extern C {
static void sal_gtk_timeout_defer( SalGtkTimeoutSource *pTSource )
{
-g_source_get_current_time( (GSource *) pTSource, pTSource-aFireTime
);
+g_get_current_time( pTSource-aFireTime );
g_time_val_add( pTSource-aFireTime,
pTSource-pInstance-m_nTimeoutMS * 1000 );
}
@@ -806,7 +806,7 @@ extern C {
SalGtkTimeoutSource *pTSource = (SalGtkTimeoutSource *)pSource;
GTimeVal aTimeNow;
-g_source_get_current_time( pSource, aTimeNow );
+g_get_current_time( aTimeNow );
return sal_gtk_timeout_expired( pTSource, nTimeoutMS, aTimeNow );
}
@@ -816,7 +816,7 @@ extern C {
SalGtkTimeoutSource *pTSource = (SalGtkTimeoutSource *)pSource;
GTimeVal aTimeNow;
-g_source_get_current_time( pSource, aTimeNow );
+g_get_current_time( aTimeNow );
return ( pTSource-aFireTime.tv_sec aTimeNow.tv_sec ||
( pTSource-aFireTime.tv_sec == aTimeNow.tv_sec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/salinst.cxx |3 --
vcl/unx/gtk/app/gtkinst.cxx | 54 +++-
2 files changed, 43 insertions(+), 14 deletions(-)
New commits:
commit 658954e8b50fc264428402dc5a95b0d6f690d191
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 24 12:03:27 2012 +0100
Resolves: fdo#48011 writer idle-callbacks are halting when events pending
Writer does a lot of work, e.g. spell-checking, word counting etc. in
idle-callbacks. It halts work by checking for AnyInput, and if any input or
paint etc is pending the idle-callbacks stop. With gtk3 rework pending
events don't seem to be available quite right.
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 9bf80c4..cb11406 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -147,9 +147,8 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType)
Display *pDisplay = pData-GetSalDisplay()-GetDisplay();
sal_Bool bRet = sal_False;
-if( (nType VCL_INPUT_TIMER) mpXLib-CheckTimeout( false ) )
+if( (nType VCL_INPUT_TIMER) (mpXLib mpXLib-CheckTimeout(false)) )
bRet = sal_True;
-
else if (XPending(pDisplay) )
{
PredicateReturn aInput;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 8cc92da..c78de14 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -27,6 +27,7 @@
/
+#include stack
#include string.h
#include osl/module.h
#define GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -264,12 +265,11 @@ extern C {
return GDK_FILTER_CONTINUE;
}
-// And then again as they pop out of gdk and into gtk+
-
-static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+static sal_uInt16 categorizeEvent(const GdkEvent *pEvent)
{
sal_uInt16 nType = 0;
-switch( pEvent-type ) {
+switch( pEvent-type )
+{
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
@@ -291,8 +291,16 @@ extern C {
nType = VCL_INPUT_OTHER;
break;
}
-((GtkInstance *)data)-subtractEvent( nType );
+return nType;
+}
+
+// And then again as they pop out of gdk and into gtk+
+
+static void _sal_gtk_event_handler_fn (GdkEvent *pEvent, gpointer data)
+{
+sal_uInt16 nType = categorizeEvent(pEvent);
+((GtkInstance *)data)-subtractEvent( nType );
gtk_main_do_event( pEvent );
}
}
@@ -623,16 +631,38 @@ bool GtkInstance::AnyInput( sal_uInt16 nType )
{
if( (nType VCL_INPUT_TIMER) IsTimerExpired() )
return true;
-else
+#if !GTK_CHECK_VERSION(3,0,0)
+bool bRet = X11SalInstance::AnyInput(nType);
+#else
+if (!gdk_events_pending())
+return false;
+
+if (nType == VCL_INPUT_ANY)
+return true;
+
+bool bRet = false;
+std::stackGdkEvent* aEvents;
+GdkEvent *pEvent = NULL;
+while ((pEvent = gdk_event_get()))
{
-bool bRet = false;
-sal_uInt16 nShift = 1;
-for (int i = 0; i 16; i++) {
-bRet |= (nType nShift) m_nAnyInput[i] 0;
-nShift = 1;
+aEvents.push(pEvent);
+sal_uInt16 nEventType = categorizeEvent(pEvent);
+if ( (nEventType nType) || ( ! nEventType (nType
VCL_INPUT_OTHER) ) )
+{
+bRet = true;
+break;
}
-return bRet;
}
+
+while (!aEvents.empty())
+{
+pEvent = aEvents.top();
+gdk_event_put(pEvent);
+gdk_event_free(pEvent);
+aEvents.pop();
+}
+#endif
+return bRet;
}
GenPspGraphics *GtkInstance::CreatePrintGraphics()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b97f109cb62de8f005a7e2fdc95c92f94d120676
Author: Rene Engelhard r...@debian.org
Date: Mon Apr 23 22:07:20 2012 +0200
fix gtk3salnativewidgets-gtk build with gcc 4.4
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index aaa4bd7..6bd2280 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -622,7 +622,7 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext
*context,
{
if ( !pSpinVal )
{
-std::fprintf( stderr, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n );
+fprintf( stderr, Tried to draw CTRL_SPINBUTTONS, but the
SpinButtons data structure didn't exist!\n );
return;
}
areaRect = pSpinVal-maUpperRect;
@@ -1335,10 +1335,10 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
}
aInfo.m_eWidth = WIDTH_ULTRA_CONDENSED;
-std::fprintf( stderr, font name BEFORE system match: \%s\\n,
aFamily.getStr() );
+fprintf( stderr, font name BEFORE system match: \%s\\n,
aFamily.getStr() );
// match font to e.g. resolve Sans
psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
-std::fprintf( stderr, font match %s, name AFTER: \%s\\n,
+fprintf( stderr, font match %s, name AFTER: \%s\\n,
aInfo.m_nID != 0 ? succeeded : failed,
rtl::OUStringToOString( aInfo.m_aStyleName,
RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
@@ -1447,7 +1447,7 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
gchar* pThemeName = NULL;
g_object_get( pSettings, gtk-theme-name, pThemeName, (char *)NULL );
#if OSL_DEBUG_LEVEL 1
-std::fprintf( stderr, Theme name is \%s\\n, pThemeName );
+fprintf( stderr, Theme name is \%s\\n, pThemeName );
#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 6d97ea37bba52b21648c91276bc9281d06cdd148
Author: Michael Meeks michael.me...@suse.com
Date: Thu Apr 19 14:34:35 2012 +0100
fdo#46687 - fix find toolbar X error handling
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 4137a8d..a647bf8 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2231,6 +2231,8 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
// to do this we need to synchronize with the XServer
GetGenericData()-ErrorTrapPush();
XSetInputFocus( getDisplay()-GetDisplay(),
widget_get_xid(m_pWindow), RevertToParent, CurrentTime );
+// fdo#46687 - an XSync should not be necessary - but for some
reason it is.
+XSync( getDisplay()-GetDisplay(), False );
GetGenericData()-ErrorTrapPop();
}
#endif
@@ -3239,9 +3241,11 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget,
GdkEvent*, gpointer frame )
#if !GTK_CHECK_VERSION(3,0,0)
if( bSetFocus )
{
+GetGenericData()-ErrorTrapPush();
XSetInputFocus( pThis-getDisplay()-GetDisplay(),
widget_get_xid(pWidget),
RevertToParent, CurrentTime );
+GetGenericData()-ErrorTrapPop();
}
#else
(void)pWidget; (void)bSetFocus;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 34 ++
1 file changed, 24 insertions(+), 10 deletions(-)
New commits:
commit 2a20f94696addc362ba62d1cced1793c08e26e75
Author: Michael Meeks michael.me...@suse.com
Date: Sat Apr 14 13:39:52 2012 +0200
gtk3: add approved theme color fetch / selection.
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6bfad00..aaa4bd7 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1166,12 +1166,17 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
aStyleSet.SetButtonRolloverTextColor( aTextColor );
aStyleSet.SetFieldRolloverTextColor( aTextColor );
-#if 0
-// Tooltip colors
-GtkStyle* pTooltipStyle = gtk_widget_get_style(
gWidgetData[m_nScreen].gTooltipPopup );
-aTextColor = getColor( pTooltipStyle-fg[ GTK_STATE_NORMAL ] );
-aStyleSet.SetHelpTextColor( aTextColor );
-#endif
+// FIXME: each gtk3 theme needs to define a set of well-known
+// color names for LibreOffice eg.
+// @define-color tooltip_bg_color #343434;
+GdkRGBA tooltip_bg_color;
+if( gtk_style_context_lookup_color( pStyle, tooltip_bg_color,
tooltip_bg_color ) )
+{
+aStyleSet.SetHelpTextColor( getColor( tooltip_bg_color ) );
+fprintf (stderr, Set tooltip bg color %g %g %g %g\n,
+ tooltip_bg_color.red, tooltip_bg_color.green,
+ tooltip_bg_color.blue, tooltip_bg_color.alpha );
+}
// background colors
GdkRGBA background_color;
@@ -1184,15 +1189,24 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
aStyleSet.SetWorkspaceColor( aBackColor );
aStyleSet.SetCheckedColorSpecialCase( );
+{ // FIXME: turn me into a helper function ...
+// construct style context for text view
+GtkStyleContext *pCStyle = gtk_style_context_new();
+gtk_style_context_set_screen( pCStyle, gtk_window_get_screen( GTK_WINDOW(
mpWindow ) ) );
+GtkWidgetPath *pCPath = gtk_widget_path_new();
+gtk_widget_path_append_type( pCPath, GTK_TYPE_TEXT_VIEW );
+gtk_widget_path_iter_add_class( pCPath, -1, GTK_STYLE_CLASS_VIEW );
+gtk_style_context_set_path( pCStyle, pCPath );
+gtk_widget_path_free( pCPath );
GdkRGBA field_background_color;
-gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL,
field_background_color);
+gtk_style_context_get_background_color(pCStyle, GTK_STATE_FLAG_NORMAL,
field_background_color);
+g_object_unref( pCStyle );
+
::Color aBackFieldColor = getColor( field_background_color );
-// FIXME: we really need some work getting the right style contexts.
-// it seems a window has a rather different background color from what we
want.
-aBackFieldColor = ::Color( COL_WHITE );
aStyleSet.SetFieldColor( aBackFieldColor );
// This baby is the default page/paper color
aStyleSet.SetWindowColor( aBackFieldColor );
+}
// highlighting colors
gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED,
text_color);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/plugadapt/salplug.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit adf7d6e17334391459343d1f96c152872ce6e704
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 26 09:55:29 2012 +0100
configuration checked before component context exists
in simple applications, e.g. spadmin, which don't have a custom main, then
this
configuration check happens too early before Application::Main gets run to
have
a chance to set the ProcessComponentContext.
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 6bc7d89..b92c8c7 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -28,6 +28,8 @@
#include officecfg/Office/Common.hxx
+#include comphelper/processfactory.hxx
+
#include osl/module.h
#include osl/process.h
@@ -54,11 +56,14 @@ static SalInstance* tryInstance( const OUString
rModuleBase, bool bForce = fals
{
SalInstance* pInst = NULL;
#if !defined(ANDROID)
-// Disable gtk3 plugin load except in experimental mode for now.
-if( !bForce
-rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( gtk3 ) )
-!officecfg::Office::Common::Misc::ExperimentalMode::get() )
-return NULL;
+if (!bForce
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk3)))
+{
+// Disable gtk3 plugin load except in experimental mode for now.
+using namespace com::sun::star;
+uno::Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
+if (!xContext.is() ||
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
+return NULL;
+}
#endif
OUStringBuffer aModName( 128 );
aModName.appendAscii( SAL_DLLPREFIXvclplug_ );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/inc/gtkprintwrapper.hxx |4 1 file changed, 4 insertions(+) New commits: commit 5c732ef6b566c35e18ed4f259764d5e8438d0527 Author: David Bolen db3l@gmail.com Date: Wed Mar 21 13:29:29 2012 + Compilation fix - GTK print dialog headers for GTK 2.14 diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx index ab97512..8457430 100644 --- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx +++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx @@ -35,7 +35,11 @@ #include gtk/gtk.h #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(2,14,0) #include gtk/gtkunixprint.h +#else +#include gtk/gtkpagesetupunixdialog.h +#endif #if !GTK_CHECK_VERSION(3,0,0) #include osl/module.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 1cf3e446744ae679bc89b39dcbbcf6b4e9821f3a
Author: Lucas Baudin xapa...@gmail.com
Date: Sat Mar 3 15:44:54 2012 +0100
gtk3: Avoid crash with some themes (unico based)
We didn't check wether the window was big enough to draw all the widgets.
Sometimes, when the window was displaying, it was too small and drawing outside
of the window caused a crash, we didn't take into account that the root point
for drawing gtk3 widgets wasn't always (0,0).
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 95aa313..6bfad00 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1002,8 +1002,10 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr,
unsigned char *src = data.get();
src += (int)ay * nStride + (int)ax * 3;
+awidth = MIN (region-width, size.getX() - ax);
+aheight = MIN (region-height, size.getY() - ay);
-for (int y = 0; y size.getY(); ++y)
+for (int y = 0; y aheight; ++y)
{
for (int x = 0; x awidth y aheight; ++x)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/plugadapt/salplug.cxx | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 966981dd77b5e6c091b9e2615a8191353897a9b2
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Feb 28 21:19:45 2012 +0100
Actually there is no need to have if and elseif with same action.
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index eb9e90c..6bc7d89 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -90,19 +90,13 @@ static SalInstance* tryInstance( const OUString
rModuleBase, bool bForce = fals
* not access the 'gnome_accessibility_module_shutdown'
anymore.
* So make sure libgtk+ co are still mapped into memory when
* atk-bridge's atexit handler gets called.
+ * #i109007# KDE3 seems to have the same problem.
+* And same applies for KDE4.
*/
if(
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk)) ||
-
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk3)) )
-{
-pCloseModule = NULL;
-}
-/*
- * #i109007# KDE3 seems to have the same problem; an atexit
cleanup
- * handler, which cannot be resolved anymore if the plugin is
already unloaded.
-* Same applies for kde4.
- */
-else if(
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde)) ||
-
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde4)) )
+
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk3)) ||
+ rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde))
||
+
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde4)) )
{
pCloseModule = NULL;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/printer/ppdparser.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 825d31d5f11364bea4184cabb538f8b6575d5795
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 23 14:10:15 2012 +
ensure ppd translation indexes are valid
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 22d73db..bbb31f0 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1097,9 +1097,14 @@ void PPDParser::parse( ::std::list rtl::OString
rLines )
{
aLine = aLine.copy(1);
nTransPos = aLine.indexOf('');
+if (nTransPos == -1)
+nTransPos = aLine.getLength();
aValue = String( aLine.copy( 0, nTransPos ),
RTL_TEXTENCODING_MS_1252 );
-// after the second doublequote can follow a / and a
translation
-aValueTranslation = handleTranslation( aLine.copy( nTransPos+2
), bIsGlobalizedLine );
+if (nTransPos+2 aLine.getLength())
+{
+// after the second doublequote can follow a / and a
translation
+aValueTranslation = handleTranslation( aLine.copy(
nTransPos+2 ), bIsGlobalizedLine );
+}
// check for quoted value
if( aOption.Len()
aUniKey.CompareToAscii( JCL, 3 ) != COMPARE_EQUAL )
@@ -1125,7 +1130,8 @@ void PPDParser::parse( ::std::list rtl::OString
rLines )
if (nTransPos == -1)
nTransPos = aLine.getLength();
aValue = String( aLine.copy( 0, nTransPos ),
RTL_TEXTENCODING_MS_1252 );
-aValueTranslation = handleTranslation( aLine.copy( nTransPos+1
), bIsGlobalizedLine );
+if (nTransPos+1 aLine.getLength())
+aValueTranslation = handleTranslation( aLine.copy(
nTransPos+1 ), bIsGlobalizedLine );
eType = eString;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/gdi/salgdi3.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 758cceaff4c8038c5ec5115aaa593d46483d6626
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Feb 13 10:59:34 2012 +0100
Duplicate #include
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index c55cb14..7761445 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -84,7 +84,6 @@
#include cairo-ft.h
#include cairo-xlib.h
#include cairo-xlib-xrender.h
-#include fontconfig/fontconfig.h
struct BOX
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/gdi/salgdi3.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 6549f4074dc00192025dcc7d8e06178b658df4a9 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Feb 10 09:31:48 2012 +0100 Missing fontconfig.h include diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index a444161..7761445 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -33,6 +33,7 @@ #include math.h #include unistd.h #include fcntl.h +#include fontconfig/fontconfig.h #include sys/mman.h #include sys/stat.h #include sys/types.h ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/dtrans/config.cxx |2 +-
vcl/unx/generic/printer/cupsmgr.cxx|6 +++---
vcl/unx/generic/printer/jobdata.cxx|2 +-
vcl/unx/generic/printer/ppdparser.cxx | 20 ++--
vcl/unx/generic/printer/printerinfomanager.cxx | 18 +-
vcl/unx/generic/window/salframe.cxx|8
vcl/unx/gtk/a11y/atktext.cxx |6 +++---
vcl/unx/gtk/a11y/atktextattributes.cxx |4 ++--
vcl/unx/gtk/app/gtkdata.cxx|2 +-
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 18 +-
vcl/unx/gtk/fpicker/SalGtkPicker.cxx |4 ++--
vcl/unx/gtk/window/gtkframe.cxx|4 ++--
12 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit beccf7c9dd4966347fa31e11922fd73bd40dfeb9
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Wed Feb 1 12:16:11 2012 -0200
Fix for fdo43460 Part LIX getLength() to isEmpty()
Part LIX
Modules
vcl (part 3)
diff --git a/vcl/unx/generic/dtrans/config.cxx
b/vcl/unx/generic/dtrans/config.cxx
index f6e71ff..7d83f5e 100644
--- a/vcl/unx/generic/dtrans/config.cxx
+++ b/vcl/unx/generic/dtrans/config.cxx
@@ -95,7 +95,7 @@ DtransX11ConfigItem::DtransX11ConfigItem() :
if( pValue-getValueTypeClass() == TypeClass_STRING )
{
const OUString* pLine = (const OUString*)pValue-getValue();
-if( pLine-getLength() )
+if( !pLine-isEmpty() )
{
m_nSelectionTimeout = pLine-toInt32();
if( m_nSelectionTimeout 1 )
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 85c2e74..a0e020a 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -291,7 +291,7 @@ struct GetPPDAttribs
~GetPPDAttribs()
{
-if( m_aResult.getLength() )
+if( !m_aResult.isEmpty() )
unlink( m_aResult.getStr() );
}
@@ -646,7 +646,7 @@ void CUPSManager::initialize()
if( m_aCUPSDestMap.find( it-first ) != m_aCUPSDestMap.end() )
continue;
-if( it-second.m_aInfo.m_aFeatures.getLength() 0 )
+if( !it-second.m_aInfo.m_aFeatures.isEmpty() )
continue;
aRemovePrinters.push_back( it-first );
}
@@ -732,7 +732,7 @@ const PPDParser* CUPSManager::createCUPSParser( const
OUString rPrinter )
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, PPD for %s is %s\n, OUStringToOString(
aPrinter, osl_getThreadTextEncoding() ).getStr(), aPPDFile.getStr() );
#endif
-if( aPPDFile.getLength() )
+if( !aPPDFile.isEmpty() )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
OUString aFileName( OStringToOUString( aPPDFile, aEncoding
) );
diff --git a/vcl/unx/generic/printer/jobdata.cxx
b/vcl/unx/generic/printer/jobdata.cxx
index bb059f0..9bd1d57 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -54,7 +54,7 @@ JobData JobData::operator=(const JobData rRight)
m_nPDFDevice= rRight.m_nPDFDevice;
m_nColorDevice = rRight.m_nColorDevice;
-if( ! m_pParser m_aPrinterName.getLength() )
+if( !m_pParser !m_aPrinterName.isEmpty() )
{
PrinterInfoManager rMgr = PrinterInfoManager::get();
rMgr.setupJobContextData( *this );
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 98bf630..fdb0f4e 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -138,7 +138,7 @@ namespace psp
)
{
com::sun::star::lang::Locale aLoc( i_rLocale );
-if( bInsertDefault aLoc.Language.getLength() == 0 )
+if( bInsertDefault aLoc.Language.isEmpty() )
{
// empty locale requested, fill in application UI locale
aLoc = Application::GetSettings().GetUILocale();
@@ -175,17 +175,17 @@ namespace psp
{
rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() +
i_rValue.getLength() + 2 );
aKey.append( i_rKey );
-if( i_rOption.getLength() || i_rValue.getLength() )
+if( !i_rOption.isEmpty() || !i_rValue.isEmpty() )
{
aKey.append( sal_Unicode( ':' ) );
aKey.append( i_rOption );
}
-if( i_rValue.getLength() )
+if( !i_rValue.isEmpty() )
{
aKey.append( sal_Unicode( ':' ) );
aKey.append( i_rValue );
}
-if( aKey.getLength() i_rTranslation.getLength() )
+if( aKey.getLength() !i_rTranslation.isEmpty() )
{
rtl::OUString aK( aKey.makeStringAndClear() );
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) New commits: commit a7b44da99409a7a378fb0a6b19961ca30df8d852 Author: Michael Meeks michael.me...@suse.com Date: Tue Jan 31 15:21:48 2012 + gtk3: clobber the page / background color to white for now. diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index cc764da..95aa313 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1174,15 +1174,24 @@ void GtkSalGraphics::updateSettings( AllSettings rSettings ) // background colors GdkRGBA background_color; gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL, background_color); + ::Color aBackColor = getColor( background_color ); -::Color aBackFieldColor = getColor( background_color ); aStyleSet.Set3DColors( aBackColor ); aStyleSet.SetFaceColor( aBackColor ); aStyleSet.SetDialogColor( aBackColor ); aStyleSet.SetWorkspaceColor( aBackColor ); +aStyleSet.SetCheckedColorSpecialCase( ); + +GdkRGBA field_background_color; +gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL, field_background_color); +::Color aBackFieldColor = getColor( field_background_color ); +// FIXME: we really need some work getting the right style contexts. +// it seems a window has a rather different background color from what we want. +aBackFieldColor = ::Color( COL_WHITE ); aStyleSet.SetFieldColor( aBackFieldColor ); +// This baby is the default page/paper color aStyleSet.SetWindowColor( aBackFieldColor ); -aStyleSet.SetCheckedColorSpecialCase( ); + // highlighting colors gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED, text_color); ::Color aHighlightColor = getColor( text_color ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDEXLib.cxx |4 1 file changed, 4 deletions(-) New commits: commit 5cde352b9622c0e009b52e4848c84584d03e0d5d Author: Thomas Arnhold tho...@arnhold.org Date: Mon Jan 23 15:35:55 2012 +0100 remove duplicate header diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 56150cf..23822b1 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -51,10 +51,6 @@ #include KDESalDisplay.hxx -#if OSL_DEBUG_LEVEL 1 -#include stdio.h -#endif - #include stdio.h #if QT_VERSION = QT_VERSION_CHECK( 4, 9, 0 ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/window/salframe.cxx |2 ++ vcl/unx/gtk/window/gtkframe.cxx |2 ++ 2 files changed, 4 insertions(+) New commits: commit 0d5fde790b19515378c9b11a928603b76ac0b846 Author: Jan Holesovsky ke...@suse.cz Date: Wed Dec 14 19:01:44 2011 +0100 If possible, make the window big enough to fit all Writer toolbars. [with large icons] diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index b835a01..20b8b06 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -345,6 +345,8 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, int nScreen, SystemParentData* w = 785; if( aScreenSize.Width() = 1024 ) w = 920; +if( aScreenSize.Width() = 1280 ) +w = 1050; if( aScreenSize.Height() = 600 ) h = 550; diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 0c195d3..a384375 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1328,6 +1328,8 @@ Size GtkSalFrame::calcDefaultSize() w = 785; if( aScreenSize.Width() = 1024 ) w = 920; +if( aScreenSize.Width() = 1280 ) +w = 1050; if( aScreenSize.Height() = 600 ) h = 550; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 38b097840f1139ada4abf11c5ce7a4691fa29c0b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Dec 15 08:18:28 2011 +0200
The generic thing is X11-specific
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 9bd9781..8b4488d 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -52,12 +52,12 @@ static oslModule pCloseModule = NULL;
static SalInstance* tryInstance( const OUString rModuleBase )
{
SalInstance* pInst = NULL;
-
+#ifndef ANDROID
// Disable gtk3 plugin load except in experimental mode for now.
if( rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( gtk3 ) )
!SalGenericSystem::enableExperimentalFeatures() )
return NULL;
-
+#endif
OUStringBuffer aModName( 128 );
aModName.appendAscii( SAL_DLLPREFIXvclplug_ );
aModName.append( rModuleBase );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/gdi/salprn-gtk.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 5f49389c742c2ff642ee886eb816b2959c596ff6
Author: Michael Meeks michael.me...@suse.com
Date: Mon Dec 5 22:08:09 2011 +
WaE: cleanup ambiguous types in append
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index fa81cb6..15b4030 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -809,7 +809,7 @@ GtkPrintDialog::impl_initCustomTab()
gtk_box_pack_start(GTK_BOX(pCurParent), pRow, FALSE,
FALSE, 0);
}
if (!pGroup)
-aPropertyToDependencyRowMap[aPropertyName +
rtl::OUString::valueOf(0)] = pRow;
+aPropertyToDependencyRowMap[aPropertyName +
rtl::OUString::valueOf(sal_Int32(0))] = pRow;
gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0);
}
}
@@ -1153,11 +1153,11 @@ GtkPrintDialog::updateControllerPrintRange()
const GtkPageRange* const pRanges =
m_pWrapper-print_settings_get_page_ranges(pSettings, num_ranges);
for (gint i = 0; i != num_ranges pRanges; ++i)
{
-sBuf.append(pRanges[i].start+1);
+sBuf.append(sal_Int32(pRanges[i].start+1));
if (pRanges[i].start != pRanges[i].end)
{
sBuf.append(sal_Unicode('-'));
-sBuf.append(pRanges[i].end+1);
+sBuf.append(sal_Int32(pRanges[i].end+1));
}
if (i != num_ranges-1)
@@ -1225,7 +1225,7 @@ const
const rtl::OUString
aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM(PrintDialog));
pItem-setValue(aPrintDialogStr,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CopyCount)),
-
rtl::OUString::valueOf(m_pWrapper-print_settings_get_n_copies(pSettings)));
+
rtl::OUString::valueOf(sal_Int32(m_pWrapper-print_settings_get_n_copies(pSettings;
pItem-setValue(aPrintDialogStr,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Collate)),
m_pWrapper-print_settings_get_collate(pSettings)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
0 files changed New commits: commit 452b4a5fa63aa64504bce754c038274b96ceb0fd Author: Takeshi Abe t...@fixedpoint.jp Date: Thu Nov 10 23:48:57 2011 +0900 removed empty file diff --git a/vcl/unx/generic/app/unxpspgraphics.cxx b/vcl/unx/generic/app/unxpspgraphics.cxx deleted file mode 100644 index e69de29..000 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/printer/unxpspgraphics.cxx | 156 -
1 file changed, 156 deletions(-)
New commits:
commit effa8def9d60ef75152455562f88300754c8ab65
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 7 12:53:33 2011 +0100
remove unused file
diff --git a/vcl/unx/generic/printer/unxpspgraphics.cxx
b/vcl/unx/generic/printer/unxpspgraphics.cxx
deleted file mode 100644
index 4998e44..000
--- a/vcl/unx/generic/printer/unxpspgraphics.cxx
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include precompiled_vcl.hxx
-
-#include stdlib.h
-#include unistd.h
-#include fcntl.h
-#include sys/mman.h
-#include sys/stat.h
-#include sys/types.h
-
-#include generic/geninst.h
-#include generic/pspgraphics.h
-#include generic/glyphcache.hxx
-
-#include vcl/jobdata.hxx
-#include vcl/printerinfomanager.hxx
-#include vcl/bmpacc.hxx
-#include vcl/svapp.hxx
-#include vcl/sysdata.hxx
-
-#include generic/printergfx.hxx
-#include salbmp.hxx
-#include impfont.hxx
-#include outfont.hxx
-#include fontsubset.hxx
-#include salprn.hxx
-#include region.h
-
-#ifdef ENABLE_GRAPHITE
-#include graphite_layout.hxx
-#include graphite_serverfont.hxx
-#endif
-
-using ::rtl::OUString;
-using ::rtl::OString;
-
-UnxPspGraphics::UnxPspGraphics()
-{
-}
-
-UnxPspGraphics::~UnxPspGraphics()
-{
-}
-
-}
-
-void UnxPspGraphics::FreeEmbedFontData( const void* pData, long nLen )
-{
-if( pData )
-munmap( (char*)pData, nLen );
-}
-
-const void* UnxPspGraphics::GetEmbedFontData( const ImplFontData* pFont, const
sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo rInfo, long* pDataLen )
-{
-// in this context the pFont-GetFontId() is a valid PSP
-// font since they are the only ones left after the PDF
-// export has filtered its list of subsettable fonts (for
-// which this method was created). The correct way would
-// be to have the GlyphCache search for the ImplFontData pFont
-psp::fontID aFont = pFont-GetFontId();
-
-psp::PrintFontManager rMgr = psp::PrintFontManager::get();
-
-psp::PrintFontInfo aFontInfo;
-if( ! rMgr.getFontInfo( aFont, aFontInfo ) )
-return NULL;
-
-// fill in font info
-rInfo.m_nAscent = aFontInfo.m_nAscend;
-rInfo.m_nDescent= aFontInfo.m_nDescend;
-rInfo.m_aPSName = rMgr.getPSName( aFont );
-
-int xMin, yMin, xMax, yMax;
-rMgr.getFontBoundingBox( aFont, xMin, yMin, xMax, yMax );
-
-psp::CharacterMetric aMetrics[256];
-sal_Ucs aUnicodes[256];
-if( aFontInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL aFontInfo.m_eType
== psp::fonttype::Type1 )
-{
-for( int i = 0; i 256; i++ )
-aUnicodes[i] = pUnicodes[i] 0x0100 ? pUnicodes[i] + 0xf000 :
pUnicodes[i];
-pUnicodes = aUnicodes;
-}
-if( ! rMgr.getMetrics( aFont, pUnicodes, 256, aMetrics ) )
-return NULL;
-
-OString aSysPath = rMgr.getFontFileSysPath( aFont );
-struct stat aStat;
-if( stat( aSysPath.getStr(), aStat ) )
-return NULL;
-int fd = open( aSysPath.getStr(), O_RDONLY );
-if( fd 0 )
-return NULL;
-void* pFile = mmap( NULL, aStat.st_size, PROT_READ, MAP_SHARED, fd, 0 );
-close( fd );
-if( pFile == MAP_FAILED )
-return NULL;
-
-*pDataLen = aStat.st_size;
-
-rInfo.m_aFontBBox = Rectangle( Point( xMin, yMin ), Size( xMax-xMin,
yMax-yMin ) );
-rInfo.m_nCapHeight = yMax; // Well ...
-
-for( int i = 0; i 256; i++ )
-pWidths[i] = (aMetrics[i].width 0 ? aMetrics[i].width : 0);
-
-switch( aFontInfo.m_eType )
-{
-case psp::fonttype::TrueType:
-rInfo.m_nFontType = FontSubsetInfo::SFNT_TTF;
-break;
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx | 32
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit dab309e782cce77b3c22915627f2a2d3ff66cf01
Author: Cosimo Cecchi cosi...@gnome.org
Date: Thu Nov 3 14:07:48 2011 -0400
gtk: fix the build
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index a80e0be..2df357b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -506,7 +506,7 @@ GtkSalFrame::~GtkSalFrame()
if( m_hBackgroundPixmap )
{
XSetWindowBackgroundPixmap( getDisplay()-GetDisplay(),
-window_get_xid(m_pWindow),
+widget_get_xid(m_pWindow),
None );
XFreePixmap( getDisplay()-GetDisplay(), m_hBackgroundPixmap );
}
@@ -663,7 +663,7 @@ void GtkSalFrame::InitCommon()
m_aSystemData.pVisual = pDisp-GetVisual( m_nScreen
).GetVisual();
m_aSystemData.nDepth = pDisp-GetVisual( m_nScreen
).GetDepth();
m_aSystemData.aColormap= pDisp-GetColormap( m_nScreen
).GetXColormap();
-m_aSystemData.aWindow = window_get_xid(m_pWindow);
+m_aSystemData.aWindow = widget_get_xid(m_pWindow);
#endif
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
@@ -713,7 +713,7 @@ void GtkSalFrame::InitCommon()
* some paint issues
*/
XSetWindowBackgroundPixmap( getDisplay()-GetDisplay(),
-window_get_xid(m_pWindow),
+widget_get_xid(m_pWindow),
m_hBackgroundPixmap );
#endif
}
@@ -751,7 +751,7 @@ static void lcl_set_accept_focus( GtkWindow* pWindow,
gboolean bAccept, bool bBe
else if( ! bBeforeRealize )
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
-XLIB_Window aWindow = window_get_xid(m_pWindow);
+XLIB_Window aWindow = widget_get_xid(m_pWindow);
XWMHints* pHints = XGetWMHints( pDisplay, aWindow );
if( ! pHints )
{
@@ -1039,7 +1039,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
if( ! m_bWindowIsGtkPlug )
{
XReparentWindow( getDisplay()-GetDisplay(),
- window_get_xid(m_pWindow),
+ widget_get_xid(m_pWindow),
(XLIB_Window)pSysData-aWindow,
0, 0 );
}
@@ -1101,7 +1101,7 @@ SalGraphics* GtkSalFrame::GetGraphics()
AllocateFrame();
m_aGraphics[i].pGraphics-setDevice( m_aFrame );
#else // common case:
-m_aGraphics[i].pGraphics-Init( this,
window_get_xid(m_pWindow), m_nScreen );
+m_aGraphics[i].pGraphics-Init( this,
widget_get_xid(m_pWindow), m_nScreen );
#endif
}
return m_aGraphics[i].pGraphics;
@@ -2285,7 +2285,7 @@ void GtkSalFrame::grabPointer( sal_Bool bGrab, sal_Bool
bOwnerEvents )
// set the right cursor this way
if( !pEnv || !*pEnv )
XGrabPointer( getDisplay()-GetDisplay(),
- window_get_xid( m_pWindow ),
+ widget_get_xid( m_pWindow ),
bOwnerEvents,
PointerMotionMask | ButtonPressMask |
ButtonReleaseMask,
GrabModeAsync,
@@ -2467,7 +2467,7 @@ SalBitmap* GtkSalFrame::SnapShot()
#else
X11SalBitmap *pBmp = new X11SalBitmap;
if( pBmp-SnapShot( GDK_DISPLAY_XDISPLAY( getGdkDisplay() ),
-window_get_xid(m_pWindow) ) )
+widget_get_xid(m_pWindow) ) )
return pBmp;
else
delete pBmp;
@@ -2612,7 +2612,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window
aNewParent, bool bXEmbed, int nSc
{
if( m_aGraphics[i].bInUse )
{
-m_aGraphics[i].pGraphics-SetDrawable( window_get_xid(m_pWindow),
m_nScreen );
+m_aGraphics[i].pGraphics-SetDrawable( widget_get_xid(m_pWindow),
m_nScreen );
m_aGraphics[i].pGraphics-SetWindow( m_pWindow );
}
}
@@ -2701,7 +2701,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
if( pEvent-xproperty.atom == nDesktopAtom
pEvent-xproperty.state == PropertyNewValue )
{
-m_nWorkArea = pAdaptor-getWindowWorkArea(
window_get_xid(m_pWindow) );
+m_nWorkArea = pAdaptor-getWindowWorkArea(
widget_get_xid(m_pWindow) );
}
}
else if( pEvent-type == ConfigureNotify )
@@ -2729,7 +2729,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
int x = 0, y = 0;
XLIB_Window aChild;
XTranslateCoordinates( getDisplay()-GetDisplay(),
-
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 910bbf6f1e4c6bed983b51bc611b25a119960809
Author: Cosimo Cecchi cosi...@gnome.org
Date: Thu Nov 3 20:35:11 2011 +
fix gtk2 build
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 2df357b..f3e7f6f 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -751,7 +751,7 @@ static void lcl_set_accept_focus( GtkWindow* pWindow,
gboolean bAccept, bool bBe
else if( ! bBeforeRealize )
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
-XLIB_Window aWindow = widget_get_xid(m_pWindow);
+XLIB_Window aWindow = widget_get_xid(GTK_WIDGET(pWindow));
XWMHints* pHints = XGetWMHints( pDisplay, aWindow );
if( ! pHints )
{
@@ -814,14 +814,14 @@ static void lcl_set_user_time( GtkWindow* i_pWindow,
guint32 i_nTime )
p_gdk_x11_window_set_user_time =
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin,
gdk_x11_window_set_user_time );
}
if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( widget_get_window(i_pWindow), i_nTime
);
+p_gdk_x11_window_set_user_time(
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
else
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
if( nUserTime )
{
-XChangeProperty( pDisplay, widget_get_xid(i_pWindow),
+XChangeProperty( pDisplay, widget_get_xid(GTK_WIDGET(i_pWindow)),
nUserTime, XA_CARDINAL, 32,
PropModeReplace, (unsigned char*)i_nTime, 1 );
}
@@ -3251,7 +3251,7 @@ gboolean implDelayedFullScreenHdl (void *pWindow)
}
}
-gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
+gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame
)
{
GtkSalFrame* pThis = (GtkSalFrame*)frame;
@@ -3280,7 +3280,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*,
gpointer frame )
if( bSetFocus )
{
XSetInputFocus( pThis-getDisplay()-GetDisplay(),
-widget_get_xid(m_pWindow),
+widget_get_xid(pWidget),
RevertToParent, CurrentTime );
}
#else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtksys.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c8278a72b36adfd7f0a44dbedc558961dfd0dd24
Author: Michael Meeks michael.me...@suse.com
Date: Mon Oct 31 14:15:02 2011 +
gtk: tolerate NULL from gdk_screen_get_monitor_plug_name
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index b752cce..dbe1c47 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -118,7 +118,7 @@ static int _fallback_get_primary_monitor (GdkScreen
*pScreen)
for (int i = 0; i max ret 0; i++)
{
char *name = gdk_screen_get_monitor_plug_name (pScreen, i);
-if (!g_ascii_strncasecmp (name, LVDS, 4))
+if (name !g_ascii_strncasecmp (name, LVDS, 4))
ret = i;
g_free (name);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 71c5eb4c41fe4f36f975950cbb616796d9d7bfe5
Author: Michael Meeks michael.me...@suse.com
Date: Thu Oct 27 10:38:12 2011 +0100
gtk3: disable signalDraw for gtk2 case to avoid cairo build issues
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 87d1f49..8cf6cd7 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3118,7 +3118,6 @@ void GtkSalFrame::renderArea( cairo_t *cr,
cairo_rectangle_t *area )
cairo_restore( cr );
}
}
-#endif
gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame )
{
@@ -3132,11 +3131,9 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t
*cr, gpointer frame )
if (debugQueuePureRedraw 0)
{
debugQueuePureRedraw--;
-#if GTK_CHECK_VERSION(3,0,0)
fprintf (stderr, skip signalDraw for debug %d\n,
debugQueuePureRedraw);
cairo_rectangle_t rect = { x1, y1, x2 - x1, y2 - y1 };
pThis-renderArea( cr, rect );
- #endif
return FALSE;
}
@@ -3157,15 +3154,15 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t
*cr, gpointer frame )
struct SalPaintEvent aEvent( rect.x, rect.y, rect.width, rect.height );
aEvent.mbImmediateUpdate = true;
pThis-CallCallback( SALEVENT_PAINT, aEvent );
-#if GTK_CHECK_VERSION(3,0,0)
pThis-renderArea( cr, rect );
-#endif
}
pThis-m_nDuringRender--;
return FALSE;
}
+#endif // GTK_CHECK_VERSION(3,0,0)
+
gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent,
gpointer frame )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/saldisp.cxx | 38 --
1 file changed, 16 insertions(+), 22 deletions(-)
New commits:
commit 8619d58ecdaf181bd1a2a65c371545d7d9f80c14
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 27 15:20:14 2011 +0100
there is no USE_XINERAMA define, but USE_XINERAMA_XSUN/USE_XINERAMA_XORG
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 74c4ef7..a26027d 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -58,7 +58,6 @@
#include X11/XKBlib.h
#include X11/Xatom.h
-#ifdef USE_XINERAMA
#ifdef USE_XINERAMA_XORG
#include X11/extensions/Xinerama.h
#elif defined USE_XINERAMA_XSUN
@@ -69,9 +68,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned
char*, int*);
#else
#include X11/extensions/xinerama.h
#endif
-#else
-#error USE_XINERAMA but no xinerama version
-#endif
#endif
#include tools/postx.h
@@ -2455,7 +2451,6 @@ void SalDisplay::InitXinerama()
m_bXinerama = false;
return; // multiple screens mean no xinerama
}
-#ifdef USE_XINERAMA
#if defined(USE_XINERAMA_XSUN)
int nFramebuffers = 1;
if( XineramaGetState( pDisp_, m_nDefaultScreen ) )
@@ -2480,28 +2475,28 @@ void SalDisplay::InitXinerama()
}
}
#elif defined(USE_XINERAMA_XORG)
-if( XineramaIsActive( pDisp_ ) )
-{
-int nFramebuffers = 1;
-XineramaScreenInfo* pScreens = XineramaQueryScreens( pDisp_,
nFramebuffers );
-if( pScreens )
+if( XineramaIsActive( pDisp_ ) )
{
-if( nFramebuffers 1 )
+int nFramebuffers = 1;
+XineramaScreenInfo* pScreens = XineramaQueryScreens( pDisp_,
nFramebuffers );
+if( pScreens )
{
-m_aXineramaScreens = std::vectorRectangle();
-m_aXineramaScreenIndexMap = std::vectorint(nFramebuffers);
-for( int i = 0; i nFramebuffers; i++ )
+if( nFramebuffers 1 )
{
-addXineramaScreenUnique( i, pScreens[i].x_org,
- pScreens[i].y_org,
- pScreens[i].width,
- pScreens[i].height );
+m_aXineramaScreens = std::vectorRectangle();
+m_aXineramaScreenIndexMap = std::vectorint(nFramebuffers);
+for( int i = 0; i nFramebuffers; i++ )
+{
+addXineramaScreenUnique( i, pScreens[i].x_org,
+ pScreens[i].y_org,
+ pScreens[i].width,
+ pScreens[i].height );
+}
+m_bXinerama = m_aXineramaScreens.size() 1;
}
-m_bXinerama = m_aXineramaScreens.size() 1;
+XFree( pScreens );
}
-XFree( pScreens );
}
-}
#endif
#if OSL_DEBUG_LEVEL 1
if( m_bXinerama )
@@ -2510,7 +2505,6 @@ if( XineramaIsActive( pDisp_ ) )
fprintf( stderr, Xinerama screen: %ldx%ld+%ld+%ld\n,
it-GetWidth(), it-GetHeight(), it-Left(), it-Top() );
}
#endif
-#endif // USE_XINERAMA
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtksys.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 6484c6583ce4393155b1760c6d4e2a944d34a774
Author: Michael Meeks michael.me...@suse.com
Date: Wed Oct 26 16:11:17 2011 +0100
gtk3: gdk_screen_get_monitor_plug_name is only present gtk 2.14
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index a80e68a..a2cbe65 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -107,6 +107,7 @@ bool GtkSalSystem::IsMultiDisplay()
return gdk_display_get_n_screens (mpDisplay) 1;
}
+#if GTK_CHECK_VERSION(2,14,0)
namespace {
static int _fallback_get_primary_monitor (GdkScreen *pScreen)
{
@@ -122,6 +123,7 @@ static int _fallback_get_primary_monitor (GdkScreen
*pScreen)
}
return 0;
}
+#endif
static int _get_primary_monitor (GdkScreen *pScreen)
{
@@ -138,10 +140,14 @@ static int _get_primary_monitor (GdkScreen *pScreen)
get_fn = NULL;
g_module_close (module);
}
+#if GTK_CHECK_VERSION(2,14,0)
if (!get_fn)
get_fn = _fallback_get_primary_monitor;
-
-return get_fn (pScreen);
+#endif
+if (get_fn)
+return get_fn (pScreen);
+else
+return 0;
}
} // end anonymous namespace
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtksys.cxx | 16 1 file changed, 16 insertions(+) New commits: commit 10bce0fbf39b80d0859119b005f62accefe7b35b Author: Michael Meeks michael.me...@suse.com Date: Wed Oct 26 16:42:39 2011 +0100 gtk3: fix another gdk_screen_get_monitor_plug_name instance diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index 99624f1..4134b5d 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -186,7 +186,23 @@ rtl::OUString GtkSalSystem::GetScreenName(unsigned int nScreen) pScreen = getScreenMonitorFromIdx (mpDisplay, nScreen, nMonitor); if (!pScreen) return rtl::OUString(); + +#if GTK_CHECK_VERSION(3,0,0) || GTK_CHECK_VERSION(2,14,0) pStr = gdk_screen_get_monitor_plug_name (pScreen, nMonitor); +#else +static gchar (*get_fn) (GdkScreen *, int) = NULL; + +GModule *module = g_module_open (NULL, (GModuleFlags) 0); +if (!g_module_symbol (module, gdk_screen_get_monitor_plug_name, + (gpointer *)get_fn)) +get_fn = NULL; +g_module_close (module); + +if (get_fn) +pStr = get_fn (pScreen, nMonitor); +else +pStr = g_strdup_printf (%d, nScreen); +#endif rtl::OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8); g_free (pStr); return aRet; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtksys.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe87d9b8633f00c18ae770782694cf71db10bbfc Author: Petr Mladek pmla...@suse.cz Date: Wed Oct 26 17:57:56 2011 +0200 gdk_screen_get_monitor_plug_name returns gchar * diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index 4134b5d..0d1299a 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -190,7 +190,7 @@ rtl::OUString GtkSalSystem::GetScreenName(unsigned int nScreen) #if GTK_CHECK_VERSION(3,0,0) || GTK_CHECK_VERSION(2,14,0) pStr = gdk_screen_get_monitor_plug_name (pScreen, nMonitor); #else -static gchar (*get_fn) (GdkScreen *, int) = NULL; +static gchar * (*get_fn) (GdkScreen *, int) = NULL; GModule *module = g_module_open (NULL, (GModuleFlags) 0); if (!g_module_symbol (module, gdk_screen_get_monitor_plug_name, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/printer/ppdparser.cxx | 90 +-
1 file changed, 45 insertions(+), 45 deletions(-)
New commits:
commit cbf692559c91dae8db4cada6c7eeeb613313df24
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 24 15:05:35 2011 +0200
These DBG_ASSERTs should really be OSL_TRACEs.
Otherwise, --enable-dbgutil smoketestoo_native fails due to assertions.
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 208fc07..7eec1f7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -804,69 +804,69 @@ PPDParser::PPDParser( const String rFile ) :
m_pImageableAreas = getKey( String( RTL_CONSTASCII_USTRINGPARAM(
ImageableArea ) ) );
if( m_pImageableAreas )
m_pDefaultImageableArea = m_pImageableAreas-getDefaultValue();
-DBG_ASSERT(
-m_pImageableAreas,
-OSL_FORMAT(
-Warning: no ImageableArea in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
-DBG_ASSERT(
-m_pDefaultImageableArea,
-OSL_FORMAT(
-Warning: no DefaultImageableArea in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
+if (m_pImageableAreas == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no ImageableArea in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
+if (m_pDefaultImageableArea == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no DefaultImageableArea in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
m_pPaperDimensions = getKey( String( RTL_CONSTASCII_USTRINGPARAM(
PaperDimension ) ) );
if( m_pPaperDimensions )
m_pDefaultPaperDimension = m_pPaperDimensions-getDefaultValue();
-DBG_ASSERT(
-m_pPaperDimensions,
-OSL_FORMAT(
-Warning: no PaperDimensions in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
-DBG_ASSERT(
-m_pDefaultPaperDimension,
-OSL_FORMAT(
-Warning: no DefaultPaperDimensions in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
+if (m_pPaperDimensions == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no PaperDimensions in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
+if (m_pDefaultPaperDimension == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no DefaultPaperDimensions in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
m_pResolutions = getKey( String( RTL_CONSTASCII_USTRINGPARAM( Resolution
) ) );
if( m_pResolutions )
m_pDefaultResolution = m_pResolutions-getDefaultValue();
-DBG_ASSERT(
-m_pResolutions,
-OSL_FORMAT(
-Warning: no Resolution in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
-DBG_ASSERT(
-m_pDefaultResolution,
-OSL_FORMAT(
-Warning: no DefaultResolution in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
+if (m_pResolutions == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no Resolution in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
+if (m_pDefaultResolution == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no DefaultResolution in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
m_pInputSlots = getKey( String( RTL_CONSTASCII_USTRINGPARAM( InputSlot )
) );
if( m_pInputSlots )
m_pDefaultInputSlot = m_pInputSlots-getDefaultValue();
-DBG_ASSERT(
-m_pInputSlots,
-OSL_FORMAT(
-Warning: no InputSlot in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
-DBG_ASSERT(
-m_pDefaultInputSlot,
-OSL_FORMAT(
-Warning: no DefaultInputSlot in %s\n,
-rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr()));
+if (m_pInputSlots == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no InputSlot in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
+if (m_pDefaultInputSlot == 0) {
+OSL_TRACE(
+OSL_LOG_PREFIX Warning: no DefaultInputSlot in %s\n,
+rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+}
m_pDuplexTypes = getKey( String( RTL_CONSTASCII_USTRINGPARAM( Duplex ) )
);
if( m_pDuplexTypes )
m_pDefaultDuplexType = m_pDuplexTypes-getDefaultValue();
m_pFontList = getKey( String( RTL_CONSTASCII_USTRINGPARAM( Font ) ) );
-DBG_ASSERT(
-m_pFontList,
-OSL_FORMAT(
-
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/main.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 6163c62a52794725188faf82ee12852f4b2cd023
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Oct 20 16:41:50 2011 +0200
let Qt call XInitThreads(), so that it knows it's been called (fdo#40298)
Otherwise QPixmap complains when used outside of the main Qt thread
and resets itself to null pixmap, eventually leading to crashes.
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 9e0a361..482a212 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -56,7 +56,18 @@ extern C {
established, so protect X against itself
*/
if( ! ( pNoXInitThreads *pNoXInitThreads ) )
+{
+#if QT_VERSION = 0x040800
+// let Qt call XInitThreads(), so that also Qt knows it's been used
+// (otherwise QPixmap may warn about threads not being initialized)
+QApplication::setAttribute( Qt::AA_X11InitThreads );
+#else
XInitThreads();
+// just in case somebody builds with old version and then upgrades
Qt,
+// otherwise this is a no-op
+QApplication::setAttribute( static_cast ApplicationAttribute (
10 ));
+#endif
+}
#if QT_VERSION 0x05
// Qt 4.x support needs = 4.1.0
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDESalGraphics.cxx | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 936d19e606cbf29d41bff42db559a01f5deb240c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Oct 20 19:05:13 2011 +0200
fix horizontal scrollbars with KDE oxygen style (bnc#722918)
Apparently there are two style flags for detecting the widget
is horizontal.
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 5dbe491..60cd4ed 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -493,10 +493,9 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType
type, ControlPart part,
if (sbVal-mnVisibleSize sbVal-mnMax)
option.state = QStyle::State_MouseOver;
-//horizontal or vertical
-if (part == PART_DRAW_BACKGROUND_VERT)
-option.orientation = Qt::Vertical;
-else
+bool horizontal = ( part == PART_DRAW_BACKGROUND_HORZ );
//horizontal or vertical
+option.orientation = horizontal ? Qt::Horizontal : Qt::Vertical;
+if( horizontal )
option.state |= QStyle::State_Horizontal;
//setup parameters from the OO values
@@ -592,7 +591,10 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType
type, ControlPart part,
option.maximum = slVal-mnMax;
option.minimum = slVal-mnMin;
option.sliderPosition = option.sliderValue = slVal-mnCur;
-option.orientation = (part == PART_TRACK_HORZ_AREA) ? Qt::Horizontal :
Qt::Vertical;
+bool horizontal = ( part == PART_TRACK_HORZ_AREA ); //horizontal or
vertical
+option.orientation = horizontal ? Qt::Horizontal : Qt::Vertical;
+if( horizontal )
+option.state |= QStyle::State_Horizontal;
draw( QStyle::CC_Slider, option, m_image,
vclStateValue2StateFlag(nControlState, value) );
}
@@ -901,7 +903,10 @@ sal_Bool KDESalGraphics::getNativeControlRegion(
ControlType type, ControlPart p
if( part == PART_TRACK_VERT_AREA || part == PART_TRACK_HORZ_AREA )
{
QStyleOptionSlider option;
-option.orientation = ( part == PART_TRACK_HORZ_AREA ) ?
Qt::Horizontal : Qt::Vertical;
+bool horizontal = ( part == PART_TRACK_HORZ_AREA );
//horizontal or vertical
+option.orientation = horizontal ? Qt::Horizontal :
Qt::Vertical;
+if( horizontal )
+option.state |= QStyle::State_Horizontal;
// getNativeControlRegion usually gets ImplControlValue as
'val' (i.e. not the proper
// subclass), so use random sensible values (doesn't matter
anyway, as the wanted
// geometry here depends only on button sizes)
@@ -971,6 +976,8 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType
nType, ControlPart nP
rect.moveTo( 0, 0 );
QStyleOptionSlider options;
options.orientation = bHorizontal ? Qt::Horizontal : Qt::Vertical;
+if( bHorizontal )
+options.state |= QStyle::State_Horizontal;
options.rect = rect;
// some random sensible values, since we call this code only for
scrollbar buttons,
// the slider position does not exactly matter
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/main.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a6347e0971d718943241627f528fa4df3950ad44
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Oct 20 19:56:44 2011 +0200
fix last commit
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 482a212..12e4e14 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -65,7 +65,7 @@ extern C {
XInitThreads();
// just in case somebody builds with old version and then upgrades
Qt,
// otherwise this is a no-op
-QApplication::setAttribute( static_cast ApplicationAttribute (
10 ));
+QApplication::setAttribute( static_cast Qt::ApplicationAttribute
( 10 ));
#endif
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDESalFrame.cxx | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) New commits: commit 7cd58dbe32e5421986216dd7c6b24a4bb0b9c1e5 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Oct 18 16:52:47 2011 +0200 style tooltips properly with KDE4 vclplug (fdo#40461) diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 10e7350..4dd54e5 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -38,6 +38,8 @@ #include kmainwindow.h #include kapplication.h #include ktoolbar.h +#include qdebug.h +#include qtooltip.h #undef Region @@ -239,11 +241,9 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) style.SetFieldTextColor( aText ); style.SetFieldRolloverTextColor( aText ); style.SetWindowTextColor( aText ); -style.SetHelpTextColor( aText ); // Base style.SetFieldColor( aBase ); -style.SetHelpColor( aBase ); style.SetWindowColor( aBase ); style.SetActiveTabColor( aBase ); @@ -268,11 +268,14 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) style.SetHighlightColor( aHigh ); style.SetHighlightTextColor( toColor(pal.color( QPalette::HighlightedText)) ); +// Tooltip +style.SetHelpColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipBase ))); +style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText ))); + // Font Font aFont = toFont( kapp-font(), rSettings.GetUILocale() ); style.SetAppFont( aFont ); -style.SetHelpFont( aFont ); style.SetMenuFont( aFont ); // will be changed according to pMenuBar //style.SetToolFont( aFont ); //already set above @@ -291,6 +294,8 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) } style.SetFloatTitleFont( aFont ); +style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILocale())); + int flash_time = QApplication::cursorFlashTime(); style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/printer/ppdparser.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a99322071afd45c17df973a965e459111c93f36b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 7 14:47:02 2011 +0100
its not a secret which PPD is missing a DefaultResolution
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 8b99f1a..a236e5f 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -824,7 +824,9 @@ PPDParser::PPDParser( const String rFile ) :
if( m_pResolutions )
m_pDefaultResolution = m_pResolutions-getDefaultValue();
DBG_ASSERT( m_pResolutions, Warning: no Resolution in PPD\n );
-DBG_ASSERT( m_pDefaultResolution, Warning: no DefaultResolution in PPD\n
);
+DBG_ASSERT( m_pDefaultResolution,
+rtl::OStringBuffer(Warning: no DefaultResolution in ).
+append(rtl::OUStringToOString(rFile,
osl_getThreadTextEncoding())).append('\n').getStr() );
m_pInputSlots = getKey( String( RTL_CONSTASCII_USTRINGPARAM( InputSlot )
) );
if( m_pInputSlots )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/app/gtkinst.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3daddf9e013db9220c1c49861e1e18c9e3c16314 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Oct 5 17:30:19 2011 +0200 fix also older gtk+ build diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index f0cf177..16c1a78 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -258,7 +258,7 @@ void GtkInstance::AddToRecentDocumentList(const rtl::OUString rFileUrl, const r static addItemFnc sym_gtk_recent_manager_add_item = (addItemFnc)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, gtk_recent_manager_add_item); if (sym_gtk_recent_manager_get_default sym_gtk_recent_manager_add_item) -sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(), sGtkURL); +sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(), sGtkURL.getStr()); else X11SalInstance::AddToRecentDocumentList(rFileUrl, rMimeType); #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
