Update to SRC680_m221.

This commit is contained in:
Maho Nakata 2007-07-18 09:43:02 +00:00
parent 4d03875cc6
commit 463778756c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=195839
20 changed files with 20 additions and 180 deletions

View file

@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
CODELINE= 680
MILESTONE?= 220
MILESTONE?= 221
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20070710
SNAPDATE= 20070717
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
.if defined(WITH_CWS)

View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
MD5 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = c70ebae43e7060c7ada57d87636be5ba
SHA256 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 8ade360fed974a21492f185bdd0fd0069efd29eb0cbc1e2c2d107be86e7cac33
SIZE (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 287031377
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144

View file

@ -1,11 +0,0 @@
--- vcl/source/window/winproc.cxx 5 Jul 2007 08:44:18 -0000 1.114
+++ vcl/source/window/winproc.cxx 12 Jul 2007 13:32:22 -0000 1.115
@@ -2534,7 +2534,7 @@
break;
case SALEVENT_SHOWDIALOG:
{
- int nDialogID = reinterpret_cast<int>(pEvent);
+ int nDialogID = static_cast<int>(reinterpret_cast<sal_IntPtr>(pEvent));
nRet = ImplHandleShowDialog( pWindow, nDialogID );
}
break;

View file

@ -1,10 +0,0 @@
--- svx/inc/svx/svdobj.hxx 6 Jul 2007 07:30:43 -0000 1.3
+++ svx/inc/svx/svdobj.hxx 12 Jul 2007 13:56:39 -0000 1.4
@@ -531,6 +531,7 @@
//
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SvxShape;
class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
{
private:

View file

@ -1,19 +0,0 @@
Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
===================================================================
RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- reportdesign/source/ui/dlg/GroupsSorting.cxx 9 Jul 2007 11:56:29 -0000 1.2
+++ reportdesign/source/ui/dlg/GroupsSorting.cxx 12 Jul 2007 13:51:08 -0000 1.3
@@ -1143,8 +1143,8 @@
xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
{
- sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
- xGroup->setGroupOn( nGroupOn );
+ sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+ xGroup->setGroupOn( nGroupOn );
}
if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
{

View file

@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
CODELINE= 680
MILESTONE?= 220
MILESTONE?= 221
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20070710
SNAPDATE= 20070717
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
.if defined(WITH_CWS)

View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
MD5 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = c70ebae43e7060c7ada57d87636be5ba
SHA256 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 8ade360fed974a21492f185bdd0fd0069efd29eb0cbc1e2c2d107be86e7cac33
SIZE (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 287031377
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144

View file

@ -1,11 +0,0 @@
--- vcl/source/window/winproc.cxx 5 Jul 2007 08:44:18 -0000 1.114
+++ vcl/source/window/winproc.cxx 12 Jul 2007 13:32:22 -0000 1.115
@@ -2534,7 +2534,7 @@
break;
case SALEVENT_SHOWDIALOG:
{
- int nDialogID = reinterpret_cast<int>(pEvent);
+ int nDialogID = static_cast<int>(reinterpret_cast<sal_IntPtr>(pEvent));
nRet = ImplHandleShowDialog( pWindow, nDialogID );
}
break;

View file

@ -1,10 +0,0 @@
--- svx/inc/svx/svdobj.hxx 6 Jul 2007 07:30:43 -0000 1.3
+++ svx/inc/svx/svdobj.hxx 12 Jul 2007 13:56:39 -0000 1.4
@@ -531,6 +531,7 @@
//
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SvxShape;
class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
{
private:

View file

@ -1,19 +0,0 @@
Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
===================================================================
RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- reportdesign/source/ui/dlg/GroupsSorting.cxx 9 Jul 2007 11:56:29 -0000 1.2
+++ reportdesign/source/ui/dlg/GroupsSorting.cxx 12 Jul 2007 13:51:08 -0000 1.3
@@ -1143,8 +1143,8 @@
xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
{
- sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
- xGroup->setGroupOn( nGroupOn );
+ sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+ xGroup->setGroupOn( nGroupOn );
}
if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
{

View file

@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
CODELINE= 680
MILESTONE?= 220
MILESTONE?= 221
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20070710
SNAPDATE= 20070717
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
.if defined(WITH_CWS)

View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
MD5 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = c70ebae43e7060c7ada57d87636be5ba
SHA256 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 8ade360fed974a21492f185bdd0fd0069efd29eb0cbc1e2c2d107be86e7cac33
SIZE (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 287031377
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144

View file

@ -1,11 +0,0 @@
--- vcl/source/window/winproc.cxx 5 Jul 2007 08:44:18 -0000 1.114
+++ vcl/source/window/winproc.cxx 12 Jul 2007 13:32:22 -0000 1.115
@@ -2534,7 +2534,7 @@
break;
case SALEVENT_SHOWDIALOG:
{
- int nDialogID = reinterpret_cast<int>(pEvent);
+ int nDialogID = static_cast<int>(reinterpret_cast<sal_IntPtr>(pEvent));
nRet = ImplHandleShowDialog( pWindow, nDialogID );
}
break;

View file

@ -1,10 +0,0 @@
--- svx/inc/svx/svdobj.hxx 6 Jul 2007 07:30:43 -0000 1.3
+++ svx/inc/svx/svdobj.hxx 12 Jul 2007 13:56:39 -0000 1.4
@@ -531,6 +531,7 @@
//
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SvxShape;
class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
{
private:

View file

@ -1,19 +0,0 @@
Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
===================================================================
RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- reportdesign/source/ui/dlg/GroupsSorting.cxx 9 Jul 2007 11:56:29 -0000 1.2
+++ reportdesign/source/ui/dlg/GroupsSorting.cxx 12 Jul 2007 13:51:08 -0000 1.3
@@ -1143,8 +1143,8 @@
xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
{
- sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
- xGroup->setGroupOn( nGroupOn );
+ sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+ xGroup->setGroupOn( nGroupOn );
}
if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
{

View file

@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set
.endif
CODELINE= 680
MILESTONE?= 220
MILESTONE?= 221
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20070710
SNAPDATE= 20070717
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
.if defined(WITH_CWS)

View file

@ -1,6 +1,6 @@
MD5 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 245e58891d2d091ae3a4d484a0488be0
SHA256 (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = f83619ac1a3055a4be7a95d3fead1109d76ab244015da76e208da21af40e2ab7
SIZE (openoffice.org2/OOo_SRC680_m220_source.tar.bz2) = 292163303
MD5 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = c70ebae43e7060c7ada57d87636be5ba
SHA256 (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 8ade360fed974a21492f185bdd0fd0069efd29eb0cbc1e2c2d107be86e7cac33
SIZE (openoffice.org2/OOo_SRC680_m221_source.tar.bz2) = 287031377
MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2/unowinreg.dll) = 6144

View file

@ -1,11 +0,0 @@
--- vcl/source/window/winproc.cxx 5 Jul 2007 08:44:18 -0000 1.114
+++ vcl/source/window/winproc.cxx 12 Jul 2007 13:32:22 -0000 1.115
@@ -2534,7 +2534,7 @@
break;
case SALEVENT_SHOWDIALOG:
{
- int nDialogID = reinterpret_cast<int>(pEvent);
+ int nDialogID = static_cast<int>(reinterpret_cast<sal_IntPtr>(pEvent));
nRet = ImplHandleShowDialog( pWindow, nDialogID );
}
break;

View file

@ -1,10 +0,0 @@
--- svx/inc/svx/svdobj.hxx 6 Jul 2007 07:30:43 -0000 1.3
+++ svx/inc/svx/svdobj.hxx 12 Jul 2007 13:56:39 -0000 1.4
@@ -531,6 +531,7 @@
//
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SvxShape;
class SVX_DLLPUBLIC SdrObject: public SfxListener, public tools::WeakBase< SdrObject >
{
private:

View file

@ -1,19 +0,0 @@
Index: reportdesign/source/ui/dlg/GroupsSorting.cxx
===================================================================
RCS file: /cvs/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- reportdesign/source/ui/dlg/GroupsSorting.cxx 9 Jul 2007 11:56:29 -0000 1.2
+++ reportdesign/source/ui/dlg/GroupsSorting.cxx 12 Jul 2007 13:51:08 -0000 1.3
@@ -1143,8 +1143,8 @@
xGroup->setKeepTogether( m_aKeepTogetherLst.GetSelectEntryPos() );
if ( m_aGroupOnLst.GetSavedValue() != m_aGroupOnLst.GetSelectEntryPos() )
{
- sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_Int32>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
- xGroup->setGroupOn( nGroupOn );
+ sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_aGroupOnLst.GetEntryData(m_aGroupOnLst.GetSelectEntryPos())));
+ xGroup->setGroupOn( nGroupOn );
}
if ( m_aGroupIntervalEd.GetSavedValue().ToInt32() != m_aGroupIntervalEd.GetValue() )
{