rpms/openoffice.org/F-11 openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, NONE, 1.1 openoffice.org.spec, 1.1927, 1.1928
Caolan McNamara
caolanm at fedoraproject.org
Wed Aug 19 08:20:39 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9578/F-11
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
Log Message:
Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch:
dbaccess/source/ui/misc/WCopyTable.cxx | 2 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 +-
dbaccess/source/ui/tabledesign/TableController.cxx | 2 +-
wizards/com/sun/star/wizards/db/DBMetaData.java | 4 ++--
wizards/com/sun/star/wizards/table/TableWizard.java | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch ---
diff -ru wizards.orig/com/sun/star/wizards/db/DBMetaData.java wizards/com/sun/star/wizards/db/DBMetaData.java
--- wizards.orig/com/sun/star/wizards/db/DBMetaData.java 2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/db/DBMetaData.java 2009-07-30 14:33:22.000000000 +0100
@@ -748,11 +748,11 @@
}
}
- public boolean supportsCoreSQLGrammar()
+ public boolean supportsPrimaryKey()
{
try
{
- return xDBMetaData.supportsCoreSQLGrammar();
+ return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
}
catch (SQLException e)
{
diff -ru wizards.orig/com/sun/star/wizards/table/TableWizard.java wizards/com/sun/star/wizards/table/TableWizard.java
--- wizards.orig/com/sun/star/wizards/table/TableWizard.java 2009-07-30 14:28:39.000000000 +0100
+++ wizards/com/sun/star/wizards/table/TableWizard.java 2009-07-30 14:29:50.000000000 +0100
@@ -250,7 +250,7 @@
{
curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
- if (this.curTableDescriptor.supportsCoreSQLGrammar())
+ if (this.curTableDescriptor.supportsPrimaryKey())
{
curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
}
@@ -264,7 +264,7 @@
boolean bTableCreated = false;
String schemaname = curFinalizer.getSchemaName();
String catalogname = curFinalizer.getCatalogName();
- if (curTableDescriptor.supportsCoreSQLGrammar())
+ if (curTableDescriptor.supportsPrimaryKey())
{
String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
if (keyfieldnames != null)
@@ -359,7 +359,7 @@
int i = 0;
i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_TABLE + 2), SOMAINPAGE);
i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 3), SOFIELDSFORMATPAGE);
- if (this.curTableDescriptor.supportsCoreSQLGrammar())
+ if (this.curTableDescriptor.supportsPrimaryKey())
{
i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 4), SOPRIMARYKEYPAGE);
}
diff -ru dbaccess.orig/source/ui/misc/WCopyTable.cxx dbaccess/source/ui/misc/WCopyTable.cxx
--- dbaccess.orig/source/ui/misc/WCopyTable.cxx 2009-07-30 12:58:32.000000000 +0100
+++ dbaccess/source/ui/misc/WCopyTable.cxx 2009-07-30 14:18:18.000000000 +0100
@@ -1364,7 +1364,7 @@
try
{
Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_QUERY_THROW );
- bSupports = xMetaData->supportsCoreSQLGrammar();
+ bSupports = xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar();
}
catch(const Exception&)
{
diff -ru dbaccess.orig/source/ui/tabledesign/TableController.cxx dbaccess/source/ui/tabledesign/TableController.cxx
--- dbaccess.orig/source/ui/tabledesign/TableController.cxx 2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TableController.cxx 2009-07-30 14:18:18.000000000 +0100
@@ -1119,7 +1119,7 @@
}
if(!bFoundPKey)
{
- if(_bNew && xMetaData.is() && xMetaData->supportsCoreSQLGrammar())
+ if(_bNew && xMetaData.is() && (xMetaData->supportsCoreSQLGrammar() || xMetaData->supportsMinimumSQLGrammar()))
{
String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
diff -ru dbaccess.orig/source/ui/tabledesign/TEditControl.cxx dbaccess/source/ui/tabledesign/TEditControl.cxx
--- dbaccess.orig/source/ui/tabledesign/TEditControl.cxx 2009-07-30 12:58:31.000000000 +0100
+++ dbaccess/source/ui/tabledesign/TEditControl.cxx 2009-07-30 14:18:18.000000000 +0100
@@ -1527,7 +1527,7 @@
Reference<XConnection> xCon = rController.getConnection();
Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
- if(!xMetaData.is() || !xMetaData->supportsCoreSQLGrammar())
+ if(!xMetaData.is() || (!xMetaData->supportsCoreSQLGrammar() && !xMetaData->supportsMinimumSQLGrammar()))
return sal_False; // no primary keys allowed
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1927
retrieving revision 1.1928
diff -u -p -r1.1927 -r1.1928
--- openoffice.org.spec 18 Aug 2009 07:48:29 -0000 1.1927
+++ openoffice.org.spec 19 Aug 2009 08:20:39 -0000 1.1928
@@ -152,6 +152,7 @@ Patch76: openoffice.org-3.1.0.oooXXXXX.s
Patch77: openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch
Patch78: workspace.os132.patch
Patch79: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
+Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1661,7 +1662,8 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch76 -p0 -b .oooXXXXX.svx.64bit.patch
%patch77 -p0 -b .ooo103651.canvas.nosubpixel.patch
%patch78 -p0 -b .workspace.os132.patch
-%patch79 -p0 -b .openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
+%patch79 -p0 -b .ooo104306.moverecentlyused.patch
+%patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4164,10 +4166,11 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Tue Aug 18 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
+* Wed Aug 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
- Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc
- add workspace.os132.patch to avoid switch html view overwrite horror
- Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
+- Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
* Thu Jul 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
- Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
More information about the fedora-extras-commits
mailing list