rpms/openoffice.org/devel openoffice.org-1.9.116.ooo51774.rsc.parallel.patch, NONE, 1.1 openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch, NONE, 1.1 openoffice.org.spec, 1.291, 1.292
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Jul 10 18:20:37 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18371
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
Log Message:
lets test the evo2 stuff
openoffice.org-1.9.116.ooo51774.rsc.parallel.patch:
makefile.mk | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE openoffice.org-1.9.116.ooo51774.rsc.parallel.patch ---
Index: source/parser/makefile.mk
===================================================================
RCS file: /cvs/gsl/rsc/source/parser/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- source/parser/makefile.mk 22 Nov 2002 18:30:39 -0000 1.3
+++ source/parser/makefile.mk 10 Jul 2005 14:46:21 -0000
@@ -106,4 +106,5 @@
$(OBJ)$/rscinit.obj : $(YACCTARGET)
$(OBJ)$/rscicpx.obj : $(YACCTARGET)
$(OBJ)$/rsclex.obj : $(YACCTARGET)
+$(OBJ)$/rscyacc.obj : $(YACCTARGET)
openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch:
abpresid.hrc | 3 +-
abspilot.cxx | 12 ++++++++++-
abspilot.src | 33 +++++++++++++++---------------
addresssettings.hxx | 2 +
datasourcehandling.cxx | 12 ++++++++++-
datasourcehandling.hxx | 8 ++++++-
typeselectionpage.cxx | 53 ++++++++++++++++++++++++-------------------------
typeselectionpage.hxx | 4 +--
8 files changed, 78 insertions(+), 49 deletions(-)
--- NEW FILE openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch ---
--- 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 @@
enum AddressSourceType
{
AST_MORK,
+ AST_GROUPWISE,
+ AST_EVOLUTION_LDAP,
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 @@
}
//---------------------------------------------------------------------
+ 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" );
}
//---------------------------------------------------------------------
--- 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 @@
/// 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 @@
: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_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 @@
FreeResource();
Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
- m_aMORK.SetClickHdl( aTypeSelectionHandler );
+ m_aEvolutionGroupwise.SetClickHdl( aTypeSelectionHandler );
+ m_aEvolutionLdap.SetClickHdl( aTypeSelectionHandler );
m_aEvolution.SetClickHdl( aTypeSelectionHandler );
- m_aLDAP.SetClickHdl( aTypeSelectionHandler );
m_aOutlook.SetClickHdl( aTypeSelectionHandler );
m_aOE.SetClickHdl( aTypeSelectionHandler );
m_aOther.SetClickHdl( aTypeSelectionHandler );
#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();
- Point aPos = m_aLDAP.GetPosPixel();
- aPos.Y() -= nMoveControlsUp;
- m_aLDAP.SetPosPixel( aPos );
+ m_aEvolutionGroupwise.Hide();
+ m_aEvolutionLdap.Hide();
+ m_aEvolution.Hide();
aPos = m_aOutlook.GetPosPixel();
aPos.Y() -= nMoveControlsUp;
@@ -139,14 +139,13 @@
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);
- if(!(xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))).is()))
+ 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();
m_aEvolution.Hide();
-
- aPos = m_aLDAP.GetPosPixel();
- aPos.Y() -= nMoveControlsUp;
- m_aLDAP.SetPosPixel( aPos );
+ m_aEvolutionLdap.Hide();
+ m_aEvolutionGroupwise.Hide();
aPos = m_aOther.GetPosPixel();
aPos.Y() -= nMoveControlsUp;
@@ -160,12 +159,12 @@
{
AddressBookSourcePage::ActivatePage();
- if (m_aMORK.IsChecked())
- m_aMORK.GrabFocus();
- 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_aOutlook.IsChecked())
m_aOutlook.GrabFocus();
else if (m_aOE.IsChecked())
@@ -186,9 +185,9 @@
//---------------------------------------------------------------------
void TypeSelectionPage::selectType( AddressSourceType _eType )
{
- m_aMORK.Check(AST_MORK == _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_aOutlook.Check(AST_OUTLOOK == _eType);
m_aOE.Check(AST_OE == _eType);
m_aOther.Check(AST_OTHER == _eType);
@@ -197,12 +196,12 @@
//---------------------------------------------------------------------
AddressSourceType TypeSelectionPage::getSelectedType( )
{
- if (m_aMORK.IsChecked())
- return AST_MORK;
+ if (m_aEvolutionLdap.IsChecked())
+ return AST_EVOLUTION_LDAP;
+ else if (m_aEvolutionGroupwise.IsChecked())
+ return AST_GROUPWISE;
else if (m_aEvolution.IsChecked())
return AST_EVOLUTION;
- else if (m_aLDAP.IsChecked())
- return AST_LDAP;
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: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- openoffice.org.spec 9 Jul 2005 22:06:15 -0000 1.291
+++ openoffice.org.spec 10 Jul 2005 18:20:34 -0000 1.292
@@ -1,5 +1,5 @@
%define ooo2ver 116
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
%define build_fc4 0
%define build_fc5 1
@@ -123,6 +123,8 @@
Patch55: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
Patch56: openoffice.org-1.9.115.ooo51745.cpputools.patch
Patch57: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+Patch58: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+Patch59: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -760,6 +762,8 @@
%patch55 -p1 -b .oooXXXXX.systemxmlsec.patch
%patch56 -p1 -b .ooo51745.cpputools.patch
%patch57 -p1 -b .ooo51755.scp2.parallel.patch
+%patch58 -p1 -b .ooo51774.rsc.parallel.patch
+%patch59 -p1 -b .oooXXXXX.extensions.evolution.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
@@ -2941,6 +2945,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Mon Jul 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-2
+- add openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+
* Sat Jul 09 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-1
- bump to new version, Hamburg burning the midnight oil apparently
- add openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
More information about the fedora-cvs-commits
mailing list