rpms/openoffice.org/devel openoffice.org.spec, 1.2287, 1.2288 workspace.gtk3.patch, 1.8, 1.9 openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch, 1.7, NONE openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch, 1.3, NONE openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch, 1.2, NONE openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Wed Jul 14 13:06:51 UTC 2010
- Previous message: rpms/mipv6-daemon/devel mipv6-daemon-nd-opts-sanity-check.patch, NONE, 1.1 mipv6-daemon-netlink-msg-origin-check.patch, NONE, 1.1 mipv6-daemon.spec, 1.4, 1.5
- Next message: rpms/moblin-panel-status/devel mps-fixchamplain.patch, NONE, 1.1 moblin-panel-status.spec, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29940
Modified Files:
openoffice.org.spec workspace.gtk3.patch
Removed Files:
openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
Log Message:
remove dead patches
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2287
retrieving revision 1.2288
diff -u -p -r1.2287 -r1.2288
--- openoffice.org.spec 14 Jul 2010 11:57:26 -0000 1.2287
+++ openoffice.org.spec 14 Jul 2010 13:06:51 -0000 1.2288
@@ -83,45 +83,44 @@ Patch5: openoffice.org-2.2.1.ooo7065.sw
Patch6: openoffice.org-2.3.0.ooo76649.httpencoding.patch
Patch7: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
Patch8: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch9: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch10: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch11: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch12: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch13: ooo-build.ooo2497.filter.svg.patch
-Patch14: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch15: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch16: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch17: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch18: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch19: workspace.impress195.patch
-Patch20: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch21: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch22: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch23: workspace.srb1.patch
-Patch24: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch25: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-Patch26: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch27: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch28: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-Patch29: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
-Patch30: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch31: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
-Patch32: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-Patch33: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch34: workspace.writerfilter08.patch
-Patch35: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch36: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch37: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch38: workspace.vcl113.patch
-Patch39: workspace.tl81.patch
-Patch40: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch41: workspace.gtk3.patch
-Patch42: workspace.sw33bf06.patch
-Patch43: workspace.sb128.patch
-Patch44: openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
-Patch45: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
-Patch46: workspace.native317.patch
-Patch47: workspace.sb126.patch
+Patch9: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch10: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch11: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch12: ooo-build.ooo2497.filter.svg.patch
+Patch13: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch14: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch15: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch16: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch17: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch18: workspace.impress195.patch
+Patch19: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch20: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch21: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch22: workspace.srb1.patch
+Patch23: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch24: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+Patch25: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch26: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+Patch27: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+Patch28: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
+Patch29: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch30: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
+Patch31: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch32: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch33: workspace.writerfilter08.patch
+Patch34: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch35: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch36: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch37: workspace.vcl113.patch
+Patch38: workspace.tl81.patch
+Patch39: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch40: workspace.gtk3.patch
+Patch41: workspace.sw33bf06.patch
+Patch42: workspace.sb128.patch
+Patch43: openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
+Patch44: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
+Patch45: workspace.native317.patch
+Patch46: workspace.sb126.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1618,45 +1617,44 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch6 -p0 -b .ooo76649.httpencoding.patch
%patch7 -p1 -b .ooo86080.unopkg.bodge.patch
%patch8 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch9 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch10 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch11 -p0 -b .gccXXXXX.solenv.javaregistration.patch
-%patch12 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch13 -p1 -b .ooo2497.filter.svg.patch
-%patch14 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch15 -p0 -b .ooo101274.opening-a-directory.patch
-%patch16 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch17 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch18 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch19 -p0 -b .workspace.impress195.patch
-%patch20 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch21 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch22 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch23 -p1 -b .workspace.srb1.patch
-%patch24 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch25 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
-%patch26 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch27 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch28 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch29 -p1 -b .ooo74188.indiccursor.editeng.patch
-%patch30 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch31 -p0 -b .ooo111699.svx.nullfield.patch
-%patch32 -p0 -b .ooo111758.sd.xerror.patch
-%patch33 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch34 -p0 -b .workspace.writerfilter08.patch
-%patch35 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch36 -p0 -b .ooo107490.cppu.lifecycle.patch
-%patch37 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
-%patch38 -p0 -b .workspace.vcl113.patch
-%patch39 -p0 -b .workspace.tl81.patch
-%patch40 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch41 -p0 -b .workspace.gtk3.patch
-%patch42 -p0 -b .workspace.sw33bf06.patch
-%patch43 -p1 -b .workspace.sb128.patch
-%patch44 -p0 -b .oooXXXXX.offapi.weirdness.patch
-%patch45 -p0 -b .oooXXXXX.afms.buildtype.patch
-%patch46 -p1 -b .workspace.native317.patch
-%patch47 -p1 -b .workspace.sb126.patch
+%patch9 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch10 -p0 -b .gccXXXXX.solenv.javaregistration.patch
+%patch11 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch12 -p1 -b .ooo2497.filter.svg.patch
+%patch13 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch14 -p0 -b .ooo101274.opening-a-directory.patch
+%patch15 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch16 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch17 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch18 -p0 -b .workspace.impress195.patch
+%patch19 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch20 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch21 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch22 -p1 -b .workspace.srb1.patch
+%patch23 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch24 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
+%patch25 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch26 -p1 -b .ooo108846.sfx2.qstartfixes.patch
+%patch27 -p1 -b .ooo95369.sw.sortedobjs.patch
+%patch28 -p1 -b .ooo74188.indiccursor.editeng.patch
+%patch29 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch30 -p0 -b .ooo111699.svx.nullfield.patch
+%patch31 -p0 -b .ooo111758.sd.xerror.patch
+%patch32 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch33 -p0 -b .workspace.writerfilter08.patch
+%patch34 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch35 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch36 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch37 -p0 -b .workspace.vcl113.patch
+%patch38 -p0 -b .workspace.tl81.patch
+%patch39 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch40 -p0 -b .workspace.gtk3.patch
+%patch41 -p0 -b .workspace.sw33bf06.patch
+%patch42 -p1 -b .workspace.sb128.patch
+%patch43 -p0 -b .oooXXXXX.offapi.weirdness.patch
+%patch44 -p0 -b .oooXXXXX.afms.buildtype.patch
+%patch45 -p1 -b .workspace.native317.patch
+%patch46 -p1 -b .workspace.sb126.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
workspace.gtk3.patch:
configure.in | 6
fpicker/source/office/iodlg.src | 5
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 95 -
fpicker/source/unx/gnome/SalGtkFilePicker.hxx | 6
fpicker/source/unx/gnome/resourceprovider.cxx | 3
fpicker/source/unx/gnome/resourceprovider.hxx | 1
source/appl/makefile.mk | 2
source/appl/shutdowniconunx.cxx | 22
source/eggtrayicon-impl.h | 2
source/eggtrayicon.c | 57
source/makefile.mk | 2
source/nsplugin/source/makefile.mk | 2
source/ooo/makefile.mk | 4
source/plugin/unx/npnapi.cxx | 5
source/plugin/util/makefile.pmk | 2
source/unx/gnome/SalGtkFilePicker.cxx | 6
source/unx/gnome/SalGtkPicker.cxx | 4
source/unx/gnome/makefile.mk | 6
svtools/inc/svtools/svtools.hrc | 1
unx/gtk/a11y/makefile.mk | 2
unx/gtk/app/gtkdata.cxx | 32
unx/gtk/app/makefile.mk | 2
unx/gtk/gdi/makefile.mk | 4
unx/gtk/gdi/salnativewidgets-gtk.cxx | 2316 +++++++++++++-------------
unx/gtk/window/gtkframe.cxx | 109 -
unx/gtk/window/gtkobject.cxx | 17
unx/gtk/window/makefile.mk | 2
unx/inc/plugins/gtk/gtkdata.hxx | 35
unx/inc/plugins/gtk/gtkframe.hxx | 2
unx/inc/plugins/gtk/gtkgdi.hxx | 16
unx/inc/plugins/gtk/gtkobject.hxx | 2
unx/inc/saldisp.hxx | 4
unx/source/app/saldisp.cxx | 21
unx/source/app/salsys.cxx | 2
util/makefile.mk | 4
35 files changed, 1553 insertions(+), 1248 deletions(-)
Index: workspace.gtk3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gtk3.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- workspace.gtk3.patch 13 Jul 2010 15:55:00 -0000 1.8
+++ workspace.gtk3.patch 14 Jul 2010 13:06:51 -0000 1.9
@@ -1,3 +1,278 @@
+diff -ru svtools.orig/inc/svtools/svtools.hrc svtools/inc/svtools/svtools.hrc
+--- svtools/inc/svtools/svtools.hrc 2009-01-14 15:52:54.000000000 +0000
++++ svtools/inc/svtools/svtools.hrc 2009-01-14 15:53:18.000000000 +0000
+@@ -73,6 +73,7 @@
+ #define RID_FILEOPEN_INVALIDFOLDER (RID_SVTOOLS_START + 34)
+ #define RID_FILEOPEN_NOTEXISTENTFILE (RID_SVTOOLS_START + 35)
+ #define STR_SVT_NOREMOVABLEDEVICE (RID_SVTOOLS_START + 36)
++#define STR_SVT_ALLFORMATS (RID_SVTOOLS_START + 37)
+
+ // doc template dialog
+ #define DLG_DOCTEMPLATE (RID_SVTOOLS_START+50)
+diff -ru fpicker.orig/source/office/iodlg.src fpicker/source/office/iodlg.src
+--- fpicker/source/office/iodlg.src 2009-01-14 11:56:02.000000000 +0000
++++ fpicker/source/office/iodlg.src 2009-01-14 15:59:44.000000000 +0000
+@@ -317,5 +312,10 @@
+ Text [ en-US ] = "No removable storage device detected.\nMake sure it is plugged in properly and try again." ;
+ };
+
++String STR_SVT_ALLFORMATS
++{
++ Text [ en-US ] = "All Formats" ;
++};
++
+ //******************************************************************** EOF
+
+diff -ru fpicker.orig/source/unx/gnome/resourceprovider.cxx fpicker/source/unx/gnome/resourceprovider.cxx
+--- fpicker/source/unx/gnome/resourceprovider.cxx 2009-01-14 11:56:02.000000000 +0000
++++ fpicker/source/unx/gnome/resourceprovider.cxx 2009-01-14 15:42:26.000000000 +0000
+@@ -85,7 +85,8 @@
+ { CHECKBOX_SELECTION, STR_SVT_FILEPICKER_SELECTION },
+ { FOLDERPICKER_TITLE, STR_SVT_FOLDERPICKER_DEFAULT_TITLE },
+ { FOLDER_PICKER_DEF_DESCRIPTION, STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION },
+- { FILE_PICKER_OVERWRITE, STR_SVT_ALREADYEXISTOVERWRITE }
++ { FILE_PICKER_OVERWRITE, STR_SVT_ALREADYEXISTOVERWRITE },
++ { FILE_PICKER_ALLFORMATS, STR_SVT_ALLFORMATS }
+ };
+
+ _Entry OtherCtrlIdToResIdTable[] = {
+diff -ru fpicker.orig/source/unx/gnome/resourceprovider.hxx fpicker/source/unx/gnome/resourceprovider.hxx
+--- fpicker/source/unx/gnome/resourceprovider.hxx 2009-01-14 11:56:02.000000000 +0000
++++ fpicker/source/unx/gnome/resourceprovider.hxx 2009-01-14 15:40:34.000000000 +0000
+@@ -48,6 +48,7 @@
+ #define FILE_PICKER_TITLE_SAVE 503
+ #define FILE_PICKER_FILE_TYPE 504
+ #define FILE_PICKER_OVERWRITE 505
++#define FILE_PICKER_ALLFORMATS 506
+
+ //------------------------------------------------------------------------
+ // deklarations
+diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-14 11:56:02.000000000 +0000
++++ fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-14 15:42:05.000000000 +0000
+@@ -52,6 +52,7 @@
+
+ #include <iostream>
+ #include <algorithm>
++#include <set>
+ #include "resourceprovider.hxx"
+ #ifndef _SV_RC_H
+ #include <tools/rc.hxx>
+@@ -181,6 +182,7 @@
+ mbPreviewState( sal_False ),
+ mHID_Preview( 0 ),
+ m_pPreview( NULL ),
++ m_pPseudoFilter( NULL ),
+ m_PreviewImageWidth( 256 ),
+ m_PreviewImageHeight( 256 )
+ {
+@@ -692,7 +694,7 @@
+ m_pFilterList = new FilterList;
+
+ // set the first filter to the current filter
+- if( ( !m_aCurrentFilter ) || ( !m_aCurrentFilter.getLength() ) )
++ if ( !m_aCurrentFilter.getLength() )
+ m_aCurrentFilter = _rInitialCurrentFilter;
+ }
+ }
+@@ -715,7 +717,6 @@
+
+ // append the filter
+ m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) );
+- // implAddFilter( aTitle, aFilter );
+ }
+
+ //-----------------------------------------------------------------------------------------
+@@ -782,7 +783,10 @@
+ }
+ else if( GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog)))
+ {
+- updateCurrentFilterFromName(gtk_file_filter_get_name( filter ));
++ if (m_pPseudoFilter != filter)
++ updateCurrentFilterFromName(gtk_file_filter_get_name( filter ));
++ else
++ updateCurrentFilterFromName(OUStringToOString( m_aInitialFilter, RTL_TEXTENCODING_UTF8 ).getStr());
+ }
+ }
+
+@@ -950,9 +954,15 @@
+ }
+ }
+
+- const gchar* filtername =
+- gtk_file_filter_get_name( gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) );
+- sFilterName = OUString( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 );
++ GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog));
++ if (m_pPseudoFilter != filter)
++ {
++ const gchar* filtername =
++ gtk_file_filter_get_name( filter );
++ sFilterName = OUString( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 );
++ }
++ else
++ sFilterName = m_aInitialFilter;
+ }
+
+ OSL_TRACE( "2: current filter is %s\n",
+@@ -1917,7 +1927,7 @@
+ }
+ }
+
+-int SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType )
++GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType )
+ {
+ GdkThreadLock aLock;
+
+@@ -1968,7 +1978,6 @@
+
+ gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( m_pDialog ), filter );
+
+- int nAdded = 0;
+ if (!bAllGlob)
+ {
+ GtkTreeIter iter;
+@@ -1979,30 +1988,67 @@
+ 2, aFilterName.getStr(),
+ 3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(),
+ -1);
+- nAdded = 1;
+ }
+- return nAdded;
++ return filter;
+ }
+
+-int SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const Sequence< StringPair >& _rFilters )
++void SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const Sequence< StringPair >& _rFilters )
+ {
+ // Gtk+ has no filter group concept I think so ...
+ // implAddFilter( _rFilter, String() );
+- int nAdded = 0;
+ const StringPair* pSubFilters = _rFilters.getConstArray();
+ const StringPair* pSubFiltersEnd = pSubFilters + _rFilters.getLength();
+ for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters )
+- nAdded += implAddFilter( pSubFilters->First, pSubFilters->Second );
+- return nAdded;
++ implAddFilter( pSubFilters->First, pSubFilters->Second );
+ }
+
+ void SalGtkFilePicker::SetFilters()
+ {
+- OSL_TRACE( "start setting filters\n");
+-
+ GdkThreadLock aLock;
+
+- int nAdded = 0;
++ if (!m_aInitialFilter.getLength())
++ m_aInitialFilter = m_aCurrentFilter;
++
++ rtl::OUString sPseudoFilter;
++ if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) )
++ {
++ std::set<OUString> aAllFormats;
++ if( m_pFilterList && !m_pFilterList->empty() )
++ {
++ for ( FilterList::iterator aListIter = m_pFilterList->begin();
++ aListIter != m_pFilterList->end();
++ ++aListIter
++ )
++ {
++ if( aListIter->hasSubFilters() )
++ { // it's a filter group
++ UnoFilterList aSubFilters;
++ aListIter->getSubFilters( aSubFilters );
++ const StringPair* pSubFilters = aSubFilters.getConstArray();
++ const StringPair* pSubFiltersEnd = pSubFilters + aSubFilters.getLength();
++ for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters )
++ aAllFormats.insert(pSubFilters->Second);
++ }
++ else
++ aAllFormats.insert(aListIter->getFilter());
++ }
++ }
++ if (aAllFormats.size() > 1)
++ {
++ rtl::OUString sAllFilter;
++ std::set<OUString>::const_iterator aEnd = aAllFormats.end();
++ for (std::set<OUString>::const_iterator aIter = aAllFormats.begin(); aIter != aEnd; ++aIter)
++ {
++ if (sAllFilter.getLength())
++ sAllFilter += OUString(sal_Unicode(';'));
++ sAllFilter += *aIter;
++ }
++ CResourceProvider aResProvider;
++ sPseudoFilter = aResProvider.getResString(FILE_PICKER_ALLFORMATS);
++ m_pPseudoFilter = implAddFilter( sPseudoFilter, sAllFilter );
++ }
++ }
++
+ if( m_pFilterList && !m_pFilterList->empty() )
+ {
+ for ( FilterList::iterator aListIter = m_pFilterList->begin();
+@@ -2016,30 +2062,27 @@
+ UnoFilterList aSubFilters;
+ aListIter->getSubFilters( aSubFilters );
+
+- nAdded += implAddFilterGroup( aListIter->getTitle(), aSubFilters );
++ implAddFilterGroup( aListIter->getTitle(), aSubFilters );
+ }
+ else
+ {
+ // it's a single filter
+
+- nAdded += implAddFilter( aListIter->getTitle(), aListIter->getFilter() );
++ implAddFilter( aListIter->getTitle(), aListIter->getFilter() );
+ }
+ }
+ }
+
+- if (nAdded)
++ if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_pFilterStore), NULL)) //If m_pFilterStore is not empty
+ gtk_widget_show( m_pFilterExpander );
+ else
+ gtk_widget_hide( m_pFilterExpander );
+
+ // set the default filter
+- if( m_aCurrentFilter && (m_aCurrentFilter.getLength() > 0) )
+- {
+- OSL_TRACE( "Setting current filter to %s\n",
+- OUStringToOString( m_aCurrentFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
+-
++ if (sPseudoFilter.getLength())
++ SetCurFilter( sPseudoFilter );
++ else if(m_aCurrentFilter.getLength())
+ SetCurFilter( m_aCurrentFilter );
+- }
+
+ OSL_TRACE( "end setting filters\n");
+ }
+diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+--- fpicker/source/unx/gnome/SalGtkFilePicker.hxx 2009-01-14 11:56:02.000000000 +0000
++++ fpicker/source/unx/gnome/SalGtkFilePicker.hxx 2009-01-14 15:34:41.000000000 +0000
+@@ -317,11 +317,13 @@
+ gulong mnHID_SelectionChange;
+
+ ::rtl::OUString m_aCurrentFilter;
++ ::rtl::OUString m_aInitialFilter;
+
+ bool bVersionWidthUnset;
+ sal_Bool mbPreviewState;
+ gulong mHID_Preview;
+ GtkWidget* m_pPreview;
++ GtkFileFilter* m_pPseudoFilter;
+ sal_Int32 m_PreviewImageWidth;
+ sal_Int32 m_PreviewImageHeight;
+
+@@ -332,8 +334,8 @@
+ void UpdateFilterfromUI();
+
+ void implChangeType( GtkTreeSelection *selection );
+- int implAddFilter( const OUString& rFilter, const OUString& rType);
+- int implAddFilterGroup( const OUString& rFilter,
++ GtkFileFilter * implAddFilter( const OUString& rFilter, const OUString& rType );
++ void implAddFilterGroup( const OUString& rFilter,
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters );
+ void updateCurrentFilterFromName(const gchar* filtername);
+ void unselect_type();
--- vcl.orig/unx/gtk/a11y/makefile.mk 2010-05-29 11:29:16.000000000 +0100
+++ vcl/unx/gtk/a11y/makefile.mk 2010-05-29 11:30:47.000000000 +0100
@@ -50,7 +50,7 @@
--- openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch DELETED ---
--- openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch DELETED ---
--- openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch DELETED ---
--- openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch DELETED ---
- Previous message: rpms/mipv6-daemon/devel mipv6-daemon-nd-opts-sanity-check.patch, NONE, 1.1 mipv6-daemon-netlink-msg-origin-check.patch, NONE, 1.1 mipv6-daemon.spec, 1.4, 1.5
- Next message: rpms/moblin-panel-status/devel mps-fixchamplain.patch, NONE, 1.1 moblin-panel-status.spec, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list