rpms/openoffice.org/devel openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12061

Modified Files:
	openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch 
Log Message:
Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch

openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch:

Index: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch	14 Jan 2009 16:07:17 -0000	1.1
+++ openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch	14 Jan 2009 16:16:30 -0000	1.2
@@ -66,6 +66,15 @@
  	m_PreviewImageWidth( 256 ),
      m_PreviewImageHeight( 256 )
  {
+@@ -689,7 +691,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;
+ 	}
+ }
 @@ -713,7 +715,6 @@
  
  	// append the filter
@@ -122,7 +131,7 @@
      if (!bAllGlob)
      {
          GtkTreeIter iter;
-@@ -1964,27 +1973,64 @@
+@@ -1964,27 +1973,66 @@
              2, aFilterName.getStr(),
              3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(),
              -1);
@@ -154,6 +163,7 @@
 +	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;
@@ -188,14 +198,15 @@
 +				sAllFilter += *aIter;
 +			}
 +			CResourceProvider aResProvider;
-+			m_pPseudoFilter = implAddFilter( aResProvider.getResString(FILE_PICKER_ALLFORMATS), sAllFilter );
++			sPseudoFilter = aResProvider.getResString(FILE_PICKER_ALLFORMATS);
++			m_pPseudoFilter = implAddFilter( sPseudoFilter, sAllFilter );
 +		}
 +    }
 +
  	if( m_pFilterList && !m_pFilterList->empty() )
  	{
  		for	(	FilterList::iterator aListIter = m_pFilterList->begin();
-@@ -1998,18 +2044,18 @@
+@@ -1998,30 +2046,27 @@
  				UnoFilterList aSubFilters;
  				aListIter->getSubFilters( aSubFilters );
  
@@ -217,6 +228,21 @@
          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
 --- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.hxx	2009-01-14 11:56:02.000000000 +0000
 +++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.hxx	2009-01-14 15:34:41.000000000 +0000