summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2007-07-18 09:43:02 +0000
committerMaho Nakata <maho@FreeBSD.org>2007-07-18 09:43:02 +0000
commit463778756c0720b811af7ebb4b6f300ef4627b3e (patch)
tree3733d06ad3e1d16078abb2e47e4ff1b4004d3f43 /editors
parentFix building on FreeBSD-7, with gcc 4.2.0 (diff)
Update to SRC680_m221.
Notes
Notes: svn path=/head/; revision=195839
Diffstat (limited to '')
-rw-r--r--editors/openoffice-3-devel/Makefile4
-rw-r--r--editors/openoffice-3-devel/distinfo6
-rw-r--r--editors/openoffice-3-devel/files/patch-i7949911
-rw-r--r--editors/openoffice-3-devel/files/patch-i7952010
-rw-r--r--editors/openoffice-3-devel/files/patch-i7952719
-rw-r--r--editors/openoffice.org-2-devel/Makefile4
-rw-r--r--editors/openoffice.org-2-devel/distinfo6
-rw-r--r--editors/openoffice.org-2-devel/files/patch-i7949911
-rw-r--r--editors/openoffice.org-2-devel/files/patch-i7952010
-rw-r--r--editors/openoffice.org-2-devel/files/patch-i7952719
-rw-r--r--editors/openoffice.org-3-devel/Makefile4
-rw-r--r--editors/openoffice.org-3-devel/distinfo6
-rw-r--r--editors/openoffice.org-3-devel/files/patch-i7949911
-rw-r--r--editors/openoffice.org-3-devel/files/patch-i7952010
-rw-r--r--editors/openoffice.org-3-devel/files/patch-i7952719
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile4
-rw-r--r--editors/openoffice.org-vcltesttool/distinfo6
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i7949911
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i7952010
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i7952719
20 files changed, 20 insertions, 180 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 579c69c27c59..46b9dfe5d60b 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -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)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index f9cad8753c8f..af295b40a169 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -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
diff --git a/editors/openoffice-3-devel/files/patch-i79499 b/editors/openoffice-3-devel/files/patch-i79499
deleted file mode 100644
index f6cb7b03c62c..000000000000
--- a/editors/openoffice-3-devel/files/patch-i79499
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice-3-devel/files/patch-i79520 b/editors/openoffice-3-devel/files/patch-i79520
deleted file mode 100644
index ccc05e9cbc3c..000000000000
--- a/editors/openoffice-3-devel/files/patch-i79520
+++ /dev/null
@@ -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:
diff --git a/editors/openoffice-3-devel/files/patch-i79527 b/editors/openoffice-3-devel/files/patch-i79527
deleted file mode 100644
index 20c646f43f1e..000000000000
--- a/editors/openoffice-3-devel/files/patch-i79527
+++ /dev/null
@@ -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() )
- {
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 579c69c27c59..46b9dfe5d60b 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -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)
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index f9cad8753c8f..af295b40a169 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -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
diff --git a/editors/openoffice.org-2-devel/files/patch-i79499 b/editors/openoffice.org-2-devel/files/patch-i79499
deleted file mode 100644
index f6cb7b03c62c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i79499
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-2-devel/files/patch-i79520 b/editors/openoffice.org-2-devel/files/patch-i79520
deleted file mode 100644
index ccc05e9cbc3c..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i79520
+++ /dev/null
@@ -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:
diff --git a/editors/openoffice.org-2-devel/files/patch-i79527 b/editors/openoffice.org-2-devel/files/patch-i79527
deleted file mode 100644
index 20c646f43f1e..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i79527
+++ /dev/null
@@ -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() )
- {
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 579c69c27c59..46b9dfe5d60b 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -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)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index f9cad8753c8f..af295b40a169 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -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
diff --git a/editors/openoffice.org-3-devel/files/patch-i79499 b/editors/openoffice.org-3-devel/files/patch-i79499
deleted file mode 100644
index f6cb7b03c62c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i79499
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-3-devel/files/patch-i79520 b/editors/openoffice.org-3-devel/files/patch-i79520
deleted file mode 100644
index ccc05e9cbc3c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i79520
+++ /dev/null
@@ -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:
diff --git a/editors/openoffice.org-3-devel/files/patch-i79527 b/editors/openoffice.org-3-devel/files/patch-i79527
deleted file mode 100644
index 20c646f43f1e..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i79527
+++ /dev/null
@@ -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() )
- {
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 579c69c27c59..46b9dfe5d60b 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -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)
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index f9cad8753c8f..af295b40a169 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i79499 b/editors/openoffice.org-vcltesttool/files/patch-i79499
deleted file mode 100644
index f6cb7b03c62c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i79499
+++ /dev/null
@@ -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;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i79520 b/editors/openoffice.org-vcltesttool/files/patch-i79520
deleted file mode 100644
index ccc05e9cbc3c..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i79520
+++ /dev/null
@@ -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:
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i79527 b/editors/openoffice.org-vcltesttool/files/patch-i79527
deleted file mode 100644
index 20c646f43f1e..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i79527
+++ /dev/null
@@ -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() )
- {