rpms/openoffice.org/F-10 openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch, 1.1, 1.2 openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, 1.1, 1.2 openoffice.org.spec, 1.1735, 1.1736 workspace.pdfextfix02.patch, 1.1, 1.2
David Tardon
dtardon at fedoraproject.org
Fri Aug 21 05:08:23 UTC 2009
- Previous message: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.41, 1.42 nouveau-bicubic-2x.patch, 1.8, 1.9 nouveau-multiple-xserver.patch, 1.10, 1.11 nouveau-transition-hack.patch, 1.11, 1.12 sources, 1.42, 1.43 xorg-x11-drv-nouveau.spec, 1.51, 1.52
- Next message: rpms/openoffice.org/F-10 workspace.os131.patch, NONE, 1.1 openoffice.org.spec, 1.1736, 1.1737
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dtardon
Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24545
Modified Files:
openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
openoffice.org.spec workspace.pdfextfix02.patch
Log Message:
make the last three patches applicable
openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch:
inc/progress.hxx | 11 +++++++++++
source/core/data/cell.cxx | 2 +-
source/core/tool/progress.cxx | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
Index: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch 9 Jun 2009 10:33:52 -0000 1.1
+++ openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch 21 Aug 2009 05:08:21 -0000 1.2
@@ -16,7 +16,7 @@ diff -ru sc.orig/inc/progress.hxx sc/inc
+#define MIN_NO_CODES_PER_PROGRESS_UPDATE 100
+
+
- class SC_DLLPUBLIC ScProgress
+ class ScProgress
{
private:
diff -ru sc.orig/source/core/data/cell.cxx sc/source/core/data/cell.cxx
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(-)
Index: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 19 Aug 2009 08:20:38 -0000 1.1
+++ openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch 21 Aug 2009 05:08:22 -0000 1.2
@@ -1,50 +1,48 @@
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 @@
- }
- }
+@@ -748,9 +748,9 @@
+ }}
-- public boolean supportsCoreSQLGrammar()
-+ public boolean supportsPrimaryKey()
- {
- try
- {
-- return xDBMetaData.supportsCoreSQLGrammar();
-+ return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
- }
- catch (SQLException e)
- {
+
+- public boolean supportsCoreSQLGrammar(){
++ public boolean supportsPrimaryKey() {
+ try {
+- return xDBMetaData.supportsCoreSQLGrammar();
++ return xDBMetaData.supportsMinimumSQLGrammar() || xDBMetaData.supportsCoreSQLGrammar();
+ } catch (SQLException e) {
+ e.printStackTrace(System.out);
+ return false;
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 @@
- {
+ public void buildSteps(){
curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
- curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
+ curFieldFormatter = new FieldFormatter(this, curTableDescriptor );
- if (this.curTableDescriptor.supportsCoreSQLGrammar())
+ if (this.curTableDescriptor.supportsPrimaryKey())
- {
curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
- }
+ curFinalizer = new Finalizer(this, curTableDescriptor);
+ enableNavigationButtons(false, false, false);
@@ -264,7 +264,7 @@
boolean bTableCreated = false;
String schemaname = curFinalizer.getSchemaName();
String catalogname = curFinalizer.getCatalogName();
-- if (curTableDescriptor.supportsCoreSQLGrammar())
-+ if (curTableDescriptor.supportsPrimaryKey())
- {
+- if (curTableDescriptor.supportsCoreSQLGrammar()){
++ if (curTableDescriptor.supportsPrimaryKey()) {
String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
- if (keyfieldnames != null)
+ if (keyfieldnames != null){
+ if (keyfieldnames.length > 0){
@@ -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);
- }
+ i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 5), SOFINALPAGE); // Orderby is always supported
+ setRoadmapInteractive(true);
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
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1735
retrieving revision 1.1736
diff -u -p -r1.1735 -r1.1736
--- openoffice.org.spec 19 Aug 2009 08:20:38 -0000 1.1735
+++ openoffice.org.spec 21 Aug 2009 05:08:22 -0000 1.1736
@@ -3807,6 +3807,7 @@ fi
- Resolves: rhbz#504419 openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
- Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
- Resolves: rhbz#514683 add openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+- make the last three patches applicable
* Fri May 01 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
- Resolves: rhbz#494643 EMF polypolygons issue
workspace.pdfextfix02.patch:
config/description.xml | 2
inc/wrapper.hxx | 8
pdfiadaptor.cxx | 19 +
pdfiadaptor.hxx | 2
test/tests.cxx | 8
tree/drawtreevisiting.cxx | 14 +
tree/genericelements.hxx | 3
tree/pdfiprocessor.cxx | 141 +++++++++-----
wrapper/wrapper.cxx | 160 ++++++++++++---
xpdfwrapper/makefile.mk | 3
xpdfwrapper/pdfioutdev_gpl.cxx | 246 +++++++++++++++++-------
xpdfwrapper/pdfioutdev_gpl.hxx | 6
xpdfwrapper/pnghelper.cxx | 411 +++++++++++++++++++++++++++++++++++++++++
xpdfwrapper/pnghelper.hxx | 92 +++++++++
xpdfwrapper/wrapper_gpl.cxx | 50 +++-
15 files changed, 987 insertions(+), 178 deletions(-)
Index: workspace.pdfextfix02.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/workspace.pdfextfix02.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.pdfextfix02.patch 16 Jun 2009 11:59:09 -0000 1.1
+++ workspace.pdfextfix02.patch 21 Aug 2009 05:08:22 -0000 1.2
@@ -361,14 +361,14 @@ Index: sdext/source/pdfimport/tree/pdfip
else
{
if (
-- ( m_GlyphsList[i].getPrevGlyphsSpace()<= fPreAvarageSpaceValue )&&
+- ( m_GlyphsList[i].getPrevGlypthsSpace()<= fPreAvarageSpaceValue )&&
- ( fPrevDiffCharSpace<=fAvarageDiffCharSpaceValue )&&
- ( fPostDiffCharSpace<=fAvarageDiffCharSpaceValue ) ||
-+ ( ( m_GlyphsList[i].getPrevGlyphsSpace()<= fPreAvarageSpaceValue )&&
++ ( ( m_GlyphsList[i].getPrevGlypthsSpace()<= fPreAvarageSpaceValue )&&
+ ( fPrevDiffCharSpace<=fAvarageDiffCharSpaceValue )&&
+ ( fPostDiffCharSpace<=fAvarageDiffCharSpaceValue )
+ ) ||
- ( m_GlyphsList[i].getPrevGlyphsSpace() == 0.0 )
+ ( m_GlyphsList[i].getPrevGlypthsSpace() == 0.0 )
)
{
@@ -451,45 +452,45 @@
@@ -1576,7 +1576,7 @@ Index: sdext/source/pdfimport/config/des
</simple-license>
</registration>
-- <version value="0.4" />
+- <version value="0.3.2" />
+ <version value="1.0" />
<platform value="UPDATED_SUPPORTED_PLATFORM" />
- Previous message: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.41, 1.42 nouveau-bicubic-2x.patch, 1.8, 1.9 nouveau-multiple-xserver.patch, 1.10, 1.11 nouveau-transition-hack.patch, 1.11, 1.12 sources, 1.42, 1.43 xorg-x11-drv-nouveau.spec, 1.51, 1.52
- Next message: rpms/openoffice.org/F-10 workspace.os131.patch, NONE, 1.1 openoffice.org.spec, 1.1736, 1.1737
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list