|
|
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20487
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
Log Message:
rh#200874#
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(-)
--- NEW FILE openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch ---
Index: source/dialog/optjava.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/optjava.hxx,v
retrieving revision 1.5
diff -u -r1.5 optjava.hxx
--- openoffice.org.orig/svx/source/dialog/optjava.hxx 8 Sep 2005 21:46:14
-0000 1.5
+++ openoffice.org/svx/source/dialog/optjava.hxx 1 Aug 2006 08:30:39
-0000
@@ -205,6 +205,11 @@
bool IsPathDuplicate( const String&
_rPath );
+ inline void EnableRemoveButton()
+ {
m_aRemoveBtn.Enable(
+
m_aPathList.GetSelectEntryPos()
+ !=
LISTBOX_ENTRY_NOTFOUND ); }
+
public:
SvxJavaClassPathDlg( Window* pParent );
~SvxJavaClassPathDlg();
Index: source/dialog/optjava.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/optjava.cxx,v
retrieving revision 1.11
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 @@
// set initial focus to path list
m_aPathList.GrabFocus();
+ EnableRemoveButton();
}
// -----------------------------------------------------------------------
@@ -984,6 +985,7 @@
ErrorBox( this, WB_OK, sMsg ).Execute();
}
}
+ EnableRemoveButton();
return 0;
}
@@ -1010,7 +1012,10 @@
INetURLObject aURL( sFolderURL );
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 );
+ }
else
{
String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
@@ -1018,6 +1023,7 @@
ErrorBox( this, WB_OK, sMsg ).Execute();
}
}
+ EnableRemoveButton();
return 0;
}
@@ -1038,6 +1044,7 @@
}
}
+ EnableRemoveButton();
return 0;
}
@@ -1098,5 +1105,6 @@
}
// select first entry
m_aPathList.SelectEntryPos(0);
+ EnableRemoveButton();
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- openoffice.org.spec 31 Jul 2006 10:08:23 -0000 1.807
+++ openoffice.org.spec 1 Aug 2006 08:40:31 -0000 1.808
@@ -129,6 +129,7 @@
Patch63: workspace.configure18.patch
Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
Patch65: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch66: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -925,6 +926,7 @@
%patch63 -p1 -b .workspace.configure18.patch
%patch64 -p1 -b .ooo54603.fontconfig.part2.patch
%patch65 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch66 -p1 -b .ooo68018.svx.classpathdialog.patch
tar xzf %{SOURCE1}
@@ -3503,6 +3505,7 @@
* Mon Jul 31 2006 Caolan McNamara <caolanm@xxxxxxxxxx> - 1:2.0.3-7.8
- add openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
- rh#200703# -> openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+- rh#200874# -> openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
* Wed Jul 26 2006 Caolan McNamara <caolanm@xxxxxxxxxx> - 1:2.0.3-7.7
- rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|