rpms/openoffice.org/devel openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch, 1.1, 1.2 openoffice.org.spec, 1.518, 1.519 openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch, 1.1, NONE openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Oct 28 10:47:14 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28816
Modified Files:
openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
openoffice.org.spec
Removed Files:
openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
Log Message:
wrong ldap
openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch:
extensions/source/abpilot/abpresid.hrc | 3 -
extensions/source/abpilot/abspilot.cxx | 12 +++++
extensions/source/abpilot/abspilot.src | 33 ++++++++--------
extensions/source/abpilot/addresssettings.hxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 12 +++++
extensions/source/abpilot/datasourcehandling.hxx | 8 +++
extensions/source/abpilot/typeselectionpage.cxx | 47 +++++++++++------------
extensions/source/abpilot/typeselectionpage.hxx | 4 -
source/abpilot/abpresid.hrc | 0
source/abpilot/abspilot.cxx | 0
source/abpilot/abspilot.src | 0
source/abpilot/addresssettings.hxx | 0
source/abpilot/datasourcehandling.cxx | 0
source/abpilot/datasourcehandling.hxx | 0
source/abpilot/typeselectionpage.cxx | 0
source/abpilot/typeselectionpage.hxx | 0
16 files changed, 75 insertions(+), 46 deletions(-)
Index: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch 10 Jul 2005 18:20:34 -0000 1.1
+++ openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch 28 Oct 2005 10:47:04 -0000 1.2
@@ -1,6 +1,136 @@
---- openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx 2005-02-24 16:33:03.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/addresssettings.hxx 2005-02-24 16:33:46.000000000 +0530
-@@ -80,6 +80,8 @@
+Index: source/abpilot/abpresid.hrc
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abpresid.hrc,v
+retrieving revision 1.8
+diff -u -p -u -r1.8 abpresid.hrc
+--- openoffice.org.orig/extensions/source/abpilot/abpresid.hrc 8 Sep 2005 19:02:49 -0000 1.8
++++ openoffice.org/extensions/source/abpilot/abpresid.hrc 28 Oct 2005 10:40:40 -0000
+@@ -172,7 +172,8 @@
+ #define RB_OUTLOOK 4
+ #define RB_OUTLOOKEXPRESS 5
+ #define RB_OTHER 6
+-
++#define RB_EVOLUTION_LDAP 7
++#define RB_GROUPWISE 8
+ //........................................................................
+ #define ET_DATASOURCENAME 1
+ #define ET_LOCATION 2
+Index: source/abpilot/abspilot.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abspilot.cxx,v
+retrieving revision 1.11
+diff -u -p -u -r1.11 abspilot.cxx
+--- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx 8 Sep 2005 19:04:06 -0000 1.11
++++ openoffice.org/extensions/source/abpilot/abspilot.cxx 28 Oct 2005 10:40:40 -0000
+@@ -152,7 +152,9 @@ namespace abp
+
+ // some initial settings
+ #ifdef UNX
+- m_aSettings.eType = AST_MORK;
++ m_aSettings.eType = AST_GROUPWISE;
++ m_aSettings.eType = AST_LDAP;
++ m_aSettings.eType = AST_EVOLUTION;
+ #else
+ m_aSettings.eType = AST_OE;
+ #endif
+@@ -395,6 +397,14 @@ namespace abp
+ {
+ case AST_MORK:
+ m_aNewDataSource = aContext.createNewMORK( m_aSettings.sDataSourceName );
++ break;
++
++ case AST_GROUPWISE:
++ m_aNewDataSource = aContext.createNewEvolutionGroupwise( m_aSettings.sDataSourceName );
++ break;
++
++ case AST_EVOLUTION_LDAP:
++ m_aNewDataSource = aContext.createNewEvolutionLdap( m_aSettings.sDataSourceName );
+ break;
+
+ case AST_EVOLUTION:
+Index: source/abpilot/abspilot.src
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abspilot.src,v
+retrieving revision 1.50
+diff -u -p -u -r1.50 abspilot.src
+--- openoffice.org.orig/extensions/source/abpilot/abspilot.src 8 Sep 2005 19:04:37 -0000 1.50
++++ openoffice.org/extensions/source/abpilot/abspilot.src 28 Oct 2005 10:40:40 -0000
+@@ -122,34 +122,35 @@ TabPage RID_PAGE_SELECTABTYPE
+ Text [ en-US ] = "Please select the type of your external address book:";
+ };
+
+- RadioButton RB_MORK
++ RadioButton RB_GROUPWISE
++ {
++ Pos = MAP_APPFONT ( 15, 79 ) ;
++ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
++
++ Text [ de ] = "Groupwise";
++ Text [ en-US ] = "Groupwise";
++ };
++ RadioButton RB_LDAP
+ {
+- Pos = MAP_APPFONT ( 15, 68 ) ;
++ Pos = MAP_APPFONT ( 15, 90 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+- Group = TRUE;
+
+- Text [ de ] = "Mozilla / Netscape";
+- Text [ en-US ] = "Mozilla / Netscape";
++ Text [ de ] = "LDAP Adress-Bestand";
++ Text [ en-US ] = "LDAP address data";
+ };
++
+ RadioButton RB_EVOLUTION
+ {
+- Pos = MAP_APPFONT ( 15, 79 ) ;
++ Pos = MAP_APPFONT ( 15, 101 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+
+ Text [ de ] = "Evolution";
+ Text [ en-US ] = "Evolution";
+ };
+- RadioButton RB_LDAP
+- {
+- Pos = MAP_APPFONT ( 15, 90 ) ;
+- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+
+- Text [ de ] = "LDAP Adress-Bestand";
+- Text [ en-US ] = "LDAP address data";
+- };
+ RadioButton RB_OUTLOOK
+ {
+- Pos = MAP_APPFONT ( 15, 101 ) ;
++ Pos = MAP_APPFONT ( 15, 112 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+
+ Text [ de ] = "Outlook Adressbuch";
+@@ -157,7 +158,7 @@ TabPage RID_PAGE_SELECTABTYPE
+ };
+ RadioButton RB_OUTLOOKEXPRESS
+ {
+- Pos = MAP_APPFONT ( 15,112 ) ;
++ Pos = MAP_APPFONT ( 15,123 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+
+ Text [ de ] = "Windows System-Adressbuch";
+@@ -165,7 +166,7 @@ TabPage RID_PAGE_SELECTABTYPE
+ };
+ RadioButton RB_OTHER
+ {
+- Pos = MAP_APPFONT ( 15, 123 ) ;
++ Pos = MAP_APPFONT ( 15, 134 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+
+ Text [ de ] = "andere externe Datenquelle";
+Index: source/abpilot/addresssettings.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/addresssettings.hxx,v
+retrieving revision 1.5
+diff -u -p -u -r1.5 addresssettings.hxx
+--- openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx 8 Sep 2005 19:04:54 -0000 1.5
++++ openoffice.org/extensions/source/abpilot/addresssettings.hxx 28 Oct 2005 10:40:40 -0000
+@@ -54,6 +54,8 @@ namespace abp
enum AddressSourceType
{
AST_MORK,
@@ -9,9 +139,14 @@
AST_EVOLUTION,
AST_LDAP,
AST_OUTLOOK,
---- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx 2005-02-23 15:50:09.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx 2005-02-24 16:39:45.000000000 +0530
-@@ -347,9 +347,19 @@
+Index: source/abpilot/datasourcehandling.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.cxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 datasourcehandling.cxx
+--- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx 8 Sep 2005 19:06:23 -0000 1.7
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx 28 Oct 2005 10:40:41 -0000
+@@ -324,9 +324,19 @@ namespace abp
}
//---------------------------------------------------------------------
@@ -32,63 +167,57 @@
}
//---------------------------------------------------------------------
---- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx 2005-02-23 16:41:00.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx 2005-02-23 16:42:45.000000000 +0530
-@@ -112,9 +112,15 @@
+Index: source/abpilot/datasourcehandling.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.hxx,v
+retrieving revision 1.5
+diff -u -p -u -r1.5 datasourcehandling.hxx
+--- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx 8 Sep 2005 19:06:38 -0000 1.5
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx 28 Oct 2005 10:40:41 -0000
+@@ -86,8 +86,14 @@ namespace abp
/// creates a new MORK data source
ODataSource createNewMORK( 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 LDAP data source
ODataSource createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
-
---- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx 2005-02-23 16:43:50.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx 2005-02-28 12:07:56.742599018 +0530
-@@ -85,9 +85,9 @@
- protected:
- FixedText m_aHint;
- FixedLine m_aTypeSep;
-- RadioButton m_aMORK;
-+ RadioButton m_aEvolutionGroupwise;
-+ RadioButton m_aEvolutionLdap;
- RadioButton m_aEvolution;
-- RadioButton m_aLDAP;
- RadioButton m_aOutlook;
- RadioButton m_aOE;
- RadioButton m_aOther;
---- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx 2005-02-23 14:36:42.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx 2005-02-28 12:08:49.569802335 +0530
-@@ -89,9 +89,9 @@
+Index: source/abpilot/typeselectionpage.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.cxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 typeselectionpage.cxx
+--- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx 8 Sep 2005 19:10:12 -0000 1.7
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx 28 Oct 2005 10:40:50 -0000
+@@ -63,9 +63,9 @@ namespace abp
:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_SELECTABTYPE))
,m_aHint (this, ResId(FT_TYPE_HINTS))
,m_aTypeSep (this, ResId(FL_TYPE))
- ,m_aMORK (this, ResId(RB_MORK))
- ,m_aEvolution (this, ResId(RB_EVOLUTION))
-- ,m_aLDAP (this, ResId(RB_LDAP))
+ ,m_aEvolutionGroupwise (this, ResId(RB_GROUPWISE))
-+ ,m_aEvolutionLdap (this, ResId(RB_LDAP))
+ ,m_aLDAP (this, ResId(RB_LDAP))
+ ,m_aEvolution (this, ResId(RB_EVOLUTION))
,m_aOutlook (this, ResId(RB_OUTLOOK))
,m_aOE (this, ResId(RB_OUTLOOKEXPRESS))
,m_aOther (this, ResId(RB_OTHER))
-@@ -99,20 +99,20 @@
+@@ -73,20 +73,20 @@ namespace abp
FreeResource();
Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
- m_aMORK.SetClickHdl( aTypeSelectionHandler );
+- m_aEvolution.SetClickHdl( aTypeSelectionHandler );
+ m_aEvolutionGroupwise.SetClickHdl( aTypeSelectionHandler );
-+ m_aEvolutionLdap.SetClickHdl( aTypeSelectionHandler );
- m_aEvolution.SetClickHdl( aTypeSelectionHandler );
-- m_aLDAP.SetClickHdl( aTypeSelectionHandler );
+ m_aLDAP.SetClickHdl( aTypeSelectionHandler );
++ m_aEvolution.SetClickHdl( aTypeSelectionHandler );
m_aOutlook.SetClickHdl( aTypeSelectionHandler );
m_aOE.SetClickHdl( aTypeSelectionHandler );
m_aOther.SetClickHdl( aTypeSelectionHandler );
@@ -96,19 +225,19 @@
#ifndef UNX
- sal_Int32 nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
- m_aEvolution.Hide();
-+ sal_Int32 nMoveControlsUp = m_aEvolution.GetPosPixel().Y() - m_aEvolutionLdap.GetPosPixel().Y();
-+ sal_Int32 nMoveControlsUp = m_aEvolutionLdap.GetPosPixel().Y() - m_aEvolutionGroupwise.GetPosPixel().Y();
++ sal_Int32 nMoveControlsUp = m_aEvolution.GetPosPixel().Y() - m_aLDAP.GetPosPixel().Y();
++ sal_Int32 nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolutionGroupwise.GetPosPixel().Y();
- Point aPos = m_aLDAP.GetPosPixel();
- aPos.Y() -= nMoveControlsUp;
- m_aLDAP.SetPosPixel( aPos );
+ m_aEvolutionGroupwise.Hide();
-+ m_aEvolutionLdap.Hide();
++ m_aLDAP.Hide();
+ m_aEvolution.Hide();
aPos = m_aOutlook.GetPosPixel();
aPos.Y() -= nMoveControlsUp;
-@@ -139,14 +139,13 @@
+@@ -113,14 +113,13 @@ namespace abp
m_aOther.SetPosPixel( aPos );
Reference< ::com::sun::star::sdbc::XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
@@ -116,19 +245,19 @@
+ if(!(xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))).is()))
{
- nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
-+ nMoveControlsUp = m_aEvolution.GetPosPixel().Y() - m_aEvolutionLdap.GetPosPixel().Y();
-+ nMoveControlsUp = m_aEvolutionLdap.GetPosPixel().Y() - m_aEvolutionGroupwise.GetPosPixel().Y();
++ nMoveControlsUp = m_aEvolution.GetPosPixel().Y() - m_aLDAP.GetPosPixel().Y();
++ nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolutionGroupwise.GetPosPixel().Y();
m_aEvolution.Hide();
-
- aPos = m_aLDAP.GetPosPixel();
- aPos.Y() -= nMoveControlsUp;
- m_aLDAP.SetPosPixel( aPos );
-+ m_aEvolutionLdap.Hide();
++ m_aLDAP.Hide();
+ m_aEvolutionGroupwise.Hide();
aPos = m_aOther.GetPosPixel();
aPos.Y() -= nMoveControlsUp;
-@@ -160,12 +159,12 @@
+@@ -134,10 +133,10 @@ namespace abp
{
AddressBookSourcePage::ActivatePage();
@@ -137,35 +266,31 @@
- else if (m_aEvolution.IsChecked())
+ if (m_aEvolution.IsChecked())
m_aEvolution.GrabFocus();
-- else if (m_aLDAP.IsChecked())
-- m_aLDAP.GrabFocus();
+ else if (m_aEvolutionGroupwise.IsChecked())
+ m_aEvolutionGroupwise.GrabFocus();
-+ else if (m_aEvolutionLdap.IsChecked())
-+ m_aEvolutionLdap.GrabFocus();
+ else if (m_aLDAP.IsChecked())
+ m_aLDAP.GrabFocus();
else if (m_aOutlook.IsChecked())
- m_aOutlook.GrabFocus();
- else if (m_aOE.IsChecked())
-@@ -186,9 +185,9 @@
+@@ -160,9 +159,9 @@ namespace abp
//---------------------------------------------------------------------
void TypeSelectionPage::selectType( AddressSourceType _eType )
{
- m_aMORK.Check(AST_MORK == _eType);
+- m_aEvolution.Check(AST_EVOLUTION == _eType);
+ m_aEvolutionGroupwise.Check(AST_GROUPWISE == _eType);
-+ m_aEvolutionLdap.Check(AST_EVOLUTION_LDAP == _eType);
- m_aEvolution.Check(AST_EVOLUTION == _eType);
-- m_aLDAP.Check(AST_LDAP == _eType);
+ m_aLDAP.Check(AST_LDAP == _eType);
++ m_aEvolution.Check(AST_EVOLUTION == _eType);
m_aOutlook.Check(AST_OUTLOOK == _eType);
m_aOE.Check(AST_OE == _eType);
m_aOther.Check(AST_OTHER == _eType);
-@@ -197,12 +196,12 @@
+@@ -171,12 +170,12 @@ namespace abp
//---------------------------------------------------------------------
AddressSourceType TypeSelectionPage::getSelectedType( )
{
- if (m_aMORK.IsChecked())
- return AST_MORK;
-+ if (m_aEvolutionLdap.IsChecked())
-+ return AST_EVOLUTION_LDAP;
++ if (m_aLDAP.IsChecked())
++ return AST_LDAP;
+ else if (m_aEvolutionGroupwise.IsChecked())
+ return AST_GROUPWISE;
else if (m_aEvolution.IsChecked())
@@ -175,113 +300,22 @@
else if (m_aOutlook.IsChecked())
return AST_OUTLOOK;
else if (m_aOE.IsChecked())
---- openoffice.org.orig/extensions/source/abpilot/abpresid.hrc 2005-02-23 16:33:35.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/abpresid.hrc 2005-02-23 16:35:01.000000000 +0530
-@@ -198,7 +198,8 @@
- #define RB_OUTLOOK 4
- #define RB_OUTLOOKEXPRESS 5
- #define RB_OTHER 6
--
-+#define RB_EVOLUTION_LDAP 7
-+#define RB_GROUPWISE 8
- //........................................................................
- #define ET_DATASOURCENAME 1
- #define ET_LOCATION 2
---- openoffice.org.orig/extensions/source/abpilot/abspilot.src 2005-02-23 13:49:53.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/abspilot.src 2005-02-28 12:07:20.498948162 +0530
-@@ -148,34 +148,35 @@
- Text [ en-US ] = "Please select the type of your external address book:";
- };
-
-- RadioButton RB_MORK
-+ RadioButton RB_GROUPWISE
-+ {
-+ Pos = MAP_APPFONT ( 15, 79 ) ;
-+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-+
-+ Text [ de ] = "Groupwise";
-+ Text [ en-US ] = "Groupwise";
-+ };
-+ RadioButton RB_LDAP
- {
-- Pos = MAP_APPFONT ( 15, 68 ) ;
-+ Pos = MAP_APPFONT ( 15, 90 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-- Group = TRUE;
-
-- Text [ de ] = "Mozilla / Netscape";
-- Text [ en-US ] = "Mozilla / Netscape";
-+ Text [ de ] = "LDAP Adress-Bestand";
-+ Text [ en-US ] = "LDAP address data";
- };
-+
- RadioButton RB_EVOLUTION
- {
-- Pos = MAP_APPFONT ( 15, 79 ) ;
-+ Pos = MAP_APPFONT ( 15, 101 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
- Text [ de ] = "Evolution";
- Text [ en-US ] = "Evolution";
- };
-- RadioButton RB_LDAP
-- {
-- Pos = MAP_APPFONT ( 15, 90 ) ;
-- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
-- Text [ de ] = "LDAP Adress-Bestand";
-- Text [ en-US ] = "LDAP address data";
-- };
- RadioButton RB_OUTLOOK
- {
-- Pos = MAP_APPFONT ( 15, 101 ) ;
-+ Pos = MAP_APPFONT ( 15, 112 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
- Text [ de ] = "Outlook Adressbuch";
-@@ -183,7 +184,7 @@
- };
- RadioButton RB_OUTLOOKEXPRESS
- {
-- Pos = MAP_APPFONT ( 15,112 ) ;
-+ Pos = MAP_APPFONT ( 15,123 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
- Text [ de ] = "Windows System-Adressbuch";
-@@ -191,7 +192,7 @@
- };
- RadioButton RB_OTHER
- {
-- Pos = MAP_APPFONT ( 15, 123 ) ;
-+ Pos = MAP_APPFONT ( 15, 134 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-
- Text [ de ] = "andere externe Datenquelle";
---- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx 2005-02-24 11:10:46.000000000 +0530
-+++ openoffice.org/extensions/source/abpilot/abspilot.cxx 2005-02-28 12:36:20.034151760 +0530
-@@ -178,7 +178,9 @@
-
- // some initial settings
- #ifdef UNX
-- m_aSettings.eType = AST_MORK;
-+ m_aSettings.eType = AST_GROUPWISE;
-+ m_aSettings.eType = AST_EVOLUTION_LDAP;
-+ m_aSettings.eType = AST_EVOLUTION;
- #else
- m_aSettings.eType = AST_OE;
- #endif
-@@ -423,6 +425,14 @@
- m_aNewDataSource = aContext.createNewMORK( m_aSettings.sDataSourceName );
- break;
-
-+ case AST_GROUPWISE:
-+ m_aNewDataSource = aContext.createNewEvolutionGroupwise( m_aSettings.sDataSourceName );
-+ break;
-+
-+ case AST_EVOLUTION_LDAP:
-+ m_aNewDataSource = aContext.createNewEvolutionLdap( m_aSettings.sDataSourceName );
-+ break;
-+
- case AST_EVOLUTION:
- m_aNewDataSource = aContext.createNewEvolution( m_aSettings.sDataSourceName );
- break;
+Index: source/abpilot/typeselectionpage.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.hxx,v
+retrieving revision 1.6
+diff -u -p -u -r1.6 typeselectionpage.hxx
+--- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx 8 Sep 2005 19:10:28 -0000 1.6
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx 28 Oct 2005 10:40:50 -0000
+@@ -59,9 +59,9 @@ namespace abp
+ protected:
+ FixedText m_aHint;
+ FixedLine m_aTypeSep;
+- RadioButton m_aMORK;
+- RadioButton m_aEvolution;
++ RadioButton m_aEvolutionGroupwise;
+ RadioButton m_aLDAP;
++ RadioButton m_aEvolution;
+ RadioButton m_aOutlook;
+ RadioButton m_aOE;
+ RadioButton m_aOther;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- openoffice.org.spec 27 Oct 2005 18:27:37 -0000 1.518
+++ openoffice.org.spec 28 Oct 2005 10:47:04 -0000 1.519
@@ -1,5 +1,5 @@
%define ooo2ver 3
-%define ooo_rpm_release 6
+%define ooo_rpm_release 7
%define ooo_base_name OOO680_m%{ooo2ver}
%define build_fc5 1
%define build_fc4 0
@@ -183,35 +183,33 @@
Patch32: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
Patch33: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
Patch34: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch35: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch36: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch37: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch38: workspace.javapatch.patch
-Patch39: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
-Patch40: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch41: openoffice.org-1.9.112.ooo53025.exception.package.patch
-Patch42: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch43: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
-Patch44: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
-Patch45: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch46: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch47: workspace.impress57.patch
-Patch48: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
-Patch49: workspace.gslpatches6.patch
-Patch50: workspace.dmake43p01.patch
-Patch51: workspace.emblock1.patch
-Patch52: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch53: workspace.cmcfixes18.patch
-Patch54: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
-Patch55: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch56: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch57: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch58: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch59: workspace.cmcfixes19.patch
-Patch60: workspace.atkbridge.patch
-Patch61: openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
-Patch62: openoffice.org-2.0.0.ooo55603.mythes.crash.patch
-Patch63: openoffice.org-2.0.0.ooo56536.sw.rtfcrash.patch
+Patch35: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
+Patch36: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch37: workspace.javapatch.patch
+Patch38: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
+Patch39: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch40: openoffice.org-1.9.112.ooo53025.exception.package.patch
+Patch41: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch42: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
+Patch43: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
+Patch44: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch45: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch46: workspace.impress57.patch
+Patch47: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
+Patch48: workspace.gslpatches6.patch
+Patch49: workspace.dmake43p01.patch
+Patch50: workspace.emblock1.patch
+Patch51: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch52: workspace.cmcfixes18.patch
+Patch53: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
+Patch54: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
+Patch55: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch56: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch57: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch58: workspace.cmcfixes19.patch
+Patch59: workspace.atkbridge.patch
+Patch60: workspace.cmcfixes20.patch
+Patch61: openoffice.org-2.0.0.ooo56536.sw.rtfcrash.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -856,40 +854,38 @@
%patch32 -p1 -b .ooo51931.systemxmlsec.patch
%patch33 -p1 -b .oooXXXXX.extensions.evolution.patch
%patch34 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch35 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch36 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch37 -p1 -b .ooo52428.execshield.bridges.patch
-%patch38 -p1 -b .workspace.javapatch.patch
-%patch39 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-%patch40 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch41 -p1 -b .ooo53025.exception.package.patch
-%patch42 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch43 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
-%patch44 -p1 -b .ooo54586.nfslock.sal.patch
-%patch45 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch46 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch47 -p1 -b .workspace.impress57.patch
-%patch48 -p1 -b .ooo54040.savecrash.svtools.patch
-%patch49 -p1 -b .workspace.gslpatches6.patch
-%patch50 -p1 -b .dmake43p01.patch
-%patch51 -p1 -b .workspace.emblock1.patch
+%patch35 -p1 -b .ooo49720.mozillanspr.extensions.patch
+%patch36 -p1 -b .ooo52428.execshield.bridges.patch
+%patch37 -p1 -b .workspace.javapatch.patch
+%patch38 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
+%patch39 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch40 -p1 -b .ooo53025.exception.package.patch
+%patch41 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch42 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
+%patch43 -p1 -b .ooo54586.nfslock.sal.patch
+%patch44 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch45 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch46 -p1 -b .workspace.impress57.patch
+%patch47 -p1 -b .ooo54040.savecrash.svtools.patch
+%patch48 -p1 -b .workspace.gslpatches6.patch
+%patch49 -p1 -b .dmake43p01.patch
+%patch50 -p1 -b .workspace.emblock1.patch
%if ! %{internalicu}
-%patch52 -p1 -b .ooo54479.systemicu.patch
+%patch51 -p1 -b .ooo54479.systemicu.patch
%endif
-%patch53 -p1 -b .workspace.cmcfixes18.patch
-#%patch54 -p1 -b .ooo54692.fasterhelpcontent2.patch
+%patch52 -p1 -b .workspace.cmcfixes18.patch
+#%patch53 -p1 -b .ooo54692.fasterhelpcontent2.patch
%if %{internaljavabits}
-%patch55 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch56 -p1 -b .ooo51718.rpath.patch
+%patch54 -p1 -b .berkeleydb-jni-casting-misuse.patch
+%patch55 -p1 -b .ooo51718.rpath.patch
%else
-%patch57 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch56 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
%endif
-%patch58 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch59 -p1 -b .workspace.cmcfixes19.patch
-%patch60 -p1 -b .workspace.atkbridge.patch
-%patch61 -p1 -b .oooXXXXX.sysui.linkforce.patch
-%patch62 -p1 -b .ooo55603.mythes.crash.patch
-%patch63 -p1 -b .ooo56536.sw.rtfcrash.patch
+%patch57 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch58 -p1 -b .workspace.cmcfixes19.patch
+%patch59 -p1 -b .workspace.atkbridge.patch
+%patch60 -p1 -b .workspace.cmcfixes20.patch
+%patch61 -p1 -b .ooo56536.sw.rtfcrash.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -3251,6 +3247,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Oct 28 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.7
+- rh#171918# wrong LDAP stuff gets launched from wizard
+- upstream patches as cmcfixes20
+
* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.6
- rh#171425#/ooo#56536# weird SwTxtNode is not a SwTxtNode problem
--- openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch DELETED ---
--- openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch DELETED ---
More information about the fedora-cvs-commits
mailing list