ooo-build r15182 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15182 - in trunk: . patches/dev300
- Date: Tue, 27 Jan 2009 22:49:01 +0000 (UTC)
Author: kyoshida
Date: Tue Jan 27 22:49:01 2009
New Revision: 15182
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15182&view=rev
Log:
2009-01-27 Kohei Yoshida <kyoshida novell com>
* patches/dev300/calc-dp-custom-names-sc-m39.diff:
* patches/dev300/calc-dp-custom-names-sc.diff:
* patches/dev300/apply: adjusted for dev300-m40.
Added:
trunk/patches/dev300/calc-dp-custom-names-sc-m39.diff
- copied unchanged from r15169, /trunk/patches/dev300/calc-dp-custom-names-sc.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/calc-dp-custom-names-sc.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Tue Jan 27 22:49:01 2009
@@ -1094,9 +1094,14 @@
[ CalcFixes > dev300-m36 ]
# support custom names in data pilot tables.
-calc-dp-custom-names-sc.diff, n#338014, i#22029, kohei
calc-dp-custom-names-offapi.diff, n#338014, i#22029, kohei
+[ CalcFixes > dev300-m36 <= dev300-m39 ]
+calc-dp-custom-names-sc-m39.diff, n#338014, i#22029, kohei
+
+[ CalcFixes > dev300-m39 ]
+calc-dp-custom-names-sc.diff, n#338014, i#22029, kohei
+
[ CalcFixes < dev300-m40 ]
# fix 'Identify Categories' greakage on grouping.
calc-dp-group-ident-category-fix.diff, n#447182, i#96171, kohei
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 Tue Jan 27 22:49:01 2009
@@ -1,5 +1,5 @@
diff --git sc/inc/dpobject.hxx sc/inc/dpobject.hxx
-index b006185..58162b1 100644
+index 2eff673..99df24f 100644
--- sc/inc/dpobject.hxx
+++ sc/inc/dpobject.hxx
@@ -38,6 +38,8 @@
@@ -11,7 +11,7 @@
//------------------------------------------------------------------
namespace com { namespace sun { namespace star { namespace sheet {
-@@ -169,7 +171,16 @@ public:
+@@ -167,7 +169,16 @@ public:
void SetTag(const String& rNew);
const String& GetTag() const { return aTableTag; }
@@ -30,7 +30,7 @@
BOOL IsDuplicated( long nDim );
long GetDimCount();
diff --git sc/inc/dpsave.hxx sc/inc/dpsave.hxx
-index ca61f04..ebcca70 100644
+index ead2c05..a6a5149 100644
--- sc/inc/dpsave.hxx
+++ sc/inc/dpsave.hxx
@@ -34,9 +34,11 @@
@@ -45,7 +45,7 @@
namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldReference;
-@@ -58,6 +60,7 @@ class ScDPSaveMember
+@@ -57,6 +59,7 @@ class ScDPSaveMember
{
private:
String aName;
@@ -53,7 +53,7 @@
USHORT nVisibleMode;
USHORT nShowDetailsMode;
-@@ -79,6 +82,10 @@ public:
+@@ -77,18 +80,23 @@ public:
void SetName( const String& rNew ); // used if the source member was renamed (groups)
@@ -64,7 +64,6 @@
void WriteToSource( const com::sun::star::uno::Reference<
com::sun::star::uno::XInterface>& xMember,
sal_Int32 nPosition );
-@@ -87,12 +94,13 @@ public:
};
@@ -80,34 +79,34 @@
BOOL bIsDataLayout;
BOOL bDupFlag;
USHORT nOrientation;
-@@ -143,9 +153,14 @@ public:
+@@ -138,9 +146,14 @@ public:
USHORT GetFunction() const { return nFunction; }
void SetUsedHierarchy(long nNew);
long GetUsedHierarchy() const { return nUsedHierarchy; }
-- void SetLayoutName(const String* pName);
-- const String& GetLayoutName() const;
-- BOOL HasLayoutName() 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;
+- SC_DLLPUBLIC void SetLayoutName(const String* pName);
+- 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;
+
+ bool IsMemberNameInUse(const ::rtl::OUString& rName) const;
const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; }
- void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
-@@ -187,6 +202,8 @@ private:
+ SC_DLLPUBLIC void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
+@@ -180,6 +193,8 @@ private:
BOOL bFilterButton; // not passed to DataPilotSource
BOOL bDrillDown; // not passed to DataPilotSource
+ ::std::auto_ptr<rtl::OUString> mpGrandTotalName;
+
public:
- ScDPSaveData();
+ SC_DLLPUBLIC ScDPSaveData();
ScDPSaveData(const ScDPSaveData& r);
-@@ -196,11 +213,15 @@ public:
+@@ -189,11 +204,15 @@ public:
BOOL operator== ( const ScDPSaveData& r ) const;
@@ -115,16 +114,15 @@
+ const ::rtl::OUString* GetGrandTotalName() const;
+
const List& GetDimensions() const { return aDimList; }
-- void AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); }
-+ void AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); }
+ void AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); }
ScDPSaveDimension* GetDimensionByName(const String& rName);
- ScDPSaveDimension* GetDataLayoutDimension();
+ SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension();
+ ScDPSaveDimension* GetExistingDataLayoutDimension() const;
ScDPSaveDimension* DuplicateDimension(const String& rName);
- ScDPSaveDimension& DuplicateDimension(const ScDPSaveDimension& rDim);
-@@ -211,6 +232,7 @@ public:
+ SC_DLLPUBLIC ScDPSaveDimension& DuplicateDimension(const ScDPSaveDimension& rDim);
+@@ -204,6 +223,7 @@ public:
void RemoveDimensionByName(const String& rName);
ScDPSaveDimension* GetInnermostDimension(USHORT nOrientation);
@@ -163,7 +161,7 @@
diff --git sc/inc/dptabsrc.hxx sc/inc/dptabsrc.hxx
-index 1afed45..9f696da 100644
+index f7ae03b..5536264 100644
--- sc/inc/dptabsrc.hxx
+++ sc/inc/dptabsrc.hxx
@@ -33,6 +33,7 @@
@@ -174,20 +172,7 @@
#include <tools/string.hxx>
#include <tools/list.hxx>
#include "global.hxx" // enum ScSubTotalFunc
-@@ -108,11 +109,8 @@ class ScDPSource : public cppu::WeakImplHelper6<
- com::sun::star::lang::XServiceInfo >
- {
- private:
-- void FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool &bHasAutoShow);
--
--private:
- ScDPTableData* pData; // data source
-- ScDPDimensions* pDimensions; // api objects
-+ ScDPDimensions* pDimensions; // api objects
- // settings:
- long nColDims[SC_DAPI_MAXFIELDS];
- long nRowDims[SC_DAPI_MAXFIELDS];
-@@ -139,9 +137,18 @@ private:
+@@ -136,6 +137,8 @@ private:
List aRowLevelList;
BOOL bResultOverflow;
@@ -196,17 +181,7 @@
void CreateRes_Impl();
void FillMemberResults();
void FillLevelList( USHORT nOrientation, List& rList );
-+ void FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool &bHasAutoShow);
-+
-+ /**
-+ * Set visibilities of individual rows in the cache table based on the
-+ * page field data.
-+ */
-+ void FilterCacheTableByPageDimensions();
-
- void SetDupCount( long nNew );
-
-@@ -152,11 +159,15 @@ public:
+@@ -162,11 +165,15 @@ public:
ScDPTableData* GetData() { return pData; }
const ScDPTableData* GetData() const { return pData; }
@@ -222,7 +197,7 @@
String GetDataDimName(long nIndex);
BOOL IsDataLayoutDimension(long nDim);
USHORT GetDataLayoutOrientation();
-@@ -323,6 +334,8 @@ private:
+@@ -333,6 +340,8 @@ private:
long nUsedHier;
USHORT nFunction; // enum GeneralFunction
String aName; // if empty, take from source
@@ -231,7 +206,7 @@
long nSourceDim; // >=0 if dup'ed
::com::sun::star::sheet::DataPilotFieldReference
aReferenceValue; // settings for "show data as" / "displayed value"
-@@ -340,6 +353,9 @@ public:
+@@ -350,6 +359,9 @@ public:
ScDPDimension* CreateCloneObject();
ScDPHierarchies* GetHierarchiesObject();
@@ -241,7 +216,7 @@
// XNamed
virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setName( const ::rtl::OUString& aName )
-@@ -726,7 +742,7 @@ private:
+@@ -736,7 +748,7 @@ private:
long nLev;
ScDPItemData maData;
@@ -250,7 +225,7 @@
sal_Int32 nPosition; // manual sorting
BOOL bVisible;
-@@ -740,6 +756,7 @@ public:
+@@ -750,6 +762,7 @@ public:
BOOL IsNamedItem( const ScDPItemData& r ) const;
String GetNameStr() const;
void FillItemData( ScDPItemData& rData ) const;
@@ -259,10 +234,10 @@
sal_Int32 Compare( const ScDPMember& rOther ) const; // visible order
diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 0dbbfe3..eb1a777 100644
+index 504ff00..b9178c9 100644
--- sc/inc/unonames.hxx
+++ sc/inc/unonames.hxx
-@@ -558,6 +558,9 @@
+@@ -559,6 +559,9 @@
#define SC_UNO_ROWFIELDCOUNT "RowFieldCount"
#define SC_UNO_COLUMNFIELDCOUNT "ColumnFieldCount"
#define SC_UNO_DATAFIELDCOUNT "DataFieldCount"
@@ -273,18 +248,10 @@
// (preliminary:)
#define SC_UNO_REFVALUE "ReferenceValue"
diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
-index dc256de..c0ff01a 100644
+index d7c9a6c..fbf9c78 100644
--- sc/source/core/data/dpobject.cxx
+++ sc/source/core/data/dpobject.cxx
-@@ -83,6 +83,7 @@ using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::sheet::DataPilotTableHeaderData;
- using ::com::sun::star::sheet::DataPilotTablePositionData;
-+using ::rtl::OUString;
-
- // -----------------------------------------------------------------------
-
-@@ -339,6 +340,31 @@ void ScDPObject::SetTag(const String& rNew)
+@@ -342,6 +342,31 @@ void ScDPObject::SetTag(const String& rNew)
aTableTag = rNew;
}
@@ -316,7 +283,7 @@
uno::Reference<sheet::XDimensionsSupplier> ScDPObject::GetSource()
{
CreateObjects();
-@@ -429,7 +455,8 @@ void ScDPObject::CreateObjects()
+@@ -432,7 +457,8 @@ void ScDPObject::CreateObjects()
pData = pGroupData;
}
@@ -326,7 +293,7 @@
}
if (pSaveData)
-@@ -673,23 +700,33 @@ void ScDPObject::GetDrillDownData(const ScAddress& rPos, Sequence< Sequence<Any>
+@@ -676,23 +702,33 @@ void ScDPObject::GetDrillDownData(const ScAddress& rPos, Sequence< Sequence<Any>
rTableData = xDrillDownData->getDrillDownData(filters);
}
@@ -377,7 +344,7 @@
String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout )
diff --git sc/source/core/data/dpoutput.cxx sc/source/core/data/dpoutput.cxx
-index d9b1df3..888af7f 100644
+index a411c80..de9c898 100644
--- sc/source/core/data/dpoutput.cxx
+++ sc/source/core/data/dpoutput.cxx
@@ -81,6 +81,7 @@
@@ -510,20 +477,11 @@
}
bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivotDataField& rFilter )
-@@ -1761,7 +1784,7 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient )
-
- // test for row header
-
-- if ( nRow+1 == nDataStartRow && nCol >= nTabStartCol == nCol < nTabStartCol + nRowFieldCount )
-+ if ( nRow+1 == nDataStartRow && nCol >= nTabStartCol && nCol < nTabStartCol + nRowFieldCount )
- {
- rOrient = sheet::DataPilotFieldOrientation_ROW;
- long nField = nCol - nTabStartCol;
diff --git sc/source/core/data/dpsave.cxx sc/source/core/data/dpsave.cxx
-index 621573f..9c69fb5 100644
+index 130e7a8..3072232 100644
--- sc/source/core/data/dpsave.cxx
+++ sc/source/core/data/dpsave.cxx
-@@ -60,6 +60,7 @@
+@@ -59,6 +59,7 @@
#include <com/sun/star/util/XCloneable.hpp>
using namespace com::sun::star;
@@ -531,7 +489,7 @@
// -----------------------------------------------------------------------
-@@ -114,6 +115,7 @@ void lcl_SkipExtra( SvStream& rStream )
+@@ -113,6 +114,7 @@ void lcl_SkipExtra( SvStream& rStream )
ScDPSaveMember::ScDPSaveMember(const String& rName) :
aName( rName ),
@@ -539,7 +497,7 @@
nVisibleMode( SC_DPSAVEMODE_DONTKNOW ),
nShowDetailsMode( SC_DPSAVEMODE_DONTKNOW )
{
-@@ -121,9 +123,12 @@ ScDPSaveMember::ScDPSaveMember(const String& rName) :
+@@ -120,9 +122,12 @@ ScDPSaveMember::ScDPSaveMember(const String& rName) :
ScDPSaveMember::ScDPSaveMember(const ScDPSaveMember& r) :
aName( r.aName ),
@@ -551,8 +509,8 @@
+ mpLayoutName.reset(new OUString(*r.mpLayoutName));
}
- ScDPSaveMember::ScDPSaveMember(SvStream& rStream)
-@@ -186,6 +191,21 @@ void ScDPSaveMember::SetName( const String& rNew )
+ ScDPSaveMember::~ScDPSaveMember()
+@@ -167,6 +172,21 @@ void ScDPSaveMember::SetName( const String& rNew )
aName = rNew;
}
@@ -574,7 +532,7 @@
void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
{
// nothing to do?
-@@ -206,6 +226,18 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
+@@ -187,6 +207,18 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
lcl_SetBoolProperty( xMembProp,
rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (BOOL)nShowDetailsMode );
@@ -593,7 +551,7 @@
if ( nPosition >= 0 )
{
try
-@@ -224,8 +256,9 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
+@@ -205,8 +237,9 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
aName( rName ),
@@ -604,7 +562,7 @@
bIsDataLayout( bDataLayout ),
bDupFlag( FALSE ),
nOrientation( sheet::DataPilotFieldOrientation_HIDDEN ),
-@@ -244,6 +277,8 @@ ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
+@@ -225,6 +258,8 @@ ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
aName( r.aName ),
@@ -613,7 +571,7 @@
bIsDataLayout( r.bIsDataLayout ),
bDupFlag( r.bDupFlag ),
nOrientation( r.nOrientation ),
-@@ -284,14 +319,14 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
+@@ -265,14 +300,14 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
pLayoutInfo = new sheet::DataPilotFieldLayoutInfo( *(r.pLayoutInfo) );
else
pLayoutInfo = NULL;
@@ -631,8 +589,8 @@
+ mpSubtotalName.reset(new OUString(*r.mpSubtotalName));
}
- ScDPSaveDimension::ScDPSaveDimension(SvStream& rStream)
-@@ -376,7 +410,6 @@ ScDPSaveDimension::~ScDPSaveDimension()
+ ScDPSaveDimension::~ScDPSaveDimension()
+@@ -283,7 +318,6 @@ ScDPSaveDimension::~ScDPSaveDimension()
delete pSortInfo;
delete pAutoShowInfo;
delete pLayoutInfo;
@@ -640,7 +598,7 @@
delete pSelectedPage;
delete [] pSubTotalFuncs;
}
-@@ -488,25 +521,45 @@ void ScDPSaveDimension::SetUsedHierarchy(long nNew)
+@@ -395,25 +429,45 @@ void ScDPSaveDimension::SetUsedHierarchy(long nNew)
nUsedHierarchy = nNew;
}
@@ -698,7 +656,7 @@
}
void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference* pNew)
-@@ -642,6 +695,19 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
+@@ -549,6 +603,19 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
{
aAny <<= aFilter;
xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_FILTER), aAny );
@@ -718,7 +676,7 @@
}
catch ( beans::UnknownPropertyException& )
{
-@@ -784,7 +850,8 @@ ScDPSaveData::ScDPSaveData() :
+@@ -691,7 +758,8 @@ ScDPSaveData::ScDPSaveData() :
nIgnoreEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
nRepeatEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
bFilterButton( TRUE ),
@@ -728,7 +686,7 @@
{
}
-@@ -794,7 +861,8 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
+@@ -701,7 +769,8 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
nIgnoreEmptyMode( r.nIgnoreEmptyMode ),
nRepeatEmptyMode( r.nRepeatEmptyMode ),
bFilterButton( r.bFilterButton ),
@@ -738,7 +696,7 @@
{
if ( r.pDimensionData )
pDimensionData = new ScDPDimensionSaveData( *r.pDimensionData );
-@@ -807,6 +875,9 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
+@@ -714,6 +783,9 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
ScDPSaveDimension* pNew = new ScDPSaveDimension( *(ScDPSaveDimension*)r.aDimList.GetObject(i) );
aDimList.Insert( pNew, LIST_APPEND );
}
@@ -748,7 +706,7 @@
}
ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
-@@ -843,6 +914,9 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
+@@ -750,6 +822,9 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
new ScDPSaveDimension( *(ScDPSaveDimension*)r.aDimList.GetObject(i) );
aDimList.Insert( pNew, LIST_APPEND );
}
@@ -758,7 +716,7 @@
}
return *this;
}
-@@ -870,6 +944,16 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
+@@ -777,6 +852,16 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
*(ScDPSaveDimension*)r.aDimList.GetObject(i) ) )
return FALSE;
@@ -775,7 +733,7 @@
return TRUE;
}
-@@ -883,6 +967,16 @@ ScDPSaveData::~ScDPSaveData()
+@@ -790,6 +875,16 @@ ScDPSaveData::~ScDPSaveData()
delete pDimensionData;
}
@@ -792,7 +750,7 @@
ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const String& rName)
{
long nCount = aDimList.Count();
-@@ -925,6 +1019,17 @@ ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const String& rName)
+@@ -832,6 +927,17 @@ ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const String& rName)
ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
{
@@ -810,7 +768,7 @@
long nCount = aDimList.Count();
for (long i=0; i<nCount; i++)
{
-@@ -932,9 +1037,7 @@ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
+@@ -839,9 +945,7 @@ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
if ( pDim->IsDataLayout() )
return pDim;
}
@@ -821,7 +779,7 @@
}
ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const String& rName)
-@@ -988,6 +1091,18 @@ ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(USHORT nOrientation)
+@@ -895,6 +999,18 @@ ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(USHORT nOrientation)
return pInner; // the last matching one
}
@@ -840,7 +798,7 @@
long ScDPSaveData::GetDataDimensionCount() const
{
long nDataCount = 0;
-@@ -1095,6 +1210,14 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
+@@ -1002,6 +1118,14 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
lcl_SetBoolProperty( xSourceProp,
rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY), (BOOL)nRepeatEmptyMode );
@@ -1017,10 +975,10 @@
}
else if ( pMember->IsVisible() )
diff --git sc/source/core/data/dptabsrc.cxx sc/source/core/data/dptabsrc.cxx
-index 8cc8f03..fc5b220 100644
+index 499309f..0affd2e 100644
--- sc/source/core/data/dptabsrc.cxx
+++ sc/source/core/data/dptabsrc.cxx
-@@ -83,6 +83,7 @@ using ::com::sun::star::uno::Reference;
+@@ -85,6 +85,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
@@ -1028,7 +986,7 @@
// -----------------------------------------------------------------------
-@@ -139,7 +140,8 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) :
+@@ -141,7 +142,8 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) :
pRowResRoot( NULL ),
pColResults( NULL ),
pRowResults( NULL ),
@@ -1038,7 +996,7 @@
{
pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
}
-@@ -161,6 +163,16 @@ ScDPSource::~ScDPSource()
+@@ -163,6 +165,16 @@ ScDPSource::~ScDPSource()
delete pResData;
}
@@ -1055,7 +1013,7 @@
USHORT ScDPSource::GetOrientation(long nColumn)
{
long i;
-@@ -184,16 +196,21 @@ long ScDPSource::GetDataDimensionCount()
+@@ -186,16 +198,21 @@ long ScDPSource::GetDataDimensionCount()
return nDataDimCount;
}
@@ -1084,7 +1042,7 @@
return aRet;
}
-@@ -480,7 +497,10 @@ String ScDPSource::getDataDescription()
+@@ -484,7 +501,10 @@ String ScDPSource::getDataDescription()
String aRet;
if ( pResData->GetMeasureCount() == 1 )
@@ -1096,7 +1054,7 @@
// empty for more than one measure
-@@ -685,6 +705,55 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool
+@@ -769,6 +789,55 @@ void ScDPSource::FilterCacheTableByPageDimensions()
}
}
@@ -1152,38 +1110,7 @@
void ScDPSource::CreateRes_Impl()
{
if ( !pResData )
-@@ -850,29 +919,8 @@ void ScDPSource::CreateRes_Impl()
- }
- else
- {
-- {
-- ScSimpleSharedString& rSharedString = GetData()->GetSharedString();
-+ FilterCacheTableByPageDimensions();
-
-- // filter table by page dimensions.
-- vector<ScDPCacheTable::Criterion> aCriteria;
-- for (i = 0; i < nPageDimCount; ++i)
-- {
-- ScDPDimension* pDim = GetDimensionsObject()->getByIndex(nPageDims[i]);
-- if (!pDim || !pDim->HasSelectedPage())
-- continue;
--
-- long nField = pDim->GetDimension();
-- const ScDPItemData& rData = pDim->GetSelectedData();
-- aCriteria.push_back(ScDPCacheTable::Criterion());
-- ScDPCacheTable::Criterion& r = aCriteria.back();
-- r.mnFieldIndex = static_cast<sal_Int32>(nField);
-- sal_Int32 nStrId = rSharedString.getStringId(rData.aString);
-- r.mpFilter.reset(
-- new ScDPCacheTable::SingleFilter(rSharedString, nStrId, rData.fValue, rData.bHasValue));
-- }
-- if (!aCriteria.empty())
-- pData->FilterCacheTable(aCriteria);
-- }
- aInfo.aPageDims.reserve(nPageDimCount);
- for (i = 0; i < nPageDimCount; ++i)
- aInfo.aPageDims.push_back(nPageDims[i]);
-@@ -1065,6 +1113,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
+@@ -1128,6 +1197,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
@@ -1191,7 +1118,7 @@
static SfxItemPropertyMap aDPSourceMap_Impl[] =
{
-@@ -1073,6 +1122,10 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
+@@ -1136,6 +1206,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 },
@@ -1202,7 +1129,7 @@
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -1094,6 +1147,12 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName,
+@@ -1157,6 +1231,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 ) );
@@ -1215,7 +1142,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -1123,6 +1182,11 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa
+@@ -1186,6 +1266,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);
@@ -1227,7 +1154,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -1270,6 +1334,8 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
+@@ -1333,6 +1418,8 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
pHierarchies( NULL ),
nUsedHier( 0 ),
nFunction( SUBTOTAL_FUNC_SUM ), // sum is default
@@ -1236,7 +1163,7 @@
nSourceDim( -1 ),
bHasSelectedPage( FALSE ),
pSelectedData( NULL )
-@@ -1297,6 +1363,16 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
+@@ -1360,6 +1447,16 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
return pHierarchies;
}
@@ -1253,7 +1180,7 @@
uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
throw(uno::RuntimeException)
{
-@@ -1456,6 +1532,8 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
+@@ -1519,6 +1616,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 },
@@ -1262,7 +1189,7 @@
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -1526,6 +1604,18 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
+@@ -1589,6 +1688,18 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
}
DELETEZ( pSelectedData ); // invalid after changing aSelectedPage
}
@@ -1281,7 +1208,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -1585,6 +1675,10 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
+@@ -1648,6 +1759,10 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
else
aRet <<= uno::Sequence<sheet::TableFilterField>(0);
}
@@ -1292,7 +1219,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -2085,7 +2179,11 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
+@@ -2148,7 +2263,11 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
return aRet;
}
@@ -1305,7 +1232,7 @@
}
void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
-@@ -2188,6 +2286,20 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
+@@ -2251,6 +2370,20 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
aRet <<= aAutoShowInfo;
else if ( aNameStr.EqualsAscii( SC_UNO_LAYOUT ) )
aRet <<= aLayoutInfo;
@@ -1326,7 +1253,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -2480,6 +2592,7 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
+@@ -2543,6 +2676,7 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
nHier( nH ),
nLev( nL ),
maData( rN, fV, bHV ),
@@ -1334,7 +1261,7 @@
nPosition( -1 ),
bVisible( TRUE ),
bShowDet( TRUE )
-@@ -2540,6 +2653,11 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
+@@ -2603,6 +2737,11 @@ void ScDPMember::FillItemData( ScDPItemData& rData ) const
rData = maData;
}
@@ -1346,7 +1273,7 @@
String ScDPMember::GetNameStr() const
{
return maData.aString;
-@@ -2599,6 +2717,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
+@@ -2662,6 +2801,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 },
@@ -1354,7 +1281,7 @@
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
-@@ -2622,6 +2741,12 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
+@@ -2685,6 +2825,12 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
if (aValue >>= nInt)
setPosition( nInt );
}
@@ -1367,7 +1294,7 @@
else
{
DBG_ERROR("unknown property");
-@@ -2641,6 +2766,8 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa
+@@ -2704,6 +2850,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();
@@ -1377,10 +1304,10 @@
{
DBG_ERROR("unknown property");
diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index 326364b..5e747ca 100644
+index 0d0088f..e0a8b5d 100644
--- sc/source/filter/excel/read.cxx
+++ sc/source/filter/excel/read.cxx
-@@ -1196,6 +1196,9 @@ FltError ImportExcel8::Read( void )
+@@ -1190,6 +1190,9 @@ FltError ImportExcel8::Read( void )
eLastErr = SCWARN_IMPORT_ROW_OVERFLOW;
else if( rAddrConv.IsColTruncated() )
eLastErr = SCWARN_IMPORT_COLUMN_OVERFLOW;
@@ -1391,18 +1318,18 @@
return eLastErr;
diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
-index c7c1bf7..29390dd 100644
+index 2e7d2aa..0d43d06 100644
--- sc/source/filter/excel/xepivot.cxx
+++ sc/source/filter/excel/xepivot.cxx
-@@ -65,6 +65,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
+@@ -67,6 +67,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
using ::com::sun::star::sheet::DataPilotFieldLayoutInfo;
using ::com::sun::star::sheet::DataPilotFieldReference;
+using ::rtl::OUString;
- // ============================================================================
- // Pivot cache
-@@ -943,6 +944,11 @@ void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
+ using ::rtl::OString;
+ using ::rtl::OUString;
+@@ -972,6 +973,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() );
@@ -1414,7 +1341,7 @@
}
void XclExpPTItem::WriteBody( XclExpStream& rStrm )
-@@ -1011,8 +1017,13 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
+@@ -1040,8 +1046,13 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
::set_flag( maFieldExtInfo.mnFlags, EXC_SXVDEX_SHOWALL, rSaveDim.GetShowEmpty() );
// visible name
@@ -1430,7 +1357,7 @@
// subtotals
XclPTSubtotalVec aSubtotals;
-@@ -1079,7 +1090,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
+@@ -1108,7 +1119,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
rDataInfo.SetApiAggFunc( eFunc );
// visible name
@@ -1443,7 +1370,7 @@
// result field reference
if( const DataPilotFieldReference* pFieldRef = rSaveDim.GetReferenceValue() )
-@@ -1188,10 +1203,9 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
+@@ -1217,10 +1232,9 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
// pivot table properties from DP object
mnOutScTab = rOutScRange.aStart.Tab();
maPTInfo.maTableName = rDPObj.GetName();
@@ -1455,7 +1382,7 @@
if( const ScDPSaveData* pSaveData = rDPObj.GetSaveData() )
{
-@@ -1272,8 +1286,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
+@@ -1301,8 +1315,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
WriteSxli( rStrm, maPTInfo.mnDataCols, maPTInfo.mnColFields );
// SXEX
WriteSxex( rStrm );
@@ -1468,7 +1395,7 @@
}
}
-@@ -1307,6 +1323,15 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
+@@ -1336,6 +1352,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();
@@ -1484,7 +1411,7 @@
}
void XclExpPivotTable::SetFieldPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
-@@ -1414,17 +1439,21 @@ void XclExpPivotTable::Finalize()
+@@ -1443,17 +1468,21 @@ void XclExpPivotTable::Finalize()
rnDataXclRow = rnXclRow1 + maPTInfo.mnColFields + 1;
if( maDataFields.empty() )
++rnDataXclRow;
@@ -1510,7 +1437,7 @@
}
// records ----------------------------------------------------------------
-@@ -1500,14 +1529,68 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
+@@ -1529,14 +1558,68 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
rStrm.EndRecord();
}
@@ -1583,10 +1510,10 @@
}
}
diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx
-index 1e2e0bf..dac338a 100644
+index eb36b4a..c210911 100644
--- sc/source/filter/excel/xestring.cxx
+++ sc/source/filter/excel/xestring.cxx
-@@ -484,7 +484,8 @@ void XclExpString::WritePhoneticSettings( XclExpStream& rStrm ) const
+@@ -423,7 +423,8 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
void XclExpString::Write( XclExpStream& rStrm ) const
{
@@ -1596,7 +1523,7 @@
WriteBuffer( rStrm );
if( IsWriteFormats() ) // only in BIFF8 included in string
WriteFormats( rStrm );
-@@ -605,6 +606,7 @@ void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMax
+@@ -589,6 +590,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;
@@ -1814,16 +1741,16 @@
// ============================================================================
diff --git sc/source/filter/excel/xlpivot.cxx sc/source/filter/excel/xlpivot.cxx
-index 7e00cf2..cecd910 100644
+index e3544b5..c915903 100644
--- sc/source/filter/excel/xlpivot.cxx
+++ sc/source/filter/excel/xlpivot.cxx
-@@ -32,6 +32,7 @@
+@@ -31,6 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
- #include "xlpivot.hxx"
#include "dpgroup.hxx"
+#include "dpsave.hxx"
- #include "xistream.hxx"
#include "xestream.hxx"
+ #include "xistream.hxx"
#include "xestring.hxx"
@@ -581,7 +582,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldInfo& rInfo )
XclPTFieldExtInfo::XclPTFieldExtInfo() :
@@ -1975,10 +1902,10 @@
+}
+
diff --git sc/source/filter/inc/xepivot.hxx sc/source/filter/inc/xepivot.hxx
-index 62a19b5..41e0907 100644
+index 2de57fa..2078003 100644
--- sc/source/filter/inc/xepivot.hxx
+++ sc/source/filter/inc/xepivot.hxx
-@@ -411,8 +411,10 @@ private:
+@@ -412,8 +412,10 @@ private:
void WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) const;
/** Writes the SXEX records containing additional pivot table info. */
void WriteSxex( XclExpStream& rStrm ) const;
@@ -1990,7 +1917,7 @@
// ------------------------------------------------------------------------
private:
-@@ -423,7 +425,7 @@ private:
+@@ -424,7 +426,7 @@ private:
const XclExpPivotCache& mrPCache; /// The pivot cache this pivot table bases on.
XclPTInfo maPTInfo; /// Info about the pivot table (SXVIEW record).
XclPTExtInfo maPTExtInfo; /// Extended info about the pivot table (SXEX record).
@@ -2000,10 +1927,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 9b9e7ed..0168b81 100644
+index f023a12..706b12c 100644
--- sc/source/filter/inc/xestring.hxx
+++ sc/source/filter/inc/xestring.hxx
-@@ -336,6 +336,7 @@ private:
+@@ -323,6 +323,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.
@@ -2108,7 +2035,7 @@
// ============================================================================
#endif
diff --git sc/source/filter/inc/xlstring.hxx sc/source/filter/inc/xlstring.hxx
-index 0b30049..89f8275 100644
+index 626b11b..0a078a4 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
@@ -2120,10 +2047,10 @@
// ----------------------------------------------------------------------------
diff --git sc/source/ui/dbgui/pvfundlg.cxx sc/source/ui/dbgui/pvfundlg.cxx
-index adc048c..24ae67c 100644
+index 6dc4551..880a14b 100644
--- sc/source/ui/dbgui/pvfundlg.cxx
+++ sc/source/ui/dbgui/pvfundlg.cxx
-@@ -708,7 +708,9 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
+@@ -705,7 +705,9 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
maLbDims ( this, ScResId( LB_DIMS ) ),
maBtnOk ( this, ScResId( BTN_OK ) ),
maBtnCancel ( this, ScResId( BTN_CANCEL ) ),
@@ -2134,7 +2061,7 @@
{
FreeResource();
-@@ -722,7 +724,13 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
+@@ -719,7 +721,13 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
{
const ScDPSaveDimension* pDimension = pSaveData ? pSaveData->GetExistingDimensionByName(aName) : 0;
if ( !pDimension || (pDimension->GetOrientation() != nOrient) )
@@ -2148,7 +2075,7 @@
}
}
if( maLbDims.GetEntryCount() )
-@@ -738,7 +746,17 @@ short ScDPShowDetailDlg::Execute()
+@@ -735,7 +743,17 @@ short ScDPShowDetailDlg::Execute()
String ScDPShowDetailDlg::GetDimensionName() const
{
@@ -2168,7 +2095,7 @@
IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox )
diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
-index 0c0bdd5..fb60d32 100644
+index 2cb2e8b..466967e 100644
--- sc/source/ui/dbgui/pvlaydlg.cxx
+++ sc/source/ui/dbgui/pvlaydlg.cxx
@@ -63,6 +63,7 @@
@@ -2310,7 +2237,7 @@
}
}
diff --git sc/source/ui/view/dbfunc3.cxx sc/source/ui/view/dbfunc3.cxx
-index cc98745..13a52c6 100644
+index 3e5a627..d66ac37 100644
--- sc/source/ui/view/dbfunc3.cxx
+++ sc/source/ui/view/dbfunc3.cxx
@@ -91,6 +91,10 @@ using ::com::sun::star::uno::Sequence;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
