summaryrefslogtreecommitdiff
path: root/sc/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/core')
-rw-r--r--sc/source/core/data/column.cxx2
-rw-r--r--sc/source/core/data/documen9.cxx29
-rw-r--r--sc/source/core/data/dpobject.cxx2
-rw-r--r--sc/source/core/data/dptablecache.cxx2
-rw-r--r--sc/source/core/data/dptabres.cxx6
-rw-r--r--sc/source/core/data/dptabsrc.cxx2
-rw-r--r--sc/source/core/data/global.cxx2
-rw-r--r--sc/source/core/data/validat.cxx2
-rw-r--r--sc/source/core/tool/chgtrack.cxx4
-rw-r--r--sc/source/core/tool/compiler.cxx2
-rw-r--r--sc/source/core/tool/interpr1.cxx2
-rw-r--r--sc/source/core/tool/interpr2.cxx2
-rw-r--r--sc/source/core/tool/interpr5.cxx2
13 files changed, 44 insertions, 15 deletions
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 4989aede2b48..9240098196d7 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -726,7 +726,7 @@ sal_Bool ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
i = (nLo+nHi) / 2; // no effort, no division by zero
else
{ // interpolating search
- long nLoRow = pItems[nLo].nRow; // no unsigned underflow upon substraction
+ long nLoRow = pItems[nLo].nRow; // no unsigned underflow upon subtraction
i = nLo + (long)((long)(nRow - nLoRow) * (nHi - nLo)
/ (pItems[nHi].nRow - nLoRow));
if ( i < 0 || static_cast<SCSIZE>(i) >= nCount )
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 62d5da0a4141..30e7e22319b0 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -157,6 +157,22 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
if (GetLinkManager())
pDrawLayer->SetLinkManager( pLinkManager );
+ //UUUU set DrawingLayer's SfxItemPool at Calc's SfxItemPool as
+ // secondary pool to support DrawingLayer FillStyle ranges (and similar)
+ // in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when
+ // the PageStyle using SvxBrushItem is visualized and will be potentially
+ // used more intense in the future
+ if(xPoolHelper.isValid())
+ {
+ ScDocumentPool* pLocalPool = xPoolHelper->GetDocPool();
+
+ if(pLocalPool)
+ {
+ OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a secondary pool set where the DrawingLayer ItemPool is to be placed (!)");
+ pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool());
+ }
+ }
+
// Drawing pages are accessed by table number, so they must also be present
// for preceding table numbers, even if the tables aren't allocated
// (important for clipboard documents).
@@ -251,7 +267,20 @@ IMPL_LINK_INLINE_END( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex
void ScDocument::DeleteDrawLayer()
{
+ //UUUU remove DrawingLayer's SfxItemPool from Calc's SfxItemPool where
+ // it is registered as secondary pool
+ if(xPoolHelper.isValid())
+ {
+ ScDocumentPool* pLocalPool = xPoolHelper->GetDocPool();
+
+ if(pLocalPool && pLocalPool->GetSecondaryPool())
+ {
+ pLocalPool->SetSecondaryPool(0);
+ }
+ }
+
delete pDrawLayer;
+ pDrawLayer = 0;
}
sal_Bool ScDocument::DrawGetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index ee4158201e3c..bbd19e259cd0 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1724,7 +1724,7 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
bool bDataFound = false;
rFields.clear();
- //! merge multiple occurences (data field with different functions)
+ //! merge multiple occurrences (data field with different functions)
//! force data field in one dimension
std::vector< long > aPos;
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index a1b07ca2fd91..01f7cfecfed1 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -623,7 +623,7 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS
sal_uLong ScDPTableDataCache::GetDimNumType( SCCOL nDim) const
{
DBG_ASSERT( IsValid(), " IsValid() == false " );
- DBG_ASSERT( nDim < mnColumnCount && nDim >=0, " dimention out of bound " );
+ DBG_ASSERT( nDim < mnColumnCount && nDim >=0, " dimension out of bound " );
if ( mpTableDataValues[nDim].size()==0 )
return NUMBERFORMAT_UNDEFINED;
else
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index b498484e2cea..5d4642b63d46 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -704,7 +704,7 @@ ScDPAggData* lcl_GetChildTotal( ScDPAggData* pFirst, long nMeasure )
ScDPAggData* pAgg = pFirst;
long nSkip = nMeasure;
- // subtotal settings are ignored - colum/row totals exist once per measure
+ // subtotal settings are ignored - column/row totals exist once per measure
for ( long nPos=0; nPos<nSkip; nPos++ )
pAgg = pAgg->GetChild(); // column total is constructed empty - children need to be created
@@ -1095,7 +1095,7 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect
if ( GetDPMember() && !GetDPMember()->getShowDetails() )
{
// Wang Xu Ming -- 2009-6-16
- // Show DataLayout dimention
+ // Show DataLayout dimension
nMemberStep = 1;
while ( nPos < ppDim.size() )
{
@@ -1143,7 +1143,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD
{
// Wang Xu Ming -- 2009-6-16
// DataPilot Migration
- // Show DataLayout dimention
+ // Show DataLayout dimension
nMemberStep = 1;
while ( !rParams.IsEnd( nPos ) )
{
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 2519f33b43b7..5f9bab302905 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1002,7 +1002,7 @@ void ScDPSource::CreateRes_Impl()
pRowResRoot->UpdateDataResults( pColResRoot, pResData->GetRowStartMeasure() );
}
- // SortMembers does the sorting by a result dimension, using the orginal results,
+ // SortMembers does the sorting by a result dimension, using the original results,
// but not running totals etc.
pRowResRoot->SortMembers( pColResRoot );
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 79a98c6c9b33..714338b6aff1 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -1236,7 +1236,7 @@ ScFunctionList::ScFunctionList() :
::std::auto_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) );
// Browse for all possible OpCodes. This is not the fastest method, but
// otherwise the sub resources within the resource blocks and the
- // resource blocks themselfs would had to be ordered according to
+ // resource blocks themselves would had to be ordered according to
// OpCodes, which is utopian..
for (i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; i++)
{
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 555766c2d094..3d2bbcb60611 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -655,7 +655,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
const ScMatrix *pValues = aValidationSrc.GetMatrix();
if (!pValues)
{
- // The somewhat nasty case of either an error occured, or the
+ // The somewhat nasty case of either an error occurred, or the
// dereferenced value of a single cell reference or an immediate result
// is stored as a single value.
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 142c93ce12d7..6b6bb713f61b 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -933,7 +933,7 @@ ScChangeActionDel::ScChangeActionDel( const ScRange& rRange,
ScChangeActionDel::ScChangeActionDel(const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
const ScBigRange& aBigRangeP, const String& aUserP, const DateTime& aDateTimeP, const String &sComment,
- const ScChangeActionType eTypeP, const SCsCOLROW nD, ScChangeTrack* pTrackP) // wich of nDx and nDy is set is depend on the type
+ const ScChangeActionType eTypeP, const SCsCOLROW nD, ScChangeTrack* pTrackP) // which of nDx and nDy is set is depend on the type
:
ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment),
pTrack( pTrackP ),
@@ -1261,7 +1261,7 @@ void ScChangeActionDel::UndoCutOffInsert()
ScChangeActionMove::ScChangeActionMove(const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
const ScBigRange& aToBigRange, const String& aUserP, const DateTime& aDateTimeP, const String &sComment,
- const ScBigRange& aFromBigRange, ScChangeTrack* pTrackP) // wich of nDx and nDy is set is depend on the type
+ const ScBigRange& aFromBigRange, ScChangeTrack* pTrackP) // which of nDx and nDy is set is depend on the type
:
ScChangeAction(SC_CAT_MOVE, aToBigRange, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment),
aFromRange(aFromBigRange),
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 82c5d75de671..600d7741deb1 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1235,7 +1235,7 @@ struct ConventionXL
if( bStartHasDoc )
{
- // A ref across multipled workbooks ?
+ // A ref across multiplied workbooks ?
if( !bEndHasDoc )
return;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 23be39911a7a..70afc97396df 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6592,7 +6592,7 @@ void ScInterpreter::ScDBCount()
// existing cells, so if a query matches an empty cell there's
// nothing returned, and therefor not counted!
// Since this has ever been the case and this code here only came
- // into existance to fix #i6899 and it never worked before we'll
+ // into existence to fix #i6899 and it never worked before we'll
// have to live with it until we reimplement the iterators to also
// return empty cells, which would mean to adapt all callers of
// iterators.
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 63edaf706cd0..1d9638b27b28 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -325,7 +325,7 @@ void ScInterpreter::ScGetDiffDate360()
* 30" or "NASD 30" method (funny enough they also state that Excel is the
* only tool that does so).
*
- * Note that the definiton given in
+ * Note that the definition given in
* http://msdn.microsoft.com/library/en-us/office97/html/SEB7C.asp
* is _not_ the way how it is actually calculated by Excel (that would not
* even match any of the 7 methods mentioned above) and would result in the
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index e1f9c0a5b788..bf668a582ed3 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -667,7 +667,7 @@ void ScInterpreter::MEMat(ScMatrix* mM, SCSIZE n)
* permutations (row exchanges).
*
* Returns 0 if a singular matrix is encountered, else +1 if an even number of
- * permutations occured, or -1 if odd, which is the sign of the determinant.
+ * permutations occurred, or -1 if odd, which is the sign of the determinant.
* This may be used to calculate the determinant by multiplying the sign with
* the product of the diagonal elements of the LU matrix.
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 16:31:34 +0000