[ooo-build-commit] patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Tue Nov 17 11:22:45 PST 2009
patches/dev300/cws-koheidatapilot03-sc.diff | 256 +++++++++++++++------------
patches/dev300/cws-koheidatapilot03-vcl.diff | 45 ++--
2 files changed, 173 insertions(+), 128 deletions(-)
New commits:
commit e978300069c8a126071b2146edcab719e4260aa4
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Tue Nov 17 11:55:48 2009 -0500
Updated patches for koheidatapilot03 cws.
This update fixes i#106583, and also removes several compiler
warnings.
* patches/dev300/cws-koheidatapilot03-sc.diff:
* patches/dev300/cws-koheidatapilot03-vcl.diff:
diff --git a/patches/dev300/cws-koheidatapilot03-sc.diff b/patches/dev300/cws-koheidatapilot03-sc.diff
index 2427c76..fc53247 100644
--- a/patches/dev300/cws-koheidatapilot03-sc.diff
+++ b/patches/dev300/cws-koheidatapilot03-sc.diff
@@ -1,13 +1,13 @@
diff --git sc/inc/AccessibleFilterMenu.hxx sc/inc/AccessibleFilterMenu.hxx
new file mode 100644
-index 0000000..2495b4c
+index 0000000..f30f910
--- /dev/null
+++ sc/inc/AccessibleFilterMenu.hxx
-@@ -0,0 +1,191 @@
+@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
++ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -56,11 +56,11 @@ index 0000000..2495b4c
+class ScDocument;
+class ScMenuFloatingWindow;
+
-+typedef ::cppu::ImplHelper1<
++typedef ::cppu::ImplHelper1<
+ ::com::sun::star::accessibility::XAccessibleSelection > ScAccessibleFilterMenu_BASE;
+
-+class ScAccessibleFilterMenu :
-+ public ScAccessibleContextBase,
++class ScAccessibleFilterMenu :
++ public ScAccessibleContextBase,
+ public ScAccessibleFilterMenu_BASE
+{
+public:
@@ -82,10 +82,10 @@ index 0000000..2495b4c
+ virtual void SAL_CALL grabFocus()
+ throw (::com::sun::star::uno::RuntimeException);
+
-+ virtual sal_Int32 SAL_CALL getForeground()
++ virtual sal_Int32 SAL_CALL getForeground()
+ throw (::com::sun::star::uno::RuntimeException);
+
-+ virtual sal_Int32 SAL_CALL getBackground()
++ virtual sal_Int32 SAL_CALL getBackground()
+ throw (::com::sun::star::uno::RuntimeException);
+
+ // XAccessibleContext
@@ -100,7 +100,7 @@ index 0000000..2495b4c
+ getAccessibleChild(sal_Int32 nIndex)
+ throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
+
-+ virtual ::com::sun::star::uno::Reference<
++ virtual ::com::sun::star::uno::Reference<
+ ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
+ getAccessibleStateSet()
+ throw (::com::sun::star::uno::RuntimeException);
@@ -110,6 +110,9 @@ index 0000000..2495b4c
+
+ // XAccessibleEventBroadcaster
+
++ using ScAccessibleContextBase::addEventListener;
++ using ScAccessibleContextBase::removeEventListener;
++
+ virtual void SAL_CALL
+ addEventListener(
+ const ::com::sun::star::uno::Reference<
@@ -125,32 +128,32 @@ index 0000000..2495b4c
+
+ // XAccessibleSelection
+
-+ virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex)
++ virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
-+ virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex)
++ virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
-+ virtual void SAL_CALL clearAccessibleSelection()
++ virtual void SAL_CALL clearAccessibleSelection()
+ throw (::com::sun::star::uno::RuntimeException);
+
-+ virtual void SAL_CALL selectAllAccessibleChildren()
++ virtual void SAL_CALL selectAllAccessibleChildren()
+ throw (::com::sun::star::uno::RuntimeException);
+
-+ virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
++ virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
+ throw (::com::sun::star::uno::RuntimeException);
+
-+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
-+ getSelectedAccessibleChild(sal_Int32 nChildIndex)
++ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
++ getSelectedAccessibleChild(sal_Int32 nChildIndex)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
-+ virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex)
++ virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+ // XInterface
+
-+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
-+ ::com::sun::star::uno::Type const & rType )
++ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
++ ::com::sun::star::uno::Type const & rType )
+ throw (::com::sun::star::uno::RuntimeException);
+
+ virtual void SAL_CALL acquire() throw ();
@@ -549,10 +552,10 @@ index 72a4769..25caeb1 100644
BOOL IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; }
};
diff --git sc/inc/column.hxx sc/inc/column.hxx
-index fd2473b..ec87323 100644
+index 740a4d7..14ad931 100644
--- sc/inc/column.hxx
+++ sc/inc/column.hxx
-@@ -162,7 +162,7 @@ public:
+@@ -161,7 +161,7 @@ public:
SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
BOOL HasDataAt(SCROW nRow) const;
BOOL HasVisibleDataAt(SCROW nRow) const;
@@ -562,10 +565,10 @@ index fd2473b..ec87323 100644
SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster
SCROW GetFirstVisDataPos(BOOL bNotes) const;
diff --git sc/inc/document.hxx sc/inc/document.hxx
-index f0f9189..14d606e 100644
+index 1f656f4..106265c 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
-@@ -859,6 +859,8 @@ public:
+@@ -866,6 +866,8 @@ public:
USHORT GetErrCode( const ScAddress& ) const;
@@ -1160,7 +1163,7 @@ index a75f3c1..4d97133 100644
BOOL bPrinted : 1; // bei Bedarf (Pagebreak-Modus)
diff --git sc/inc/global.hxx sc/inc/global.hxx
-index 3e31be4..e207691 100644
+index 8cbbc44..57a6ff1 100644
--- sc/inc/global.hxx
+++ sc/inc/global.hxx
@@ -87,8 +87,6 @@ extern "C" {
@@ -1312,10 +1315,10 @@ index d1b0fb9..680da7d 100644
typedef std::vector< String > ScDPNameVec;
diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index e823b40..3e0a1f8 100644
+index 45de84f..0db56c8 100644
--- sc/inc/sc.hrc
+++ sc/inc/sc.hrc
-@@ -1444,6 +1444,8 @@
+@@ -1437,6 +1437,8 @@
#define RID_IMG_H_DROP_URL (BMP_START + 5)
#define RID_IMG_H_DROP_LINK (BMP_START + 6)
#define RID_IMG_H_DROP_COPY (BMP_START + 7)
@@ -1324,7 +1327,7 @@ index e823b40..3e0a1f8 100644
#define RID_SCPTR_PIVOTCOL (BMP_START + 81)
#define RID_SCPTR_PIVOTROW (BMP_START + 82)
-@@ -1635,8 +1637,9 @@
+@@ -1628,8 +1630,9 @@
#define RID_SCDLG_DOCPROTECTION (SC_DIALOGS_START + 149)
#define RID_SCDLG_RETYPEPASS (SC_DIALOGS_START + 150)
#define RID_SCDLG_RETYPEPASS_INPUT (SC_DIALOGS_START + 151)
@@ -1336,10 +1339,10 @@ index e823b40..3e0a1f8 100644
#ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
-index 2e1a33d..de99888 100644
+index 21e8742..10ee5b7 100644
--- sc/inc/scabstdlg.hxx
+++ sc/inc/scabstdlg.hxx
-@@ -243,7 +243,7 @@ class AbstractScDPSubtotalDlg : public VclAbstractDialog //add for ScDPSubtotal
+@@ -235,7 +235,7 @@ class AbstractScDPSubtotalDlg : public VclAbstractDialog //add for ScDPSubtotal
{
public:
virtual USHORT GetFuncMask() const = 0;
@@ -1349,10 +1352,10 @@ index 2e1a33d..de99888 100644
class AbstractScDPNumGroupDlg : public VclAbstractDialog
diff --git sc/inc/table.hxx sc/inc/table.hxx
-index a33ebb9..715e119 100644
+index e0187f9..4001f74 100644
--- sc/inc/table.hxx
+++ sc/inc/table.hxx
-@@ -291,6 +291,7 @@ public:
+@@ -294,6 +294,7 @@ public:
}
ScBaseCell* GetCell( SCCOL nCol, SCROW nRow ) const;
@@ -1401,7 +1404,7 @@ index 067f074..9fc2ea5 100644
SCROW ScColumn::GetLastDataPos() const
{
diff --git sc/source/core/data/documen8.cxx sc/source/core/data/documen8.cxx
-index 19d6d94..448c339 100644
+index c99054b..ac6c46d 100644
--- sc/source/core/data/documen8.cxx
+++ sc/source/core/data/documen8.cxx
@@ -96,6 +96,7 @@
@@ -1412,7 +1415,7 @@ index 19d6d94..448c339 100644
#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue()
-@@ -713,8 +714,13 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
+@@ -706,8 +707,13 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
// skip everything left of rSpellPos:
while ( pCell && nRow == rSpellPos.Row() && nCol < rSpellPos.Col() )
pCell = aIter.GetNext( nCol, nRow );
@@ -1427,7 +1430,7 @@ index 19d6d94..448c339 100644
CellType eType = pCell->GetCellType();
if ( eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT )
{
-@@ -799,8 +805,6 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
+@@ -792,8 +798,6 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
if ( ++nCellCount >= SPELL_MAXCELLS ) // seen enough cells?
break;
@@ -1437,10 +1440,10 @@ index 19d6d94..448c339 100644
if ( pCell )
diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 39ff75e..efb9693 100644
+index 590d1eb..1be8fe6 100644
--- sc/source/core/data/document.cxx
+++ sc/source/core/data/document.cxx
-@@ -608,6 +608,32 @@ BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
+@@ -639,6 +639,32 @@ BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
return FALSE;
}
@@ -1474,7 +1477,7 @@ index 39ff75e..efb9693 100644
// zusammenhaengender Bereich
diff --git sc/source/core/data/dpgroup.cxx sc/source/core/data/dpgroup.cxx
-index b4e3568..96ed464 100644
+index 5ed9e77..2d62cc8 100644
--- sc/source/core/data/dpgroup.cxx
+++ sc/source/core/data/dpgroup.cxx
@@ -70,6 +70,7 @@ using ::rtl::OUStringHash;
@@ -1503,7 +1506,7 @@ index b4e3568..96ed464 100644
void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup )
diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
-index ff15b82..ede7316 100644
+index 2fc12f0..b9e55eb 100644
--- sc/source/core/data/dpobject.cxx
+++ sc/source/core/data/dpobject.cxx
@@ -75,9 +75,11 @@
@@ -2005,7 +2008,7 @@ index ff15b82..ede7316 100644
{
ScDPCacheCell aCell(rCell);
diff --git sc/source/core/data/dpoutput.cxx sc/source/core/data/dpoutput.cxx
-index 0699892..e472dbf 100644
+index 8c97a45..c0eefba 100644
--- sc/source/core/data/dpoutput.cxx
+++ sc/source/core/data/dpoutput.cxx
@@ -81,6 +81,7 @@
@@ -2281,10 +2284,11 @@ index 0699892..e472dbf 100644
const uno::Sequence<sheet::MemberResult> rSequence = pRowFields[nRowField].aResult;
const sheet::MemberResult* pArray = rSequence.getConstArray();
-@@ -1199,7 +1199,7 @@ bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const String& r
+@@ -1198,8 +1265,7 @@ bool lcl_IsNamedDataField( const ScDPGetPivotDataField& rTarget, const String& r
+
bool lcl_IsNamedCategoryField( const ScDPGetPivotDataField& rFilter, const ScDPOutLevelData& rField )
{
- //! name from source instead of caption?
+- //! name from source instead of caption?
- return ScGlobal::GetpTransliteration()->isEqual( rFilter.maFieldName, rField.aCaption );
+ return ScGlobal::GetpTransliteration()->isEqual( rFilter.maFieldName, rField.maName );
}
@@ -2292,7 +2296,7 @@ index 0699892..e472dbf 100644
bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivotDataField& rFilter )
diff --git sc/source/core/data/dpoutputgeometry.cxx sc/source/core/data/dpoutputgeometry.cxx
new file mode 100644
-index 0000000..999ab28
+index 0000000..fabddc1
--- /dev/null
+++ sc/source/core/data/dpoutputgeometry.cxx
@@ -0,0 +1,217 @@
@@ -2399,7 +2403,7 @@ index 0000000..999ab28
+
+ SCROW nRow = nCurRow;
+ SCTAB nTab = maOutRange.aStart.Tab();
-+ SCCOL nColStart = maOutRange.aStart.Col() + mnRowFields + bDataLayout;
++ SCCOL nColStart = static_cast<SCCOL>(maOutRange.aStart.Col() + mnRowFields + (bDataLayout ? 1 : 0));
+ SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnColumnFields-1);
+
+ for (SCCOL nCol = nColStart; nCol <= nColEnd; ++nCol)
@@ -2492,7 +2496,7 @@ index 0000000..999ab28
+ if (mnColumnFields)
+ {
+ SCROW nRow = nCurRow;
-+ SCCOL nColStart = maOutRange.aStart.Col() + mnRowFields + bDataLayout;
++ SCCOL nColStart = static_cast<SCCOL>(maOutRange.aStart.Col() + mnRowFields + (bDataLayout ? 1 : 0));
+ SCCOL nColEnd = nColStart + static_cast<SCCOL>(mnColumnFields-1);
+ if (rPos.Row() == nRow && nColStart <= rPos.Col() && rPos.Col() <= nColEnd)
+ return Column;
@@ -3237,7 +3241,7 @@ index 675a0a5..0494bc6 100644
}
else if ( pMember->IsVisible() )
diff --git sc/source/core/data/dptabsrc.cxx sc/source/core/data/dptabsrc.cxx
-index 3b5a6e0..1216202 100644
+index f3514ba..e99c2bc 100644
--- sc/source/core/data/dptabsrc.cxx
+++ sc/source/core/data/dptabsrc.cxx
@@ -85,6 +85,7 @@ using ::com::sun::star::uno::Reference;
@@ -3687,10 +3691,10 @@ index 925f34e..f71b842 100644
&& (nColCount == r.nColCount)
&& (nRowCount == r.nRowCount)
diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
-index 29618da..6a2898b 100644
+index d2c700c..7ce4e30 100644
--- sc/source/core/data/makefile.mk
+++ sc/source/core/data/makefile.mk
-@@ -78,6 +78,7 @@ SLOFILES = \
+@@ -79,6 +79,7 @@ SLOFILES = \
$(SLO)$/dpgroup.obj \
$(SLO)$/dpobject.obj \
$(SLO)$/dpoutput.obj \
@@ -3698,7 +3702,7 @@ index 29618da..6a2898b 100644
$(SLO)$/dpsave.obj \
$(SLO)$/dpsdbtab.obj \
$(SLO)$/dpshttab.obj \
-@@ -140,6 +141,7 @@ EXCEPTIONSFILES= \
+@@ -142,6 +143,7 @@ EXCEPTIONSFILES= \
$(SLO)$/dpsdbtab.obj \
$(SLO)$/dpobject.obj \
$(SLO)$/dpoutput.obj \
@@ -3707,7 +3711,7 @@ index 29618da..6a2898b 100644
$(SLO)$/dbdocutl.obj \
$(SLO)$/dptabsrc.obj \
diff --git sc/source/core/data/pivot2.cxx sc/source/core/data/pivot2.cxx
-index 70f48dc..7365e6d 100644
+index 901afbd..85f2941 100644
--- sc/source/core/data/pivot2.cxx
+++ sc/source/core/data/pivot2.cxx
@@ -61,11 +61,26 @@
@@ -3738,7 +3742,7 @@ index 70f48dc..7365e6d 100644
maName( rName ),
mnCol( nCol ),
mnFuncMask( PIVOT_FUNC_NONE ),
-@@ -76,6 +91,14 @@ LabelData::LabelData( const String& rName, short nCol, bool bIsValue ) :
+@@ -75,6 +90,14 @@ LabelData::LabelData( const String& rName, short nCol, bool bIsValue ) :
{
}
@@ -3754,10 +3758,10 @@ index 70f48dc..7365e6d 100644
ScDPFuncData::ScDPFuncData( short nCol, USHORT nFuncMask ) :
diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 464bf4c..eac760e 100644
+index 12e56ea..c718e0f 100644
--- sc/source/core/data/table2.cxx
+++ sc/source/core/data/table2.cxx
-@@ -962,6 +962,14 @@ ScBaseCell* ScTable::GetCell( SCCOL nCol, SCROW nRow ) const
+@@ -972,6 +972,14 @@ ScBaseCell* ScTable::GetCell( SCCOL nCol, SCROW nRow ) const
return NULL;
}
@@ -3773,10 +3777,10 @@ index 464bf4c..eac760e 100644
void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
{
diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index da460a2..6876c90 100644
+index c0a2a5d..3c77c9d 100644
--- sc/source/filter/excel/read.cxx
+++ sc/source/filter/excel/read.cxx
-@@ -1146,6 +1146,7 @@ FltError ImportExcel8::Read( void )
+@@ -1192,6 +1192,7 @@ FltError ImportExcel8::Read( void )
case EXC_ID_SXDI: rPTableMgr.ReadSxdi( maStrm ); break;
case EXC_ID_SXVDEX: rPTableMgr.ReadSxvdex( maStrm ); break;
case EXC_ID_SXEX: rPTableMgr.ReadSxex( maStrm ); break;
@@ -3784,7 +3788,7 @@ index da460a2..6876c90 100644
}
}
break;
-@@ -1180,6 +1181,9 @@ FltError ImportExcel8::Read( void )
+@@ -1226,6 +1227,9 @@ FltError ImportExcel8::Read( void )
eLastErr = SCWARN_IMPORT_ROW_OVERFLOW;
else if( rAddrConv.IsColTruncated() )
eLastErr = SCWARN_IMPORT_COLUMN_OVERFLOW;
@@ -3795,7 +3799,7 @@ index da460a2..6876c90 100644
return eLastErr;
diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
-index d7bf0b3..e475661 100644
+index 7680b03..8d0346e 100644
--- sc/source/filter/excel/xepivot.cxx
+++ sc/source/filter/excel/xepivot.cxx
@@ -67,6 +67,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
@@ -3806,7 +3810,7 @@ index d7bf0b3..e475661 100644
using ::rtl::OString;
using ::rtl::OUString;
-@@ -972,6 +973,11 @@ void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
+@@ -975,6 +976,11 @@ void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
{
::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN, !rSaveMem.GetIsVisible() );
::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDEDETAIL, !rSaveMem.GetShowDetails() );
@@ -3818,7 +3822,7 @@ index d7bf0b3..e475661 100644
}
void XclExpPTItem::WriteBody( XclExpStream& rStrm )
-@@ -1029,6 +1035,31 @@ sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefault
+@@ -1032,6 +1038,31 @@ sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefault
// fill data --------------------------------------------------------------
@@ -3850,7 +3854,7 @@ index d7bf0b3..e475661 100644
void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
{
// orientation
-@@ -1040,8 +1071,16 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
+@@ -1043,8 +1074,16 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
::set_flag( maFieldExtInfo.mnFlags, EXC_SXVDEX_SHOWALL, rSaveDim.GetShowEmpty() );
// visible name
@@ -3869,7 +3873,7 @@ index d7bf0b3..e475661 100644
// subtotals
XclPTSubtotalVec aSubtotals;
-@@ -1108,7 +1147,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
+@@ -1111,7 +1150,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
rDataInfo.SetApiAggFunc( eFunc );
// visible name
@@ -3882,7 +3886,7 @@ index d7bf0b3..e475661 100644
// result field reference
if( const DataPilotFieldReference* pFieldRef = rSaveDim.GetReferenceValue() )
-@@ -1217,9 +1260,10 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
+@@ -1220,9 +1263,10 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
// pivot table properties from DP object
mnOutScTab = rOutScRange.aStart.Tab();
maPTInfo.maTableName = rDPObj.GetName();
@@ -3894,7 +3898,7 @@ index d7bf0b3..e475661 100644
if( const ScDPSaveData* pSaveData = rDPObj.GetSaveData() )
{
// additional properties from ScDPSaveData
-@@ -1299,6 +1343,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
+@@ -1302,6 +1346,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
WriteSxli( rStrm, maPTInfo.mnDataCols, maPTInfo.mnColFields );
// SXEX
WriteSxex( rStrm );
@@ -3905,7 +3909,7 @@ index d7bf0b3..e475661 100644
}
}
-@@ -1332,6 +1380,15 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
+@@ -1335,6 +1383,15 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
::set_flag( maPTInfo.mnFlags, EXC_SXVIEW_COLGRAND, rSaveData.GetColumnGrand() );
::set_flag( maPTExtInfo.mnFlags, EXC_SXEX_DRILLDOWN, rSaveData.GetDrillDown() );
mbFilterBtn = rSaveData.GetFilterButton();
@@ -3921,7 +3925,7 @@ index d7bf0b3..e475661 100644
}
void XclExpPivotTable::SetFieldPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
-@@ -1439,13 +1496,21 @@ void XclExpPivotTable::Finalize()
+@@ -1442,13 +1499,21 @@ void XclExpPivotTable::Finalize()
rnDataXclRow = rnXclRow1 + maPTInfo.mnColFields + 1;
if( maDataFields.empty() )
++rnDataXclRow;
@@ -3944,7 +3948,7 @@ index d7bf0b3..e475661 100644
}
// records ----------------------------------------------------------------
-@@ -1525,6 +1590,72 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
+@@ -1528,6 +1593,72 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
rStrm.EndRecord();
}
@@ -4040,7 +4044,7 @@ index eb36b4a..c210911 100644
SetStrLen( nCurrLen );
diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
-index acd371f..bae2192 100644
+index acd371f..1aef359 100644
--- sc/source/filter/excel/xipivot.cxx
+++ sc/source/filter/excel/xipivot.cxx
@@ -48,7 +48,9 @@
@@ -4186,7 +4190,7 @@ index acd371f..bae2192 100644
// hidden fields
for( sal_uInt16 nField = 0, nCount = GetFieldCount(); nField < nCount; ++nField )
if( const XclImpPTField* pField = GetField( nField ) )
-@@ -1359,11 +1411,111 @@ void XclImpPivotTable::Convert()
+@@ -1359,11 +1411,112 @@ void XclImpPivotTable::Convert()
// create the DataPilot
ScDPObject* pDPObj = new ScDPObject( GetDocPtr() );
pDPObj->SetName( maPTInfo.maTableName );
@@ -4215,7 +4219,8 @@ index acd371f..bae2192 100644
+ {
+ // 'refresh table on load' flag is set. Refresh the table now. Some
+ // Excel files contain partial table output when this flag is set.
-+ mpDPObj->Output(maOutScRange.aStart);
++ ScRange aOutRange = mpDPObj->GetOutRange();
++ mpDPObj->Output(aOutRange.aStart);
+ }
+}
+
@@ -4299,7 +4304,7 @@ index acd371f..bae2192 100644
}
// ============================================================================
-@@ -1458,6 +1610,12 @@ void XclImpPivotTableManager::ReadSxex( XclImpStream& rStrm )
+@@ -1458,6 +1611,12 @@ void XclImpPivotTableManager::ReadSxex( XclImpStream& rStrm )
maPTables.back()->ReadSxex( rStrm );
}
@@ -4312,7 +4317,7 @@ index acd371f..bae2192 100644
// ----------------------------------------------------------------------------
void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm )
-@@ -1472,5 +1630,11 @@ void XclImpPivotTableManager::ConvertPivotTables()
+@@ -1472,5 +1631,11 @@ void XclImpPivotTableManager::ConvertPivotTables()
(*aIt)->Convert();
}
@@ -5372,10 +5377,10 @@ index dfbba92..b4df6b1 100644
sal_Bool bDisplayDetails;
sal_Bool bHasName;
diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index a45add1..7d9e882 100644
+index 3171e72..877fe5b 100644
--- sc/source/filter/xml/xmlimprt.cxx
+++ sc/source/filter/xml/xmlimprt.cxx
-@@ -1345,6 +1345,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap()
+@@ -1347,6 +1347,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap()
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL },
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE },
@@ -5383,7 +5388,7 @@ index a45add1..7d9e882 100644
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY },
{ XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE },
{ XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE },
-@@ -1378,6 +1379,24 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap()
+@@ -1380,6 +1381,24 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap()
return *pDataPilotTableSourceServiceAttrTokenMap;
}
@@ -5408,7 +5413,7 @@ index a45add1..7d9e882 100644
const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap()
{
if( !pDataPilotTableSourceCellRangeAttrTokenMap )
-@@ -1417,6 +1436,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap()
+@@ -1419,6 +1438,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap()
static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME },
@@ -5416,7 +5421,7 @@ index a45add1..7d9e882 100644
{ XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD, XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD },
{ XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION },
{ XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION },
-@@ -1508,6 +1528,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap()
+@@ -1510,6 +1530,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap()
static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION },
@@ -5424,7 +5429,7 @@ index a45add1..7d9e882 100644
XML_TOKEN_MAP_END
};
-@@ -1540,6 +1561,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap()
+@@ -1542,6 +1563,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap()
static __FAR_DATA SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME },
@@ -5432,7 +5437,7 @@ index a45add1..7d9e882 100644
{ XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY },
{ XML_NAMESPACE_TABLE, XML_SHOW_DETAILS, XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS },
XML_TOKEN_MAP_END
-@@ -1675,6 +1697,7 @@ ScXMLImport::ScXMLImport(
+@@ -1677,6 +1699,7 @@ ScXMLImport::ScXMLImport(
pDataPilotTableAttrTokenMap( 0 ),
pDataPilotTableElemTokenMap( 0 ),
pDataPilotTableSourceServiceAttrTokenMap( 0 ),
@@ -5441,7 +5446,7 @@ index a45add1..7d9e882 100644
pDataPilotTableSourceCellRangeAttrTokenMap( 0 ),
pDataPilotFieldAttrTokenMap( 0 ),
diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
-index f9cdfe0..139acf5 100644
+index 5d3911c..48d720d 100644
--- sc/source/filter/xml/xmlimprt.hxx
+++ sc/source/filter/xml/xmlimprt.hxx
@@ -489,6 +489,7 @@ enum ScXMLDataPilotTableElemTokens
@@ -5931,14 +5936,14 @@ index 0000000..8a76393
+}
diff --git sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
new file mode 100644
-index 0000000..7216819
+index 0000000..815a2cc
--- /dev/null
+++ sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,208 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
++ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -6007,27 +6012,26 @@ index 0000000..7216819
+{
+}
+
-+sal_Int32 ScAccessibleFilterMenuItem::getAccessibleChildCount()
++sal_Int32 ScAccessibleFilterMenuItem::getAccessibleChildCount()
+ throw (RuntimeException)
+{
+ return 0;
+}
+
-+Reference<XAccessible> ScAccessibleFilterMenuItem::getAccessibleChild(sal_Int32 /*nIndex*/)
++Reference<XAccessible> ScAccessibleFilterMenuItem::getAccessibleChild(sal_Int32 /*nIndex*/)
+ throw (RuntimeException, IndexOutOfBoundsException)
+{
+ throw IndexOutOfBoundsException();
-+ return Reference<XAccessible>();
+}
+
-+Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet()
++Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet()
+ throw (RuntimeException)
+{
+ updateStateSet();
+ return mxStateSet;
+}
+
-+OUString ScAccessibleFilterMenuItem::getImplementationName()
++OUString ScAccessibleFilterMenuItem::getImplementationName()
+ throw (RuntimeException)
+{
+ return OUString::createFromAscii("ScAccessibleFilterMenuItem");
@@ -6040,7 +6044,7 @@ index 0000000..7216819
+ return 1;
+}
+
-+sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/)
++sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/)
+ throw (IndexOutOfBoundsException, RuntimeException)
+{
+ mpWindow->executeMenuItem(mnMenuPos);
@@ -6430,7 +6434,7 @@ index dfa5ac9..2942914 100644
$(SLO)$/AccessiblePreviewHeaderCell.obj \
diff --git sc/source/ui/cctrl/dpcontrol.cxx sc/source/ui/cctrl/dpcontrol.cxx
new file mode 100644
-index 0000000..2f09c88
+index 0000000..7dd49fc
--- /dev/null
+++ sc/source/ui/cctrl/dpcontrol.cxx
@@ -0,0 +1,1419 @@
@@ -6577,7 +6581,7 @@ index 0000000..2f09c88
+ Font aTextFont( mpStyle->GetLabelFont() );
+ double fFontHeight = 12.0;
+ fFontHeight *= static_cast<double>(maZoomY.GetNumerator()) / static_cast<double>(maZoomY.GetDenominator());
-+ aTextFont.SetHeight(fFontHeight);
++ aTextFont.SetHeight(static_cast<long>(fFontHeight));
+ mpOutDev->SetFont(aTextFont);
+
+ Point aTextPos = maPos;
@@ -6595,7 +6599,7 @@ index 0000000..2f09c88
+
+void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
+{
-+ long nW = maSize.getWidth()*0.5;
++ long nW = maSize.getWidth() / 2;
+ long nH = maSize.getHeight();
+ if (nW > 18)
+ nW = 18;
@@ -7266,7 +7270,7 @@ index 0000000..2f09c88
+{
+ const sal_uInt16 nLeftMargin = 5;
+ const sal_uInt16 nTopMargin = 5;
-+ const sal_uInt16 nMenuItemHeight = maLabelFont.GetHeight()*1.8;
++ const sal_uInt16 nMenuItemHeight = static_cast< sal_uInt16 >( maLabelFont.GetHeight()*1.8 );
+
+ Size aWndSize = GetSizePixel();
+
@@ -7498,15 +7502,15 @@ index 0000000..2f09c88
+ const sal_uInt16 nSingleItemBtnAreaHeight = 32; // height of the middle area below the list box where the single-action buttons are.
+ const sal_uInt16 nBottomBtnAreaHeight = 50; // height of the bottom area where the OK and Cancel buttons are.
+ const sal_uInt16 nBtnWidth = 60;
-+ const sal_uInt16 nLabelHeight = getLabelFont().GetHeight();
++ const sal_uInt16 nLabelHeight = static_cast< sal_uInt16 >( getLabelFont().GetHeight() );
+ const sal_uInt16 nBtnHeight = nLabelHeight*2;
+ const sal_uInt16 nBottomMargin = 10;
+ const sal_uInt16 nMenuListMargin = 20;
+
+ // parameters calculated from constants.
-+ const sal_uInt16 nListBoxWidth = maWndSize.Width() - nListBoxMargin*2;
-+ const sal_uInt16 nListBoxHeight = maWndSize.Height() - nTopMargin - nMenuHeight -
-+ nMenuListMargin - nSingleItemBtnAreaHeight - nBottomBtnAreaHeight;
++ const sal_uInt16 nListBoxWidth = static_cast< sal_uInt16 >( maWndSize.Width() - nListBoxMargin*2 );
++ const sal_uInt16 nListBoxHeight = static_cast< sal_uInt16 >( maWndSize.Height() - nTopMargin - nMenuHeight -
++ nMenuListMargin - nSingleItemBtnAreaHeight - nBottomBtnAreaHeight );
+
+ const sal_uInt16 nSingleBtnAreaY = nTopMargin + nMenuHeight + nListBoxHeight + nMenuListMargin - 1;
+
@@ -7593,7 +7597,7 @@ index 0000000..2f09c88
+{
+ size_t n = maMembers.size();
+ for (size_t i = 0; i < n; ++i)
-+ maChecks.CheckEntryPos(i, bSet);
++ maChecks.CheckEntryPos(static_cast< USHORT >( i ), bSet);
+}
+
+void ScDPFieldPopupWindow::selectCurrentMemberOnly(bool bSet)
@@ -7789,7 +7793,7 @@ index 0000000..2f09c88
+ for (size_t i = 0; i < n; ++i)
+ {
+ maChecks.InsertEntry(maMembers[i].maName);
-+ maChecks.CheckEntryPos(i, maMembers[i].mbVisible);
++ maChecks.CheckEntryPos(static_cast< USHORT >( i ), maMembers[i].mbVisible);
+ if (maMembers[i].mbVisible)
+ ++nVisMemCount;
+ }
@@ -7824,7 +7828,7 @@ index 0000000..2f09c88
+ size_t n = maMembers.size();
+ for (size_t i = 0; i < n; ++i)
+ {
-+ bool bState = maChecks.IsChecked(i);
++ bool bState = maChecks.IsChecked(static_cast< USHORT >( i ));
+ aResult.insert(ResultMap::value_type(maMembers[i].maName, bState));
+ }
+ rResult.swap(aResult);
@@ -7977,6 +7981,18 @@ index e7b96af..43ff4bd 100644
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
+diff --git sc/source/ui/dbgui/makefile.mk sc/source/ui/dbgui/makefile.mk
+index 5d71655..8865125 100644
+--- sc/source/ui/dbgui/makefile.mk
++++ sc/source/ui/dbgui/makefile.mk
+@@ -80,6 +80,7 @@ EXCEPTIONSFILES= \
+ $(SLO)$/csvsplits.obj \
+ $(SLO)$/csvtablebox.obj \
+ $(SLO)$/fieldwnd.obj \
++ $(SLO)$/pvfundlg.obj \
+ $(SLO)$/pvlaydlg.obj \
+ $(SLO)$/dapidata.obj
+
diff --git sc/source/ui/dbgui/pvfundlg.cxx sc/source/ui/dbgui/pvfundlg.cxx
index 08a5e03..ec140d8 100644
--- sc/source/ui/dbgui/pvfundlg.cxx
@@ -8953,10 +8969,10 @@ index f94a7ed..2f7e628 100644
void InitFocus ();
void InitFields ();
diff --git sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx
-index 73ebf38..f4fb524 100644
+index 9b5edcd..a2cbe23 100644
--- sc/source/ui/undo/undodat.cxx
+++ sc/source/ui/undo/undodat.cxx
-@@ -1879,7 +1879,7 @@ void __EXPORT ScUndoDataPilot::Undo()
+@@ -1876,7 +1876,7 @@ void __EXPORT ScUndoDataPilot::Undo()
else
{
// delete inserted object
@@ -8965,7 +8981,7 @@ index 73ebf38..f4fb524 100644
}
}
}
-@@ -1889,7 +1889,7 @@ void __EXPORT ScUndoDataPilot::Undo()
+@@ -1886,7 +1886,7 @@ void __EXPORT ScUndoDataPilot::Undo()
ScDPObject* pDestObj = new ScDPObject( *pOldDPObject );
pDestObj->SetAlive(TRUE);
@@ -9075,10 +9091,10 @@ index 0f6a291..0c9122a 100644
ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd,
diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
-index d07feb0..90c6883 100644
+index 6d73479..a08ded3 100644
--- sc/source/ui/view/cellsh2.cxx
+++ sc/source/ui/view/cellsh2.cxx
-@@ -764,7 +764,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+@@ -750,7 +750,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
// select database range or data
pTabViewShell->GetDBData( TRUE, SC_DB_OLD );
@@ -9087,7 +9103,7 @@ index d07feb0..90c6883 100644
if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
pTabViewShell->MarkDataArea( FALSE );
-@@ -830,6 +830,19 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
+@@ -816,6 +816,19 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScMarkType eType = GetViewData()->GetSimpleArea(aRange);
if ( (eType & SC_MARK_SIMPLE) == SC_MARK_SIMPLE )
{
@@ -9144,7 +9160,7 @@ index b372240..05dce54 100644
pData = pDocSh->GetDBData(
ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
-index 4b50b5b..86fc703 100644
+index 4b50b5b..b9183fa 100644
--- sc/source/ui/view/dbfunc3.cxx
+++ sc/source/ui/view/dbfunc3.cxx
@@ -44,19 +44,17 @@
@@ -9701,7 +9717,7 @@ index 4b50b5b..86fc703 100644
+ nRank = itrSub->second;
+
+ if (!bAscending)
-+ nRank = nMemberCount - nRank - 1;
++ nRank = static_cast< sal_uInt16 >( nMemberCount - nRank - 1 );
+
+ aRankedNames[nRank] = aName;
+ }
@@ -9931,7 +9947,7 @@ index 2b65eb8..42b22a6 100644
ReleaseMouse();
pFilterBox->MouseButtonDown( MouseEvent( aRelPos, 1, MOUSE_SIMPLECLICK, MOUSE_LEFT ) );
diff --git sc/source/ui/view/gridwin2.cxx sc/source/ui/view/gridwin2.cxx
-index 7c59936..f5386d2 100644
+index 7c59936..784d3d4 100644
--- sc/source/ui/view/gridwin2.cxx
+++ sc/source/ui/view/gridwin2.cxx
@@ -55,48 +55,124 @@
@@ -10236,7 +10252,7 @@ index 7c59936..f5386d2 100644
+ {
+ pSubMenu->addMenuItem(
+ aUserSortNames[i], true,
-+ new PopupSortAction(rPos, PopupSortAction::CUSTOM, i, pViewShell));
++ new PopupSortAction(rPos, PopupSortAction::CUSTOM, static_cast<sal_uInt16>(i), pViewShell));
+ }
+ }
+
@@ -10373,6 +10389,28 @@ index 76d6e02..1cd54a2 100644
}
}
}
+diff --git sc/source/ui/view/makefile.mk sc/source/ui/view/makefile.mk
+index 466ab5d..f6540ce 100644
+--- sc/source/ui/view/makefile.mk
++++ sc/source/ui/view/makefile.mk
+@@ -140,7 +140,6 @@ SLOFILES = \
+ $(SLO)$/dbfunc2.obj \
+ $(SLO)$/tabvwsh2.obj
+ .ELSE
+-
+ NOOPTFILES=\
+ $(SLO)$/drawview.obj \
+ $(SLO)$/dbfunc2.obj \
+@@ -157,7 +156,8 @@ EXCEPTIONSFILES= \
+ $(SLO)$/cellsh1.obj \
+ $(SLO)$/drawvie4.obj \
+ $(SLO)$/formatsh.obj \
+- $(SLO)$/scextopt.obj \
++ $(SLO)$/gridwin2.obj \
++ $(SLO)$/scextopt.obj \
+ $(SLO)$/tabvwshb.obj \
+ $(SLO)$/viewdata.obj \
+ $(SLO)$/viewfun5.obj \
diff --git sc/source/ui/view/tabview.cxx sc/source/ui/view/tabview.cxx
index 917d7ff..925a2b7 100644
--- sc/source/ui/view/tabview.cxx
@@ -10437,7 +10475,7 @@ index 917d7ff..925a2b7 100644
}
}
diff --git sc/util/makefile.mk sc/util/makefile.mk
-index 4fdc5ac..2b56e37 100644
+index c06071f..54656d6 100644
--- sc/util/makefile.mk
+++ sc/util/makefile.mk
@@ -58,6 +58,7 @@ RESLIB1LIST=\
diff --git a/patches/dev300/cws-koheidatapilot03-vcl.diff b/patches/dev300/cws-koheidatapilot03-vcl.diff
index 7e22555..685f0c0 100644
--- a/patches/dev300/cws-koheidatapilot03-vcl.diff
+++ b/patches/dev300/cws-koheidatapilot03-vcl.diff
@@ -55,7 +55,7 @@ index 0000000..ef31da0
+
+#endif
diff --git vcl/inc/vcl/vclevent.hxx vcl/inc/vcl/vclevent.hxx
-index 8d84666..59163ca 100644
+index 71b895f..b73a660 100644
--- vcl/inc/vcl/vclevent.hxx
+++ vcl/inc/vcl/vclevent.hxx
@@ -35,11 +35,19 @@
@@ -78,7 +78,7 @@ index 8d84666..59163ca 100644
#define VCLEVENT_OBJECT_DYING 1
// VclWindowEvent:
-@@ -239,6 +247,16 @@ public:
+@@ -240,6 +248,17 @@ public:
USHORT GetItemPos() const { return mnPos; }
};
@@ -86,6 +86,7 @@ index 8d84666..59163ca 100644
+{
+public:
+ VclAccessibleEvent( ULONG n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible );
++ virtual ~VclAccessibleEvent();
+ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const;
+
+private:
@@ -110,10 +111,10 @@ index b81aed8..0e25330 100644
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
};
diff --git vcl/inc/vcl/window.hxx vcl/inc/vcl/window.hxx
-index d927ab0..945f1c5 100644
+index 1917158..540906c 100644
--- vcl/inc/vcl/window.hxx
+++ vcl/inc/vcl/window.hxx
-@@ -582,7 +582,7 @@ protected:
+@@ -583,7 +583,7 @@ protected:
void ImplCallEventListeners( ULONG nEvent, void* pData = NULL );
void CallEventListeners( ULONG nEvent, void* pData = NULL );
@@ -122,7 +123,7 @@ index d927ab0..945f1c5 100644
// FIXME: this is a hack to workaround missing layout functionality
SAL_DLLPRIVATE void ImplAdjustNWFSizes();
-@@ -899,6 +899,13 @@ public:
+@@ -900,6 +900,13 @@ public:
USHORT GetGetFocusFlags() const;
void GrabFocusToDocument();
@@ -137,10 +138,10 @@ index d927ab0..945f1c5 100644
BOOL HasCompoundControlFocus() const;
diff --git vcl/prj/d.lst vcl/prj/d.lst
-index d9c14f4..7ac2c74 100644
+index 9836281..5a1bf2f 100644
--- vcl/prj/d.lst
+++ vcl/prj/d.lst
-@@ -84,6 +84,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl\plug\vcl
+@@ -82,6 +82,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl
..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
@@ -149,10 +150,10 @@ index d9c14f4..7ac2c74 100644
..\inc\vcl\prndlg.hxx %_DEST%\inc%_EXT%\vcl\prndlg.hxx
..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
diff --git vcl/source/app/vclevent.cxx vcl/source/app/vclevent.cxx
-index 75ef1ea..fef22ff 100644
+index 75ef1ea..abdb3ec 100644
--- vcl/source/app/vclevent.cxx
+++ vcl/source/app/vclevent.cxx
-@@ -34,10 +34,24 @@
+@@ -34,10 +34,30 @@
#include "vcl/vclevent.hxx"
#include "vcl/svdata.hxx"
@@ -167,7 +168,13 @@ index 75ef1ea..fef22ff 100644
+VclAccessibleEvent::VclAccessibleEvent( ULONG n, const Reference<XAccessible>& rxAccessible ) :
+ VclSimpleEvent(n),
-+ mxAccessible(rxAccessible) {}
++ mxAccessible(rxAccessible)
++{
++}
++
++VclAccessibleEvent::~VclAccessibleEvent()
++{
++}
+
+Reference<XAccessible> VclAccessibleEvent::GetAccessible() const
+{
@@ -178,7 +185,7 @@ index 75ef1ea..fef22ff 100644
{
// Copy the list, because this can be destroyed when calling a Link...
diff --git vcl/source/window/makefile.mk vcl/source/window/makefile.mk
-index 169cf44..d17ea6c 100644
+index cdd4aef..75e9107 100644
--- vcl/source/window/makefile.mk
+++ vcl/source/window/makefile.mk
@@ -69,6 +69,7 @@ SLOFILES= \
@@ -278,10 +285,10 @@ index 0000000..869f52b
+}
+
diff --git vcl/source/window/window.cxx vcl/source/window/window.cxx
-index 2b14764..4ff4999 100644
+index 3b18e4d..b9a81a3 100644
--- vcl/source/window/window.cxx
+++ vcl/source/window/window.cxx
-@@ -690,6 +690,7 @@ void Window::ImplInitWindowData( WindowType nType )
+@@ -698,6 +698,7 @@ void Window::ImplInitWindowData( WindowType nType )
mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled
mpWindowImpl->mbDisableAccessibleLabelForRelation = FALSE; // TRUE: do not set LabelFor relation on accessible objects
mpWindowImpl->mbDisableAccessibleLabeledByRelation = FALSE; // TRUE: do not set LabeledBy relation on accessible objects
@@ -289,7 +296,7 @@ index 2b14764..4ff4999 100644
mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
}
-@@ -3901,6 +3902,20 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
+@@ -3911,6 +3912,20 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
}
}
@@ -310,7 +317,7 @@ index 2b14764..4ff4999 100644
// -----------------------------------------------------------------------
void Window::ImplGrabFocus( USHORT nFlags )
{
-@@ -3972,9 +3987,7 @@ void Window::ImplGrabFocus( USHORT nFlags )
+@@ -3982,9 +3997,7 @@ void Window::ImplGrabFocus( USHORT nFlags )
pFrame = pFrame->mpWindowImpl->mpFrameData->mpNextFrame;
}
@@ -321,7 +328,7 @@ index 2b14764..4ff4999 100644
BOOL bMustNotGrabFocus = FALSE;
// #100242#, check parent hierarchy if some floater prohibits grab focus
-@@ -5367,6 +5380,11 @@ void Window::CallEventListeners( ULONG nEvent, void* pData )
+@@ -5377,6 +5390,11 @@ void Window::CallEventListeners( ULONG nEvent, void* pData )
}
}
@@ -333,7 +340,7 @@ index 2b14764..4ff4999 100644
// -----------------------------------------------------------------------
void Window::AddEventListener( const Link& rEventListener )
-@@ -7742,6 +7760,11 @@ void Window::GrabFocusToDocument()
+@@ -7752,6 +7770,11 @@ void Window::GrabFocusToDocument()
}
}
@@ -441,10 +448,10 @@ index e98a809..23ba24c 100644
else
{
diff --git vcl/unx/gtk/a11y/atkwrapper.cxx vcl/unx/gtk/a11y/atkwrapper.cxx
-index 599f283..ac508bd 100644
+index 67ec595..cec4a29 100644
--- vcl/unx/gtk/a11y/atkwrapper.cxx
+++ vcl/unx/gtk/a11y/atkwrapper.cxx
-@@ -514,6 +514,60 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
+@@ -515,6 +515,60 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
/*****************************************************************************/
More information about the ooo-build-commit
mailing list