ooo-build r15372 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15372 - in trunk: . patches/dev300
- Date: Wed, 18 Feb 2009 20:39:15 +0000 (UTC)
Author: kyoshida
Date: Wed Feb 18 20:39:14 2009
New Revision: 15372
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15372&view=rev
Log:
2009-02-18 Kohei Yoshida <kyoshida novell com>
* patches/dev300/calc-dp-custom-names-sc.diff:
* patches/dev300/sc-winbuild-tweak.diff:
* patches/dev300/sc-winbuild-tweak-m0.diff: combined the hunks for
dpsave.hxx.
Modified:
trunk/ChangeLog
trunk/patches/dev300/calc-dp-custom-names-sc.diff
trunk/patches/dev300/sc-winbuild-tweak-m0.diff
trunk/patches/dev300/sc-winbuild-tweak.diff
Modified: trunk/patches/dev300/calc-dp-custom-names-sc.diff
==============================================================================
--- trunk/patches/dev300/calc-dp-custom-names-sc.diff (original)
+++ trunk/patches/dev300/calc-dp-custom-names-sc.diff Wed Feb 18 20:39:14 2009
@@ -30,7 +30,7 @@
BOOL IsDuplicated( long nDim );
long GetDimCount();
diff --git sc/inc/dpsave.hxx sc/inc/dpsave.hxx
-index ead2c05..a6a5149 100644
+index ead2c05..dbc57f0 100644
--- sc/inc/dpsave.hxx
+++ sc/inc/dpsave.hxx
@@ -34,9 +34,11 @@
@@ -79,7 +79,22 @@
BOOL bIsDataLayout;
BOOL bDupFlag;
USHORT nOrientation;
-@@ -138,9 +146,14 @@ public:
+@@ -127,39 +135,44 @@ public:
+
+ void SetName( const String& rNew ); // used if the source dim was renamed (groups)
+
+- SC_DLLPUBLIC void SetOrientation(USHORT nNew);
++ void SetOrientation(USHORT nNew);
+ void SetSubTotals(BOOL bSet); // to be removed!
+- SC_DLLPUBLIC void SetSubTotals(long nCount, const USHORT* pFuncs);
++ void SetSubTotals(long nCount, const USHORT* pFuncs);
+ long GetSubTotalsCount() const { return nSubTotalCount; }
+ USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; }
+- SC_DLLPUBLIC void SetShowEmpty(BOOL bSet);
++ void SetShowEmpty(BOOL bSet);
+ BOOL GetShowEmpty() const { return BOOL(nShowEmptyMode); }
+- SC_DLLPUBLIC void SetFunction(USHORT nNew); // enum GeneralFunction
++ void SetFunction(USHORT nNew); // enum GeneralFunction
USHORT GetFunction() const { return nFunction; }
void SetUsedHierarchy(long nNew);
long GetUsedHierarchy() const { return nUsedHierarchy; }
@@ -87,16 +102,43 @@
- SC_DLLPUBLIC const String& GetLayoutName() const;
- SC_DLLPUBLIC BOOL HasLayoutName() const;
+
-+ SC_DLLPUBLIC void SetLayoutName(const ::rtl::OUString& rName);
-+ SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const;
-+ SC_DLLPUBLIC void RemoveLayoutName();
-+ SC_DLLPUBLIC void SetSubtotalName(const ::rtl::OUString& rName);
-+ SC_DLLPUBLIC const ::rtl::OUString* GetSubtotalName() const;
++ void SetLayoutName(const ::rtl::OUString& rName);
++ const ::rtl::OUString* GetLayoutName() const;
++ void RemoveLayoutName();
++ void SetSubtotalName(const ::rtl::OUString& rName);
++ const ::rtl::OUString* GetSubtotalName() const;
+
+ bool IsMemberNameInUse(const ::rtl::OUString& rName) const;
const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; }
- SC_DLLPUBLIC void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
+- SC_DLLPUBLIC void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
++ void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
+
+ const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const { return pSortInfo; }
+- SC_DLLPUBLIC void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
++ void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
+ const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* GetAutoShowInfo() const { return pAutoShowInfo; }
+- SC_DLLPUBLIC void SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
++ void SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
+ const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const { return pLayoutInfo; }
+- SC_DLLPUBLIC void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
++ void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
+
+- SC_DLLPUBLIC void SetCurrentPage( const String* pPage ); // NULL = no selection (all)
+- SC_DLLPUBLIC BOOL HasCurrentPage() const;
+- SC_DLLPUBLIC const String& GetCurrentPage() const;
++ void SetCurrentPage( const String* pPage ); // NULL = no selection (all)
++ BOOL HasCurrentPage() const;
++ const String& GetCurrentPage() const;
+
+ USHORT GetOrientation() const { return nOrientation; }
+
+ ScDPSaveMember* GetExistingMemberByName(const String& rName);
+- SC_DLLPUBLIC ScDPSaveMember* GetMemberByName(const String& rName);
++ ScDPSaveMember* GetMemberByName(const String& rName);
+
+ void SetMemberPosition( const String& rName, sal_Int32 nNewPos );
+
@@ -180,6 +193,8 @@ private:
BOOL bFilterButton; // not passed to DataPilotSource
BOOL bDrillDown; // not passed to DataPilotSource
@@ -161,7 +203,7 @@
diff --git sc/inc/dptabsrc.hxx sc/inc/dptabsrc.hxx
-index f7ae03b..5536264 100644
+index f7ae03b..f10ae2d 100644
--- sc/inc/dptabsrc.hxx
+++ sc/inc/dptabsrc.hxx
@@ -33,6 +33,7 @@
@@ -234,10 +276,10 @@
sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order
diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 504ff00..b9178c9 100644
+index 8635af1..a348e69 100644
--- sc/inc/unonames.hxx
+++ sc/inc/unonames.hxx
-@@ -559,6 +559,9 @@
+@@ -562,6 +562,9 @@
#define SC_UNO_ROWFIELDCOUNT "RowFieldCount"
#define SC_UNO_COLUMNFIELDCOUNT "ColumnFieldCount"
#define SC_UNO_DATAFIELDCOUNT "DataFieldCount"
@@ -975,7 +1017,7 @@
}
else if ( pMember->IsVisible() )
diff --git sc/source/core/data/dptabsrc.cxx sc/source/core/data/dptabsrc.cxx
-index 499309f..0affd2e 100644
+index 499309f..2c045d6 100644
--- sc/source/core/data/dptabsrc.cxx
+++ sc/source/core/data/dptabsrc.cxx
@@ -85,6 +85,7 @@ using ::com::sun::star::uno::Reference;
@@ -1054,7 +1096,7 @@
// empty for more than one measure
-@@ -1128,6 +1197,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
+@@ -1128,6 +1148,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
@@ -1062,7 +1104,7 @@
static SfxItemPropertyMap aDPSourceMap_Impl[] =
{
-@@ -1136,6 +1206,10 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
+@@ -1136,6 +1157,10 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
{MAP_CHAR_LEN(SC_UNO_IGNOREEM), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
{MAP_CHAR_LEN(SC_UNO_REPEATIF), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
{MAP_CHAR_LEN(SC_UNO_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 },
@@ -1073,7 +1115,7 @@
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -1157,6 +1231,12 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName,
+@@ -1157,6 +1182,12 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName,
setIgnoreEmptyRows( lcl_GetBoolFromAny( aValue ) );
else if ( aNameStr.EqualsAscii( SC_UNO_REPEATIF ) )
setRepeatIfEmpty( lcl_GetBoolFromAny( aValue ) );
@@ -1086,7 +1128,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -1186,6 +1266,11 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa
+@@ -1186,6 +1217,11 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa
aRet <<= static_cast<sal_Int32>(nColDimCount);
else if ( aNameStr.EqualsAscii( SC_UNO_DATAFIELDCOUNT ) ) // read-only
aRet <<= static_cast<sal_Int32>(nDataDimCount);
@@ -1098,7 +1140,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -1333,6 +1418,8 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
+@@ -1333,6 +1369,8 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
pHierarchies( NULL ),
nUsedHier( 0 ),
nFunction( SUBTOTAL_FUNC_SUM ), // sum is default
@@ -1107,7 +1149,7 @@
nSourceDim( -1 ),
bHasSelectedPage( FALSE ),
pSelectedData( NULL )
-@@ -1360,6 +1447,16 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
+@@ -1360,6 +1398,16 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
return pHierarchies;
}
@@ -1124,7 +1166,7 @@
uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
throw(uno::RuntimeException)
{
-@@ -1519,6 +1616,8 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
+@@ -1519,6 +1567,8 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
{MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_REFVALUE), 0, &getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_USEDHIER), 0, &getCppuType((sal_Int32*)0), 0, 0 },
@@ -1133,7 +1175,7 @@
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -1589,6 +1688,18 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
+@@ -1589,6 +1639,18 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
}
DELETEZ( pSelectedData ); // invalid after changing aSelectedPage
}
@@ -1152,7 +1194,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -1648,6 +1759,10 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
+@@ -1648,6 +1710,10 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
else
aRet <<= uno::Sequence<sheet::TableFilterField>(0);
}
@@ -1163,7 +1205,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -2148,7 +2263,11 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
+@@ -2148,7 +2214,11 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
return aRet;
}
@@ -1176,7 +1218,7 @@
}
void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
-@@ -2251,6 +2370,20 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
+@@ -2251,6 +2321,20 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
aRet <<= aAutoShowInfo;
else if ( aNameStr.EqualsAscii( SC_UNO_LAYOUT ) )
aRet <<= aLayoutInfo;
@@ -1197,7 +1239,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -2543,6 +2676,7 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
+@@ -2543,6 +2627,7 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
nHier( nH ),
nLev( nL ),
maData( rN, fV, bHV ),
@@ -1205,7 +1247,7 @@
nPosition( -1 ),
bVisible( TRUE ),
bShowDet( TRUE )
-@@ -2603,6 +2737,11 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
+@@ -2603,6 +2688,11 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
rData = maData;
}
@@ -1217,7 +1259,7 @@
String ScDPMember::GetNameStr() const
{
return maData.aString;
-@@ -2662,6 +2801,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
+@@ -2662,6 +2752,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
{MAP_CHAR_LEN(SC_UNO_ISVISIBL), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_SHOWDETA), 0, &getBooleanCppuType(), 0, 0 },
@@ -1225,7 +1267,7 @@
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -2685,6 +2825,12 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
+@@ -2685,6 +2776,12 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
if (aValue >>= nInt)
setPosition( nInt );
}
@@ -1238,7 +1280,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -2704,6 +2850,8 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa
+@@ -2704,6 +2801,8 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa
lcl_SetBoolInAny( aRet, getShowDetails() );
else if ( aNameStr.EqualsAscii( SC_UNO_POSITION ) )
aRet <<= (sal_Int32) getPosition();
@@ -1248,10 +1290,10 @@
{
DBG_ERROR("unknown property");
diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index 0d0088f..e0a8b5d 100644
+index 6b486ca..aa2b377 100644
--- sc/source/filter/excel/read.cxx
+++ sc/source/filter/excel/read.cxx
-@@ -1190,6 +1190,9 @@ FltError ImportExcel8::Read( void )
+@@ -1199,6 +1199,9 @@ FltError ImportExcel8::Read( void )
eLastErr = SCWARN_IMPORT_ROW_OVERFLOW;
else if( rAddrConv.IsColTruncated() )
eLastErr = SCWARN_IMPORT_COLUMN_OVERFLOW;
@@ -1454,10 +1496,10 @@
}
}
diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx
-index eb36b4a..c210911 100644
+index e65c6bc..afcd334 100644
--- sc/source/filter/excel/xestring.cxx
+++ sc/source/filter/excel/xestring.cxx
-@@ -423,7 +423,8 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
+@@ -489,7 +489,8 @@ void XclExpString::WritePhoneticSettings( XclExpStream& rStrm ) const
void XclExpString::Write( XclExpStream& rStrm ) const
{
@@ -1467,7 +1509,7 @@
WriteBuffer( rStrm );
if( IsWriteFormats() ) // only in BIFF8 included in string
WriteFormats( rStrm );
-@@ -589,6 +590,7 @@ void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMax
+@@ -662,6 +663,7 @@ void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMax
mbSmartFlags = bBiff8 && ::get_flag( nFlags, EXC_STR_SMARTFLAGS );
mbSkipFormats = ::get_flag( nFlags, EXC_STR_SEPARATEFORMATS );
mbWrapped = false;
@@ -1871,10 +1913,10 @@
ScfUInt16Vec maRowFields; /// Row field indexes.
ScfUInt16Vec maColFields; /// Column field indexes.
diff --git sc/source/filter/inc/xestring.hxx sc/source/filter/inc/xestring.hxx
-index f023a12..706b12c 100644
+index a7443cb..8851736 100644
--- sc/source/filter/inc/xestring.hxx
+++ sc/source/filter/inc/xestring.hxx
-@@ -323,6 +323,7 @@ private:
+@@ -341,6 +341,7 @@ private:
bool mbSmartFlags; /// true = omit flags on empty string; false = always write flags.
bool mbSkipFormats; /// true = skip formats on export; false = write complete formatted string.
bool mbWrapped; /// true = text contains several paragraphs.
@@ -1979,7 +2021,7 @@
// ============================================================================
#endif
diff --git sc/source/filter/inc/xlstring.hxx sc/source/filter/inc/xlstring.hxx
-index 626b11b..0a078a4 100644
+index 0b30049..89f8275 100644
--- sc/source/filter/inc/xlstring.hxx
+++ sc/source/filter/inc/xlstring.hxx
@@ -43,6 +43,7 @@ const XclStrFlags EXC_STR_FORCEUNICODE = 0x0001; /// Always use UCS-2 cha
@@ -2039,7 +2081,7 @@
IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox )
diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
-index 2cb2e8b..466967e 100644
+index 09f2156..155f3e0 100644
--- sc/source/ui/dbgui/pvlaydlg.cxx
+++ sc/source/ui/dbgui/pvlaydlg.cxx
@@ -63,6 +63,7 @@
@@ -2050,7 +2092,7 @@
//----------------------------------------------------------------------------
-@@ -1494,6 +1495,8 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
+@@ -1484,6 +1485,8 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
nPageCount, nColCount, nRowCount, nDataCount );
if ( bFit )
{
@@ -2059,7 +2101,7 @@
ScRange aOutRange( aAdrDest ); // bToNewTable is passed separately
ScDPSaveData aSaveData;
-@@ -1525,6 +1528,22 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
+@@ -1515,6 +1518,22 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
pDim->SetSortInfo( &aIt->maSortInfo );
pDim->SetLayoutInfo( &aIt->maLayoutInfo );
pDim->SetAutoShowInfo( &aIt->maShowInfo );
@@ -2082,7 +2124,7 @@
bool bManualSort = ( aIt->maSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL );
-@@ -1545,11 +1564,33 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
+@@ -1535,11 +1554,33 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
ScDPSaveMember* pMember = pDim->GetMemberByName( *pItem );
pMember->SetIsVisible( bIsVisible );
pMember->SetShowDetails( bShowDetails );
Modified: trunk/patches/dev300/sc-winbuild-tweak-m0.diff
==============================================================================
--- trunk/patches/dev300/sc-winbuild-tweak-m0.diff (original)
+++ trunk/patches/dev300/sc-winbuild-tweak-m0.diff Wed Feb 18 20:39:14 2009
@@ -133,71 +133,6 @@
Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText, ScPasswordHash eHash)
{
Sequence<sal_Int8> aHash;
-diff -upr /cygdrive/g/ooo-build/build/dev300-m40/sc/inc/dpsave.hxx sc/inc/dpsave.hxx
---- /cygdrive/g/ooo-build/build/dev300-m40/sc/inc/dpsave.hxx 2009-02-14 07:58:14.496000000 +0000
-+++ sc/inc/dpsave.hxx 2009-02-13 16:46:54.746280000 +0000
-@@ -135,44 +135,44 @@ public:
-
- void SetName( const String& rNew ); // used if the source dim was renamed (groups)
-
-- SC_DLLPUBLIC void SetOrientation(USHORT nNew);
-+ void SetOrientation(USHORT nNew);
- void SetSubTotals(BOOL bSet); // to be removed!
-- SC_DLLPUBLIC void SetSubTotals(long nCount, const USHORT* pFuncs);
-+ void SetSubTotals(long nCount, const USHORT* pFuncs);
- long GetSubTotalsCount() const { return nSubTotalCount; }
- USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; }
-- SC_DLLPUBLIC void SetShowEmpty(BOOL bSet);
-+ void SetShowEmpty(BOOL bSet);
- BOOL GetShowEmpty() const { return BOOL(nShowEmptyMode); }
-- SC_DLLPUBLIC void SetFunction(USHORT nNew); // enum GeneralFunction
-+ void SetFunction(USHORT nNew); // enum GeneralFunction
- USHORT GetFunction() const { return nFunction; }
- void SetUsedHierarchy(long nNew);
- long GetUsedHierarchy() const { return nUsedHierarchy; }
-
-- SC_DLLPUBLIC void SetLayoutName(const ::rtl::OUString& rName);
-- SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const;
-- SC_DLLPUBLIC void RemoveLayoutName();
-- SC_DLLPUBLIC void SetSubtotalName(const ::rtl::OUString& rName);
-- SC_DLLPUBLIC const ::rtl::OUString* GetSubtotalName() const;
-+ void SetLayoutName(const ::rtl::OUString& rName);
-+ const ::rtl::OUString* GetLayoutName() const;
-+ void RemoveLayoutName();
-+ void SetSubtotalName(const ::rtl::OUString& rName);
-+ const ::rtl::OUString* GetSubtotalName() const;
-
- bool IsMemberNameInUse(const ::rtl::OUString& rName) const;
-
- const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; }
-- SC_DLLPUBLIC void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
-+ void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
-
- const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const { return pSortInfo; }
-- SC_DLLPUBLIC void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
-+ void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
- const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* GetAutoShowInfo() const { return pAutoShowInfo; }
-- SC_DLLPUBLIC void SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
-+ void SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
- const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const { return pLayoutInfo; }
-- SC_DLLPUBLIC void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
-+ void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
-
-- SC_DLLPUBLIC void SetCurrentPage( const String* pPage ); // NULL = no selection (all)
-- SC_DLLPUBLIC BOOL HasCurrentPage() const;
-- SC_DLLPUBLIC const String& GetCurrentPage() const;
-+ void SetCurrentPage( const String* pPage ); // NULL = no selection (all)
-+ BOOL HasCurrentPage() const;
-+ const String& GetCurrentPage() const;
-
- USHORT GetOrientation() const { return nOrientation; }
-
- ScDPSaveMember* GetExistingMemberByName(const String& rName);
-- SC_DLLPUBLIC ScDPSaveMember* GetMemberByName(const String& rName);
-+ ScDPSaveMember* GetMemberByName(const String& rName);
-
- void SetMemberPosition( const String& rName, sal_Int32 nNewPos );
-
--- /cygdrive/g/ooo-build/build/dev300-m40/sc/inc/olinetab.hxx 2009-02-14 07:55:20.558500000 +0000
+++ sc/inc/olinetab.hxx 2009-02-13 16:40:08.386905000 +0000
@@ -111,7 +111,7 @@ public:
Modified: trunk/patches/dev300/sc-winbuild-tweak.diff
==============================================================================
--- trunk/patches/dev300/sc-winbuild-tweak.diff (original)
+++ trunk/patches/dev300/sc-winbuild-tweak.diff Wed Feb 18 20:39:14 2009
@@ -133,68 +133,3 @@
Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText, ScPasswordHash eHash)
{
Sequence<sal_Int8> aHash;
-diff -upr /cygdrive/g/ooo-build/build/dev300-m40/sc/inc/dpsave.hxx sc/inc/dpsave.hxx
---- /cygdrive/g/ooo-build/build/dev300-m40/sc/inc/dpsave.hxx 2009-02-14 07:58:14.496000000 +0000
-+++ sc/inc/dpsave.hxx 2009-02-13 16:46:54.746280000 +0000
-@@ -135,44 +135,44 @@ public:
-
- void SetName( const String& rNew ); // used if the source dim was renamed (groups)
-
-- SC_DLLPUBLIC void SetOrientation(USHORT nNew);
-+ void SetOrientation(USHORT nNew);
- void SetSubTotals(BOOL bSet); // to be removed!
-- SC_DLLPUBLIC void SetSubTotals(long nCount, const USHORT* pFuncs);
-+ void SetSubTotals(long nCount, const USHORT* pFuncs);
- long GetSubTotalsCount() const { return nSubTotalCount; }
- USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; }
-- SC_DLLPUBLIC void SetShowEmpty(BOOL bSet);
-+ void SetShowEmpty(BOOL bSet);
- BOOL GetShowEmpty() const { return BOOL(nShowEmptyMode); }
-- SC_DLLPUBLIC void SetFunction(USHORT nNew); // enum GeneralFunction
-+ void SetFunction(USHORT nNew); // enum GeneralFunction
- USHORT GetFunction() const { return nFunction; }
- void SetUsedHierarchy(long nNew);
- long GetUsedHierarchy() const { return nUsedHierarchy; }
-
-- SC_DLLPUBLIC void SetLayoutName(const ::rtl::OUString& rName);
-- SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const;
-- SC_DLLPUBLIC void RemoveLayoutName();
-- SC_DLLPUBLIC void SetSubtotalName(const ::rtl::OUString& rName);
-- SC_DLLPUBLIC const ::rtl::OUString* GetSubtotalName() const;
-+ void SetLayoutName(const ::rtl::OUString& rName);
-+ const ::rtl::OUString* GetLayoutName() const;
-+ void RemoveLayoutName();
-+ void SetSubtotalName(const ::rtl::OUString& rName);
-+ const ::rtl::OUString* GetSubtotalName() const;
-
- bool IsMemberNameInUse(const ::rtl::OUString& rName) const;
-
- const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; }
-- SC_DLLPUBLIC void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
-+ void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
-
- const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const { return pSortInfo; }
-- SC_DLLPUBLIC void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
-+ void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew);
- const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* GetAutoShowInfo() const { return pAutoShowInfo; }
-- SC_DLLPUBLIC void SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
-+ void SetAutoShowInfo(const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pNew);
- const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const { return pLayoutInfo; }
-- SC_DLLPUBLIC void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
-+ void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
-
-- SC_DLLPUBLIC void SetCurrentPage( const String* pPage ); // NULL = no selection (all)
-- SC_DLLPUBLIC BOOL HasCurrentPage() const;
-- SC_DLLPUBLIC const String& GetCurrentPage() const;
-+ void SetCurrentPage( const String* pPage ); // NULL = no selection (all)
-+ BOOL HasCurrentPage() const;
-+ const String& GetCurrentPage() const;
-
- USHORT GetOrientation() const { return nOrientation; }
-
- ScDPSaveMember* GetExistingMemberByName(const String& rName);
-- SC_DLLPUBLIC ScDPSaveMember* GetMemberByName(const String& rName);
-+ ScDPSaveMember* GetMemberByName(const String& rName);
-
- void SetMemberPosition( const String& rName, sal_Int32 nNewPos );
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
