rpms/openoffice.org/devel openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch, NONE, 1.1 workspace.fpicker6.patch, NONE, 1.1 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.7, 1.8 openoffice.org.spec, 1.726, 1.727 openoffice.org-2.0.3.ooo65330.samba.fpicker.patch, 1.1, NONE openoffice.org-2.0.3.oooXXXXX.vcl.removemenukey.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 25 10:59:39 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4385
Modified Files:
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org.spec
Added Files:
openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
workspace.fpicker6.patch
Removed Files:
openoffice.org-2.0.3.ooo65330.samba.fpicker.patch
openoffice.org-2.0.3.oooXXXXX.vcl.removemenukey.patch
Log Message:
upstream patches, change ids to match
openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch:
gtk/window/gtkframe.cxx | 36 ------------------------------------
inc/plugins/gtk/gtkframe.hxx | 1 -
2 files changed, 37 deletions(-)
--- NEW FILE openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch ---
diff -ru vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 2006-05-18 12:25:04.000000000 +0100
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 2006-05-18 12:29:56.000000000 +0100
@@ -480,7 +480,6 @@
// init members
m_pCurrentCursor = NULL;
m_nKeyModifiers = 0;
- m_bSingleAltPress = false;
m_bFullscreen = false;
m_bDefaultPos = true;
m_bDefaultSize = ( (m_nStyle & SAL_FRAME_STYLE_SIZEABLE) && ! m_pParent );
@@ -2126,7 +2125,6 @@
if( !pEvent->in )
{
pThis->m_nKeyModifiers = 0;
- pThis->m_bSingleAltPress = false;
pThis->m_bSendModChangeOnRelease = false;
}
@@ -2331,37 +2329,6 @@
aModEvt.mnTime = pEvent->time;
pThis->CallCallback( SALEVENT_KEYMODCHANGE, &aModEvt );
-
- if( ! aDel.isDeleted() )
- {
- // emulate KEY_MENU
- if( ( pEvent->keyval == GDK_Alt_L || pEvent->keyval == GDK_Alt_R ) &&
- ( nModCode & ~(KEY_CONTROLMOD|KEY_MOD2)) == 0 )
- {
- if( pEvent->type == GDK_KEY_PRESS )
- pThis->m_bSingleAltPress = true;
-
- else if( pThis->m_bSingleAltPress )
- {
- SalKeyEvent aKeyEvt;
-
- aKeyEvt.mnCode = KEY_MENU | nModCode;
- aKeyEvt.mnRepeat = 0;
- aKeyEvt.mnTime = pEvent->time;
- aKeyEvt.mnCharCode = 0;
-
- // simulate KEY_MENU
- pThis->CallCallback( SALEVENT_KEYINPUT, &aKeyEvt );
- if( ! aDel.isDeleted() )
- {
- pThis->CallCallback( SALEVENT_KEYUP, &aKeyEvt );
- pThis->m_bSingleAltPress = false;
- }
- }
- }
- else
- pThis->m_bSingleAltPress = false;
- }
}
else
{
@@ -2374,10 +2341,7 @@
(pEvent->type == GDK_KEY_PRESS),
false );
if( ! aDel.isDeleted() )
- {
pThis->m_bSendModChangeOnRelease = false;
- pThis->m_bSingleAltPress = false;
- }
}
if( !aDel.isDeleted() && pThis->m_pIMHandler )
diff -ru vcl/unx/inc/plugins/gtk/gtkframe.hxx vcl/unx/inc/plugins/gtk/gtkframe.hxx
--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx 2006-05-18 12:25:04.000000000 +0100
+++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx 2006-05-18 12:29:24.000000000 +0100
@@ -191,7 +191,6 @@
int m_nSavedScreenSaverTimeout;
int m_nWorkArea;
bool m_bFullscreen;
- bool m_bSingleAltPress;
bool m_bDefaultPos;
bool m_bDefaultSize;
bool m_bSendModChangeOnRelease;
workspace.fpicker6.patch:
SalGtkFilePicker.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE workspace.fpicker6.patch ---
Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.11
diff -u -p -r1.11 SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 12 May 2006 11:28:22 -0000
@@ -1864,10 +1864,10 @@ case_insensitive_filter (const GtkFileFi
g_return_val_if_fail( data != NULL, FALSE );
g_return_val_if_fail( filter_info != NULL, FALSE );
- if( !filter_info->filename )
+ if( !filter_info->uri )
return FALSE;
- const char *pExtn = strrchr( filter_info->filename, '.' );
+ const char *pExtn = strrchr( filter_info->uri, '.' );
if( !pExtn )
return FALSE;
pExtn++;
@@ -1911,7 +1914,7 @@ int SalGtkFilePicker::implAddFilter( con
if (aTokens.getLength())
aTokens += OUString::createFromAscii(",");
aTokens = aTokens += aToken;
- gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME,
+ gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI,
case_insensitive_filter,
g_strdup( rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ) ),
(GDestroyNotify) g_free );
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
inc/jobset.hxx | 0
inc/print.hxx | 0
inc/psprint/ppdparser.hxx | 0
psprint/inc/psprint/ppdparser.hxx | 2
source/dialogs/makefile.mk | 0
source/dialogs/printdlg.cxx | 0
source/gdi/jobset.cxx | 0
svtools/source/dialogs/makefile.mk | 4
svtools/source/dialogs/printdlg.cxx | 266 ++++++++++++++++++++++++++++++++++--
svtools/util/makefile.mk | 8 -
util/makefile.mk | 0
vcl/inc/jobset.hxx | 1
vcl/inc/print.hxx | 1
vcl/source/gdi/jobset.cxx | 173 +++++++++++++++++++++++
14 files changed, 445 insertions(+), 10 deletions(-)
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 24 May 2006 10:47:31 -0000 1.7
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 25 May 2006 10:59:36 -0000 1.8
@@ -447,7 +447,7 @@
+ gtk_dialog_add_button( GTK_DIALOG( pDialog ), aOptions.getStr(), 10);
+ gtk_dialog_add_buttons (GTK_DIALOG (pDialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_PRINT, GTK_RESPONSE_OK, NULL);
-+ gtk_dialog_set_default_response (GTK_DIALOG (pDialog), GTK_RESPONSE_OK);
++ //gtk_dialog_set_default_response (GTK_DIALOG (pDialog), GTK_RESPONSE_OK);
+ TempHorrorHack(GTK_CONTAINER(pDialog),0);
+ }
+
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.726
retrieving revision 1.727
diff -u -r1.726 -r1.727
--- openoffice.org.spec 24 May 2006 09:20:39 -0000 1.726
+++ openoffice.org.spec 25 May 2006 10:59:36 -0000 1.727
@@ -96,11 +96,11 @@
Patch30: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
Patch31: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
Patch32: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
-Patch33: openoffice.org-2.0.3.ooo65330.samba.fpicker.patch
+Patch33: workspace.fpicker6.patch
Patch34: workspace.vcl59.patch
Patch35: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
Patch36: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch37: openoffice.org-2.0.3.oooXXXXX.vcl.removemenukey.patch
+Patch37: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
Patch38: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
Patch39: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
@@ -826,11 +826,11 @@
%patch30 -p1 -b .ooo65318.agg24.canvas.patch
%patch31 -p1 -b .ooo65308.notespaste.sd.patch
%patch32 -p1 -b .ooo65327.builddep.writerperfect.patch
-%patch33 -p1 -b .ooo65330.samba.fpicker.patch
+%patch33 -p1 -b .workspace.fpicker6.patch
%patch34 -p1 -b .workspace.vcl59.patch
%patch35 -p1 -b .oooXXXXX.atkbroken.vcl.patch
%patch36 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch37 -p1 -b .oooXXXXX.vcl.removemenukey.patch
+%patch37 -p1 -b .ooo65767.vcl.removemenukey.patch
%patch38 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
%patch39 -p1 -b .rh192588.officecfg.defaultcairooff.patch
--- openoffice.org-2.0.3.ooo65330.samba.fpicker.patch DELETED ---
--- openoffice.org-2.0.3.oooXXXXX.vcl.removemenukey.patch DELETED ---
More information about the fedora-cvs-commits
mailing list