rpms/openoffice.org/devel workspace.cmcfixes16.patch, NONE, 1.1 openoffice.org.spec, 1.417, 1.418
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 25 19:34:28 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21421
Modified Files:
openoffice.org.spec
Added Files:
workspace.cmcfixes16.patch
Log Message:
go for it
workspace.cmcfixes16.patch:
SalGtkFilePicker.cxx | 40 ++++++++++++++++------------------------
SalGtkFilePicker.hxx | 3 ---
2 files changed, 16 insertions(+), 27 deletions(-)
--- NEW FILE workspace.cmcfixes16.patch ---
Index: source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.7.16.1
retrieving revision 1.7
diff -u -r1.7.16.1 -r1.7
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 25 Aug 2005 12:35:02 -0000 1.7.16.1
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 12 Jul 2005 11:58:49 -0000 1.7
@@ -200,9 +200,7 @@
mbPreviewState( sal_False ),
m_pPreview( NULL ),
m_PreviewImageWidth( 256 ),
- m_PreviewImageHeight( 256 ),
- mnHID_FolderChange( 0 ),
- mnHID_SelectionChange( 0 )
+ m_PreviewImageHeight( 256 )
{
int i;
@@ -787,13 +785,17 @@
}
}
-void SalGtkFilePicker::UpdateFilterfromUI()
+rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException )
{
+ OSL_ASSERT( m_pDialog != NULL );
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ // TODO return m_pImpl->getCurrentFilter();
+
+ OSL_TRACE( "GetCURRENTfilter\n" );
+
// Update the filtername from the users selection if they have had a chance to do so.
// If the user explicitly sets a type then use that, if not then take the implicit type
// from the filter of the files glob on which he is currently searching
- if (!mnHID_FolderChange || !mnHID_SelectionChange)
- return;
GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView));
GtkTreeIter iter;
GtkTreeModel *model;
@@ -808,16 +810,6 @@
{
updateCurrentFilterFromName(gtk_file_filter_get_name( filter ));
}
-}
-
-rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException )
-{
- OSL_ASSERT( m_pDialog != NULL );
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
-
- OSL_TRACE( "GetCURRENTfilter\n" );
-
- UpdateFilterfromUI();
OSL_TRACE( "Returning current filter of %s\n",
OUStringToOString( m_aCurrentFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -1029,16 +1021,16 @@
sal_Int16 retVal = 0;
- SetFilters();
-
- mnHID_FolderChange =
+ gulong nHID_FolderChange =
g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "current-folder-changed",
G_CALLBACK( folder_changed_cb ), ( gpointer )this );
- mnHID_SelectionChange =
+ gulong nHID_SelectionChange =
g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "selection-changed",
G_CALLBACK( selection_changed_cb ), ( gpointer )this );
+ SetFilters();
+
int btn = GTK_RESPONSE_NO;
int nRes = GTK_RESPONSE_CANCEL;
@@ -1096,10 +1088,10 @@
}
}
- if (mnHID_FolderChange)
- g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mnHID_FolderChange);
- if (mnHID_SelectionChange)
- g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mnHID_SelectionChange);
+ if (nHID_FolderChange)
+ g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), nHID_FolderChange);
+ if (nHID_SelectionChange)
+ g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), nHID_SelectionChange);
return retVal;
}
Index: source/unx/gnome/SalGtkFilePicker.hxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.hxx,v
retrieving revision 1.5.18.1
retrieving revision 1.5
diff -u -r1.5.18.1 -r1.5
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.hxx 25 Aug 2005 12:35:02 -0000 1.5.18.1
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.hxx 12 Jul 2005 11:59:09 -0000 1.5
@@ -357,8 +357,6 @@
GtkWidget *m_pLists[ LIST_LAST ];
GtkWidget *m_pListLabels[ LIST_LAST ];
bool mbListVisibility[ LIST_LAST ];
- gulong mnHID_FolderChange;
- gulong mnHID_SelectionChange;
::rtl::OUString m_aCurrentFilter;
@@ -366,7 +364,6 @@
void SetCurFilter( const OUString& rFilter );
void SetFilters();
- void UpdateFilterfromUI();
void implChangeType( GtkTreeSelection *selection );
int implAddFilter( const OUString& rFilter, const OUString& rType);
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- openoffice.org.spec 25 Aug 2005 09:29:14 -0000 1.417
+++ openoffice.org.spec 25 Aug 2005 19:34:25 -0000 1.418
@@ -1,5 +1,5 @@
%define ooo2ver 125
-%define ooo_rpm_release 3
+%define ooo_rpm_release 4
%define build_fc4 0
%define build_fc5 1
@@ -173,6 +173,7 @@
Patch53: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch
Patch54: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch
Patch55: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch56: workspace.cmcfixes16.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -830,6 +831,7 @@
%patch53 -p1 -b .ooo53682.nfslock.sal.patch
%patch54 -p1 -b .ooo53699.uzipunused.postprocess.patch
%patch55 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch56 -p1 -b .workspace.cmcfixes16.patch
%if %{includeexternals}
#start ludicrous workaround
@@ -3114,6 +3116,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Thu Aug 23 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.125-4
+- add workspace.cmcfixes16.patch for export dialog problem
+
* Tue Aug 23 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.125-3
- use only underlying toolkit startup notification
- use proper nfslock fix
More information about the fedora-cvs-commits
mailing list