rpms/openoffice.org/F-12 openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch, NONE, 1.1 openoffice.org.spec, 1.2058, 1.2059 openoffice.org-3.3.0.ooo558253.sfx2.uisavedir.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6187

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

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

--- NEW FILE openoffice.org-3.3.0.ooo108637.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/F-12/openoffice.org.spec,v
retrieving revision 1.2058
retrieving revision 1.2059
diff -u -p -r1.2058 -r1.2059
--- openoffice.org.spec	25 Jan 2010 09:26:03 -0000	1.2058
+++ openoffice.org.spec	25 Jan 2010 09:29:06 -0000	1.2059
@@ -191,7 +191,7 @@ Patch113: workspace.sw33bf02.patch
 Patch114: openoffice.org-3.3.0.ooo80674.cmyk-for-jpeg-images.patch
 Patch115: workspace.impress180.patch
 Patch116: workspace.impress182.patch
-Patch117: openoffice.org-3.3.0.ooo558253.sfx2.uisavedir.patch
+Patch117: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1777,7 +1777,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch114 -p1 -b .ooo80674.cmyk-for-jpeg-images.patch
 %patch115 -p1 -b .workspace.impress180.patch
 %patch116 -p1 -b .workspace.impress182.patch
-%patch117 -p1 -b .ooo558253.sfx2.uisavedir.patch
+%patch117 -p1 -b .ooo108637.sfx2.uisavedir.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4331,7 +4331,7 @@ fi
   colorspace (dtardon)
 - Resolves: rhbz#558342 [abrt] crash in SvxNumOptionsTabPage::InitControls
   (dtardon)
-- Resolves: rhbz#558253/ooo#558253 sfx2 uisavedir (caolanm)
+- Resolves: ooo#108637/rhbz#558253 sfx2 uisavedir (caolanm)
 
 * Tue Dec 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.24
 - Resolves: rhbz#545824 bustage in writer with emboldened fonts


--- openoffice.org-3.3.0.ooo558253.sfx2.uisavedir.patch DELETED ---