rpms/openoffice.org/devel openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11402

Modified Files:
	openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch 
Log Message:
adjust patch

openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch:
 source/dialog/optjava.cxx     |    0 
 source/dialog/optjava.hxx     |    0 
 svx/source/dialog/optjava.cxx |   10 +++++++++-
 svx/source/dialog/optjava.hxx |    5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)

Index: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch	1 Aug 2006 08:40:31 -0000	1.1
+++ openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch	14 Aug 2006 12:11:26 -0000	1.2
@@ -24,7 +24,7 @@
 diff -u -r1.11 optjava.cxx
 --- openoffice.org.orig/svx/source/dialog/optjava.cxx	8 May 2006 14:56:15 -0000	1.11
 +++ openoffice.org/svx/source/dialog/optjava.cxx	1 Aug 2006 08:30:46 -0000
-@@ -943,6 +943,7 @@
+@@ -920,6 +920,7 @@
  
  	// set initial focus to path list
  	m_aPathList.GrabFocus();
@@ -32,7 +32,7 @@
  }
  
  // -----------------------------------------------------------------------
-@@ -984,6 +985,7 @@
+@@ -961,6 +962,7 @@
  			ErrorBox( this, WB_OK, sMsg ).Execute();
  		}
  	}
@@ -40,19 +40,19 @@
  	return 0;
  }
  
-@@ -1010,7 +1012,10 @@
+@@ -987,7 +989,10 @@
  		INetURLObject aURL( sFolderURL );
- 		String sFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
+         String _sFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
  		if ( !IsPathDuplicate( sFolderURL ) )
--			m_aPathList.InsertEntry( sFolder, SvFileInformationManager::GetImage( aURL ) );
-+		{
-+			USHORT nPos = m_aPathList.InsertEntry( sFolder, SvFileInformationManager::GetImage(aURL) );
-+        	m_aPathList.SelectEntryPos( nPos );
-+		}
+-            m_aPathList.InsertEntry( _sFolder, SvFileInformationManager::GetImage( aURL ) );
++        {
++			USHORT nPos = m_aPathList.InsertEntry( _sFolder, SvFileInformationManager::GetImage( aURL ) );
++			m_aPathList.SelectEntryPos( nPos );
++        }
  		else
  		{
  			String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
-@@ -1018,6 +1023,7 @@
+@@ -995,6 +1000,7 @@
  			ErrorBox( this, WB_OK, sMsg ).Execute();
  		}
  	}
@@ -60,7 +60,7 @@
  	return 0;
  }
  
-@@ -1038,6 +1044,7 @@
+@@ -1015,6 +1021,7 @@
  		}
  	}
  
@@ -68,7 +68,7 @@
  	return 0;
  }
  
-@@ -1098,5 +1105,6 @@
+@@ -1075,5 +1082,6 @@
  	}
  	// select first entry
  	m_aPathList.SelectEntryPos(0);