rpms/openoffice.org/devel openoffice.org-3.3.0.ooo558253.sfx2.uisavedir.patch, NONE, 1.1 openoffice.org.spec, 1.2129, 1.2130

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo558253.sfx2.uisavedir.patch 
Log Message:
Resolves: rhbz#558253/ooo#558253 sfx2 uisavedir

openoffice.org-3.3.0.ooo558253.sfx2.uisavedir.patch:
 guisaveas.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-3.3.0.ooo558253.sfx2.uisavedir.patch ---
diff -r 3c24aa9a7810 sfx2/source/doc/guisaveas.cxx
--- a/sfx2/source/doc/guisaveas.cxx	Sat Jan 23 16:31:03 2010 +0000
+++ b/sfx2/source/doc/guisaveas.cxx	Sun Jan 24 17:16:37 2010 +0000
@@ -231,7 +231,7 @@
 								sal_Bool bSetStandardName,
 								::rtl::OUString& aSuggestedName,
                                 sal_Bool bPreselectPassword,
-								const ::rtl::OUString& aSuggestedDir,
+								::rtl::OUString& aSuggestedDir,
 								sal_Int16 nDialog,
 								const ::rtl::OUString& rStandardDir,
 								const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList
@@ -731,7 +731,7 @@
 											sal_Bool bSetStandardName,
 											::rtl::OUString& aSuggestedName,
                                             sal_Bool bPreselectPassword,
-											const ::rtl::OUString& aSuggestedDir,
+											::rtl::OUString& aSuggestedDir,
 											sal_Int16 nDialog,
 											const ::rtl::OUString& rStandardDir,
 											const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList)
@@ -927,6 +927,7 @@
 	INetURLObject aURL( pFileDlg->GetPath() );
 	// the path should be provided outside since it might be used for further calls to the dialog
 	aSuggestedName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET );
+       aSuggestedDir = pFileDlg->GetDisplayDirectory();
 
 	// old filter options should be cleared in case different filter is used
 
@@ -1412,10 +1413,8 @@
         sal_Bool bExit = sal_False;
         while ( !bExit )
         {
+            // in case the dialog is opened a second time the folder should be the same as previously navigated to by the user, not what was handed over by initial parameters
             bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aBlackList );
-
-			// in case the dialog is opend a second time the folder should be the same as before, not what was handed over by parameters
-			aSuggestedDir = ::rtl::OUString();
             if ( nStoreMode == SAVEAS_REQUESTED )
             {
                 // in case of saving check filter for possible alien warning


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2129
retrieving revision 1.2130
diff -u -p -r1.2129 -r1.2130
--- openoffice.org.spec	18 Jan 2010 20:10:54 -0000	1.2129
+++ openoffice.org.spec	25 Jan 2010 09:24:10 -0000	1.2130
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 10
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4173,6 +4173,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 25 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-10.3
+- Resolves: rhbz#558253/ooo#558253 sfx2 uisavedir
+
 * Mon Jan 18 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-10.2
 - improve s390x uno bridge