[Libreoffice-commits] .: formula/inc formula/source sc/inc sc/source sw/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Jul 23 01:48:36 PDT 2012
formula/inc/formula/FormulaCompiler.hxx | 2
formula/source/core/api/FormulaCompiler.cxx | 122 ++---
sc/inc/chartlis.hxx | 2
sc/inc/dpobject.hxx | 2
sc/source/core/data/dpobject.cxx | 18
sc/source/core/tool/chartlis.cxx | 34 -
sc/source/core/tool/compiler.cxx | 6
sc/source/ui/inc/output.hxx | 24 -
sc/source/ui/view/output.cxx | 344 +++++++--------
sc/source/ui/view/output2.cxx | 622 ++++++++++++++--------------
sc/source/ui/view/output3.cxx | 48 +-
sw/source/ui/config/uinums.cxx | 10
sw/source/ui/inc/uinums.hxx | 6
13 files changed, 620 insertions(+), 620 deletions(-)
New commits:
commit acf134e19895489991d5fc088f06f69d638c5252
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 23 10:47:05 2012 +0200
-Werror,-Wshadow (Clang 3.1)
...where a local variable in a nested class shadows a member of an outer class.
Fixed by renaming the relevant outer class members as "m..."
Change-Id: I6caa33914ff1060e08f66eadde879fb7b4e3e7cc
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 1b4ac99..ce4157d 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -294,7 +294,7 @@ protected:
OpCodeMapPtr mxSymbols; // which symbols are used
- FormulaTokenRef pToken; // current token
+ FormulaTokenRef mpToken; // current token
FormulaTokenRef pCurrentFactorToken; // current factor token (of Factor() method)
FormulaTokenArray* pArr;
ExternalReferenceHelper* pExternalRef;
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 0a3d9af..2a48678 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -900,7 +900,7 @@ bool FormulaCompiler::GetToken()
if ( nRecursion > nRecursionMax )
{
SetError( errStackOverflow );
- pToken = new FormulaByteToken( ocStop );
+ mpToken = new FormulaByteToken( ocStop );
return false;
}
if ( bAutoCorrect && !pStack )
@@ -919,18 +919,18 @@ bool FormulaCompiler::GetToken()
nWasColRowName = 1;
else
nWasColRowName = 0;
- pToken = pArr->Next();
- while( pToken && pToken->GetOpCode() == ocSpaces )
+ mpToken = pArr->Next();
+ while( mpToken && mpToken->GetOpCode() == ocSpaces )
{
if ( nWasColRowName )
nWasColRowName++;
if ( bAutoCorrect && !pStack )
- CreateStringFromToken( aCorrectedFormula, pToken.get(), false );
- pToken = pArr->Next();
+ CreateStringFromToken( aCorrectedFormula, mpToken.get(), false );
+ mpToken = pArr->Next();
}
- if ( bAutoCorrect && !pStack && pToken )
- CreateStringFromToken( aCorrectedSymbol, pToken.get(), false );
- if( !pToken )
+ if ( bAutoCorrect && !pStack && mpToken )
+ CreateStringFromToken( aCorrectedSymbol, mpToken.get(), false );
+ if( !mpToken )
{
if( pStack )
{
@@ -942,41 +942,41 @@ bool FormulaCompiler::GetToken()
}
else
{
- if ( nWasColRowName >= 2 && pToken->GetOpCode() == ocColRowName )
+ if ( nWasColRowName >= 2 && mpToken->GetOpCode() == ocColRowName )
{ // convert an ocSpaces to ocIntersect in RPN
- pToken = new FormulaByteToken( ocIntersect );
+ mpToken = new FormulaByteToken( ocIntersect );
pArr->nIndex--; // we advanced to the second ocColRowName, step back
}
}
}
if( bStop )
{
- pToken = new FormulaByteToken( ocStop );
+ mpToken = new FormulaByteToken( ocStop );
return false;
}
- if( pToken->GetOpCode() == ocSubTotal )
+ if( mpToken->GetOpCode() == ocSubTotal )
glSubTotal = true;
- else if ( pToken->IsExternalRef() )
+ else if ( mpToken->IsExternalRef() )
{
- return HandleExternalReference(*pToken);
+ return HandleExternalReference(*mpToken);
}
- else if( pToken->GetOpCode() == ocName )
+ else if( mpToken->GetOpCode() == ocName )
{
return HandleRange();
}
- else if( pToken->GetOpCode() == ocColRowName )
+ else if( mpToken->GetOpCode() == ocColRowName )
{
return HandleSingleRef();
}
- else if( pToken->GetOpCode() == ocDBArea )
+ else if( mpToken->GetOpCode() == ocDBArea )
{
return HandleDbData();
}
- else if( pToken->GetType() == svSingleRef )
+ else if( mpToken->GetType() == svSingleRef )
{
pArr->nRefs++;
}
- else if( pToken->GetType() == svDoubleRef )
+ else if( mpToken->GetType() == svDoubleRef )
{
pArr->nRefs++;
}
@@ -993,21 +993,21 @@ void FormulaCompiler::Factor()
CurrentFactor pFacToken( this );
- OpCode eOp = pToken->GetOpCode();
+ OpCode eOp = mpToken->GetOpCode();
if( eOp == ocPush || eOp == ocColRowNameAuto || eOp == ocMatRef ||
eOp == ocDBArea
|| (bCompileForFAP && ((eOp == ocName) || (eOp == ocDBArea)
|| (eOp == ocColRowName) || (eOp == ocBad)))
)
{
- PutCode( pToken );
+ PutCode( mpToken );
eOp = NextToken();
if( eOp == ocOpen )
{
// PUSH( is an error that may be caused by an unknown function.
SetError(
- ( pToken->GetType() == svString
- || pToken->GetType() == svSingleRef )
+ ( mpToken->GetType() == svString
+ || mpToken->GetType() == svSingleRef )
? errNoName : errOperatorExpected );
if ( bAutoCorrect && !pStack )
{ // assume multiplication
@@ -1028,7 +1028,7 @@ void FormulaCompiler::Factor()
eOp = Expression();
while ((eOp == ocSep) && (!pArr->GetCodeError() || bIgnoreErrors))
{ // range list (A1;A2) converted to (A1~A2)
- pFacToken = pToken;
+ pFacToken = mpToken;
NextToken();
eOp = Expression();
// Do not ignore error here, regardless of bIgnoreErrors, otherwise
@@ -1077,7 +1077,7 @@ void FormulaCompiler::Factor()
}
if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
{
- pFacToken = pToken;
+ pFacToken = mpToken;
eOp = NextToken();
if (eOp != ocOpen)
{
@@ -1097,7 +1097,7 @@ void FormulaCompiler::Factor()
else if( eOp == ocNot || eOp == ocNeg
|| (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR) )
{
- pFacToken = pToken;
+ pFacToken = mpToken;
eOp = NextToken();
if( nNumFmt == NUMBERFORMAT_UNDEFINED && eOp == ocNot )
nNumFmt = NUMBERFORMAT_LOGICAL;
@@ -1125,7 +1125,7 @@ void FormulaCompiler::Factor()
|| (bCompileForFAP && ((eOp == ocIf) || (eOp == ocChose)))
)
{
- pFacToken = pToken;
+ pFacToken = mpToken;
OpCode eMyLastOp = eOp;
eOp = NextToken();
bool bNoParam = false;
@@ -1174,7 +1174,7 @@ void FormulaCompiler::Factor()
else if (eOp == ocIf || eOp == ocChose)
{
// the PC counters are -1
- pFacToken = pToken;
+ pFacToken = mpToken;
if ( eOp == ocIf )
pFacToken->GetJump()[ 0 ] = 3; // if, else, behind
else
@@ -1203,7 +1203,7 @@ void FormulaCompiler::Factor()
NextToken();
eOp = Expression();
// ocSep or ocClose terminate the subexpression
- PutCode( pToken );
+ PutCode( mpToken );
}
if (eOp != ocClose)
SetError(errPairExpected);
@@ -1222,7 +1222,7 @@ void FormulaCompiler::Factor()
}
else if ( eOp == ocMissing )
{
- PutCode( pToken );
+ PutCode( mpToken );
eOp = NextToken();
}
else if ( eOp == ocClose )
@@ -1238,9 +1238,9 @@ void FormulaCompiler::Factor()
bCorrected = true;
}
}
- else if ( pToken->IsExternalRef() )
+ else if ( mpToken->IsExternalRef() )
{
- PutCode(pToken);
+ PutCode(mpToken);
eOp = NextToken();
}
else
@@ -1266,10 +1266,10 @@ void FormulaCompiler::Factor()
void FormulaCompiler::RangeLine()
{
Factor();
- while (pToken->GetOpCode() == ocRange)
+ while (mpToken->GetOpCode() == ocRange)
{
FormulaToken** pCode1 = pCode - 1;
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
Factor();
FormulaToken** pCode2 = pCode - 1;
@@ -1283,9 +1283,9 @@ void FormulaCompiler::RangeLine()
void FormulaCompiler::IntersectionLine()
{
RangeLine();
- while (pToken->GetOpCode() == ocIntersect)
+ while (mpToken->GetOpCode() == ocIntersect)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
RangeLine();
PutCode(p);
@@ -1297,9 +1297,9 @@ void FormulaCompiler::IntersectionLine()
void FormulaCompiler::UnionLine()
{
IntersectionLine();
- while (pToken->GetOpCode() == ocUnion)
+ while (mpToken->GetOpCode() == ocUnion)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
IntersectionLine();
PutCode(p);
@@ -1310,12 +1310,12 @@ void FormulaCompiler::UnionLine()
void FormulaCompiler::UnaryLine()
{
- if( pToken->GetOpCode() == ocAdd )
+ if( mpToken->GetOpCode() == ocAdd )
GetToken();
- else if (SC_OPCODE_START_UN_OP <= pToken->GetOpCode() &&
- pToken->GetOpCode() < SC_OPCODE_STOP_UN_OP)
+ else if (SC_OPCODE_START_UN_OP <= mpToken->GetOpCode() &&
+ mpToken->GetOpCode() < SC_OPCODE_STOP_UN_OP)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
UnaryLine();
PutCode( p );
@@ -1329,9 +1329,9 @@ void FormulaCompiler::UnaryLine()
void FormulaCompiler::PostOpLine()
{
UnaryLine();
- while ( pToken->GetOpCode() == ocPercentSign )
+ while ( mpToken->GetOpCode() == ocPercentSign )
{ // this operator _follows_ its operand
- PutCode( pToken );
+ PutCode( mpToken );
NextToken();
}
}
@@ -1341,9 +1341,9 @@ void FormulaCompiler::PostOpLine()
void FormulaCompiler::PowLine()
{
PostOpLine();
- while (pToken->GetOpCode() == ocPow)
+ while (mpToken->GetOpCode() == ocPow)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
PostOpLine();
PutCode(p);
@@ -1355,9 +1355,9 @@ void FormulaCompiler::PowLine()
void FormulaCompiler::MulDivLine()
{
PowLine();
- while (pToken->GetOpCode() == ocMul || pToken->GetOpCode() == ocDiv)
+ while (mpToken->GetOpCode() == ocMul || mpToken->GetOpCode() == ocDiv)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
PowLine();
PutCode(p);
@@ -1369,9 +1369,9 @@ void FormulaCompiler::MulDivLine()
void FormulaCompiler::AddSubLine()
{
MulDivLine();
- while (pToken->GetOpCode() == ocAdd || pToken->GetOpCode() == ocSub)
+ while (mpToken->GetOpCode() == ocAdd || mpToken->GetOpCode() == ocSub)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
MulDivLine();
PutCode(p);
@@ -1383,9 +1383,9 @@ void FormulaCompiler::AddSubLine()
void FormulaCompiler::ConcatLine()
{
AddSubLine();
- while (pToken->GetOpCode() == ocAmpersand)
+ while (mpToken->GetOpCode() == ocAmpersand)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
AddSubLine();
PutCode(p);
@@ -1397,9 +1397,9 @@ void FormulaCompiler::ConcatLine()
void FormulaCompiler::CompareLine()
{
ConcatLine();
- while (pToken->GetOpCode() >= ocEqual && pToken->GetOpCode() <= ocGreaterEqual)
+ while (mpToken->GetOpCode() >= ocEqual && mpToken->GetOpCode() <= ocGreaterEqual)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
ConcatLine();
PutCode(p);
@@ -1411,9 +1411,9 @@ void FormulaCompiler::CompareLine()
void FormulaCompiler::NotLine()
{
CompareLine();
- while (pToken->GetOpCode() == ocNot)
+ while (mpToken->GetOpCode() == ocNot)
{
- FormulaTokenRef p = pToken;
+ FormulaTokenRef p = mpToken;
NextToken();
CompareLine();
PutCode(p);
@@ -1432,15 +1432,15 @@ OpCode FormulaCompiler::Expression()
return ocStop; //! generate token instead?
}
NotLine();
- while (pToken->GetOpCode() == ocAnd || pToken->GetOpCode() == ocOr)
+ while (mpToken->GetOpCode() == ocAnd || mpToken->GetOpCode() == ocOr)
{
- FormulaTokenRef p = pToken;
- pToken->SetByte( 2 ); // 2 parameters!
+ FormulaTokenRef p = mpToken;
+ mpToken->SetByte( 2 ); // 2 parameters!
NextToken();
NotLine();
PutCode(p);
}
- return pToken->GetOpCode();
+ return mpToken->GetOpCode();
}
// -----------------------------------------------------------------------------
void FormulaCompiler::SetError(sal_uInt16 /*nError*/)
@@ -1801,7 +1801,7 @@ OpCode FormulaCompiler::NextToken()
{
if( !GetToken() )
return ocStop;
- OpCode eOp = pToken->GetOpCode();
+ OpCode eOp = mpToken->GetOpCode();
// There must be an operator before a push
if ( (eOp == ocPush || eOp == ocColRowNameAuto) &&
!( (eLastOp == ocOpen) || (eLastOp == ocSep) ||
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 2dff0c2..96f8c73 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -78,7 +78,7 @@ private:
rtl::OUString maName;
ScChartUnoData* pUnoData;
- ScDocument* pDoc;
+ ScDocument* mpDoc;
bool bUsed:1; // for ScChartListenerCollection::FreeUnused
bool bDirty:1;
bool bSeriesRangesScheduled:1;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index e163ef1..06ad537 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -422,7 +422,7 @@ private:
private:
typedef ::boost::ptr_vector<ScDPObject> TablesType;
- ScDocument* pDoc;
+ ScDocument* mpDoc;
TablesType maTables;
SheetCaches maSheetCaches;
NameCaches maNameCaches;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 1c7786a..dcef79f 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2964,7 +2964,7 @@ bool ScDPCollection::DBCaches::remove(const ScDPCache* p)
}
ScDPCollection::ScDPCollection(ScDocument* pDocument) :
- pDoc( pDocument ),
+ mpDoc( pDocument ),
maSheetCaches(pDocument),
maNameCaches(pDocument),
maDBCaches(pDocument)
@@ -2972,10 +2972,10 @@ ScDPCollection::ScDPCollection(ScDocument* pDocument) :
}
ScDPCollection::ScDPCollection(const ScDPCollection& r) :
- pDoc(r.pDoc),
- maSheetCaches(r.pDoc),
- maNameCaches(r.pDoc),
- maDBCaches(r.pDoc)
+ mpDoc(r.mpDoc),
+ maSheetCaches(r.mpDoc),
+ maNameCaches(r.mpDoc),
+ maDBCaches(r.mpDoc)
{
}
@@ -3193,7 +3193,7 @@ void ScDPCollection::CopyToTab( SCTAB nOld, SCTAB nNew )
e.SetTab(nNew);
std::auto_ptr<ScDPObject> pNew(new ScDPObject(rObj));
pNew->SetOutRange(aOutRange);
- pDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
+ mpDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
aAdded.push_back(pNew);
}
@@ -3316,7 +3316,7 @@ void ScDPCollection::FreeTable(ScDPObject* pDPObj)
const ScRange& rOutRange = pDPObj->GetOutRange();
const ScAddress& s = rOutRange.aStart;
const ScAddress& e = rOutRange.aEnd;
- pDoc->RemoveFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
+ mpDoc->RemoveFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
TablesType::iterator itr = maTables.begin(), itrEnd = maTables.end();
for (; itr != itrEnd; ++itr)
{
@@ -3334,7 +3334,7 @@ bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj)
const ScRange& rOutRange = pDPObj->GetOutRange();
const ScAddress& s = rOutRange.aStart;
const ScAddress& e = rOutRange.aEnd;
- pDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
+ mpDoc->ApplyFlagsTab(s.Col(), s.Row(), e.Col(), e.Row(), s.Tab(), SC_MF_DP_TABLE);
maTables.push_back(pDPObj);
return true;
@@ -3343,7 +3343,7 @@ bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj)
bool ScDPCollection::HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const
{
const ScMergeFlagAttr* pMergeAttr = static_cast<const ScMergeFlagAttr*>(
- pDoc->GetAttr(nCol, nRow, nTab, ATTR_MERGE_FLAG));
+ mpDoc->GetAttr(nCol, nRow, nTab, ATTR_MERGE_FLAG));
if (!pMergeAttr)
return false;
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index d749f63..28968a1 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -123,7 +123,7 @@ ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP,
mpTokens(new vector<ScTokenRef>),
maName(rName),
pUnoData( NULL ),
- pDoc( pDocP ),
+ mpDoc( pDocP ),
bUsed( false ),
bDirty( false ),
bSeriesRangesScheduled( false )
@@ -137,7 +137,7 @@ ScChartListener::ScChartListener( const rtl::OUString& rName, ScDocument* pDocP,
mpTokens(pTokens),
maName(rName),
pUnoData( NULL ),
- pDoc( pDocP ),
+ mpDoc( pDocP ),
bUsed( false ),
bDirty( false ),
bSeriesRangesScheduled( false )
@@ -150,7 +150,7 @@ ScChartListener::ScChartListener( const ScChartListener& r ) :
mpTokens(new vector<ScTokenRef>(*r.mpTokens)),
maName(r.maName),
pUnoData( NULL ),
- pDoc( r.pDoc ),
+ mpDoc( r.mpDoc ),
bUsed( false ),
bDirty( r.bDirty ),
bSeriesRangesScheduled( r.bSeriesRangesScheduled )
@@ -163,9 +163,9 @@ ScChartListener::ScChartListener( const ScChartListener& r ) :
// Re-register this new listener for the files that the old listener
// was listening to.
- ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
+ ScExternalRefManager* pRefMgr = mpDoc->GetExternalRefManager();
const boost::unordered_set<sal_uInt16>& rFileIds = r.mpExtRefListener->getAllFileIds();
- mpExtRefListener.reset(new ExternalRefListener(*this, pDoc));
+ mpExtRefListener.reset(new ExternalRefListener(*this, mpDoc));
boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
for (; itr != itrEnd; ++itr)
{
@@ -184,7 +184,7 @@ ScChartListener::~ScChartListener()
if (mpExtRefListener.get())
{
// Stop listening to all external files.
- ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
+ ScExternalRefManager* pRefMgr = mpDoc->GetExternalRefManager();
const boost::unordered_set<sal_uInt16>& rFileIds = mpExtRefListener->getAllFileIds();
boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end();
for (; itr != itrEnd; ++itr)
@@ -228,11 +228,11 @@ void ScChartListener::Notify( SvtBroadcaster&, const SfxHint& rHint )
void ScChartListener::Update()
{
- if ( pDoc->IsInInterpreter() )
+ if ( mpDoc->IsInInterpreter() )
{ // If interpreting do nothing and restart timer so we don't
// interfere with interpreter and don't produce an Err522 or similar.
// This may happen if we are rescheduled via Basic function.
- pDoc->GetChartListenerCollection()->StartTimer();
+ mpDoc->GetChartListenerCollection()->StartTimer();
return ;
}
if ( pUnoData )
@@ -244,10 +244,10 @@ void ScChartListener::Update()
0, 0, 0, 0 );
pUnoData->GetListener()->chartDataChanged( aEvent );
}
- else if ( pDoc->GetAutoCalc() )
+ else if ( mpDoc->GetAutoCalc() )
{
bDirty = false;
- pDoc->UpdateChart(GetName());
+ mpDoc->UpdateChart(GetName());
}
}
@@ -335,7 +335,7 @@ void ScChartListener::StartListeningTo()
// no references to listen to.
return;
- for_each(mpTokens->begin(), mpTokens->end(), StartEndListening(pDoc, *this, true));
+ for_each(mpTokens->begin(), mpTokens->end(), StartEndListening(mpDoc, *this, true));
}
void ScChartListener::EndListeningTo()
@@ -344,7 +344,7 @@ void ScChartListener::EndListeningTo()
// no references to listen to.
return;
- for_each(mpTokens->begin(), mpTokens->end(), StartEndListening(pDoc, *this, false));
+ for_each(mpTokens->begin(), mpTokens->end(), StartEndListening(mpDoc, *this, false));
}
@@ -377,7 +377,7 @@ void ScChartListener::UpdateChartIntersecting( const ScRange& rRange )
if (ScRefTokenHelper::intersects(*mpTokens, pToken))
{
// force update (chart has to be loaded), don't use ScChartListener::Update
- pDoc->UpdateChart(GetName());
+ mpDoc->UpdateChart(GetName());
}
}
@@ -386,13 +386,13 @@ void ScChartListener::UpdateSeriesRanges()
{
ScRangeListRef pRangeList(new ScRangeList);
ScRefTokenHelper::getRangeListFromTokens(*pRangeList, *mpTokens);
- pDoc->SetChartRangeList(GetName(), pRangeList);
+ mpDoc->SetChartRangeList(GetName(), pRangeList);
}
ScChartListener::ExternalRefListener* ScChartListener::GetExtRefListener()
{
if (!mpExtRefListener.get())
- mpExtRefListener.reset(new ExternalRefListener(*this, pDoc));
+ mpExtRefListener.reset(new ExternalRefListener(*this, mpDoc));
return mpExtRefListener.get();
}
@@ -400,7 +400,7 @@ ScChartListener::ExternalRefListener* ScChartListener::GetExtRefListener()
void ScChartListener::SetUpdateQueue()
{
bDirty = true;
- pDoc->GetChartListenerCollection()->StartTimer();
+ mpDoc->GetChartListenerCollection()->StartTimer();
}
bool ScChartListener::operator==( const ScChartListener& r ) const
@@ -408,7 +408,7 @@ bool ScChartListener::operator==( const ScChartListener& r ) const
bool b1 = (mpTokens.get() && !mpTokens->empty());
bool b2 = (r.mpTokens.get() && !r.mpTokens->empty());
- if (pDoc != r.pDoc || bUsed != r.bUsed || bDirty != r.bDirty ||
+ if (mpDoc != r.mpDoc || bUsed != r.bUsed || bDirty != r.bDirty ||
bSeriesRangesScheduled != r.bSeriesRangesScheduled ||
GetName() != r.GetName() || b1 != b2)
return false;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 86ae89c..5a39f76 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4002,7 +4002,7 @@ ScRangeData* ScCompiler::GetRangeData( const FormulaToken& rToken ) const
bool ScCompiler::HandleRange()
{
- const ScRangeData* pRangeData = GetRangeData( *pToken);
+ const ScRangeData* pRangeData = GetRangeData( *mpToken);
if (pRangeData)
{
sal_uInt16 nErr = pRangeData->GetErrCode();
@@ -5257,7 +5257,7 @@ void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaO
// -----------------------------------------------------------------------------
bool ScCompiler::HandleSingleRef()
{
- ScSingleRefData& rRef = static_cast<ScToken*>(pToken.get())->GetSingleRef();
+ ScSingleRefData& rRef = static_cast<ScToken*>(mpToken.get())->GetSingleRef();
rRef.CalcAbsIfRel( aPos );
if ( !rRef.Valid() )
{
@@ -5469,7 +5469,7 @@ bool ScCompiler::HandleSingleRef()
// -----------------------------------------------------------------------------
bool ScCompiler::HandleDbData()
{
- ScDBData* pDBData = pDoc->GetDBCollection()->getNamedDBs().findByIndex(pToken->GetIndex());
+ ScDBData* pDBData = pDoc->GetDBCollection()->getNamedDBs().findByIndex(mpToken->GetIndex());
if ( !pDBData )
SetError(errNoName);
else if ( !bCompileForFAP )
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 295a129..3449921 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -140,13 +140,13 @@ private:
void adjustForHyperlinkInPDF(Point aURLStart, OutputDevice* pDev);
};
- OutputDevice* pDev; // Device
- OutputDevice* pRefDevice; // printer if used for preview
+ OutputDevice* mpDev; // Device
+ OutputDevice* mpRefDevice; // printer if used for preview
OutputDevice* pFmtDevice; // reference for text formatting
ScTableInfo& mrTabInfo;
RowInfo* pRowInfo; // Info-Block
SCSIZE nArrCount; // belegte Zeilen im Info-Block
- ScDocument* pDoc; // Dokument
+ ScDocument* mpDoc; // Dokument
SCTAB nTab; // Tabelle
long nScrX; // Ausgabe Startpos. (Pixel)
long nScrY;
@@ -162,8 +162,8 @@ private:
SCCOL nVisX2;
SCROW nVisY2;
ScOutputType eType; // Bildschirm/Drucker ...
- double nPPTX; // Pixel per Twips
- double nPPTY;
+ double mnPPTX; // Pixel per Twips
+ double mnPPTY;
// sal_uInt16 nZoom; // Zoom-Faktor (Prozent) - fuer GetFont
Fraction aZoomX;
Fraction aZoomY;
@@ -185,18 +185,18 @@ private:
bool bPagebreakMode; // Seitenumbruch-Vorschau
bool bSolidBackground; // weiss statt transparent
- bool bUseStyleColor;
- bool bForceAutoColor;
+ bool mbUseStyleColor;
+ bool mbForceAutoColor;
- sal_Bool bSyntaxMode; // Syntax-Highlighting
+ sal_Bool mbSyntaxMode; // Syntax-Highlighting
Color* pValueColor;
Color* pTextColor;
Color* pFormulaColor;
Color aGridColor;
- bool bShowNullValues;
- bool bShowFormulas;
+ bool mbShowNullValues;
+ bool mbShowFormulas;
bool bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen
bool bMarkClipped;
@@ -263,7 +263,7 @@ public:
void SetContentDevice( OutputDevice* pContentDev );
- void SetRefDevice( OutputDevice* pRDev ) { pRefDevice = pFmtDevice = pRDev; }
+ void SetRefDevice( OutputDevice* pRDev ) { mpRefDevice = pFmtDevice = pRDev; }
void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; }
void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; }
void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; }
@@ -272,7 +272,7 @@ public:
void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; }
void SetSolidBackground( sal_Bool bSet ) { bSolidBackground = bSet; }
- void SetUseStyleColor( sal_Bool bSet ) { bUseStyleColor = bSet; }
+ void SetUseStyleColor( sal_Bool bSet ) { mbUseStyleColor = bSet; }
void SetEditCell( SCCOL nCol, SCROW nRow );
void SetSyntaxMode( sal_Bool bNewMode );
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index aac7fde..2ae5305 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -169,13 +169,13 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
SCCOL nNewX1, SCROW nNewY1, SCCOL nNewX2, SCROW nNewY2,
double nPixelPerTwipsX, double nPixelPerTwipsY,
const Fraction* pZoomX, const Fraction* pZoomY ) :
- pDev( pNewDev ),
- pRefDevice( pNewDev ), // default is output device
+ mpDev( pNewDev ),
+ mpRefDevice( pNewDev ), // default is output device
pFmtDevice( pNewDev ), // default is output device
mrTabInfo( rTabInfo ),
pRowInfo( rTabInfo.mpRowInfo ),
nArrCount( rTabInfo.mnArrCount ),
- pDoc( pNewDoc ),
+ mpDoc( pNewDoc ),
nTab( nNewTab ),
nScrX( nNewScrX ),
nScrY( nNewScrY ),
@@ -184,8 +184,8 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
nX2( nNewX2 ),
nY2( nNewY2 ),
eType( eNewType ),
- nPPTX( nPixelPerTwipsX ),
- nPPTY( nPixelPerTwipsY ),
+ mnPPTX( nPixelPerTwipsX ),
+ mnPPTY( nPixelPerTwipsY ),
pEditObj( NULL ),
pViewShell( NULL ),
pDrawView( NULL ), // #114135#
@@ -194,15 +194,15 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
bSingleGrid( false ),
bPagebreakMode( false ),
bSolidBackground( false ),
- bUseStyleColor( false ),
- bForceAutoColor( SC_MOD()->GetAccessOptions().GetIsAutomaticFontColor() ),
- bSyntaxMode( false ),
+ mbUseStyleColor( false ),
+ mbForceAutoColor( SC_MOD()->GetAccessOptions().GetIsAutomaticFontColor() ),
+ mbSyntaxMode( false ),
pValueColor( NULL ),
pTextColor( NULL ),
pFormulaColor( NULL ),
aGridColor( COL_BLACK ),
- bShowNullValues( sal_True ),
- bShowFormulas( false ),
+ mbShowNullValues( sal_True ),
+ mbShowFormulas( false ),
bShowSpellErrors( false ),
bMarkClipped( false ), // sal_False fuer Drucker/Metafile etc.
bSnapPixel( false ),
@@ -223,7 +223,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
nVisY1 = nY1;
nVisX2 = nX2;
nVisY2 = nY2;
- pDoc->StripHidden( nVisX1, nVisY1, nVisX2, nVisY2, nTab );
+ mpDoc->StripHidden( nVisX1, nVisY1, nVisX2, nVisY2, nTab );
nScrW = 0;
for (SCCOL nX=nVisX1; nX<=nVisX2; nX++)
@@ -235,9 +235,9 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++)
nScrH += pRowInfo[nArrY].nHeight;
- bTabProtected = pDoc->IsTabProtected( nTab );
- nTabTextDirection = pDoc->GetEditTextDirection( nTab );
- bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+ bTabProtected = mpDoc->IsTabProtected( nTab );
+ nTabTextDirection = mpDoc->GetEditTextDirection( nTab );
+ bLayoutRTL = mpDoc->IsLayoutRTL( nTab );
}
ScOutputData::~ScOutputData()
@@ -251,11 +251,11 @@ void ScOutputData::SetContentDevice( OutputDevice* pContentDev )
{
// use pContentDev instead of pDev where used
- if ( pRefDevice == pDev )
- pRefDevice = pContentDev;
- if ( pFmtDevice == pDev )
+ if ( mpRefDevice == mpDev )
+ mpRefDevice = pContentDev;
+ if ( pFmtDevice == mpDev )
pFmtDevice = pContentDev;
- pDev = pContentDev;
+ mpDev = pContentDev;
}
void ScOutputData::SetMirrorWidth( long nNew )
@@ -275,12 +275,12 @@ void ScOutputData::SetMarkClipped( sal_Bool bSet )
void ScOutputData::SetShowNullValues( sal_Bool bSet )
{
- bShowNullValues = bSet;
+ mbShowNullValues = bSet;
}
void ScOutputData::SetShowFormulas( sal_Bool bSet )
{
- bShowFormulas = bSet;
+ mbShowFormulas = bSet;
}
void ScOutputData::SetShowSpellErrors( sal_Bool bSet )
@@ -312,7 +312,7 @@ void ScOutputData::SetSingleGrid( sal_Bool bNewMode )
void ScOutputData::SetSyntaxMode( sal_Bool bNewMode )
{
- bSyntaxMode = bNewMode;
+ mbSyntaxMode = bNewMode;
if (bNewMode)
if (!pValueColor)
{
@@ -342,7 +342,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
//! um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus
//! als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
long nOneY = aOnePixel.Height();
if (bMetaFile)
@@ -363,8 +363,8 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
aManualColor = aGridColor;
}
- pDev->SetLineColor( aGridColor );
- ScGridMerger aGrid( pDev, nOneX, nOneY );
+ mpDev->SetLineColor( aGridColor );
+ ScGridMerger aGrid( mpDev, nOneX, nOneY );
//
// Vertikale Linien
@@ -389,8 +389,8 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
SCCOL nCol = nXplus1;
while (nCol <= MAXCOL)
{
- nBreak = pDoc->HasColBreak(nCol, nTab);
- bool bHidden = pDoc->ColHidden(nCol, nTab);
+ nBreak = mpDoc->HasColBreak(nCol, nTab);
+ bool bHidden = mpDoc->ColHidden(nCol, nTab);
if ( nBreak || !bHidden )
break;
@@ -400,7 +400,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
if (nBreak != nBreakOld)
{
aGrid.Flush();
- pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
+ mpDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
nBreak ? aPageColor : aGridColor );
nBreakOld = nBreak;
}
@@ -427,7 +427,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
if ( nX<MAXCOL && bSingle )
{
SCCOL nVisX = nXplus1;
- while ( nVisX < MAXCOL && !pDoc->GetColWidth(nVisX,nTab) )
+ while ( nVisX < MAXCOL && !mpDoc->GetColWidth(nVisX,nTab) )
++nVisX;
nPosY = nScrY;
@@ -447,11 +447,11 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
if (nVisX <= nX2)
bHOver = pThisRowInfo->pCellInfo[nVisX+1].bHOverlapped;
else
- bHOver = ((ScMergeFlagAttr*)pDoc->GetAttr(
+ bHOver = ((ScMergeFlagAttr*)mpDoc->GetAttr(
nVisX,pThisRowInfo->nRowNo,nTab,ATTR_MERGE_FLAG))
->IsHorOverlapped();
if (bHOver)
- bHOver = ((ScMergeFlagAttr*)pDoc->GetAttr(
+ bHOver = ((ScMergeFlagAttr*)mpDoc->GetAttr(
nXplus1,pThisRowInfo->nRowNo,nTab,ATTR_MERGE_FLAG))
->IsHorOverlapped();
}
@@ -493,7 +493,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
for (SCROW i = nYplus1; i <= MAXROW; ++i)
{
if (i > nHiddenEndRow)
- bHiddenRow = pDoc->RowHidden(i, nTab, NULL, &nHiddenEndRow);
+ bHiddenRow = mpDoc->RowHidden(i, nTab, NULL, &nHiddenEndRow);
/* TODO: optimize the row break thing for large hidden
* segments where HasRowBreak() has to be called
* nevertheless for each row, as a row break is drawn also
@@ -501,7 +501,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
* once per hidden segment, maybe giving manual breaks
* priority. Something like GetNextRowBreak() and
* GetNextManualRowBreak(). */
- nBreak = pDoc->HasRowBreak(i, nTab);
+ nBreak = mpDoc->HasRowBreak(i, nTab);
if (!bHiddenRow || nBreak)
break;
}
@@ -509,7 +509,7 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
if (nBreakOld != nBreak)
{
aGrid.Flush();
- pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
+ mpDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor :
(nBreak) ? aPageColor : aGridColor );
nBreakOld = nBreak;
}
@@ -546,10 +546,10 @@ void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
bVOver = pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped;
else
{
- bVOver = ((ScMergeFlagAttr*)pDoc->GetAttr(
+ bVOver = ((ScMergeFlagAttr*)mpDoc->GetAttr(
i,nYplus1,nTab,ATTR_MERGE_FLAG))
->IsVerOverlapped()
- && ((ScMergeFlagAttr*)pDoc->GetAttr(
+ && ((ScMergeFlagAttr*)mpDoc->GetAttr(
i,nVisY,nTab,ATTR_MERGE_FLAG))
->IsVerOverlapped();
//! nVisY aus Array ??
@@ -628,10 +628,10 @@ void ScOutputData::FindRotated()
const ScPatternAttr* pPattern = pInfo->pPatternAttr;
const SfxItemSet* pCondSet = pInfo->pConditionSet;
- if ( !pPattern && !pDoc->ColHidden(nX, nTab) )
+ if ( !pPattern && !mpDoc->ColHidden(nX, nTab) )
{
- pPattern = pDoc->GetPattern( nX, nY, nTab );
- pCondSet = pDoc->GetCondResult( nX, nY, nTab );
+ pPattern = mpDoc->GetPattern( nX, nY, nTab );
+ pCondSet = mpDoc->GetCondResult( nX, nY, nTab );
}
if ( pPattern ) // Spalte nicht ausgeblendet
@@ -787,13 +787,13 @@ void ScOutputData::DrawDocumentBackground()
if ( !bSolidBackground )
return;
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
long nOneY = aOnePixel.Height();
Rectangle aRect(nScrX - nOneX, nScrY - nOneY, nScrX + nScrW, nScrY + nScrH);
Color aBgColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
- pDev->SetFillColor(aBgColor);
- pDev->DrawRect(aRect);
+ mpDev->SetFillColor(aBgColor);
+ mpDev->DrawRect(aRect);
}
namespace {
@@ -939,7 +939,7 @@ void ScOutputData::DrawBackground()
FindRotated(); //! von aussen ?
Rectangle aRect;
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
long nOneY = aOnePixel.Height();
@@ -949,12 +949,12 @@ void ScOutputData::DrawBackground()
long nLayoutSign = bLayoutRTL ? -1 : 1;
long nSignedOneX = nOneX * nLayoutSign;
- pDev->SetLineColor();
+ mpDev->SetLineColor();
- sal_Bool bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
+ sal_Bool bShowProt = mbSyntaxMode && mpDoc->IsTabProtected(nTab);
sal_Bool bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
- sal_Bool bCellContrast = bUseStyleColor &&
+ sal_Bool bCellContrast = mbUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
long nPosY = nScrY;
@@ -965,7 +965,7 @@ void ScOutputData::DrawBackground()
if ( pThisRowInfo->bChanged )
{
- if ( ( ( pThisRowInfo->bEmptyBack ) || bSyntaxMode ) && !bDoAll )
+ if ( ( ( pThisRowInfo->bEmptyBack ) || mbSyntaxMode ) && !bDoAll )
{
// nichts
}
@@ -1026,16 +1026,16 @@ void ScOutputData::DrawBackground()
!bCellContrast )
{
SCROW nY = pRowInfo[nArrY].nRowNo;
- pBackground = lcl_FindBackground( pDoc, nX, nY, nTab );
+ pBackground = lcl_FindBackground( mpDoc, nX, nY, nTab );
}
pColor = pInfo->pColorScale;
const ScDataBarInfo* pDataBarInfo = pInfo->pDataBar;
- drawCells( pColor, pBackground, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, pDev, pDataBarInfo, pOldDataBarInfo );
+ drawCells( pColor, pBackground, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, mpDev, pDataBarInfo, pOldDataBarInfo );
nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
}
- drawCells( NULL, NULL, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, pDev, NULL, pOldDataBarInfo );
+ drawCells( NULL, NULL, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, mpDev, NULL, pOldDataBarInfo );
nArrY += nSkip;
}
@@ -1051,10 +1051,10 @@ void ScOutputData::DrawShadow()
void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom)
{
- pDev->SetLineColor();
+ mpDev->SetLineColor();
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
+ sal_Bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
Color aAutoTextColor;
if ( bCellContrast )
aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
@@ -1062,7 +1062,7 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
long nInitPosX = nScrX;
if ( bLayoutRTL )
{
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
nInitPosX += nMirrorW - nOneX;
}
@@ -1120,9 +1120,9 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
nPosY + pRowInfo[nArrY].nHeight - 1 );
long nSize = pAttr->GetWidth();
- long nSizeX = (long)(nSize*nPPTX);
+ long nSizeX = (long)(nSize*mnPPTX);
if (nSizeX >= nMaxWidth) nSizeX = nMaxWidth-1;
- long nSizeY = (long)(nSize*nPPTY);
+ long nSizeY = (long)(nSize*mnPPTY);
if (nSizeY >= nRowHeight) nSizeY = nRowHeight-1;
nSizeX *= nLayoutSign; // used only to add to rectangle values
@@ -1177,8 +1177,8 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
}
//! merge rectangles?
- pDev->SetFillColor( bCellContrast ? aAutoTextColor : pAttr->GetColor() );
- pDev->DrawRect( aRect );
+ mpDev->SetFillColor( bCellContrast ? aAutoTextColor : pAttr->GetColor() );
+ mpDev->DrawRect( aRect );
}
}
}
@@ -1197,7 +1197,7 @@ void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRigh
void ScOutputData::DrawClear()
{
Rectangle aRect;
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
long nOneY = aOnePixel.Height();
@@ -1207,9 +1207,9 @@ void ScOutputData::DrawClear()
if (bMetaFile)
nOneX = nOneY = 0;
- pDev->SetLineColor();
+ mpDev->SetLineColor();
- pDev->SetFillColor( aBgColor );
+ mpDev->SetFillColor( aBgColor );
long nPosY = nScrY;
for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++)
@@ -1229,7 +1229,7 @@ void ScOutputData::DrawClear()
aRect = Rectangle( Point( nScrX, nPosY ),
Size( nScrW+1-nOneX, nRowHeight+1-nOneY) );
- pDev->DrawRect( aRect );
+ mpDev->DrawRect( aRect );
nArrY += nSkip;
}
@@ -1259,12 +1259,12 @@ size_t lclGetArrayColFromCellInfoX( sal_uInt16 nCellInfoX, sal_uInt16 nCellInfoF
void ScOutputData::DrawFrame()
{
- sal_uLong nOldDrawMode = pDev->GetDrawMode();
+ sal_uLong nOldDrawMode = mpDev->GetDrawMode();
Color aSingleColor;
sal_Bool bUseSingleColor = false;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
+ sal_Bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
// if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used
// for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines
@@ -1273,13 +1273,13 @@ void ScOutputData::DrawFrame()
if ( ( nOldDrawMode & DRAWMODE_WHITEFILL ) && ( nOldDrawMode & DRAWMODE_BLACKLINE ) )
{
- pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_WHITEFILL) );
+ mpDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_WHITEFILL) );
aSingleColor.SetColor( COL_BLACK );
bUseSingleColor = sal_True;
}
else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) )
{
- pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) );
+ mpDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) );
aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE
bUseSingleColor = sal_True;
}
@@ -1297,7 +1297,7 @@ void ScOutputData::DrawFrame()
long nInitPosX = nScrX;
if ( bLayoutRTL )
{
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
nInitPosX += nMirrorW - nOneX;
}
@@ -1315,12 +1315,12 @@ void ScOutputData::DrawFrame()
// row 0 is not visible (dummy for borders from top) - subtract its height from initial position
// subtract 1 unit more, because position 0 is first *in* cell, grid line is one unit before
long nOldPosY = nScrY - 1 - pRowInfo[ 0 ].nHeight;
- long nOldSnapY = lclGetSnappedY( *pDev, nOldPosY, bSnapPixel );
+ long nOldSnapY = lclGetSnappedY( *mpDev, nOldPosY, bSnapPixel );
rArray.SetYOffset( nOldSnapY );
for( size_t nRow = 0; nRow < nRowCount; ++nRow )
{
long nNewPosY = nOldPosY + pRowInfo[ nRow ].nHeight;
- long nNewSnapY = lclGetSnappedY( *pDev, nNewPosY, bSnapPixel );
+ long nNewSnapY = lclGetSnappedY( *mpDev, nNewPosY, bSnapPixel );
rArray.SetRowHeight( nRow, nNewSnapY - nOldSnapY );
nOldPosY = nNewPosY;
nOldSnapY = nNewSnapY;
@@ -1331,7 +1331,7 @@ void ScOutputData::DrawFrame()
// column nX1 is not visible (dummy for borders from left) - subtract its width from initial position
// subtract 1 unit more, because position 0 is first *in* cell, grid line is one unit above
long nOldPosX = nInitPosX - nLayoutSign * (1 + pRowInfo[ 0 ].pCellInfo[ nX1 ].nWidth);
- long nOldSnapX = lclGetSnappedX( *pDev, nOldPosX, bSnapPixel );
+ long nOldSnapX = lclGetSnappedX( *mpDev, nOldPosX, bSnapPixel );
// set X offset for left-to-right sheets; for right-to-left sheets this is done after for() loop
if( !bLayoutRTL )
rArray.SetXOffset( nOldSnapX );
@@ -1339,7 +1339,7 @@ void ScOutputData::DrawFrame()
{
size_t nCol = lclGetArrayColFromCellInfoX( nInfoIdx, nX1, nX2, bLayoutRTL );
long nNewPosX = nOldPosX + pRowInfo[ 0 ].pCellInfo[ nInfoIdx ].nWidth * nLayoutSign;
- long nNewSnapX = lclGetSnappedX( *pDev, nNewPosX, bSnapPixel );
+ long nNewSnapX = lclGetSnappedX( *mpDev, nNewPosX, bSnapPixel );
rArray.SetColWidth( nCol, Abs( nNewSnapX - nOldSnapX ) );
nOldPosX = nNewPosX;
nOldSnapX = nNewSnapX;
@@ -1377,7 +1377,7 @@ void ScOutputData::DrawFrame()
if ( pProcessor )
delete pProcessor;
- pDev->SetDrawMode(nOldDrawMode);
+ mpDev->SetDrawMode(nOldDrawMode);
}
// -------------------------------------------------------------------------
@@ -1462,14 +1462,14 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
const SfxItemSet* pCondSet;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
+ sal_Bool bCellContrast = mbUseStyleColor && rStyleSettings.GetHighContrastMode();
// color (pForceColor) is determined externally, including DrawMode changes
long nInitPosX = nScrX;
if ( bLayoutRTL )
{
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
nInitPosX += nMirrorW - nOneX;
}
@@ -1478,11 +1478,11 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
Rectangle aClipRect( Point(nScrX, nScrY), Size(nScrW, nScrH) );
if (bMetaFile)
{
- pDev->Push();
- pDev->IntersectClipRegion( aClipRect );
+ mpDev->Push();
+ mpDev->IntersectClipRegion( aClipRect );
}
else
- pDev->SetClipRegion( Region( aClipRect ) );
+ mpDev->SetClipRegion( Region( aClipRect ) );
svx::frame::Array& rArray = mrTabInfo.maArray;
drawinglayer::processor2d::BaseProcessor2D* pProcessor = CreateProcessor2D( );
@@ -1522,9 +1522,9 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
pCondSet = pInfo->pConditionSet;
if (!pPattern)
{
- pPattern = pDoc->GetPattern( nX, nY, nTab );
+ pPattern = mpDoc->GetPattern( nX, nY, nTab );
pInfo->pPatternAttr = pPattern;
- pCondSet = pDoc->GetCondResult( nX, nY, nTab );
+ pCondSet = mpDoc->GetCondResult( nX, nY, nTab );
pInfo->pConditionSet = pCondSet;
}
@@ -1620,11 +1620,11 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
// ohne Pen wird bei DrawPolygon rechts und unten
// ein Pixel weggelassen...
if ( rColor.GetTransparency() == 0 )
- pDev->SetLineColor(rColor);
+ mpDev->SetLineColor(rColor);
else
- pDev->SetLineColor();
- pDev->SetFillColor(rColor);
- pDev->DrawPolygon( aPoly );
+ mpDev->SetLineColor();
+ mpDev->SetFillColor(rColor);
+ mpDev->DrawPolygon( aPoly );
}
}
}
@@ -1636,11 +1636,11 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
// ohne Pen wird bei DrawPolygon rechts und unten
// ein Pixel weggelassen...
if ( pColor->GetTransparency() == 0 )
- pDev->SetLineColor(*pColor);
+ mpDev->SetLineColor(*pColor);
else
- pDev->SetLineColor();
- pDev->SetFillColor(*pColor);
- pDev->DrawPolygon( aPoly );
+ mpDev->SetLineColor();
+ mpDev->SetFillColor(*pColor);
+ mpDev->DrawPolygon( aPoly );
}
@@ -1653,12 +1653,12 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
const ::editeng::SvxBorderLine* pTopLine;
const ::editeng::SvxBorderLine* pRightLine;
const ::editeng::SvxBorderLine* pBottomLine;
- pDoc->GetBorderLines( nX, nY, nTab,
+ mpDoc->GetBorderLines( nX, nY, nTab,
&pLeftLine, &pTopLine, &pRightLine, &pBottomLine );
- aTopLine.Set( pTopLine, nPPTY );
- aBottomLine.Set( pBottomLine, nPPTY );
- aLeftLine.Set( pLeftLine, nPPTX );
- aRightLine.Set( pRightLine, nPPTX );
+ aTopLine.Set( pTopLine, mnPPTY );
+ aBottomLine.Set( pBottomLine, mnPPTY );
+ aLeftLine.Set( pLeftLine, mnPPTX );
+ aRightLine.Set( pRightLine, mnPPTX );
}
else
{
@@ -1674,7 +1674,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
const svx::frame::Style noStyle;
// Horizontal lines
- long nUpperRotate = lcl_getRotate( pDoc, nTab, nX, nY - 1 );
+ long nUpperRotate = lcl_getRotate( mpDoc, nTab, nX, nY - 1 );
pProcessor->process( svx::frame::CreateBorderPrimitives(
aPoints[bLayoutRTL?1:0], aPoints[bLayoutRTL?0:1], aTopLine,
svx::frame::Style(),
@@ -1685,7 +1685,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
aRightLine,
pForceColor, nUpperRotate, nAttrRotate ) );
- long nLowerRotate = lcl_getRotate( pDoc, nTab, nX, nY + 1 );
+ long nLowerRotate = lcl_getRotate( mpDoc, nTab, nX, nY + 1 );
pProcessor->process( svx::frame::CreateBorderPrimitives(
aPoints[bLayoutRTL?2:3], aPoints[bLayoutRTL?3:2], aBottomLine,
aLeftLine,
@@ -1697,7 +1697,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
pForceColor, 18000 - nAttrRotate, 18000 - nLowerRotate ) );
// Vertical slanted lines
- long nLeftRotate = lcl_getRotate( pDoc, nTab, nX - 1, nY );
+ long nLeftRotate = lcl_getRotate( mpDoc, nTab, nX - 1, nY );
pProcessor->process( svx::frame::CreateBorderPrimitives(
aPoints[0], aPoints[3], aLeftLine,
aTopLine,
@@ -1708,7 +1708,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
svx::frame::Style(),
pForceColor, nAttrRotate, nLeftRotate ) );
- long nRightRotate = lcl_getRotate( pDoc, nTab, nX + 1, nY );
+ long nRightRotate = lcl_getRotate( mpDoc, nTab, nX + 1, nY );
pProcessor->process( svx::frame::CreateBorderPrimitives(
aPoints[1], aPoints[2], aRightLine,
svx::frame::Style(),
@@ -1743,14 +1743,14 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
sal_uInt16 nDir = rInfo.nRotateDir;
if ( rArray.GetCellStyleTop( nCol, nRow ).Prim() )
{
- svx::frame::Style aStyle( lcl_FindHorLine( pDoc, nX, nY, nTab, nDir, sal_True ), nPPTY );
+ svx::frame::Style aStyle( lcl_FindHorLine( mpDoc, nX, nY, nTab, nDir, sal_True ), mnPPTY );
rArray.SetCellStyleTop( nCol, nRow, aStyle );
if( nRow > 0 )
rArray.SetCellStyleBottom( nCol, nRow - 1, aStyle );
}
if ( rArray.GetCellStyleBottom( nCol, nRow ).Prim() )
{
- svx::frame::Style aStyle( lcl_FindHorLine( pDoc, nX, nY, nTab, nDir, false ), nPPTY );
+ svx::frame::Style aStyle( lcl_FindHorLine( mpDoc, nX, nY, nTab, nDir, false ), mnPPTY );
rArray.SetCellStyleBottom( nCol, nRow, aStyle );
if( nRow + 1 < rArray.GetRowCount() )
rArray.SetCellStyleTop( nCol, nRow + 1, aStyle );
@@ -1782,15 +1782,15 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
if ( pProcessor ) delete pProcessor;
if (bMetaFile)
- pDev->Pop();
+ mpDev->Pop();
else
- pDev->SetClipRegion();
+ mpDev->SetClipRegion();
}
drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( )
{
- pDoc->InitDrawLayer(pDoc->GetDocumentShell());
- ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
+ mpDoc->InitDrawLayer(mpDoc->GetDocumentShell());
+ ScDrawLayer* pDrawLayer = mpDoc->GetDrawLayer();
if (!pDrawLayer)
return NULL;
@@ -1798,14 +1798,14 @@ drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( )
SdrPage *pDrawPage = pDrawLayer->GetPage( static_cast< sal_uInt16 >( nTab ) );
const drawinglayer::geometry::ViewInformation2D aNewViewInfos(
basegfx::B2DHomMatrix( ),
- pDev->GetViewTransformation(),
+ mpDev->GetViewTransformation(),
aViewRange,
GetXDrawPageForSdrPage( pDrawPage ),
0.0,
uno::Sequence< beans::PropertyValue >() );
return drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
- *pDev, aNewViewInfos );
+ *mpDev, aNewViewInfos );
}
// Drucker
@@ -1836,14 +1836,14 @@ PolyPolygon ScOutputData::GetChangedArea()
}
else if (bHad)
{
- aPoly.Insert( Polygon( pDev->PixelToLogic(aDrawingRect) ) );
+ aPoly.Insert( Polygon( mpDev->PixelToLogic(aDrawingRect) ) );
bHad = false;
}
nPosY += pRowInfo[nArrY].nHeight;
}
if (bHad)
- aPoly.Insert( Polygon( pDev->PixelToLogic(aDrawingRect) ) );
+ aPoly.Insert( Polygon( mpDev->PixelToLogic(aDrawingRect) ) );
return aPoly;
}
@@ -1874,18 +1874,18 @@ sal_Bool ScOutputData::SetChangedClip()
}
else if (bHad)
{
- aPoly.Insert( Polygon( pDev->PixelToLogic(aDrawingRect) ) );
+ aPoly.Insert( Polygon( mpDev->PixelToLogic(aDrawingRect) ) );
bHad = false;
}
nPosY += pRowInfo[nArrY].nHeight;
}
if (bHad)
- aPoly.Insert( Polygon( pDev->PixelToLogic(aDrawingRect) ) );
+ aPoly.Insert( Polygon( mpDev->PixelToLogic(aDrawingRect) ) );
sal_Bool bRet = (aPoly.Count() != 0);
if (bRet)
- pDev->SetClipRegion(Region(aPoly));
+ mpDev->SetClipRegion(Region(aPoly));
return bRet;
}
@@ -1894,8 +1894,8 @@ void ScOutputData::FindChanged()
SCCOL nX;
SCSIZE nArrY;
- bool bWasIdleDisabled = pDoc->IsIdleDisabled();
- pDoc->DisableIdle(true);
+ bool bWasIdleDisabled = mpDoc->IsIdleDisabled();
+ mpDoc->DisableIdle(true);
for (nArrY=0; nArrY<nArrCount; nArrY++)
pRowInfo[nArrY].bChanged = false;
@@ -1915,7 +1915,7 @@ void ScOutputData::FindChanged()
ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
if ( !bProgress && pFCell->GetDirty() )
{
- ScProgress::CreateInterpretProgress(pDoc, true);
+ ScProgress::CreateInterpretProgress(mpDoc, true);
bProgress = true;
}
if (pFCell->IsRunning())
@@ -1942,7 +1942,7 @@ void ScOutputData::FindChanged()
}
if ( bProgress )
ScProgress::DeleteInterpretProgress();
- pDoc->DisableIdle( bWasIdleDisabled );
+ mpDoc->DisableIdle( bWasIdleDisabled );
}
void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
@@ -1953,7 +1953,7 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
PutInOrder( nRefStartY, nRefEndY );
if ( nRefStartX == nRefEndX && nRefStartY == nRefEndY )
- pDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab );
+ mpDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab );
if ( nRefStartX <= nVisX2 && nRefEndX >= nVisX1 &&
nRefStartY <= nVisY2 && nRefEndY >= nVisY1 )
@@ -2024,28 +2024,28 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
if ( nMaxX * nLayoutSign >= nMinX * nLayoutSign &&
nMaxY >= nMinY )
{
- pDev->SetLineColor( rColor );
+ mpDev->SetLineColor( rColor );
if (bTop && bBottom && bLeft && bRight)
{
- pDev->SetFillColor();
- pDev->DrawRect( Rectangle( nMinX, nMinY, nMaxX, nMaxY ) );
+ mpDev->SetFillColor();
+ mpDev->DrawRect( Rectangle( nMinX, nMinY, nMaxX, nMaxY ) );
}
else
{
if (bTop)
- pDev->DrawLine( Point( nMinX,nMinY ), Point( nMaxX,nMinY ) );
+ mpDev->DrawLine( Point( nMinX,nMinY ), Point( nMaxX,nMinY ) );
if (bBottom)
- pDev->DrawLine( Point( nMinX,nMaxY ), Point( nMaxX,nMaxY ) );
+ mpDev->DrawLine( Point( nMinX,nMaxY ), Point( nMaxX,nMaxY ) );
if (bLeft)
- pDev->DrawLine( Point( nMinX,nMinY ), Point( nMinX,nMaxY ) );
+ mpDev->DrawLine( Point( nMinX,nMinY ), Point( nMinX,nMaxY ) );
if (bRight)
- pDev->DrawLine( Point( nMaxX,nMinY ), Point( nMaxX,nMaxY ) );
+ mpDev->DrawLine( Point( nMaxX,nMinY ), Point( nMaxX,nMaxY ) );
}
if ( bHandle && bRight && bBottom )
{
- pDev->SetLineColor();
- pDev->SetFillColor( rColor );
- pDev->DrawRect( Rectangle( nMaxX-3*nLayoutSign, nMaxY-3, nMaxX+nLayoutSign, nMaxY+1 ) );
+ mpDev->SetLineColor();
+ mpDev->SetFillColor( rColor );
+ mpDev->DrawRect( Rectangle( nMaxX-3*nLayoutSign, nMaxY-3, nMaxX+nLayoutSign, nMaxY+1 ) );
}
}
}
@@ -2059,7 +2059,7 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
PutInOrder( nRefStartY, nRefEndY );
if ( nRefStartX == nRefEndX && nRefStartY == nRefEndY )
- pDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab );
+ mpDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab );
if ( nRefStartX <= nVisX2 + 1 && nRefEndX >= nVisX1 &&
nRefStartY <= nVisY2 + 1 && nRefEndY >= nVisY1 ) // +1 because it touches next cells left/top
@@ -2135,36 +2135,36 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
else if ( nType == SC_CAT_DELETE_COLS )
bTop = bBottom = bRight = false; //! dicke Linie ???
- pDev->SetLineColor( rColor );
+ mpDev->SetLineColor( rColor );
if (bTop && bBottom && bLeft && bRight)
{
- pDev->SetFillColor();
- pDev->DrawRect( Rectangle( nMinX, nMinY, nMaxX, nMaxY ) );
+ mpDev->SetFillColor();
+ mpDev->DrawRect( Rectangle( nMinX, nMinY, nMaxX, nMaxY ) );
}
else
{
if (bTop)
{
- pDev->DrawLine( Point( nMinX,nMinY ), Point( nMaxX,nMinY ) );
+ mpDev->DrawLine( Point( nMinX,nMinY ), Point( nMaxX,nMinY ) );
if ( nType == SC_CAT_DELETE_ROWS )
- pDev->DrawLine( Point( nMinX,nMinY+1 ), Point( nMaxX,nMinY+1 ) );
+ mpDev->DrawLine( Point( nMinX,nMinY+1 ), Point( nMaxX,nMinY+1 ) );
}
if (bBottom)
- pDev->DrawLine( Point( nMinX,nMaxY ), Point( nMaxX,nMaxY ) );
+ mpDev->DrawLine( Point( nMinX,nMaxY ), Point( nMaxX,nMaxY ) );
if (bLeft)
{
- pDev->DrawLine( Point( nMinX,nMinY ), Point( nMinX,nMaxY ) );
+ mpDev->DrawLine( Point( nMinX,nMinY ), Point( nMinX,nMaxY ) );
if ( nType == SC_CAT_DELETE_COLS )
- pDev->DrawLine( Point( nMinX+nLayoutSign,nMinY ), Point( nMinX+nLayoutSign,nMaxY ) );
+ mpDev->DrawLine( Point( nMinX+nLayoutSign,nMinY ), Point( nMinX+nLayoutSign,nMaxY ) );
}
if (bRight)
- pDev->DrawLine( Point( nMaxX,nMinY ), Point( nMaxX,nMaxY ) );
+ mpDev->DrawLine( Point( nMaxX,nMinY ), Point( nMaxX,nMaxY ) );
}
if ( bLeft && bTop )
{
- pDev->SetLineColor();
- pDev->SetFillColor( rColor );
- pDev->DrawRect( Rectangle( nMinX+nLayoutSign, nMinY+1, nMinX+3*nLayoutSign, nMinY+3 ) );
+ mpDev->SetLineColor();
+ mpDev->SetFillColor( rColor );
+ mpDev->DrawRect( Rectangle( nMinX+nLayoutSign, nMinY+1, nMinX+3*nLayoutSign, nMinY+3 ) );
}
}
}
@@ -2172,8 +2172,8 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
void ScOutputData::DrawChangeTrack()
{
- ScChangeTrack* pTrack = pDoc->GetChangeTrack();
- ScChangeViewSettings* pSettings = pDoc->GetChangeViewSettings();
+ ScChangeTrack* pTrack = mpDoc->GetChangeTrack();
+ ScChangeViewSettings* pSettings = mpDoc->GetChangeViewSettings();
if ( !pTrack || !pTrack->GetFirst() || !pSettings || !pSettings->ShowChanges() )
return; // nix da oder abgeschaltet
@@ -2205,7 +2205,7 @@ void ScOutputData::DrawChangeTrack()
aRange.aEnd.SetCol( aRange.aStart.Col() );
if ( aRange.Intersects( aViewRange ) &&
- ScViewUtil::IsActionShown( *pAction, *pSettings, *pDoc ) )
+ ScViewUtil::IsActionShown( *pAction, *pSettings, *mpDoc ) )
{
aColorChanger.Update( *pAction );
Color aColor( aColorChanger.GetColor() );
@@ -2221,7 +2221,7 @@ void ScOutputData::DrawChangeTrack()
ScRange aRange = ((const ScChangeActionMove*)pAction)->
GetFromRange().MakeRange();
if ( aRange.Intersects( aViewRange ) &&
- ScViewUtil::IsActionShown( *pAction, *pSettings, *pDoc ) )
+ ScViewUtil::IsActionShown( *pAction, *pSettings, *mpDoc ) )
{
aColorChanger.Update( *pAction );
Color aColor( aColorChanger.GetColor() );
@@ -2265,22 +2265,22 @@ void ScOutputData::DrawNoteMarks()
SCROW nY = pRowInfo[nArrY].nRowNo;
SCCOL nMergeX = nX;
SCROW nMergeY = nY;
- pDoc->ExtendOverlapped( nMergeX, nMergeY, nX, nY, nTab );
+ mpDoc->ExtendOverlapped( nMergeX, nMergeY, nX, nY, nTab );
// use origin's pCell for NotePtr test below
}
- if ( pDoc->GetNotes(nTab)->findByAddress(nX, pRowInfo[nArrY].nRowNo) && ( bIsMerged ||
+ if ( mpDoc->GetNotes(nTab)->findByAddress(nX, pRowInfo[nArrY].nRowNo) && ( bIsMerged ||
( !pInfo->bHOverlapped && !pInfo->bVOverlapped ) ) )
{
if (bFirst)
{
- pDev->SetLineColor();
+ mpDev->SetLineColor();
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- if ( bUseStyleColor && rStyleSettings.GetHighContrastMode() )
- pDev->SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
+ if ( mbUseStyleColor && rStyleSettings.GetHighContrastMode() )
+ mpDev->SetFillColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
else
- pDev->SetFillColor(COL_LIGHTRED);
+ mpDev->SetFillColor(COL_LIGHTRED);
bFirst = false;
}
@@ -2297,7 +2297,7 @@ void ScOutputData::DrawNoteMarks()
}
}
if ( bLayoutRTL ? ( nMarkX >= 0 ) : ( nMarkX < nScrX+nScrW ) )
- pDev->DrawRect( Rectangle( nMarkX,nPosY,nMarkX+2*nLayoutSign,nPosY+2 ) );
+ mpDev->DrawRect( Rectangle( nMarkX,nPosY,nMarkX+2*nLayoutSign,nPosY+2 ) );
}
nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
@@ -2309,14 +2309,14 @@ void ScOutputData::DrawNoteMarks()
void ScOutputData::AddPDFNotes()
{
- vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
+ vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, mpDev->GetExtOutDevData() );
if ( !pPDFData || !pPDFData->GetIsExportNotes() )
return;
long nInitPosX = nScrX;
if ( bLayoutRTL )
{
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
+ Size aOnePixel = mpDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
nInitPosX += nMirrorW - nOneX;
}
@@ -2341,15 +2341,15 @@ void ScOutputData::AddPDFNotes()
{
// find start of merged cell
bIsMerged = sal_True;
- pDoc->ExtendOverlapped( nMergeX, nMergeY, nX, nY, nTab );
+ mpDoc->ExtendOverlapped( nMergeX, nMergeY, nX, nY, nTab );
// use origin's pCell for NotePtr test below
}
- if ( pDoc->GetNotes(nTab)->findByAddress(nMergeX, nMergeY) && ( bIsMerged ||
+ if ( mpDoc->GetNotes(nTab)->findByAddress(nMergeX, nMergeY) && ( bIsMerged ||
( !pInfo->bHOverlapped && !pInfo->bVOverlapped ) ) )
{
- long nNoteWidth = (long)( SC_CLIPMARK_SIZE * nPPTX );
- long nNoteHeight = (long)( SC_CLIPMARK_SIZE * nPPTY );
+ long nNoteWidth = (long)( SC_CLIPMARK_SIZE * mnPPTX );
+ long nNoteHeight = (long)( SC_CLIPMARK_SIZE * mnPPTY );
long nMarkX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - nNoteWidth ) * nLayoutSign;
if ( bIsMerged || pInfo->bMerged )
@@ -2365,12 +2365,12 @@ void ScOutputData::AddPDFNotes()
if ( bLayoutRTL ? ( nMarkX >= 0 ) : ( nMarkX < nScrX+nScrW ) )
{
Rectangle aNoteRect( nMarkX, nPosY, nMarkX+nNoteWidth*nLayoutSign, nPosY+nNoteHeight );
- const ScPostIt* pNote = pDoc->GetNotes(nTab)->findByAddress(nMergeX, nMergeY);
+ const ScPostIt* pNote = mpDoc->GetNotes(nTab)->findByAddress(nMergeX, nMergeY);
// Note title is the cell address (as on printed note pages)
String aTitle;
ScAddress aAddress( nMergeX, nMergeY, nTab );
- aAddress.Format( aTitle, SCA_VALID, pDoc, pDoc->GetAddressConvention() );
+ aAddress.Format( aTitle, SCA_VALID, mpDoc, mpDoc->GetAddressConvention() );
// Content has to be a simple string without line breaks
String aContent = pNote->GetText();
@@ -2399,12 +2399,12 @@ void ScOutputData::DrawClipMarks()
Color aArrowFillCol( COL_LIGHTRED );
- sal_uLong nOldDrawMode = pDev->GetDrawMode();
+ sal_uLong nOldDrawMode = mpDev->GetDrawMode();
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- if ( bUseStyleColor && rStyleSettings.GetHighContrastMode() )
+ if ( mbUseStyleColor && rStyleSettings.GetHighContrastMode() )
{
// use DrawMode to change the arrow's outline color
- pDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE );
+ mpDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE );
// use text color also for the fill color
aArrowFillCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
}
@@ -2437,30 +2437,30 @@ void ScOutputData::DrawClipMarks()
long nStartPosX = nPosX;
long nStartPosY = nPosY;
- while ( nOverX > 0 && ( ((const ScMergeFlagAttr*)pDoc->GetAttr(
+ while ( nOverX > 0 && ( ((const ScMergeFlagAttr*)mpDoc->GetAttr(
nOverX, nOverY, nTab, ATTR_MERGE_FLAG ))->GetValue() & SC_MF_HOR ) )
{
--nOverX;
- nStartPosX -= nLayoutSign * (long) ( pDoc->GetColWidth(nOverX,nTab) * nPPTX );
+ nStartPosX -= nLayoutSign * (long) ( mpDoc->GetColWidth(nOverX,nTab) * mnPPTX );
}
- while ( nOverY > 0 && ( ((const ScMergeFlagAttr*)pDoc->GetAttr(
+ while ( nOverY > 0 && ( ((const ScMergeFlagAttr*)mpDoc->GetAttr(
nOverX, nOverY, nTab, ATTR_MERGE_FLAG ))->GetValue() & SC_MF_VER ) )
{
--nOverY;
- nStartPosY -= nLayoutSign * (long) ( pDoc->GetRowHeight(nOverY,nTab) * nPPTY );
+ nStartPosY -= nLayoutSign * (long) ( mpDoc->GetRowHeight(nOverY,nTab) * mnPPTY );
}
- long nOutWidth = (long) ( pDoc->GetColWidth(nOverX,nTab) * nPPTX );
- long nOutHeight = (long) ( pDoc->GetRowHeight(nOverY,nTab) * nPPTY );
+ long nOutWidth = (long) ( mpDoc->GetColWidth(nOverX,nTab) * mnPPTX );
+ long nOutHeight = (long) ( mpDoc->GetRowHeight(nOverY,nTab) * mnPPTY );
const ScMergeAttr* pMerge = (const ScMergeAttr*)
- pDoc->GetAttr( nOverX, nOverY, nTab, ATTR_MERGE );
+ mpDoc->GetAttr( nOverX, nOverY, nTab, ATTR_MERGE );
SCCOL nCountX = pMerge->GetColMerge();
for (SCCOL i=1; i<nCountX; i++)
- nOutWidth += (long) ( pDoc->GetColWidth(nOverX+i,nTab) * nPPTX );
+ nOutWidth += (long) ( mpDoc->GetColWidth(nOverX+i,nTab) * mnPPTX );
SCROW nCountY = pMerge->GetRowMerge();
- nOutHeight += (long) pDoc->GetScaledRowHeight( nOverY+1, nOverY+nCountY-1, nTab, nPPTY);
+ nOutHeight += (long) mpDoc->GetScaledRowHeight( nOverY+1, nOverY+nCountY-1, nTab, mnPPTY);
if ( bLayoutRTL )
nStartPosX -= nOutWidth - 1;
@@ -2479,9 +2479,9 @@ void ScOutputData::DrawClipMarks()
(ScMergeAttr*)&pInfo->pPatternAttr->GetItem(ATTR_MERGE);
SCCOL nCountX = pMerge->GetColMerge();
for (SCCOL i=1; i<nCountX; i++)
- nOutWidth += (long) ( pDoc->GetColWidth(nOverX+i,nTab) * nPPTX );
+ nOutWidth += (long) ( mpDoc->GetColWidth(nOverX+i,nTab) * mnPPTX );
SCROW nCountY = pMerge->GetRowMerge();
- nOutHeight += (long) pDoc->GetScaledRowHeight( nOverY+1, nOverY+nCountY-1, nTab, nPPTY);
+ nOutHeight += (long) mpDoc->GetScaledRowHeight( nOverY+1, nOverY+nCountY-1, nTab, mnPPTY);
}
long nStartPosX = nPosX;
@@ -2498,7 +2498,7 @@ void ScOutputData::DrawClipMarks()
else
aCellRect.Right() -= 1;
- long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX );
+ long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX );
Size aMarkSize( nMarkPixel, (nMarkPixel-1)*2 );
if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_RIGHT : SC_CLIPMARK_LEFT ) )
@@ -2506,14 +2506,14 @@ void ScOutputData::DrawClipMarks()
// visually left
Rectangle aMarkRect = aCellRect;
aMarkRect.Right() = aCellRect.Left()+nMarkPixel-1;
- SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, true );
+ SvxFont::DrawArrow( *mpDev, aMarkRect, aMarkSize, aArrowFillCol, true );
}
if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_LEFT : SC_CLIPMARK_RIGHT ) )
{
// visually right
Rectangle aMarkRect = aCellRect;
aMarkRect.Left() = aCellRect.Right()-nMarkPixel+1;
- SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, false );
+ SvxFont::DrawArrow( *mpDev, aMarkRect, aMarkSize, aArrowFillCol, false );
}
}
nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
@@ -2522,7 +2522,7 @@ void ScOutputData::DrawClipMarks()
nPosY += pThisRowInfo->nHeight;
}
- pDev->SetDrawMode(nOldDrawMode);
+ mpDev->SetDrawMode(nOldDrawMode);
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index fd0c075..d4f2f7e 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -208,7 +208,7 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, sal_Bool bPTL) :
nChar( 0x0 )
{
ScModule* pScMod = SC_MOD();
- bCellContrast = pOutput->bUseStyleColor &&
+ bCellContrast = pOutput->mbUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
const svtools::ColorConfig& rColorConfig = pScMod->GetColorConfig();
@@ -224,8 +224,8 @@ void ScDrawStringsVars::SetShrinkScale( long nScale, sal_uInt8 nScript )
{
// text remains valid, size is updated
- OutputDevice* pDev = pOutput->pDev;
- OutputDevice* pRefDevice = pOutput->pRefDevice;
+ OutputDevice* pDev = pOutput->mpDev;
+ OutputDevice* pRefDevice = pOutput->mpRefDevice;
OutputDevice* pFmtDevice = pOutput->pFmtDevice;
// call GetFont with a modified fraction, use only the height
@@ -291,16 +291,16 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
// pPattern auswerten
- OutputDevice* pDev = pOutput->pDev;
- OutputDevice* pRefDevice = pOutput->pRefDevice;
+ OutputDevice* pDev = pOutput->mpDev;
+ OutputDevice* pRefDevice = pOutput->mpRefDevice;
OutputDevice* pFmtDevice = pOutput->pFmtDevice;
// Font
ScAutoFontColorMode eColorMode;
- if ( pOutput->bUseStyleColor )
+ if ( pOutput->mbUseStyleColor )
{
- if ( pOutput->bForceAutoColor )
+ if ( pOutput->mbForceAutoColor )
eColorMode = bCellContrast ? SC_AUTOCOL_IGNOREALL : SC_AUTOCOL_IGNOREFONT;
else
eColorMode = bCellContrast ? SC_AUTOCOL_IGNOREBACK : SC_AUTOCOL_DISPLAY;
@@ -380,7 +380,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
// Syntax-Modus
- if (pOutput->bSyntaxMode)
+ if (pOutput->mbSyntaxMode)
pOutput->SetSyntaxColor( &aFont, pCell );
pDev->SetFont( aFont );
@@ -415,7 +415,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
// Zahlenformat
- nValueFormat = pPattern->GetNumberFormat( pOutput->pDoc->GetFormatTable(), pCondSet );
+ nValueFormat = pPattern->GetNumberFormat( pOutput->mpDoc->GetFormatTable(), pCondSet );
// Raender
@@ -455,7 +455,7 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
const SfxPoolItem* pLangItem;
if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,sal_True,&pLangItem) != SFX_ITEM_SET )
pLangItem = &pPattern->GetItem(ATTR_LANGUAGE_FORMAT);
- nValueFormat = pOutput->pDoc->GetFormatTable()->GetFormatForLanguageIfBuiltIn(
+ nValueFormat = pOutput->mpDoc->GetFormatTable()->GetFormatForLanguageIfBuiltIn(
((SfxUInt32Item*)pFormItem)->GetValue(),
((SvxLanguageItem*)pLangItem)->GetLanguage() );
@@ -498,9 +498,9 @@ sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell )
rtl::OUString aOUString = aString;
ScCellFormat::GetString( pCell,
nFormat, aOUString, &pColor,
- *pOutput->pDoc->GetFormatTable(),
- pOutput->bShowNullValues,
- pOutput->bShowFormulas,
+ *pOutput->mpDoc->GetFormatTable(),
+ pOutput->mbShowNullValues,
+ pOutput->mbShowFormulas,
ftCheck, true );
aString = aOUString;
if ( nFormat )
@@ -522,9 +522,9 @@ sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell )
if (aString.Len() > DRAWTEXT_MAX)
aString.Erase(DRAWTEXT_MAX);
- if ( pColor && !pOutput->bSyntaxMode && !( pOutput->bUseStyleColor && pOutput->bForceAutoColor ) )
+ if ( pColor && !pOutput->mbSyntaxMode && !( pOutput->mbUseStyleColor && pOutput->mbForceAutoColor ) )
{
- OutputDevice* pDev = pOutput->pDev;
+ OutputDevice* pDev = pOutput->mpDev;
aFont.SetColor(*pColor);
pDev->SetFont( aFont ); // nur fuer Ausgabe
bChanged = sal_True;
@@ -558,7 +558,7 @@ void ScDrawStringsVars::RepeatToFill( long colWidth )
long charWidth = pOutput->pFmtDevice->GetTextWidth(rtl::OUString(nChar));
if (bPixelToLogic)
- colWidth = pOutput->pRefDevice->PixelToLogic(Size(colWidth,0)).Width();
+ colWidth = pOutput->mpRefDevice->PixelToLogic(Size(colWidth,0)).Width();
// Are there restrictions on the cell type we should filter out here ?
long aSpaceToFill = ( colWidth - aTextSize.Width() );
@@ -576,7 +576,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
{
// #i113045# do the single-character width calculations in logic units
if (bPixelToLogic)
- nWidth = pOutput->pRefDevice->PixelToLogic(Size(nWidth,0)).Width();
+ nWidth = pOutput->mpRefDevice->PixelToLogic(Size(nWidth,0)).Width();
if (!pCell)
return;
@@ -589,7 +589,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
if (eType == CELLTYPE_FORMULA)
{
ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
- if (pFCell->GetErrCode() != 0 || pOutput->bShowFormulas)
+ if (pFCell->GetErrCode() != 0 || pOutput->mbShowFormulas)
{
SetHashText(); // If the error string doesn't fit, always use "###". Also for "display formulas" (#i116691#)
return;
@@ -619,7 +619,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
double fVal = (eType == CELLTYPE_VALUE) ?
static_cast<ScValueCell*>(pCell)->GetValue() : static_cast<ScFormulaCell*>(pCell)->GetValue();
- const SvNumberformat* pNumFormat = pOutput->pDoc->GetFormatTable()->GetEntry(nFormat);
+ const SvNumberformat* pNumFormat = pOutput->mpDoc->GetFormatTable()->GetEntry(nFormat);
if (!pNumFormat)
return;
@@ -681,7 +681,7 @@ void ScDrawStringsVars::SetAutoText( const String& rAutoText )
{
aString = rAutoText;
- OutputDevice* pRefDevice = pOutput->pRefDevice;
+ OutputDevice* pRefDevice = pOutput->mpRefDevice;
OutputDevice* pFmtDevice = pOutput->pFmtDevice;
aTextSize.Width() = pFmtDevice->GetTextWidth( aString );
aTextSize.Height() = pFmtDevice->GetTextHeight();
@@ -752,7 +752,7 @@ long ScDrawStringsVars::GetExpWidth()
void ScDrawStringsVars::TextChanged()
{
- OutputDevice* pRefDevice = pOutput->pRefDevice;
+ OutputDevice* pRefDevice = pOutput->mpRefDevice;
OutputDevice* pFmtDevice = pOutput->pFmtDevice;
aTextSize.Width() = pFmtDevice->GetTextWidth( aString );
aTextSize.Height() = pFmtDevice->GetTextHeight();
@@ -789,7 +789,7 @@ sal_Bool ScDrawStringsVars::HasEditCharacters() const
double ScOutputData::GetStretch()
{
- if ( pRefDevice->IsMapMode() )
+ if ( mpRefDevice->IsMapMode() )
{
// If a non-trivial MapMode is set, its scale is now already
// taken into account in the OutputDevice's font handling
@@ -801,9 +801,9 @@ double ScOutputData::GetStretch()
// calculation in double is faster than Fraction multiplication
// and doesn't overflow
- if ( pRefDevice == pFmtDevice )
+ if ( mpRefDevice == pFmtDevice )
{
- MapMode aOld = pRefDevice->GetMapMode();
+ MapMode aOld = mpRefDevice->GetMapMode();
return ((double)aOld.GetScaleY()) / ((double)aOld.GetScaleX()) * ((double)aZoomY) / ((double)aZoomX);
}
else
@@ -924,7 +924,7 @@ sal_Bool ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
while (bHOver) // nY konstant
{
--rOverX;
- bHidden = pDoc->ColHidden(rOverX, nTab);
+ bHidden = mpDoc->ColHidden(rOverX, nTab);
if ( !bDoMerge && !bHidden )
return false;
@@ -935,7 +935,7 @@ sal_Bool ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
}
else
{
- sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
+ sal_uInt16 nOverlap = ((ScMergeFlagAttr*)mpDoc->GetAttr(
rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
bHOver = ((nOverlap & SC_MF_HOR) != 0);
bVOver = ((nOverlap & SC_MF_VER) != 0);
@@ -945,7 +945,7 @@ sal_Bool ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
while (bVOver)
{
--rOverY;
- bHidden = pDoc->RowHidden(rOverY, nTab);
+ bHidden = mpDoc->RowHidden(rOverY, nTab);
if ( !bDoMerge && !bHidden )
return false;
@@ -953,8 +953,8 @@ sal_Bool ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
--nArrY; // lokale Kopie !
if (rOverX >= nX1 && rOverY >= nY1 &&
- !pDoc->ColHidden(rOverX, nTab) &&
- !pDoc->RowHidden(rOverY, nTab) &&
+ !mpDoc->ColHidden(rOverX, nTab) &&
+ !mpDoc->RowHidden(rOverY, nTab) &&
pRowInfo[nArrY].nRowNo == rOverY)
{
bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped;
@@ -962,7 +962,7 @@ sal_Bool ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
}
else
{
- sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
+ sal_uInt16 nOverlap = ((ScMergeFlagAttr*)mpDoc->GetAttr(
rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
bHOver = ((nOverlap & SC_MF_HOR) != 0);
bVOver = ((nOverlap & SC_MF_VER) != 0);
@@ -1081,7 +1081,7 @@ sal_Bool ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW n
if ( pThisRowInfo && nX <= nX2 )
bEmpty = pThisRowInfo->pCellInfo[nX+1].bEmptyCellText;
else
- bEmpty = ( pDoc->GetCell( ScAddress( nX, nY, nTab ) ) == NULL );
+ bEmpty = ( mpDoc->GetCell( ScAddress( nX, nY, nTab ) ) == NULL );
if ( !bEmpty && ( nX < nX1 || nX > nX2 || !pThisRowInfo ) )
{
@@ -1093,16 +1093,16 @@ sal_Bool ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW n
if ( bIsPrint || bTabProtected )
{
const ScProtectionAttr* pAttr = (const ScProtectionAttr*)
- pDoc->GetEffItem( nX, nY, nTab, ATTR_PROTECTION );
+ mpDoc->GetEffItem( nX, nY, nTab, ATTR_PROTECTION );
if ( bIsPrint && pAttr->GetHidePrint() )
bEmpty = sal_True;
else if ( bTabProtected )
{
if ( pAttr->GetHideCell() )
bEmpty = sal_True;
- else if ( bShowFormulas && pAttr->GetHideFormula() )
+ else if ( mbShowFormulas && pAttr->GetHideFormula() )
{
- ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) );
+ ScBaseCell* pCell = mpDoc->GetCell( ScAddress( nX, nY, nTab ) );
if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA )
bEmpty = sal_True;
}
@@ -1114,7 +1114,7 @@ sal_Bool ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW n
void ScOutputData::GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTabP, ScBaseCell*& rpCell )
{
- pDoc->GetCell( nCol, nRow, nTabP, rpCell );
+ mpDoc->GetCell( nCol, nRow, nTabP, rpCell );
if ( rpCell && IsEmptyCellText( NULL, nCol, nRow ) )
rpCell = NULL;
}
@@ -1125,13 +1125,13 @@ sal_Bool ScOutputData::IsAvailable( SCCOL nX, SCROW nY )
// Stop at non-empty or merged or overlapped cell,
// where a note is empty as well as a cell that's hidden by protection settings
- const ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) );
+ const ScBaseCell* pCell = mpDoc->GetCell( ScAddress( nX, nY, nTab ) );
if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE && !IsEmptyCellText( NULL, nX, nY ) )
{
return false;
}
- const ScPatternAttr* pPattern = pDoc->GetPattern( nX, nY, nTab );
+ const ScPatternAttr* pPattern = mpDoc->GetPattern( nX, nY, nTab );
if ( ((const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE)).IsMerged() ||
((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).IsOverlapped() )
{
@@ -1171,7 +1171,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
//! extra member function for width?
long nColWidth = ( nCompCol <= nX2 ) ?
pRowInfo[0].pCellInfo[nCompCol+1].nWidth :
- (long) ( pDoc->GetColWidth( nCompCol, nTab ) * nPPTX );
+ (long) ( mpDoc->GetColWidth( nCompCol, nTab ) * mnPPTX );
nCellPosX += nColWidth * nLayoutSign;
++nCompCol;
}
@@ -1180,7 +1180,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
--nCompCol;
long nColWidth = ( nCompCol <= nX2 ) ?
pRowInfo[0].pCellInfo[nCompCol+1].nWidth :
- (long) ( pDoc->GetColWidth( nCompCol, nTab ) * nPPTX );
+ (long) ( mpDoc->GetColWidth( nCompCol, nTab ) * mnPPTX );
nCellPosX -= nColWidth * nLayoutSign;
}
@@ -1197,13 +1197,13 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
}
else
{
- sal_uInt16 nDocHeight = pDoc->GetRowHeight( nCompRow, nTab );
+ sal_uInt16 nDocHeight = mpDoc->GetRowHeight( nCompRow, nTab );
if ( nDocHeight )
- nCellPosY += (long) ( nDocHeight * nPPTY );
+ nCellPosY += (long) ( nDocHeight * mnPPTY );
++nCompRow;
}
}
- nCellPosY -= (long) pDoc->GetScaledRowHeight( nCellY, nCompRow-1, nTab, nPPTY );
+ nCellPosY -= (long) mpDoc->GetScaledRowHeight( nCellY, nCompRow-1, nTab, mnPPTY );
const ScMergeAttr* pMerge = (const ScMergeAttr*)&rPattern.GetItem( ATTR_MERGE );
sal_Bool bMerged = pMerge->IsMerged();
@@ -1220,7 +1220,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
{
long nColWidth = ( nCellX+i <= nX2 ) ?
pRowInfo[0].pCellInfo[nCellX+i+1].nWidth :
- (long) ( pDoc->GetColWidth( sal::static_int_cast<SCCOL>(nCellX+i), nTab ) * nPPTX );
+ (long) ( mpDoc->GetColWidth( sal::static_int_cast<SCCOL>(nCellX+i), nTab ) * mnPPTX );
nMergeSizeX += nColWidth;
}
long nMergeSizeY = 0;
@@ -1232,7 +1232,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
nDirect = 1; // skip in loop
}
// following rows always from document
- nMergeSizeY += (long) pDoc->GetScaledRowHeight( nCellY+nDirect, nCellY+nMergeRows-1, nTab, nPPTY);
+ nMergeSizeY += (long) mpDoc->GetScaledRowHeight( nCellY+nDirect, nCellY+nMergeRows-1, nTab, mnPPTY);
--nMergeSizeX; // leave out the grid horizontally, also for alignment (align between grid lines)
@@ -1291,7 +1291,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
while ( nRightMissing > 0 && nRightX < MAXCOL && ( bOverwrite || IsAvailable( nRightX+1, nCellY ) ) )
{
++nRightX;
- long nAdd = (long) ( pDoc->GetColWidth( nRightX, nTab ) * nPPTX );
+ long nAdd = (long) ( mpDoc->GetColWidth( nRightX, nTab ) * mnPPTX );
nRightMissing -= nAdd;
rParam.maClipRect.Right() += nAdd * nLayoutSign;
@@ -1305,7 +1305,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
rThisRowInfo.pCellInfo[nLeftX].bHideGrid = sal_True;
--nLeftX;
- long nAdd = (long) ( pDoc->GetColWidth( nLeftX, nTab ) * nPPTX );
+ long nAdd = (long) ( mpDoc->GetColWidth( nLeftX, nTab ) * mnPPTX );
nLeftMissing -= nAdd;
rParam.maClipRect.Left() -= nAdd * nLayoutSign;
}
@@ -1317,14 +1317,14 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
{
rThisRowInfo.pCellInfo[nRightX+1].nClipMark |= SC_CLIPMARK_RIGHT;
bAnyClipped = sal_True;
- long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX );
+ long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX );
rParam.maClipRect.Right() -= nMarkPixel * nLayoutSign;
}
if ( nLeftMissing > 0 && bMarkClipped && nLeftX >= nX1 && nLeftX <= nX2 && !bBreak && !bCellIsValue )
{
rThisRowInfo.pCellInfo[nLeftX+1].nClipMark |= SC_CLIPMARK_LEFT;
bAnyClipped = sal_True;
- long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX );
+ long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX );
rParam.maClipRect.Left() += nMarkPixel * nLayoutSign;
}
@@ -1340,7 +1340,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
if ( eType==OUTTYPE_WINDOW &&
( static_cast<const ScMergeFlagAttr&>(rPattern.GetItem(ATTR_MERGE_FLAG)).GetValue() & SC_MF_AUTO ) &&
- ( !bBreak || pRefDevice == pFmtDevice ) )
+ ( !bBreak || mpRefDevice == pFmtDevice ) )
{
// filter drop-down width is now independent from row height
const long nFilter = DROPDOWN_BITMAP_SIZE;
@@ -1393,14 +1393,14 @@ bool beginsWithRTLCharacter(const rtl::OUString& rStr)
void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
{
- OSL_ENSURE( pDev == pRefDevice ||
- pDev->GetMapMode().GetMapUnit() == pRefDevice->GetMapMode().GetMapUnit(),
+ OSL_ENSURE( mpDev == mpRefDevice ||
+ mpDev->GetMapMode().GetMapUnit() == mpRefDevice->GetMapMode().GetMapUnit(),
"DrawStrings: unterschiedliche MapUnits ?!?!" );
- vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
+ vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, mpDev->GetExtOutDevData() );
- sal_Bool bWasIdleDisabled = pDoc->IsIdleDisabled();
- pDoc->DisableIdle( true );
+ sal_Bool bWasIdleDisabled = mpDoc->IsIdleDisabled();
+ mpDoc->DisableIdle( true );
ScDrawStringsVars aVars( this, bPixelToLogic );
@@ -1414,7 +1414,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
SCCOL nLastContentCol = MAXCOL;
if ( nX2 < MAXCOL )
nLastContentCol = sal::static_int_cast<SCCOL>(
- nLastContentCol - pDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) );
+ nLastContentCol - mpDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) );
SCCOL nLoopStartX = nX1;
if ( nX1 > 0 )
--nLoopStartX; // start before nX1 for rest of long text to the left
@@ -1489,7 +1489,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
if ( nTempX < nX1 &&
!IsEmptyCellText( pThisRowInfo, nTempX, nY ) &&
- !pDoc->HasAttrib( nTempX,nY,nTab, nX1,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
+ !mpDoc->HasAttrib( nTempX,nY,nTab, nX1,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
{
nCellX = nTempX;
bDoCell = sal_True;
@@ -1510,7 +1510,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
if ( nTempX > nX &&
!IsEmptyCellText( pThisRowInfo, nTempX, nY ) &&
- !pDoc->HasAttrib( nTempX,nY,nTab, nX,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
+ !mpDoc->HasAttrib( nTempX,nY,nTab, nX,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
{
nCellX = nTempX;
bDoCell = sal_True;
@@ -1566,14 +1566,14 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
{
// #i68085# pattern from cell info for hidden columns is null,
// test for null is quicker than using column flags
- pPattern = pDoc->GetPattern( nCellX, nCellY, nTab );
- pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab );
+ pPattern = mpDoc->GetPattern( nCellX, nCellY, nTab );
+ pCondSet = mpDoc->GetCondResult( nCellX, nCellY, nTab );
}
}
else // get from document
{
- pPattern = pDoc->GetPattern( nCellX, nCellY, nTab );
- pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab );
+ pPattern = mpDoc->GetPattern( nCellX, nCellY, nTab );
+ pCondSet = mpDoc->GetCondResult( nCellX, nCellY, nTab );
}
if (pCell->HasValueData() &&
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list