diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-07-18 09:43:02 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-07-18 09:43:02 +0000 |
| commit | 463778756c0720b811af7ebb4b6f300ef4627b3e (patch) | |
| tree | 3733d06ad3e1d16078abb2e47e4ff1b4004d3f43 /editors/openoffice.org-vcltesttool/files | |
| parent | Fix building on FreeBSD-7, with gcc 4.2.0 (diff) | |
Update to SRC680_m221.
Notes
Notes:
svn path=/head/; revision=195839
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i79499 | 11 | ||||
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i79520 | 10 | ||||
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i79527 | 19 |
3 files changed, 0 insertions, 40 deletions
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() ) - { |