rpms/openoffice.org/devel workspace.cmcfixes34.patch, NONE, 1.1 .cvsignore, 1.128, 1.129 openoffice.org.spec, 1.1182, 1.1183 sources, 1.239, 1.240
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue May 22 11:54:46 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22965
Modified Files:
.cvsignore openoffice.org.spec sources
Added Files:
workspace.cmcfixes34.patch
Log Message:
next release candidate
workspace.cmcfixes34.patch:
--- NEW FILE workspace.cmcfixes34.patch ---
Index: source/ui/app/apphdl.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/app/apphdl.cxx,v
retrieving revision 1.64
diff -u -r1.64 apphdl.cxx
--- openoffice.org.orig/sw/source/ui/app/apphdl.cxx 4 Apr 2007 15:16:15 -0000 1.64
+++ openofficeorg/sw/source/ui/app/apphdl.cxx 22 May 2007 09:11:21 -0000
@@ -369,7 +369,7 @@
SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle());
SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
- &aURL, &aHidden, &aReferer, &aTargetFrameName, 0);
+ &aURL, &aHidden, &aReferer, &aTargetFrameName, 0L);
SfxShell* pShell = pItem ? pItem->GetShell() : 0;
if(pShell)
Index: source/ui/dbui/dbmgr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dbui/dbmgr.cxx,v
retrieving revision 1.118
diff -u -r1.118 dbmgr.cxx
--- openoffice.org.orig/sw/source/ui/dbui/dbmgr.cxx 26 Apr 2007 09:02:02 -0000 1.118
+++ openoffice.org/sw/source/ui/dbui/dbmgr.cxx 22 May 2007 09:11:24 -0000
@@ -3288,7 +3288,7 @@
SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL );
const SfxPoolItem* pReturnValue =
rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
- &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0);
+ &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
if(pReturnValue)
{
SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;
Index: source/ui/shells/drformsh.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/shells/drformsh.cxx,v
retrieving revision 1.13
diff -u -r1.13 drformsh.cxx
--- openoffice.org.orig/sw/source/ui/shells/drformsh.cxx 16 Sep 2006 23:13:47 -0000 1.13
+++ openoffice.org/sw/source/ui/shells/drformsh.cxx 22 May 2007 09:11:33 -0000
@@ -156,7 +156,7 @@
rView.StopShellTimer();
//issue a new command to insert the link
rView.GetViewFrame()->GetDispatcher()->Execute(
- SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0);
+ SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0L);
}
else
{
Index: source/ui/uiview/view2.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/uiview/view2.cxx,v
retrieving revision 1.72
diff -u -r1.72 view2.cxx
--- openoffice.org.orig/sw/source/ui/uiview/view2.cxx 10 May 2007 16:25:57 -0000 1.72
+++ openoffice.org/sw/source/ui/uiview/view2.cxx 22 May 2007 09:11:36 -0000
@@ -1264,7 +1264,7 @@
{
SfxAllEnumItem aEnumItem(SID_OBJECT_ALIGN, nAlias - SID_OBJECT_ALIGN_LEFT);
GetViewFrame()->GetDispatcher()->Execute(
- SID_OBJECT_ALIGN, SFX_CALLMODE_ASYNCHRON, &aEnumItem, 0);
+ SID_OBJECT_ALIGN, SFX_CALLMODE_ASYNCHRON, &aEnumItem, 0L);
}
else if(nAlias)
//these slots are either re-mapped to text or object alignment
@@ -2277,7 +2277,7 @@
//then show the "Data base only" field dialog
SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, TRUE);
pVFrame->GetDispatcher()->Execute(FN_INSERT_FIELD_DATA_ONLY,
- SFX_CALLMODE_SYNCHRON, &aOn, 0);
+ SFX_CALLMODE_SYNCHRON, &aOn, 0L);
return;
}
else
Index: source/ui/uno/unodispatch.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/uno/unodispatch.cxx,v
retrieving revision 1.19
diff -u -r1.19 unodispatch.cxx
--- openoffice.org.orig/sw/source/ui/uno/unodispatch.cxx 16 Sep 2006 23:29:51 -0000 1.19
+++ openoffice.org/sw/source/ui/uno/unodispatch.cxx 22 May 2007 09:11:37 -0000
@@ -292,7 +292,7 @@
m_pView->GetViewFrame()->GetDispatcher()->Execute(
FN_MAILMERGE_WIZARD,
SFX_CALLMODE_ASYNCHRON,
- &aDBProperties, 0);
+ &aDBProperties, 0L);
// pNewDBMgr->ExecuteFormLetter(rSh, aArgs);
}
else if(!aURL.Complete.compareToAscii(cURLDocumentDataSource))
Index: source/ui/utlui/content.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/utlui/content.cxx,v
retrieving revision 1.45
diff -u -r1.45 content.cxx
--- openoffice.org.orig/sw/source/ui/utlui/content.cxx 26 Apr 2007 09:22:48 -0000 1.45
+++ openoffice.org/sw/source/ui/utlui/content.cxx 22 May 2007 09:11:39 -0000
@@ -2934,7 +2934,7 @@
SwPtrItem aPtrItem( FN_INSERT_MULTI_TOX, (void*)pBase);
pActiveShell->GetView().GetViewFrame()->
GetDispatcher()->Execute(FN_INSERT_MULTI_TOX,
- SFX_CALLMODE_ASYNCHRON, &aPtrItem, 0);
+ SFX_CALLMODE_ASYNCHRON, &aPtrItem, 0L);
}
break;
Index: source/ui/utlui/glbltree.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/utlui/glbltree.cxx,v
retrieving revision 1.35
diff -u -r1.35 glbltree.cxx
--- openoffice.org.orig/sw/source/ui/utlui/glbltree.cxx 26 Apr 2007 09:23:00 -0000 1.35
+++ openoffice.org/sw/source/ui/utlui/glbltree.cxx 22 May 2007 09:11:39 -0000
@@ -1373,7 +1373,7 @@
SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle());
pActiveShell->GetView().GetViewFrame()->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON,
- &aURL, &aReadOnly, &aReferer, &aTargetFrameName, 0);
+ &aURL, &aReadOnly, &aReferer, &aTargetFrameName, 0L);
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- .cvsignore 18 May 2007 17:01:17 -0000 1.128
+++ .cvsignore 22 May 2007 11:54:08 -0000 1.129
@@ -205,3 +205,4 @@
OOF680_m13.tar.bz2
OOF680_m14.tar.bz2
OOF680_m16.tar.bz2
+OOF680_m17.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1182
retrieving revision 1.1183
diff -u -r1.1182 -r1.1183
--- openoffice.org.spec 21 May 2007 08:29:33 -0000 1.1182
+++ openoffice.org.spec 22 May 2007 11:54:08 -0000 1.1183
@@ -1,5 +1,5 @@
%define oootag OOF680
-%define ooomilestone 16
+%define ooomilestone 17
%define rh_rpm_release 1
# gcc#19664#
@@ -129,6 +129,7 @@
Patch70: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
Patch71: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
Patch72: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch73: workspace.cmcfixes34.patch
%define instdir %{_libdir}/openoffice.org
@@ -1059,6 +1060,7 @@
%patch70 -p1 -b .ooo76393.sal.dynamicsection.patch
%patch71 -p1 -b .oooXXXXX.shell.reduceglobals.patch
%patch72 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch73 -p1 -b .workspace.cmcfixes34.patch
cp %{SOURCE1} extras/source/database/evolocal.odb
@@ -2638,8 +2640,13 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue May 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.1
+- next 2.2.1 release candidate
+- add workspace.cmcfixes34.patch for int(0) not being promoted to long
+ NULL in ellipsed methods
+
* Fri May 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-16.1
-- a 2.2.1 release candidate
+- 2.2.1 release candidate
- Resolves: rhbz#216332 use cups for all duplex and printer features
- Resolves: rhbz#237110 Dzongkha langpack
- drop integrated workspace.cmcfixes32.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- sources 18 May 2007 17:01:17 -0000 1.239
+++ sources 22 May 2007 11:54:09 -0000 1.240
@@ -4,4 +4,4 @@
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
-f43599e0eab7c12ad6b39ae2d7f6ed72 OOF680_m16.tar.bz2
+9547202d9e2788b459d5b5e0d1a7c6f2 OOF680_m17.tar.bz2
More information about the fedora-extras-commits
mailing list