rpms/openoffice.org/devel .cvsignore, 1.97, 1.98 openoffice.org.spec, 1.626, 1.627 sources, 1.155, 1.156 workspace.evo2fixes.patch, 1.1, 1.2 openoffice.org-2.0.2.ooo62138.extensions.patch, 1.2, NONE openoffice.org-2.0.2.ooo62318.extensions.mozab.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Feb 22 14:17:36 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15532
Modified Files:
.cvsignore openoffice.org.spec sources
workspace.evo2fixes.patch
Removed Files:
openoffice.org-2.0.2.ooo62138.extensions.patch
openoffice.org-2.0.2.ooo62318.extensions.mozab.patch
Log Message:
next version
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore 20 Feb 2006 11:43:43 -0000 1.97
+++ .cvsignore 22 Feb 2006 14:17:33 -0000 1.98
@@ -158,3 +158,4 @@
Tigert-templates.tar.gz
OOB680_m1.tar.bz2
OOB680_m2.tar.bz2
+OOB680_m3.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- openoffice.org.spec 21 Feb 2006 14:07:34 -0000 1.626
+++ openoffice.org.spec 22 Feb 2006 14:17:33 -0000 1.627
@@ -1,5 +1,5 @@
%define oootag OOB680
-%define ooomilestone 2
+%define ooomilestone 3
%define rh_rpm_release 1
%define build_fc5 1
@@ -175,38 +175,35 @@
Patch6: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
Patch7: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
Patch8: openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
-Patch9: openoffice.org-2.0.2.ooo62138.extensions.patch
-Patch10: openoffice.org-2.0.2.ooo34909.dbaccess.patch
-Patch11: workspace.evo2fixes.patch
-Patch12: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch13: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch14: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch15: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch16: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch17: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch18: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch20: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch21: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch22: workspace.dmake43p01.patch
-Patch23: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch24: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch25: workspace.atkbridge.patch
-Patch26: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
-Patch27: workspace.jaxpapi.patch
-Patch28: workspace.systemjava.patch
-Patch29: workspace.targetedaot.patch
-Patch30: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
-Patch31: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch32: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
-Patch33: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
-Patch34: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
-Patch35: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
-Patch36: openoffice.org-2.0.2.ooo61875.sd.compile.patch
-Patch37: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
-Patch38: openoffice.org-2.0.2.ooo62030.solenv._version.patch
-Patch39: openoffice.org-2.0.2.ooo62318.extensions.mozab.patch
-Patch40: openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch
+Patch9: openoffice.org-2.0.2.ooo34909.dbaccess.patch
+Patch10: workspace.evo2fixes.patch
+Patch11: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch12: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch13: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch14: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch15: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch16: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch17: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch20: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch21: workspace.dmake43p01.patch
+Patch22: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch23: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch24: workspace.atkbridge.patch
+Patch25: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
+Patch26: workspace.jaxpapi.patch
+Patch27: workspace.systemjava.patch
+Patch28: workspace.targetedaot.patch
+Patch29: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch30: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch31: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
+Patch32: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch33: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch34: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch35: openoffice.org-2.0.2.ooo61875.sd.compile.patch
+Patch36: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
+Patch37: openoffice.org-2.0.2.ooo62030.solenv._version.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -830,45 +827,42 @@
%endif
%patch7 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
%patch8 -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
-%patch9 -p1 -b .ooo62138.extensions.patch
-%patch10 -p1 -b .ooo34909.dbaccess.patch
-%patch11 -p1 -b .workspace.evo2fixes.patch
-%patch12 -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch13 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch14 -p1 -b .ooo54603.fontconfig.patch
-%patch15 -p1 -b .ooo51931.systemxmlsec.patch
-%patch16 -p1 -b .ooo52428.execshield.bridges.patch
+%patch9 -p1 -b .ooo34909.dbaccess.patch
+%patch10 -p1 -b .workspace.evo2fixes.patch
+%patch11 -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch12 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch13 -p1 -b .ooo54603.fontconfig.patch
+%patch14 -p1 -b .ooo51931.systemxmlsec.patch
+%patch15 -p1 -b .ooo52428.execshield.bridges.patch
%if ! %{internaljavabits}
-%patch17 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch16 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
%else
-%patch18 -p1 -b .ooo51718.rpath.patch
+%patch17 -p1 -b .ooo51718.rpath.patch
%endif
-%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch20 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch21 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch22 -p1 -b .dmake43p01.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch20 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch21 -p1 -b .dmake43p01.patch
%if ! %{internalicu}
-%patch23 -p1 -b .ooo54479.systemicu.patch
+%patch22 -p1 -b .ooo54479.systemicu.patch
%endif
-%patch24 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch25 -p0 -b .workspace.atkbridge.patch
-%patch26 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch27 -p0 -b .workspace.jaxpapi.patch
-%patch28 -p1 -b .workspace.systemjava.patch
-%patch29 -p1 -b .workspace.targetedaot.patch
-%patch30 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch31 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch23 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch24 -p0 -b .workspace.atkbridge.patch
+%patch25 -p1 -b .ooo56651.sw.rtfcrash.patch
+%patch26 -p0 -b .workspace.jaxpapi.patch
+%patch27 -p1 -b .workspace.systemjava.patch
+%patch28 -p1 -b .workspace.targetedaot.patch
+%patch29 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch30 -p1 -b .ooo58606.sw.pre-edit.patch
%if %{build_fc4}
-%patch32 -p1 -b .gcc25199.bitfieldaccess.patch
+%patch31 -p1 -b .gcc25199.bitfieldaccess.patch
%endif
-%patch33 -p1 -b .ooo59675.sysui.rtfmimetype.patch
-%patch34 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch35 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch36 -p1 -b .ooo61875.sd.compile.patch
-%patch37 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
-%patch38 -p1 -b .ooo62030.solenv._version.patch
-%patch39 -p1 -b .ooo62318.extensions.mozab.patch
-%patch40 -p1 -b .rhXXXXXX.solenv.gcjproblem.patch
+%patch32 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch33 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch34 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch35 -p1 -b .ooo61875.sd.compile.patch
+%patch36 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
+%patch37 -p1 -b .ooo62030.solenv._version.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -963,14 +957,16 @@
# see tamil translation issue rh#159381#, remove when complete and upstreamed
cd transex3/prj
-build --dlv_switch -link --all -P$MAXBUILDS -- -s
+#build --dlv_switch -link --all -P$MAXBUILDS -- -s
+build --dlv_switch -link --all -P$MAXBUILDS
deliver -link
localize -m -x -l ta-IN -f %{SOURCE2}
localize -m -x -l ga -f %{SOURCE6}
cd ../..
cd instsetoo_native/util
-if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
+# if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
+if ! build --dlv_switch -link --all -P$MAXBUILDS; then
echo parallel build failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
unset MAXPROCESS
build --dlv_switch -link --all
@@ -3358,7 +3354,7 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-2.1
+* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-3.1
- hunspell replaces myspell
- Catalan help documentation available
- add sestatus details to crash_reporter
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- sources 20 Feb 2006 11:43:44 -0000 1.155
+++ sources 22 Feb 2006 14:17:33 -0000 1.156
@@ -9,4 +9,4 @@
fae552b2b9d556920b930a97a2e3e9ab openoffice.org-myspell-contrib.tar.gz
0c5e6d8ded4e9489ac1870f56e324f36 openoffice.org-simple-crash_report.sh
0fc9c0b585e2c92a7ac05adebeb4caf2 GSI_ga.sdf
-fe9bcbc54e3b23ba1c28a418c696f2b2 OOB680_m2.tar.bz2
+63c2dea9645122cfdc4532df4edda03f OOB680_m3.tar.bz2
workspace.evo2fixes.patch:
extensions/source/abpilot/abpresid.hrc | 0
extensions/source/abpilot/abspilot.cxx | 0
extensions/source/abpilot/abspilot.src | 0
extensions/source/abpilot/addresssettings.hxx | 0
extensions/source/abpilot/datasourcehandling.cxx | 0
extensions/source/abpilot/datasourcehandling.hxx | 0
extensions/source/abpilot/makefile.mk | 4
extensions/source/abpilot/typeselectionpage.cxx | 0
extensions/source/abpilot/typeselectionpage.hxx | 0
openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx | 21 -
openoffice.org/connectivity/source/drivers/evoab2/EApi.h | 135 ++----
openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx | 26 +
openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx | 5
openoffice.org/connectivity/source/drivers/evoab2/NColumns.cxx | 106 +++++
openoffice.org/connectivity/source/drivers/evoab2/NColumns.hxx | 73 +++
openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 86 +++-
openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 28 +
openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx | 5
openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx | 194 +++++++++-
openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 41 +-
openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 11
openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx | 33 +
openoffice.org/connectivity/source/drivers/evoab2/NTable.cxx | 108 +++++
openoffice.org/connectivity/source/drivers/evoab2/NTable.hxx | 84 ++++
openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx | 17
openoffice.org/connectivity/source/drivers/evoab2/makefile.mk | 2
openoffice.org/extensions/source/abpilot/abpresid.hrc | 2
openoffice.org/extensions/source/abpilot/abspilot.cxx | 15
openoffice.org/extensions/source/abpilot/abspilot.src | 17
openoffice.org/extensions/source/abpilot/addresssettings.hxx | 2
openoffice.org/extensions/source/abpilot/datasourcehandling.cxx | 12
openoffice.org/extensions/source/abpilot/datasourcehandling.hxx | 8
openoffice.org/extensions/source/abpilot/typeselectionpage.cxx | 173 +++-----
openoffice.org/extensions/source/abpilot/typeselectionpage.hxx | 18
source/abpilot/makefile.mk | 0
35 files changed, 966 insertions(+), 260 deletions(-)
Index: workspace.evo2fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.evo2fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.evo2fixes.patch 16 Feb 2006 14:33:08 -0000 1.1
+++ workspace.evo2fixes.patch 22 Feb 2006 14:17:33 -0000 1.2
@@ -1557,3 +1557,456 @@
$(SLO)$/NTables.obj \
$(SLO)$/NCatalog.obj \
$(SLO)$/NConnection.obj \
+Index: source/abpilot/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/makefile.mk,v
+retrieving revision 1.9
+diff -u -r1.9 makefile.mk
+--- openoffice.org.orig/extensions/source/abpilot/makefile.mk 19 Dec 2005 17:27:56 -0000 1.9
++++ openoffice.org/extensions/source/abpilot/makefile.mk 20 Feb 2006 11:35:26 -0000
+@@ -69,8 +69,10 @@
+ $(EXCEPTIONSFILES)
+
+
+-.IF "WITH_MOZILLA" != ""
++.IF "$(WITH_MOZILLA)" != "NO"
++.IF "$(SYSTEM_MOZILLA)" != "YES"
+ CDEFS+=-DWITH_MOZILLA
++.ENDIF
+ .ENDIF
+
+ SRS1NAME=$(TARGET)
+Index: extensions/source/abpilot/abpresid.hrc
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abpresid.hrc,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 abpresid.hrc
+--- openoffice.org/extensions/source/abpilot/abpresid.hrc 19 Dec 2005 17:26:07 -0000 1.10
++++ openoffice.org/extensions/source/abpilot/abpresid.hrc 16 Feb 2006 12:45:37 -0000
+@@ -174,6 +174,8 @@
+ #define RB_OUTLOOK 6
+ #define RB_OUTLOOKEXPRESS 7
+ #define RB_OTHER 8
++#define RB_EVOLUTION_GROUPWISE 9
++#define RB_EVOLUTION_LDAP 10
+
+ //........................................................................
+ #define ET_DATASOURCENAME 1
+Index: extensions/source/abpilot/abspilot.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abspilot.cxx,v
+retrieving revision 1.13
+diff -u -p -u -r1.13 abspilot.cxx
+--- openoffice.org/extensions/source/abpilot/abspilot.cxx 19 Dec 2005 17:26:24 -0000 1.13
++++ openoffice.org/extensions/source/abpilot/abspilot.cxx 16 Feb 2006 12:45:38 -0000
+@@ -151,12 +151,9 @@ namespace abp
+ m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
+
+ // some initial settings
+-#ifdef WITH_MOZILLA
+ #ifdef UNX
+- m_aSettings.eType = AST_MORK;
+-#else
+- m_aSettings.eType = AST_OE;
+-#endif
++// FIXME: if KDE use KAB instead
++ m_aSettings.eType = AST_EVOLUTION;
+ #else
+ m_aSettings.eType = AST_OTHER;
+ #endif
+@@ -410,6 +407,14 @@ namespace abp
+ m_aNewDataSource = aContext.createNewEvolution( m_aSettings.sDataSourceName );
+ break;
+
++ case AST_EVOLUTION_GROUPWISE:
++ m_aNewDataSource = aContext.createNewEvolutionGroupwise( m_aSettings.sDataSourceName );
++ break;
++
++ case AST_EVOLUTION_LDAP:
++ m_aNewDataSource = aContext.createNewEvolutionLdap( m_aSettings.sDataSourceName );
++ break;
++
+ case AST_KAB:
+ m_aNewDataSource = aContext.createNewKab( m_aSettings.sDataSourceName );
+ break;
+Index: extensions/source/abpilot/abspilot.src
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abspilot.src,v
+retrieving revision 1.54
+diff -u -p -u -r1.54 abspilot.src
+--- openoffice.org/extensions/source/abpilot/abspilot.src 21 Dec 2005 18:07:05 -0000 1.54
++++ openoffice.org/extensions/source/abpilot/abspilot.src 16 Feb 2006 12:45:38 -0000
+@@ -129,6 +129,7 @@ TabPage RID_PAGE_SELECTABTYPE
+ Text [ de ] = "Mozilla / Netscape";
+ Text [ en-US ] = "Mozilla / Netscape";
+ };
++// All position & size/height data below this is not used
+ RadioButton RB_THUNDERBIRD
+ {
+ Pos = MAP_APPFONT ( 15, 79 ) ;
+@@ -145,6 +146,22 @@ TabPage RID_PAGE_SELECTABTYPE
+ Text [ de ] = "Evolution";
+ Text [ en-US ] = "Evolution";
+ };
++ RadioButton RB_EVOLUTION_GROUPWISE
++ {
++ Pos = MAP_APPFONT ( 15, 90 ) ;
++ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
++
++ Text [ de ] = "Groupwise";
++ Text [ en-US ] = "Groupwise";
++ };
++ RadioButton RB_EVOLUTION_LDAP
++ {
++ Pos = MAP_APPFONT ( 15, 90 ) ;
++ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
++
++ Text [ de ] = "Evolution LDAP";
++ Text [ en-US ] = "Evolution LDAP";
++ };
+ RadioButton RB_KAB
+ {
+ Pos = MAP_APPFONT ( 15, 101 ) ;
+Index: extensions/source/abpilot/addresssettings.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/addresssettings.hxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 addresssettings.hxx
+--- openoffice.org/extensions/source/abpilot/addresssettings.hxx 19 Dec 2005 17:27:17 -0000 1.7
++++ openoffice.org/extensions/source/abpilot/addresssettings.hxx 16 Feb 2006 12:45:38 -0000
+@@ -56,6 +56,8 @@ namespace abp
+ AST_MORK,
+ AST_THUNDERBIRD,
+ AST_EVOLUTION,
++ AST_EVOLUTION_GROUPWISE,
++ AST_EVOLUTION_LDAP,
+ AST_KAB,
+ AST_LDAP,
+ AST_OUTLOOK,
+Index: extensions/source/abpilot/datasourcehandling.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.cxx,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 datasourcehandling.cxx
+--- openoffice.org/extensions/source/abpilot/datasourcehandling.cxx 19 Dec 2005 17:27:30 -0000 1.9
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx 16 Feb 2006 12:45:38 -0000
+@@ -330,9 +330,19 @@ namespace abp
+ }
+
+ //---------------------------------------------------------------------
++ ODataSource ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( ))
++ {
++ return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
++ }
++ //---------------------------------------------------------------------
++ ODataSource ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( ))
++ {
++ return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
++ }
++ //---------------------------------------------------------------------
+ ODataSource ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ {
+- return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution" );
++ return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
+ }
+
+ //---------------------------------------------------------------------
+Index: extensions/source/abpilot/datasourcehandling.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.hxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 datasourcehandling.hxx
+--- openoffice.org/extensions/source/abpilot/datasourcehandling.hxx 19 Dec 2005 17:27:42 -0000 1.7
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx 16 Feb 2006 12:45:38 -0000
+@@ -89,9 +89,15 @@ namespace abp
+ /// creates a new Thunderbird data source
+ ODataSource createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
+- /// creates a new Evolution data source
++ /// creates a new Evolution local data source
+ ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
++ /// creates a new Evolution LDAP data source
++ ODataSource createNewEvolutionLdap( const ::rtl::OUString& _rName ) SAL_THROW (( ));
++
++ /// creates a new Evolution GROUPWISE data source
++ ODataSource createNewEvolutionGroupwise( const ::rtl::OUString& _rName ) SAL_THROW (( ));
++
+ /// creates a new KDE address book data source
+ ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
+Index: extensions/source/abpilot/typeselectionpage.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.cxx,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 typeselectionpage.cxx
+--- openoffice.org/extensions/source/abpilot/typeselectionpage.cxx 19 Dec 2005 17:28:09 -0000 1.9
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx 16 Feb 2006 12:45:38 -0000
+@@ -57,43 +57,6 @@ namespace abp
+ using namespace ::com::sun::star::uno;
+ using namespace ::com::sun::star::sdbc;
+
+- //---------------------------------------------------------------------
+- namespace
+- {
+- void lcl_hideChoice( ::std::vector< RadioButton* >& _allTypes, RadioButton& _typeToHide )
+- {
+- for ( ::std::vector< RadioButton* >::iterator loop = _allTypes.begin();
+- loop != _allTypes.end();
+- ++loop
+- )
+- {
+- if ( *loop == &_typeToHide )
+- {
+- // remove the element from the allTypes array
+- ::std::copy( loop + 1, _allTypes.end(), loop );
+- _allTypes.resize( _allTypes.size() - 1 );
+-
+- // hide the control in question
+- _typeToHide.Hide();
+-
+- // change position of all subsequent controls
+- if ( loop != _allTypes.end() )
+- {
+- sal_Int32 nMoveUp = (*loop)->GetPosPixel().Y() - _typeToHide.GetPosPixel().Y();
+- do
+- {
+- Point aPos = (*loop)->GetPosPixel();
+- aPos.Y() -= nMoveUp;
+- (*loop)->SetPosPixel( aPos );
+- }
+- while ( ++loop != _allTypes.end() );
+- }
+- break;
+- }
+- }
+- }
+- }
+-
+ //=====================================================================
+ //= TypeSelectionPage
+ //=====================================================================
+@@ -105,65 +68,73 @@ namespace abp
+ ,m_aMORK (this, ResId(RB_MORK))
+ ,m_aThunderbird (this, ResId(RB_THUNDERBIRD))
+ ,m_aEvolution (this, ResId(RB_EVOLUTION))
++ ,m_aEvolutionGroupwise (this, ResId(RB_EVOLUTION_GROUPWISE))
++ ,m_aEvolutionLdap (this, ResId(RB_EVOLUTION_LDAP))
+ ,m_aKab (this, ResId(RB_KAB))
+ ,m_aLDAP (this, ResId(RB_LDAP))
+ ,m_aOutlook (this, ResId(RB_OUTLOOK))
+ ,m_aOE (this, ResId(RB_OUTLOOKEXPRESS))
+ ,m_aOther (this, ResId(RB_OTHER))
+ {
++ Point aTopLeft;
++ Size aItemSize;
++
+ FreeResource();
+
+- ::std::vector< RadioButton* > allTypes;
+- // must be sorted by ascending y-coordinate
+- allTypes.push_back( &m_aMORK );
+- allTypes.push_back( &m_aThunderbird );
+- allTypes.push_back( &m_aEvolution );
+- allTypes.push_back( &m_aKab );
+- allTypes.push_back( &m_aLDAP );
+- allTypes.push_back( &m_aOutlook );
+- allTypes.push_back( &m_aOE );
+- allTypes.push_back( &m_aOther );
++ aTopLeft = m_aMORK.GetPosPixel();
++ aItemSize = m_aMORK.GetSizePixel();
++
++ bool bWithMozilla = true, bUnx = true;
++ bool bHaveEvolution = true, bHaveKab = true;
+
+ #ifndef WITH_MOZILLA
+- // the following 5 types are provided by the Mozilla-based database driver. If we're compiled without
+- // without Mozilla support, then they're not available.
+- lcl_hideChoice( allTypes, m_aMORK );
+- lcl_hideChoice( allTypes, m_aThunderbird );
+- lcl_hideChoice( allTypes, m_aLDAP );
+- lcl_hideChoice( allTypes, m_aOutlook );
+- lcl_hideChoice( allTypes, m_aOE );
++ bWithMozilla = false;
+ #endif
+-
+ #ifndef UNX
+- // no Evolution nor KDE address book on Windows systems
+- lcl_hideChoice( allTypes, m_aEvolution );
+- lcl_hideChoice( allTypes, m_aKab );
+-#endif
+-
+-#ifdef UNX
+- // no Outlook / Outlook Express for ~NIX systems
+- lcl_hideChoice( allTypes, m_aOutlook );
+- lcl_hideChoice( allTypes, m_aOE );
+-
++ bUnx = false;
++ bHaveEvolution = false;
++ bHaveKab = false;
++#else
+ Reference< XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
+
+ // check whether Evolution is available
+- Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))) );
++ Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))) );
+ if ( !xDriver.is() )
+- lcl_hideChoice( allTypes, m_aEvolution );
++ bHaveEvolution = false;
+
+ // check whether KDE address book is available
+ xDriver = xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:kab")));
+ if ( !xDriver.is() )
+- lcl_hideChoice( allTypes, m_aKab );
++ bHaveKab = false;
+ #endif
+
++ // Items are displayed in list order
++ m_aAllTypes.push_back( ButtonItem( &m_aEvolution, AST_EVOLUTION, bHaveEvolution ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aEvolutionGroupwise, AST_EVOLUTION_GROUPWISE, bHaveEvolution ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aEvolutionLdap, AST_EVOLUTION_LDAP, bHaveEvolution ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aMORK, AST_MORK, bWithMozilla ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aThunderbird, AST_THUNDERBIRD, bWithMozilla ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aKab, AST_KAB, bHaveKab ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aLDAP, AST_LDAP, bWithMozilla ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aOutlook, AST_OUTLOOK, bWithMozilla && !bUnx ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla && !bUnx ) );
++ m_aAllTypes.push_back( ButtonItem( &m_aOther, AST_OTHER, true ) );
++
+ Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+- for ( ::std::vector< RadioButton* >::const_iterator loop = allTypes.begin();
+- loop != allTypes.end();
+- ++loop
+- )
+- (*loop)->SetClickHdl( aTypeSelectionHandler );
++ for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++ loop != m_aAllTypes.end(); ++loop )
++ {
++ ButtonItem aItem = *loop;
++ if (!aItem.m_bVisible)
++ aItem.m_pItem->Hide();
++ else
++ {
++ aItem.m_pItem->SetPosPixel( aTopLeft );
++ aTopLeft.Y() += (aItemSize.Height() * 5) / 4;
++ aItem.m_pItem->SetClickHdl( aTypeSelectionHandler );
++ aItem.m_pItem->Show();
++ }
++ }
+ }
+
+ //---------------------------------------------------------------------
+@@ -171,15 +145,16 @@ namespace abp
+ {
+ AddressBookSourcePage::ActivatePage();
+
+- RadioButton* pOptions[] = {
+- &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
+- };
+- for ( RadioButton** pCheck = pOptions; *pCheck; ++pCheck )
+- if ( (*pCheck)->IsChecked() )
+- {
+- (*pCheck)->GrabFocus();
++ for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++ loop != m_aAllTypes.end(); ++loop )
++ {
++ ButtonItem aItem = (*loop);
++ if( aItem.m_pItem->IsChecked() && aItem.m_bVisible )
++ {
++ aItem.m_pItem->GrabFocus();
+ break;
+ }
++ }
+
+ getDialog()->enableButtons(WZB_PREVIOUS, sal_False);
+ }
+@@ -194,35 +169,24 @@ namespace abp
+ //---------------------------------------------------------------------
+ void TypeSelectionPage::selectType( AddressSourceType _eType )
+ {
+- m_aMORK.Check(AST_MORK == _eType);
+- m_aThunderbird.Check(AST_THUNDERBIRD == _eType);
+- m_aEvolution.Check(AST_EVOLUTION == _eType);
+- m_aKab.Check(AST_KAB == _eType);
+- m_aLDAP.Check(AST_LDAP == _eType);
+- m_aOutlook.Check(AST_OUTLOOK == _eType);
+- m_aOE.Check(AST_OE == _eType);
+- m_aOther.Check(AST_OTHER == _eType);
++ for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++ loop != m_aAllTypes.end(); ++loop )
++ {
++ ButtonItem aItem = (*loop);
++ aItem.m_pItem->Check( _eType == aItem.m_eType );
++ }
+ }
+
+ //---------------------------------------------------------------------
+- AddressSourceType TypeSelectionPage::getSelectedType( )
+- {
+- if (m_aMORK.IsChecked())
+- return AST_MORK;
+- else if (m_aThunderbird.IsChecked())
+- return AST_THUNDERBIRD;
+- else if (m_aEvolution.IsChecked())
+- return AST_EVOLUTION;
+- else if (m_aKab.IsChecked())
+- return AST_KAB;
+- else if (m_aLDAP.IsChecked())
+- return AST_LDAP;
+- else if (m_aOutlook.IsChecked())
+- return AST_OUTLOOK;
+- else if (m_aOE.IsChecked())
+- return AST_OE;
+- else if (m_aOther.IsChecked())
+- return AST_OTHER;
++ AddressSourceType TypeSelectionPage::getSelectedType()
++ {
++ for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++ loop != m_aAllTypes.end(); ++loop )
++ {
++ ButtonItem aItem = (*loop);
++ if ( aItem.m_pItem->IsChecked() )
++ return aItem.m_eType;
++ }
+
+ return AST_INVALID;
+ }
+Index: extensions/source/abpilot/typeselectionpage.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.hxx,v
+retrieving revision 1.8
+diff -u -p -u -r1.8 typeselectionpage.hxx
+--- openoffice.org/extensions/source/abpilot/typeselectionpage.hxx 19 Dec 2005 17:28:44 -0000 1.8
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx 16 Feb 2006 12:45:38 -0000
+@@ -61,6 +61,8 @@ namespace abp
+ FixedLine m_aTypeSep;
+ RadioButton m_aMORK;
+ RadioButton m_aThunderbird;
++ RadioButton m_aEvolutionGroupwise;
++ RadioButton m_aEvolutionLdap;
+ RadioButton m_aEvolution;
+ RadioButton m_aKab;
+ RadioButton m_aLDAP;
+@@ -68,6 +70,22 @@ namespace abp
+ RadioButton m_aOE;
+ RadioButton m_aOther;
+
++ struct ButtonItem {
++ RadioButton *m_pItem;
++ AddressSourceType m_eType;
++ bool m_bVisible;
++
++ ButtonItem( RadioButton *pItem,
++ AddressSourceType eType,
++ bool bVisible ) :
++ m_pItem( pItem ),
++ m_eType( eType ),
++ m_bVisible( bVisible )
++ {}
++ };
++
++ ::std::vector< ButtonItem > m_aAllTypes;
++
+ public:
+ TypeSelectionPage( OAddessBookSourcePilot* _pParent );
+
--- openoffice.org-2.0.2.ooo62138.extensions.patch DELETED ---
--- openoffice.org-2.0.2.ooo62318.extensions.mozab.patch DELETED ---
More information about the fedora-cvs-commits
mailing list