rpms/openoffice.org/devel openoffice.org-1.9.114.oooXXXXX.systemboost.patch, NONE, 1.1 openoffice.org-1.9.114.oooXXXXX.nostlport.patch, 1.4, 1.5 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.1, 1.2 openoffice.org.spec, 1.298, 1.299
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 13 12:47:42 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7859
Modified Files:
openoffice.org-1.9.114.oooXXXXX.nostlport.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org.spec
Added Files:
openoffice.org-1.9.114.oooXXXXX.systemboost.patch
Log Message:
split patch
openoffice.org-1.9.114.oooXXXXX.systemboost.patch:
source/ui/app/makefile.mk | 0
sw/source/ui/app/makefile.mk | 1 +
2 files changed, 1 insertion(+)
--- NEW FILE openoffice.org-1.9.114.oooXXXXX.systemboost.patch ---
Index: source/ui/app/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/source/ui/app/makefile.mk,v
retrieving revision 1.14
diff -u -p -r1.14 makefile.mk
--- openoffice.org.orig/sw/source/ui/app/makefile.mk 10 Dec 2004 17:58:44 -0000 1.14
+++ openoffice.org/sw/source/ui/app/makefile.mk 9 Jul 2005 15:53:54 -0000
@@ -109,6 +109,7 @@ EXCEPTIONSFILES= \
$(SLO)$/docst.obj \
$(SLO)$/swmodule.obj \
$(SLO)$/swmodul1.obj \
+ $(SLO)$/apphdl.obj \
$(SLO)$/docsh2.obj
LIB1TARGET= $(SLB)$/app.lib
openoffice.org-1.9.114.oooXXXXX.nostlport.patch:
dbaccess/source/core/api/RowSet.cxx | 17 ++-
dbaccess/source/core/api/RowSet.hxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 24 ++---
dbaccess/source/core/api/RowSetCache.cxx | 14 +-
dbaccess/source/core/api/RowSetCacheIterator.cxx | 17 +--
dbaccess/source/core/api/RowSetCacheIterator.hxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 2
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 42 ++++----
dbaccess/source/ui/inc/indexcollection.hxx | 26 ++---
dbaccess/source/ui/misc/indexcollection.cxx | 40 ++++----
forms/source/xforms/propertysetbase.cxx | 2
forms/source/xforms/submission.cxx | 2
openoffice.org/stlport/systemstl/numeric | 80 +++++++++++++++++
scp2/source/ure/makefile.mk | 4
source/accessibility/AccessibleEmptyEditSource.cxx | 0
source/core/api/RowSet.cxx | 0
source/core/api/RowSet.hxx | 0
source/core/api/RowSetBase.cxx | 0
source/core/api/RowSetCache.cxx | 0
source/core/api/RowSetCacheIterator.cxx | 0
source/core/api/RowSetCacheIterator.hxx | 0
source/core/dataaccess/datasource.cxx | 0
source/filter/xml/xmlDataSource.cxx | 0
source/filter/xml/xmlTableFilterList.cxx | 0
source/ui/dlg/DbAdminImpl.cxx | 0
source/ui/dlg/indexdialog.cxx | 0
source/ui/inc/indexcollection.hxx | 0
source/ui/misc/indexcollection.cxx | 0
source/ure/makefile.mk | 0
source/xforms/propertysetbase.cxx | 0
source/xforms/submission.cxx | 0
stlport/makefile.mk | 1
stlport/systemstl/functional | 4
stlport/systemstl/rope | 2
stlport/systemstl/vector | 16 ---
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 4
systemstl/functional | 0
systemstl/rope | 0
systemstl/vector | 0
42 files changed, 198 insertions(+), 111 deletions(-)
Index: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.oooXXXXX.nostlport.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.114.oooXXXXX.nostlport.patch 9 Jul 2005 15:55:07 -0000 1.4
+++ openoffice.org-1.9.114.oooXXXXX.nostlport.patch 13 Jul 2005 12:47:38 -0000 1.5
@@ -970,18 +970,3 @@
// register as listener
StartListening( mpEditSource->GetBroadcaster() );
-Index: source/ui/app/makefile.mk
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/app/makefile.mk,v
-retrieving revision 1.14
-diff -u -p -r1.14 makefile.mk
---- openoffice.org.orig/sw/source/ui/app/makefile.mk 10 Dec 2004 17:58:44 -0000 1.14
-+++ openoffice.org/sw/source/ui/app/makefile.mk 9 Jul 2005 15:53:54 -0000
-@@ -109,6 +109,7 @@ EXCEPTIONSFILES= \
- $(SLO)$/docst.obj \
- $(SLO)$/swmodule.obj \
- $(SLO)$/swmodul1.obj \
-+ $(SLO)$/apphdl.obj \
- $(SLO)$/docsh2.obj
-
- LIB1TARGET= $(SLB)$/app.lib
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 0
com/sun/star/wizards/letter/LetterWizardDialogResources.java | 0
desktop/source/app/langselect.cxx | 10 -
desktop/source/app/langselect.hxx | 2
desktop/source/app/userinstall.cxx | 15 -
desktop/source/migration/wizard.cxx | 19 --
framework/source/services/substitutepathvars.cxx | 93 ++++++++++
framework/util/makefile.mk | 1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 8
registry/schema/org/openoffice/Office/Common.xcs | 0
sfx2/source/appl/sfxhelp.cxx | 59 +++++-
source/app/langselect.cxx | 0
source/app/langselect.hxx | 0
source/app/userinstall.cxx | 0
source/appl/sfxhelp.cxx | 0
source/formwizard/dbwizres.src | 0
source/migration/wizard.cxx | 0
source/services/substitutepathvars.cxx | 0
source/ui/misc/glosdoc.cxx | 0
sw/source/ui/misc/glosdoc.cxx | 14 -
util/makefile.mk | 0
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 28 ++-
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 20 +-
wizards/source/formwizard/dbwizres.src | 11 +
24 files changed, 207 insertions(+), 73 deletions(-)
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 7 Jul 2005 20:30:48 -0000 1.1
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 13 Jul 2005 12:47:38 -0000 1.2
@@ -443,3 +443,154 @@
</prop>
<prop oor:name="UIConfig" oor:type="oor:string-list">
<info>
+Index: com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+===================================================================
+RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 LetterWizardDialogImpl.java
+--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 20 May 2005 15:42:29 -0000 1.10
++++ openoffice.org/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 13 Jul 2005 11:22:44 -0000
+@@ -754,18 +754,38 @@ public class LetterWizardDialogImpl exte
+ }
+ }
+
+- private int getOfficeLinguistic() {
++ private int getOfficeLinguistic() {
++ boolean bMatch = false;
+ int oL = 0;
+ String OfficeLinguistic = Configuration.getOfficeLinguistic(xMSF);
++ if (
++ OfficeLinguistic.equalsIgnoreCase("en-IE") ||
++ OfficeLinguistic.equalsIgnoreCase("en-CA") ||
++ OfficeLinguistic.equalsIgnoreCase("en-NZ") ||
++ OfficeLinguistic.equalsIgnoreCase("en-AU")
++ )
++ {
++ OfficeLinguistic = "en-GB";
++ }
+ for (int i = 0; i < Norms.length; i++){
+ if (Norms[i].equalsIgnoreCase(OfficeLinguistic)) {
++ bMatch = true;
+ oL = i;
+ }
+ }
++ if (!bMatch) {
++ String[] portions = OfficeLinguistic.split("-");
++ OfficeLinguistic = portions[0];
++ for (int i = 0; i < Norms.length; i++){
++ if (Norms[i].equalsIgnoreCase(OfficeLinguistic)) {
++ oL = i;
++ }
++ }
++ }
+ return oL;
+ }
+
+- private void setPossibleSenderData(boolean bState) {
++ private void setPossibleSenderData(boolean bState) {
+ setControlProperty("optSenderDefine", "Enabled", new Boolean(bState));
+ setControlProperty("optSenderPlaceholder", "Enabled", new Boolean(bState));
+ setControlProperty("lblSenderAddress", "Enabled", new Boolean(bState));
+@@ -856,7 +881,7 @@ public class LetterWizardDialogImpl exte
+
+ if (ProdName.startsWith("Open")) {
+ //Add Languages for OpenOffice.org
+- Norms = new String[16];
++ Norms = new String[18];
+
+ Norms[0] = "en-US";
+ Norms[1] = "de";
+@@ -874,6 +899,8 @@ public class LetterWizardDialogImpl exte
+ Norms[13] = "da";
+ Norms[14] = "hu";
+ Norms[15] = "hr";
++ Norms[16] = "en-GB";
++ Norms[17] = "sk";
+ } else {
+ Norms = new String[11];
+
+Index: com/sun/star/wizards/letter/LetterWizardDialogResources.java
+===================================================================
+RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java,v
+retrieving revision 1.5
+diff -u -p -u -r1.5 LetterWizardDialogResources.java
+--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java 3 May 2005 14:23:44 -0000 1.5
++++ openoffice.org/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java 13 Jul 2005 11:22:44 -0000
+@@ -14,10 +14,10 @@ public class LetterWizardDialogResources
+ final static int RID_LETTERWIZARDLANGUAGE_START = 3110;
+ final static int RID_RID_COMMON_START = 500;
+
+- protected String[] RoadmapLabels = new String[7];
+- protected String[] SalutationLabels = new String[3];
+- protected String[] GreetingLabels = new String[3];
+- protected String[] LanguageLabels = new String[16];
++ protected String[] RoadmapLabels = new String[7];
++ protected String[] SalutationLabels = new String[3];
++ protected String[] GreetingLabels = new String[3];
++ protected String[] LanguageLabels = new String[18];
+
+ String resOverwriteWarning;
+ String resTemplateDescription;
+@@ -149,31 +149,31 @@ public class LetterWizardDialogResources
+ loadCommonResources();
+ }
+
+- private void loadCommonResources() {
++ private void loadCommonResources() {
+ resOverwriteWarning = getResText(RID_RID_COMMON_START + 19);
+ resTemplateDescription = getResText(RID_RID_COMMON_START + 20);
+ }
+
+- private void loadRoadmapResources() {
++ private void loadRoadmapResources() {
+ for (int i = 1; i < 7; i++) {
+ RoadmapLabels[i] = getResText(RID_LETTERWIZARDROADMAP_START + i);
+ }
+ }
+
+- private void loadSalutationResources() {
++ private void loadSalutationResources() {
+ for (int i = 1; i < 4; i++) {
+ SalutationLabels[i-1] = getResText(RID_LETTERWIZARDSALUTATION_START + i);
+ }
+ }
+
+- private void loadGreetingResources() {
++ private void loadGreetingResources() {
+ for (int i = 1; i < 4; i++) {
+ GreetingLabels[i-1] = getResText(RID_LETTERWIZARDGREETING_START + i);
+ }
+ }
+
+- private void loadLanguageResources() {
+- for (int i = 1; i < 17; i++) {
++ private void loadLanguageResources() {
++ for (int i = 1; i < 19; i++) {
+ LanguageLabels[i-1] = getResText(RID_LETTERWIZARDLANGUAGE_START + i);
+ }
+
+Index: source/formwizard/dbwizres.src
+===================================================================
+RCS file: /cvs/installation/wizards/source/formwizard/dbwizres.src,v
+retrieving revision 1.68
+diff -u -p -u -r1.68 dbwizres.src
+--- openoffice.org.orig/wizards/source/formwizard/dbwizres.src 3 May 2005 14:24:05 -0000 1.68
++++ openoffice.org/wizards/source/formwizard/dbwizres.src 13 Jul 2005 11:23:24 -0000
+@@ -2515,6 +2515,17 @@ String RID_LETTERWIZARDLANGUAGE_START +
+ Text [ en-US] = "Croatian";
+ };
+
++String RID_LETTERWIZARDLANGUAGE_START + 17
++{
++ Text [ de ] = "International English";
++ Text [ en-US] = "International English";
++};
++
++String RID_LETTERWIZARDLANGUAGE_START + 18
++{
++ Text [ de ] = "Slovak";
++ Text [ en-US] = "Slovak";
++};
+
+ // ============================================================================
+ // ============================ ======================
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- openoffice.org.spec 13 Jul 2005 08:57:00 -0000 1.298
+++ openoffice.org.spec 13 Jul 2005 12:47:38 -0000 1.299
@@ -129,6 +129,7 @@
Patch60: openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch
Patch61: workspace.impress63.patch
Patch62: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
+Patch63: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -771,6 +772,7 @@
%patch60 -p1 -b .rhXXXXX.desktop.noexpand.patch
%patch61 -p1 -b .workspace.impress63.patch
%patch62 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
+%patch63 -p1 -b .oooXXXXX.systemboost.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
#libxmlsec/db4 then this needs to be modified/dropped
@@ -2954,9 +2956,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Wed Jul 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-3.cmc
+* Wed Jul 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-4
- lets continue to use stlport for fc4, because I have suspicions I don't
want to inflict on the stable branch
+- rh#162984# fallbacks from en_AU to en_GB for wizards
* Mon Jul 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-3
- enable evo addressbook in addressbook wizard
More information about the fedora-cvs-commits
mailing list