[Libreoffice-commits] .: 9 commits - chart2/source scaddins/source sc/inc sc/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jan 24 06:43:33 PST 2011
chart2/source/view/axes/VPolarGrid.cxx | 60 ------
chart2/source/view/axes/VPolarGrid.hxx | 6
chart2/source/view/inc/PlottingPositionHelper.hxx | 3
chart2/source/view/main/PlottingPositionHelper.cxx | 11 -
sc/inc/chgtrack.hxx | 12 -
sc/inc/rangeutl.hxx | 5
sc/source/core/data/cell.cxx | 126 -------------
sc/source/core/data/documen7.cxx | 13 -
sc/source/core/data/tabprotection.cxx | 4
sc/source/core/tool/chgtrack.cxx | 196 ---------------------
sc/source/core/tool/compiler.cxx | 95 ----------
sc/source/core/tool/interpr1.cxx | 32 ---
sc/source/core/tool/lookupcache.cxx | 39 ----
sc/source/core/tool/rangeutl.cxx | 18 -
sc/source/filter/html/htmlpars.cxx | 99 ----------
sc/source/ui/app/inputwin.cxx | 5
sc/source/ui/docshell/docsh3.cxx | 23 --
sc/source/ui/inc/output.hxx | 3
sc/source/ui/inc/viewutil.hxx | 4
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 14 -
sc/source/ui/unoobj/fmtuno.cxx | 20 +-
sc/source/ui/unoobj/nameuno.cxx | 18 -
sc/source/ui/unoobj/styleuno.cxx | 2
sc/source/ui/view/output.cxx | 58 ------
sc/source/ui/view/tabview2.cxx | 49 -----
sc/source/ui/view/viewutil.cxx | 156 ----------------
scaddins/source/datefunc/datefunc.cxx | 4
28 files changed, 33 insertions(+), 1044 deletions(-)
New commits:
commit 9d34f532a38853a82b86512f1f90364c4edaa0f3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:27:54 2011 +0100
Remove OLD_SELECTION_PAINT.
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index ab60aad..b845fff 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -252,9 +252,6 @@ public:
void FindChanged();
void SetPagebreakMode( ScPageBreakData* pPageData );
-#ifdef OLD_SELECTION_PAINT
- void DrawMark( Window* pWin );
-#endif
void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, BOOL bHandle );
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index 70603d0..303eea9 100644
--- a/sc/source/ui/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx
@@ -104,10 +104,6 @@ public:
ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
BOOL GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
-#ifdef OLD_SELECTION_PAINT
- BOOL GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont );
- void GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
-#endif
};
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 686e070..388b1cf 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1782,64 +1782,6 @@ void ScOutputData::FindChanged()
pDoc->DisableIdle( bWasIdleDisabled );
}
-#ifdef OLD_SELECTION_PAINT
-void ScOutputData::DrawMark( Window* pWin )
-{
- Rectangle aRect;
- ScInvertMerger aInvert( pWin );
- //! additional method AddLineRect for ScInvertMerger?
-
- long nPosY = nScrY;
- for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++)
- {
- RowInfo* pThisRowInfo = &pRowInfo[nArrY];
- if (pThisRowInfo->bChanged)
- {
- long nPosX = nScrX;
- if (bLayoutRTL)
- nPosX += nMirrorW - 1; // always in pixels
-
- aRect = Rectangle( Point( nPosX,nPosY ), Size(1, pThisRowInfo->nHeight) );
- if (bLayoutRTL)
- aRect.Left() = aRect.Right() + 1;
- else
- aRect.Right() = aRect.Left() - 1;
-
- BOOL bOldMarked = FALSE;
- for (SCCOL nX=nX1; nX<=nX2; nX++)
- {
- if (pThisRowInfo->pCellInfo[nX+1].bMarked != bOldMarked)
- {
- if (bOldMarked && aRect.Right() >= aRect.Left())
- aInvert.AddRect( aRect );
-
- if (bLayoutRTL)
- aRect.Right() = nPosX;
- else
- aRect.Left() = nPosX;
-
- bOldMarked = pThisRowInfo->pCellInfo[nX+1].bMarked;
- }
-
- if (bLayoutRTL)
- {
- nPosX -= pRowInfo[0].pCellInfo[nX+1].nWidth;
- aRect.Left() = nPosX+1;
- }
- else
- {
- nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth;
- aRect.Right() = nPosX-1;
- }
- }
- if (bOldMarked && aRect.Right() >= aRect.Left())
- aInvert.AddRect( aRect );
- }
- nPosY += pThisRowInfo->nHeight;
- }
-}
-#endif
-
void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, BOOL bHandle )
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index fe38231..6c7f09b 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -171,9 +171,6 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
rMark.SetMarkArea( ScRange( nBlockStartX,nBlockStartY, nTab, nBlockEndX,nBlockEndY, nTab ) );
-#ifdef OLD_SELECTION_PAINT
- InvertBlockMark( nBlockStartX,nBlockStartY,nBlockEndX,nBlockEndY );
-#endif
UpdateSelectionOverlay();
}
}
@@ -262,13 +259,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
SCTAB nTab = nCurZ;
-#ifdef OLD_SELECTION_PAINT
- SCCOL nDrawStartCol;
- SCROW nDrawStartRow;
- SCCOL nDrawEndCol;
- SCROW nDrawEndRow;
-#endif
-
// Set old selection area
ScUpdateRect aRect( nBlockStartX, nBlockStartY, nOldBlockEndX, nOldBlockEndY );
@@ -371,22 +361,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
aRect.SetNew( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY );
rMark.SetMarkArea( ScRange( nBlockStartX, nBlockStartY, nTab, nBlockEndX, nBlockEndY, nTab ) );
-#ifdef OLD_SELECTION_PAINT
- BOOL bCont;
- BOOL bDraw = aRect.GetXorDiff( nDrawStartCol, nDrawStartRow,
- nDrawEndCol, nDrawEndRow, bCont );
- if ( bDraw )
- {
- HideAllCursors();
- InvertBlockMark( nDrawStartCol, nDrawStartRow, nDrawEndCol, nDrawEndRow );
- if (bCont)
- {
- aRect.GetContDiff( nDrawStartCol, nDrawStartRow, nDrawEndCol, nDrawEndRow );
- InvertBlockMark( nDrawStartCol, nDrawStartRow, nDrawEndCol, nDrawEndRow );
- }
- ShowAllCursors();
- }
-#endif
UpdateSelectionOverlay();
nOldCurX = nCurX;
@@ -929,35 +903,12 @@ void ScTabView::PaintBlock( BOOL bReset )
USHORT i;
if ( bMulti )
{
-#ifdef OLD_SELECTION_PAINT
- for (i=0; i<4; i++)
- if (pGridWin[i] && pGridWin[i]->IsVisible())
- pGridWin[i]->InvertSimple( nBlockStartX, nBlockStartY,
- nBlockEndX, nBlockEndY,
- TRUE, TRUE );
-#endif
rMark.ResetMark();
UpdateSelectionOverlay();
bDidReset = TRUE;
}
else
{
-#ifdef OLD_SELECTION_PAINT
- // (mis)use InvertBlockMark to remove all of the selection
- // -> set bBlockNeg (like when removing parts of a selection)
- // and convert everything to Multi
-
- rMark.MarkToMulti();
- BOOL bOld = bBlockNeg;
- bBlockNeg = TRUE;
- // #73130# (negative) MarkArea must be set in case of repaint
- rMark.SetMarkArea( ScRange( nBlockStartX,nBlockStartY, nTab,
- nBlockEndX,nBlockEndY, nTab ) );
-
- InvertBlockMark( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY );
-
- bBlockNeg = bOld;
-#endif
rMark.ResetMark();
UpdateSelectionOverlay();
bDidReset = TRUE;
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 9347a60..dad8517 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -474,160 +474,4 @@ BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
return TRUE;
}
-#ifdef OLD_SELECTION_PAINT
-BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont )
-{
- rCont = FALSE;
-
- if (nNewStartX == nOldStartX && nNewEndX == nOldEndX &&
- nNewStartY == nOldStartY && nNewEndY == nOldEndY)
- {
- rX1 = nNewStartX;
- rY1 = nNewStartY;
- rX2 = nNewStartX;
- rY2 = nNewStartY;
- return FALSE;
- }
-
- rX1 = Min(nNewStartX,nOldStartX);
- rY1 = Min(nNewStartY,nOldStartY);
- rX2 = Max(nNewEndX,nOldEndX);
- rY2 = Max(nNewEndY,nOldEndY);
-
- if (nNewStartX == nOldStartX && nNewEndX == nOldEndX) // nur vertikal
- {
- if (nNewStartY == nOldStartY)
- {
- rY1 = Min( nNewEndY, nOldEndY ) + 1;
- rY2 = Max( nNewEndY, nOldEndY );
- }
- else if (nNewEndY == nOldEndY)
- {
- rY1 = Min( nNewStartY, nOldStartY );
- rY2 = Max( nNewStartY, nOldStartY ) - 1;
- }
- else
- {
- rY1 = Min( nNewStartY, nOldStartY );
- rY2 = Max( nNewStartY, nOldStartY ) - 1;
- rCont = TRUE;
- nContY1 = Min( nNewEndY, nOldEndY ) + 1;
- nContY2 = Max( nNewEndY, nOldEndY );
- nContX1 = rX1;
- nContX2 = rX2;
- }
- }
- else if (nNewStartY == nOldStartY && nNewEndY == nOldEndY) // nur horizontal
- {
- if (nNewStartX == nOldStartX)
- {
- rX1 = Min( nNewEndX, nOldEndX ) + 1;
- rX2 = Max( nNewEndX, nOldEndX );
- }
- else if (nNewEndX == nOldEndX)
- {
- rX1 = Min( nNewStartX, nOldStartX );
- rX2 = Max( nNewStartX, nOldStartX ) - 1;
- }
- else
- {
- rX1 = Min( nNewStartX, nOldStartX );
- rX2 = Max( nNewStartX, nOldStartX ) - 1;
- rCont = TRUE;
- nContX1 = Min( nNewEndX, nOldEndX ) + 1;
- nContX2 = Max( nNewEndX, nOldEndX );
- nContY1 = rY1;
- nContY2 = rY2;
- }
- }
- else if (nNewEndX == nOldEndX && nNewEndY == nOldEndY) // links oben
- {
- if ((nNewStartX<nOldStartX) == (nNewStartY<nOldStartY))
- rX1 = Min( nNewStartX, nOldStartX );
- else
- rX1 = Max( nNewStartX, nOldStartX ); // Ecke weglassen
- rX2 = nOldEndX;
- rY1 = Min( nNewStartY, nOldStartY ); // oben
- rY2 = Max( nNewStartY, nOldStartY ) - 1;
- rCont = TRUE;
- nContY1 = rY2+1;
- nContY2 = nOldEndY;
- nContX1 = Min( nNewStartX, nOldStartX ); // links
- nContX2 = Max( nNewStartX, nOldStartX ) - 1;
- }
- else if (nNewStartX == nOldStartX && nNewEndY == nOldEndY) // rechts oben
- {
- if ((nNewEndX<nOldEndX) != (nNewStartY<nOldStartY))
- rX2 = Max( nNewEndX, nOldEndX );
- else
- rX2 = Min( nNewEndX, nOldEndX ); // Ecke weglassen
- rX1 = nOldStartX;
- rY1 = Min( nNewStartY, nOldStartY ); // oben
- rY2 = Max( nNewStartY, nOldStartY ) - 1;
- rCont = TRUE;
- nContY1 = rY2+1;
- nContY2 = nOldEndY;
- nContX1 = Min( nNewEndX, nOldEndX ) + 1; // rechts
- nContX2 = Max( nNewEndX, nOldEndX );
- }
- else if (nNewEndX == nOldEndX && nNewStartY == nOldStartY) // links unten
- {
- if ((nNewStartX<nOldStartX) != (nNewEndY<nOldEndY))
- rX1 = Min( nNewStartX, nOldStartX );
- else
- rX1 = Max( nNewStartX, nOldStartX ); // Ecke weglassen
- rX2 = nOldEndX;
- rY1 = Min( nNewEndY, nOldEndY ) + 1; // unten
- rY2 = Max( nNewEndY, nOldEndY );
- rCont = TRUE;
- nContY1 = nOldStartY;
- nContY2 = rY1-1;
- nContX1 = Min( nNewStartX, nOldStartX ); // links
- nContX2 = Max( nNewStartX, nOldStartX ) - 1;
- }
- else if (nNewStartX == nOldStartX && nNewStartY == nOldStartY) // rechts unten
- {
- if ((nNewEndX<nOldEndX) == (nNewEndY<nOldEndY))
- rX2 = Max( nNewEndX, nOldEndX );
- else
- rX2 = Min( nNewEndX, nOldEndX ); // Ecke weglassen
- rX1 = nOldStartX;
- rY1 = Min( nNewEndY, nOldEndY ) + 1; // unten
- rY2 = Max( nNewEndY, nOldEndY );
- rCont = TRUE;
- nContY1 = nOldStartY;
- nContY2 = rY1-1;
- nContX1 = Min( nNewEndX, nOldEndX ) + 1; // rechts
- nContX2 = Max( nNewEndX, nOldEndX );
- }
- else // Ueberschlag
- {
- rX1 = nOldStartX;
- rY1 = nOldStartY;
- rX2 = nOldEndX;
- rY2 = nOldEndY;
- rCont = TRUE;
- nContX1 = nNewStartX;
- nContY1 = nNewStartY;
- nContX2 = nNewEndX;
- nContY2 = nNewEndY;
- }
-
- return TRUE;
-}
-
-void ScUpdateRect::GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
-{
- rX1 = nContX1;
- rY1 = nContY1;
- rX2 = nContX2;
- rY2 = nContY2;
-}
-#endif
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 14e8b16d4f9dd0ef3a484f7bfd7f6c86fdddc7fc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:24:32 2011 +0100
Remove DEBUG_CHANGETRACK.
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 6ddc527..4bb75ca 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -48,9 +48,6 @@
#include "refupdat.hxx"
#endif
-#define DEBUG_CHANGETRACK 0
-
-
class ScBaseCell;
class ScDocument;
@@ -183,9 +180,6 @@ public:
ScChangeActionLinkEntry* GetNext() { return pNext; }
const ScChangeAction* GetAction() const { return pAction; }
ScChangeAction* GetAction() { return pAction; }
-#if DEBUG_CHANGETRACK
- String ToString() const;
-#endif // DEBUG_CHANGETRACK
};
// --- ScChangeActionCellListEntry -----------------------------------------
@@ -444,9 +438,6 @@ public:
// only to be used in the XML import
void AddDependent( ULONG nActionNumber,
const ScChangeTrack* pTrack );
-#if DEBUG_CHANGETRACK
- String ToString( ScDocument* pDoc ) const;
-#endif // DEBUG_CHANGETRACK
};
@@ -1350,9 +1341,6 @@ public:
void AppendCloned( ScChangeAction* pAppend );
SC_DLLPUBLIC ScChangeTrack* Clone( ScDocument* pDocument ) const;
void MergeActionState( ScChangeAction* pAct, const ScChangeAction* pOtherAct );
-#if DEBUG_CHANGETRACK
- String ToString() const;
-#endif // DEBUG_CHANGETRACK
};
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 329b934..a5d3d0d 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -72,30 +72,6 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry
#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001
#define SC_CHGTRACK_FILEFORMAT 0x0001
-// --- ScChangeActionLinkEntry ---------------------------------------------
-
-#if DEBUG_CHANGETRACK
-String ScChangeActionLinkEntry::ToString() const
-{
- String aReturn;
- if ( pAction )
- {
- aReturn = String::CreateFromInt64( static_cast< sal_Int64 >( pAction->GetActionNumber() ) );
- }
- else if ( pLink && pLink->pAction )
- {
- aReturn = String::CreateFromAscii( "*" );
- aReturn += String::CreateFromInt64( static_cast< sal_Int64 >( pLink->pAction->GetActionNumber() ) );
- }
- else
- {
- aReturn = String::CreateFromAscii( "-" );
- }
-
- return aReturn;
-}
-#endif // DEBUG_CHANGETRACK
-
// --- ScChangeAction ------------------------------------------------------
ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScRange& rRange )
@@ -651,148 +627,6 @@ void ScChangeAction::AddDependent( ULONG nActionNumber,
}
}
-
-#if DEBUG_CHANGETRACK
-String ScChangeAction::ToString( ScDocument* pDoc ) const
-{
- String aReturn;
-
- String aNumber = String::CreateFromInt64( static_cast< sal_Int64 >( GetActionNumber() ) );
-
- String aActionState;
- ScChangeActionState eActionState = GetState();
- switch ( eActionState )
- {
- case SC_CAS_VIRGIN:
- {
- aActionState = String::CreateFromAscii( " " );
- }
- break;
- case SC_CAS_ACCEPTED:
- {
- aActionState = String::CreateFromAscii( "+" );
- }
- break;
- case SC_CAS_REJECTED:
- {
- aActionState = String::CreateFromAscii( "-" );
- }
- break;
- }
-
- String aRejectAction;
- if ( IsRejecting() )
- {
- aRejectAction += 'r';
- aRejectAction += String::CreateFromInt64( static_cast< sal_Int64 >( GetRejectAction() ) );
- }
-
- String aReference;
- GetRefString( aReference, pDoc, TRUE );
-
- String aAuthor = GetUser();
-
- DateTime aDT = GetDateTime();
- String aDate = ScGlobal::pLocaleData->getDate( aDT );
- aDate += ' ';
- aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE );
-
- String aDescription;
- GetDescription( aDescription, pDoc );
-
- String aLinkAny;
- const ScChangeActionLinkEntry* pLinkA = pLinkAny;
- while ( pLinkA )
- {
- if ( !aLinkAny.Len() )
- {
- aLinkAny = String::CreateFromAscii( "(Any:" );
- }
- aLinkAny += String::CreateFromAscii( " ->" );
- aLinkAny += pLinkA->ToString();
- pLinkA = pLinkA->GetNext();
- }
- if ( aLinkAny.Len() )
- {
- aLinkAny += ')';
- }
-
- String aLinkDeletedIn;
- const ScChangeActionLinkEntry* pLinkDI = pLinkDeletedIn;
- while ( pLinkDI )
- {
- if ( !aLinkDeletedIn.Len() )
- {
- aLinkDeletedIn = String::CreateFromAscii( "(DeletedIn:" );
- }
- aLinkDeletedIn += String::CreateFromAscii( " ->" );
- aLinkDeletedIn += pLinkDI->ToString();
- pLinkDI = pLinkDI->GetNext();
- }
- if ( aLinkDeletedIn.Len() )
- {
- aLinkDeletedIn += ')';
- }
-
- String aLinkDeleted;
- const ScChangeActionLinkEntry* pLinkD = pLinkDeleted;
- while ( pLinkD )
- {
- if ( !aLinkDeleted.Len() )
- {
- aLinkDeleted = String::CreateFromAscii( "(Deleted:" );
- }
- aLinkDeleted += String::CreateFromAscii( " ->" );
- aLinkDeleted += pLinkD->ToString();
- pLinkD = pLinkD->GetNext();
- }
- if ( aLinkDeleted.Len() )
- {
- aLinkDeleted += ')';
- }
-
- String aLinkDependent;
- const ScChangeActionLinkEntry* pLinkDp = pLinkDependent;
- while ( pLinkDp )
- {
- if ( !aLinkDependent.Len() )
- {
- aLinkDependent = String::CreateFromAscii( "(Dependent:" );
- }
- aLinkDependent += String::CreateFromAscii( " ->" );
- aLinkDependent += pLinkDp->ToString();
- pLinkDp = pLinkDp->GetNext();
- }
- if ( aLinkDependent.Len() )
- {
- aLinkDependent += ')';
- }
-
- aReturn += aNumber;
- aReturn += aActionState;
- aReturn += aRejectAction;
- aReturn += String::CreateFromAscii( ": " );
- aReturn += aReference;
- aReturn += ' ';
- aReturn += aAuthor;
- aReturn += ' ';
- aReturn += aDate;
- aReturn += ' ';
- aReturn += aDescription;
- aReturn += ' ';
- aReturn += aLinkAny;
- aReturn += ' ';
- aReturn += aLinkDeletedIn;
- aReturn += ' ';
- aReturn += aLinkDeleted;
- aReturn += ' ';
- aReturn += aLinkDependent;
-
- return aReturn;
-}
-#endif // DEBUG_CHANGETRACK
-
-
// --- ScChangeActionIns ---------------------------------------------------
ScChangeActionIns::ScChangeActionIns( const ScRange& rRange )
@@ -4810,34 +4644,4 @@ void ScChangeTrack::MergeActionState( ScChangeAction* pAct, const ScChangeAction
}
}
-#if DEBUG_CHANGETRACK
-String ScChangeTrack::ToString() const
-{
- String aReturn;
-
- aReturn += String::CreateFromAscii( "============================================================\n" );
-
- const ScChangeAction* pGenerated = GetFirstGenerated();
- while ( pGenerated )
- {
- aReturn += pGenerated->ToString( pDoc );
- aReturn += '\n';
- pGenerated = pGenerated->GetNext();
- }
-
- aReturn += String::CreateFromAscii( "------------------------------------------------------------\n" );
-
- const ScChangeAction* pAction = GetFirst();
- while ( pAction )
- {
- aReturn += pAction->ToString( pDoc );
- aReturn += '\n';
- pAction = pAction->GetNext();
- }
- aReturn += String::CreateFromAscii( "============================================================\n" );
-
- return aReturn;
-}
-#endif // DEBUG_CHANGETRACK
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 9ba6a7f..93c928c 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -80,11 +80,6 @@
#include "conflictsdlg.hxx"
#include "globstr.hrc"
-#if DEBUG_CHANGETRACK
-#include <stdio.h>
-#endif // DEBUG_CHANGETRACK
-
-
//------------------------------------------------------------------
//
@@ -1219,15 +1214,6 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
return false;
}
-#if DEBUG_CHANGETRACK
- ::rtl::OUString aMessage(RTL_CONSTASCII_USTRINGPARAM( "\nbefore merge:\n" ));
- aMessage += pThisTrack->ToString();
- ::rtl::OString aMsg = ::rtl::OUStringToOString( aMessage, RTL_TEXTENCODING_UTF8 );
- OSL_ENSURE( false, aMsg.getStr() );
- //fprintf( stdout, "%s ", aMsg.getStr() );
- //fflush( stdout );
-#endif // DEBUG_CHANGETRACK
-
// reset show changes
ScChangeViewSettings aChangeViewSet;
aChangeViewSet.SetShowChanges( FALSE );
@@ -1396,15 +1382,6 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
aInfoBox.Execute();
}
-#if DEBUG_CHANGETRACK
- aMessage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\nafter merge:\n" ));
- aMessage += pThisTrack->ToString();
- aMsg = ::rtl::OUStringToOString( aMessage, RTL_TEXTENCODING_UTF8 );
- OSL_ENSURE( false, aMsg.getStr() );
- //fprintf( stdout, "%s ", aMsg.getStr() );
- //fflush( stdout );
-#endif // DEBUG_CHANGETRACK
-
return ( pThisAction != NULL );
}
commit 24a4aac837d5973027704162c6d7185877d52b72
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:21:02 2011 +0100
Remove OS2_DOCH_NICHT.
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b2308be..2782e39 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -791,11 +791,6 @@ void ScTextWnd::Resize()
long nDiff = aSize.Height()
- LogicToPixel( Size( 0, GetTextHeight() ) ).Height();
-#ifdef OS2_DOCH_NICHT
- nDiff-=2; // wird durch 2 geteilt
- // passt sonst nicht zur normalen Textausgabe
-#endif
-
aSize.Width() -= 2 * TEXT_STARTPOS - 1;
pEditView->SetOutputArea(
commit cca589c315a27b90a2090db8bb32fc8bbfdd52a5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:17:39 2011 +0100
Remove CHART_ADDRESS_CONV_WORKAROUND as it is activated anyway.
Description of CHART_ADDRESS_CONV_WORKAROUND:
Chart always stores cell range addresses using CONV_OOO convention. But
if parsing with CONV_OOO fails, try parsing it using the current address
convention.
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 12640dc..6e0ff9b 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -36,11 +36,6 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-// Chart always stores cell range addresses using CONV_OOO convention. But
-// if parsing with CONV_OOO fails, try parsing it using the current address
-// convention.
-#define CHART_ADDRESS_CONV_WORKAROUND 1
-
//------------------------------------------------------------------------
class SvStream;
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 76ca370..dbaba08 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -477,11 +477,9 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
{
if ((rAddress.Parse( sToken, const_cast<ScDocument*>(pDocument), eConv ) & SCA_VALID) == SCA_VALID)
return true;
-#if CHART_ADDRESS_CONV_WORKAROUND
::formula::FormulaGrammar::AddressConvention eConvUI = pDocument->GetAddressConvention();
if (eConv != eConvUI)
return ((rAddress.Parse(sToken, const_cast<ScDocument*>(pDocument), eConvUI) & SCA_VALID) == SCA_VALID);
-#endif
}
return sal_False;
}
@@ -508,11 +506,9 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
if ( aUIString.GetChar(0) == (sal_Unicode) '.' )
aUIString.Erase( 0, 1 );
bResult = ((rRange.aStart.Parse( aUIString, const_cast<ScDocument*> (pDocument), eConv) & SCA_VALID) == SCA_VALID);
-#if CHART_ADDRESS_CONV_WORKAROUND
if (!bResult && eConv != eConv)
bResult = ((rRange.aStart.Parse(
aUIString, const_cast<ScDocument*>(pDocument), eConv) & SCA_VALID) == SCA_VALID);
-#endif
rRange.aEnd = rRange.aStart;
}
else
@@ -537,7 +533,6 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
eConv) & SCA_VALID) == SCA_VALID) &&
((rRange.aEnd.Parse( aUIString.Copy((xub_StrLen)nIndex+1), const_cast<ScDocument*>(pDocument),
eConv) & SCA_VALID) == SCA_VALID);
-#if CHART_ADDRESS_CONV_WORKAROUND
if (!bResult && eConv != eConv)
{
bResult = ((rRange.aStart.Parse( aUIString.Copy(0, (xub_StrLen)nIndex), const_cast<ScDocument*>(pDocument),
@@ -545,7 +540,6 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
((rRange.aEnd.Parse( aUIString.Copy((xub_StrLen)nIndex+1), const_cast<ScDocument*>(pDocument),
eConv) & SCA_VALID) == SCA_VALID);
}
-#endif
}
}
}
@@ -937,7 +931,6 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
if ((nRet & SCA_VALID) != SCA_VALID)
{
// first cell is invalid.
-#if CHART_ADDRESS_CONV_WORKAROUND
if (eConv == FormulaGrammar::CONV_OOO)
continue;
@@ -945,16 +938,12 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
if ((nRet & SCA_VALID) != SCA_VALID)
// first cell is really invalid.
continue;
-#else
- continue;
-#endif
}
nRet = aCell2.Parse(aEndCell, pDoc, FormulaGrammar::CONV_OOO, &aExtInfo2);
if ((nRet & SCA_VALID) != SCA_VALID)
{
// second cell is invalid.
-#if CHART_ADDRESS_CONV_WORKAROUND
if (eConv == FormulaGrammar::CONV_OOO)
continue;
@@ -962,9 +951,6 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
if ((nRet & SCA_VALID) != SCA_VALID)
// second cell is really invalid.
continue;
-#else
- continue;
-#endif
}
if (aExtInfo1.mnFileId != aExtInfo2.mnFileId || aExtInfo1.mbExternal != aExtInfo2.mbExternal)
@@ -988,13 +974,9 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
USHORT nRet = aCell.Parse(aToken, pDoc, ::formula::FormulaGrammar::CONV_OOO, &aExtInfo);
if ((nRet & SCA_VALID) != SCA_VALID)
{
-#if CHART_ADDRESS_CONV_WORKAROUND
nRet = aCell.Parse(aToken, pDoc, eConv, &aExtInfo);
if ((nRet & SCA_VALID) != SCA_VALID)
continue;
-#else
- continue;
-#endif
}
// Looks good!
commit fea75c9c04257e8ac03eeea7baa5d860671e98ad
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:15:15 2011 +0100
Remove erGENERATEMAPPING directive.
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 78e5fa7..e98fcff 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -202,92 +202,6 @@ void ScCompiler::fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap )
}
}
-
-#ifdef erGENERATEMAPPING
-// Run in en-US UI by calling from within gdb, edit pODFF entries afterwards.
-void dbg_call_generateMappingODFF()
-{
- // static ScCompiler members
- fprintf( stdout, "%s", "static struct AddInMap\n{\n const char* pODFF;\n const char* pEnglish;\n bool bMapDupToInternal;\n const char* pOriginal;\n const char* pUpper;\n} maAddInMap[];\n");
- fprintf( stdout, "%s", "static const AddInMap* GetAddInMap();\n");
- fprintf( stdout, "%s", "static size_t GetAddInMapCount();\n");
- fprintf( stdout, "addinfuncdata___:%s", "ScCompiler::AddInMap ScCompiler::maAddInMap[] =\n{\n");
- ScUnoAddInCollection* pColl = ScGlobal::GetAddInCollection();
- long nCount = pColl->GetFuncCount();
- for (long i=0; i < nCount; ++i)
- {
- const ScUnoAddInFuncData* pFuncData = pColl->GetFuncData(i);
- if (pFuncData)
- {
-#define out(rStr) (ByteString( rStr, RTL_TEXTENCODING_UTF8).GetBuffer())
- String aL = pFuncData->GetUpperLocal();
- String aP = pFuncData->GetOriginalName();
- String aU = pFuncData->GetUpperName();
- fprintf( stdout, "addinfuncdata%3ld: { \"%s\", \"%s\", false, \"%s\", \"%s\" },\n",
- i, out(aL), out(aL), out(aP), out(aU));
-#undef out
- }
- }
- fprintf( stdout, "addinfuncdata___:%s", "};\n");
- fprintf( stdout, "%s", "\n// static\nconst ScCompiler::AddInMap* ScCompiler::GetAddInMap()\n{\n return maAddInMap;\n}\n");
- fprintf( stdout, "%s", "\n// static\nsize_t ScCompiler::GetAddInMapCount()\n{\n return sizeof(maAddInMap)/sizeof(maAddInMap[0]);\n}\n");
- fflush( stdout);
-}
-#endif // erGENERATEMAPPING
-
-#ifdef erGENERATEMAPPINGDIFF
-// Run in en-US UI by calling from within gdb.
-void dbg_call_generateMappingDiff()
-{
- using namespace ::com::sun::star::sheet;
- ScCompiler::OpCodeMapPtr xPODF = ScCompiler::GetOpCodeMap(
- FormulaLanguage::ODF_11);
- ScCompiler::OpCodeMapPtr xODFF = ScCompiler::GetOpCodeMap(
- FormulaLanguage::ODFF);
- ScCompiler::OpCodeMapPtr xENUS = ScCompiler::GetOpCodeMap(
- FormulaLanguage::ENGLISH);
- USHORT nPODF = xPODF->getSymbolCount();
- USHORT nODFF = xODFF->getSymbolCount();
- USHORT nENUS = xENUS->getSymbolCount();
- printf( "%s\n", "This is a semicolon separated file, you may import it as such to Calc.");
- printf( "%s\n", "Spreadsheet functions name differences between PODF (ODF < 1.2) and ODFF (ODF >= 1.2), plus English UI names.");
- printf( "\nInternal OpCodes; PODF: %d; ODFF: %d; ENUS: %d\n",
- (int)nPODF, (int)nODFF, (int)nENUS);
- USHORT nMax = ::std::max( ::std::max( nPODF, nODFF), nENUS);
-#define out(rStr) (ByteString( rStr, RTL_TEXTENCODING_UTF8).GetBuffer())
- for (USHORT i=0; i < nMax; ++i)
- {
- const String& rPODF = xPODF->getSymbol(static_cast<OpCode>(i));
- const String& rODFF = xODFF->getSymbol(static_cast<OpCode>(i));
- const String& rENUS = xENUS->getSymbol(static_cast<OpCode>(i));
- if (rPODF != rODFF)
- printf( "%d;%s;%s;%s\n", (int)i, out(rPODF), out(rODFF), out(rENUS));
- }
- // Actually they should all differ, so we could simply list them all, but
- // this is correct and we would find odd things, if any.
- const ExternalHashMap* pPODF = xPODF->getReverseExternalHashMap();
- const ExternalHashMap* pODFF = xODFF->getReverseExternalHashMap();
- const ExternalHashMap* pENUS = xENUS->getReverseExternalHashMap();
- printf( "\n%s\n", "Add-In mapping");
- for (ExternalHashMap::const_iterator it = pPODF->begin(); it != pPODF->end(); ++it)
- {
- ExternalHashMap::const_iterator iLookODFF = pODFF->find( (*it).first);
- ExternalHashMap::const_iterator iLookENUS = pENUS->find( (*it).first);
- String aNative( iLookENUS == pENUS->end() ?
- String::CreateFromAscii( "ENGLISH_SYMBOL_NOT_FOUND") :
- (*iLookENUS).second);
- if (iLookODFF == pODFF->end())
- printf( "NOT FOUND;%s;;%s\n", out((*it).first), out(aNative));
- else if((*it).second == (*iLookODFF).second) // upper equal
- printf( "EQUAL;%s;%s;%s\n", out((*it).first), out((*iLookODFF).second), out(aNative));
- else
- printf( ";%s;%s;%s\n", out((*it).first), out((*iLookODFF).second), out(aNative));
- }
-#undef out
- fflush( stdout);
-}
-#endif // erGENERATEMAPPINGDIFF
-
void ScCompiler::DeInit()
{
if (pCharClassEnglish)
commit fc162b7fe774b3f6c1b7c811c957e97588f81173
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:11:35 2011 +0100
Remove erDEBUG directive.
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index a97c7ef..83ec191 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1129,101 +1129,8 @@ bool ScFormulaCell::MarkUsedExternalReferences()
}
-// FIXME: set to 0
-#define erDEBUGDOT 0
-// If set to 1, write output that's suitable for graphviz tools like dot.
-// Only node1 -> node2 entries are written, you'll have to manually surround
-// the file content with [strict] digraph name { ... }
-// The ``strict'' keyword might be necessary in case of multiple identical
-// paths like they occur in iterations, otherwise dot may consume too much
-// memory when generating the layout, or you'll get unreadable output. On the
-// other hand, information about recurring calculation is lost then.
-// Generates output only if variable nDebug is set in debugger, see below.
-// FIXME: currently doesn't cope with iterations and recursions. Code fragments
-// are a leftover from a previous debug session, meant as a pointer.
-#if erDEBUGDOT
-#include <cstdio>
-using ::std::fopen;
-using ::std::fprintf;
-#include <vector>
-static const char aDebugDotFile[] = "ttt_debug.dot";
-#endif
-
void ScFormulaCell::Interpret()
{
-
-#if erDEBUGDOT
- static int nDebug = 0;
- static const int erDEBUGDOTRUN = 3;
- static FILE* pDebugFile = 0;
- static sal_Int32 nDebugRootCount = 0;
- static unsigned int nDebugPathCount = 0;
- static ScAddress aDebugLastPos( ScAddress::INITIALIZE_INVALID);
- static ScAddress aDebugThisPos( ScAddress::INITIALIZE_INVALID);
- typedef ::std::vector< ByteString > DebugVector;
- static DebugVector aDebugVec;
- class DebugElement
- {
- public:
- static void push( ScFormulaCell* pCell )
- {
- aDebugThisPos = pCell->aPos;
- if (aDebugVec.empty())
- {
- ByteString aR( "root_");
- aR += ByteString::CreateFromInt32( ++nDebugRootCount);
- aDebugVec.push_back( aR);
- }
- String aStr;
- pCell->aPos.Format( aStr, SCA_VALID | SCA_TAB_3D, pCell->GetDocument(),
- pCell->GetDocument()->GetAddressConvention() );
- ByteString aB( aStr, RTL_TEXTENCODING_UTF8);
- aDebugVec.push_back( aB);
- }
- static void pop()
- {
- aDebugLastPos = aDebugThisPos;
- if (!aDebugVec.empty())
- {
- aDebugVec.pop_back();
- if (aDebugVec.size() == 1)
- {
- aDebugVec.pop_back();
- aDebugLastPos = ScAddress( ScAddress::INITIALIZE_INVALID);
- }
- }
- }
- DebugElement( ScFormulaCell* p ) { push(p); }
- ~DebugElement() { pop(); }
- };
- class DebugDot
- {
- public:
- static void out( const char* pColor )
- {
- if (nDebug != erDEBUGDOTRUN)
- return;
- char pColorString[256];
- sprintf( pColorString, (*pColor ?
- ",color=\"%s\",fontcolor=\"%s\"" : "%s%s"), pColor,
- pColor);
- size_t n = aDebugVec.size();
- fprintf( pDebugFile,
- "\"%s\" -> \"%s\" [label=\"%u\"%s]; // v:%d\n",
- aDebugVec[n-2].GetBuffer(), aDebugVec[n-1].GetBuffer(),
- ++nDebugPathCount, pColorString, n-1);
- fflush( pDebugFile);
- }
- };
- #define erDEBUGDOT_OUT( p ) (DebugDot::out(p))
- #define erDEBUGDOT_ELEMENT_PUSH( p ) (DebugElement::push(p))
- #define erDEBUGDOT_ELEMENT_POP() (DebugElement::pop())
-#else
- #define erDEBUGDOT_OUT( p )
- #define erDEBUGDOT_ELEMENT_PUSH( p )
- #define erDEBUGDOT_ELEMENT_POP()
-#endif
-
if (!IsDirtyOrInTableOpDirty() || pDocument->GetRecursionHelper().IsInReturn())
return; // no double/triple processing
@@ -1234,39 +1141,8 @@ void ScFormulaCell::Interpret()
if ( pDocument->IsInDdeLinkUpdate() )
return;
-#if erDEBUGDOT
- // set nDebug=1 in debugger to init things
- if (nDebug == 1)
- {
- ++nDebug;
- pDebugFile = fopen( aDebugDotFile, "a");
- if (!pDebugFile)
- nDebug = 0;
- else
- nDebug = erDEBUGDOTRUN;
- }
- // set nDebug=3 (erDEBUGDOTRUN) in debugger to get any output
- DebugElement aDebugElem( this);
- // set nDebug=5 in debugger to close output
- if (nDebug == 5)
- {
- nDebug = 0;
- fclose( pDebugFile);
- pDebugFile = 0;
- }
-#endif
-
if (bRunning)
{
-
-#if erDEBUGDOT
- if (!pDocument->GetRecursionHelper().IsDoingIteration() ||
- aDebugThisPos != aDebugLastPos)
- erDEBUGDOT_OUT(aDebugThisPos == aDebugLastPos ? "orange" :
- (pDocument->GetRecursionHelper().GetIteration() ? "blue" :
- "red"));
-#endif
-
if (!pDocument->GetDocOptions().IsIter())
{
aResult.SetResultError( errCircularReference );
@@ -1290,8 +1166,6 @@ void ScFormulaCell::Interpret()
pDocument->GetRecursionHelper().GetIteration())
return ;
- erDEBUGDOT_OUT( pDocument->GetRecursionHelper().GetIteration() ? "magenta" : "");
-
ScRecursionHelper& rRecursionHelper = pDocument->GetRecursionHelper();
BOOL bOldRunning = bRunning;
if (rRecursionHelper.GetRecursionCount() > MAXRECURSION)
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 51ba8fd..192f8d5 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -56,11 +56,6 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkArou
// STATIC DATA -----------------------------------------------------------
-#ifdef erDEBUG
-ULONG erCountBCAInserts = 0;
-ULONG erCountBCAFinds = 0;
-#endif
-
// -----------------------------------------------------------------------
void ScDocument::StartListeningArea( const ScRange& rRange,
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index a71b28e..78e5fa7 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -414,15 +414,6 @@ String ScCompiler::FindAddInFunction( const String& rUpperName, BOOL bLocalFirst
}
-#ifdef erDEBUG
-void dbg_call_testcreatemapping()
-{
- using namespace ::com::sun::star::sheet;
- ScCompiler::OpCodeMapPtr xMap = ScCompiler::GetOpCodeMap( FormulaLanguage::ODFF);
- xMap->createSequenceOfAvailableMappings( FormulaMapGroup::FUNCTIONS);
-}
-#endif
-
//-----------------------------------------------------------------------------
ScCompiler::Convention::~Convention()
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e59601c..b3cb919 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7709,26 +7709,6 @@ static bool lcl_LookupQuery( ScAddress & o_rResultPos, ScDocument * pDoc,
return bFound;
}
-#define erDEBUG_LOOKUPCACHE 0
-#if erDEBUG_LOOKUPCACHE
-#include <cstdio>
-using ::std::fprintf;
-using ::std::fflush;
-static struct LookupCacheDebugCounter
-{
- unsigned long nMiss;
- unsigned long nHit;
- LookupCacheDebugCounter() : nMiss(0), nHit(0) {}
- ~LookupCacheDebugCounter()
- {
- fprintf( stderr, "\nmiss: %lu, hit: %lu, total: %lu, hit/miss: %lu, hit/total %lu%\n",
- nMiss, nHit, nHit+nMiss, (nMiss>0 ? nHit/nMiss : 0),
- ((nHit+nMiss)>0 ? (100*nHit)/(nHit+nMiss) : 0));
- fflush( stderr);
- }
-} aLookupCacheDebugCounter;
-#endif
-
bool ScInterpreter::LookupQueryWithCache( ScAddress & o_rResultPos,
const ScQueryParam & rParam ) const
{
@@ -7751,23 +7731,11 @@ bool ScInterpreter::LookupQueryWithCache( ScAddress & o_rResultPos,
{
case ScLookupCache::NOT_CACHED :
case ScLookupCache::CRITERIA_DIFFERENT :
-#if erDEBUG_LOOKUPCACHE
- ++aLookupCacheDebugCounter.nMiss;
-#if erDEBUG_LOOKUPCACHE > 1
- fprintf( stderr, "miss %d,%d,%d\n", (int)aPos.Col(), (int)aPos.Row(), (int)aPos.Tab());
-#endif
-#endif
bFound = lcl_LookupQuery( o_rResultPos, pDok, rParam, rEntry);
if (eCacheResult == ScLookupCache::NOT_CACHED)
rCache.insert( o_rResultPos, aCriteria, aPos, bFound);
break;
case ScLookupCache::FOUND :
-#if erDEBUG_LOOKUPCACHE
- ++aLookupCacheDebugCounter.nHit;
-#if erDEBUG_LOOKUPCACHE > 1
- fprintf( stderr, "hit %d,%d,%d\n", (int)aPos.Col(), (int)aPos.Row(), (int)aPos.Tab());
-#endif
-#endif
bFound = true;
break;
case ScLookupCache::NOT_AVAILABLE :
diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx
index a9b2cfd..f410dda 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -32,40 +32,15 @@
#include "lookupcache.hxx"
#include "document.hxx"
-#ifdef erDEBUG
-#include <cstdio>
-using ::std::fprintf;
-static long nCacheCount = 0;
-#endif
-
-
ScLookupCache::ScLookupCache( ScDocument * pDoc, const ScRange & rRange ) :
maRange( rRange),
mpDoc( pDoc)
{
-#ifdef erDEBUG
- ++nCacheCount;
- fprintf( stderr, "\nctor ScLookupCache %ld: %d, %d, %d, %d, %d, %d; buckets: %lu, size: %lu\n",
- nCacheCount,
- (int)getRange().aStart.Col(), (int)getRange().aStart.Row(),
- (int)getRange().aStart.Tab(), (int)getRange().aEnd.Col(),
- (int)getRange().aEnd.Row(), (int)getRange().aEnd.Tab(),
- (unsigned long)maQueryMap.bucket_count(), (unsigned long)maQueryMap.size());
-#endif
}
ScLookupCache::~ScLookupCache()
{
-#ifdef erDEBUG
- fprintf( stderr, "\ndtor ScLookupCache %ld: %d, %d, %d, %d, %d, %d; buckets: %lu, size: %lu\n",
- nCacheCount,
- (int)getRange().aStart.Col(), (int)getRange().aStart.Row(),
- (int)getRange().aStart.Tab(), (int)getRange().aEnd.Col(),
- (int)getRange().aEnd.Row(), (int)getRange().aEnd.Tab(),
- (unsigned long)maQueryMap.bucket_count(), (unsigned long)maQueryMap.size());
- --nCacheCount;
-#endif
}
@@ -90,25 +65,13 @@ bool ScLookupCache::insert( const ScAddress & rResultAddress,
const QueryCriteria & rCriteria, const ScAddress & rQueryAddress,
const bool bAvailable )
{
-#ifdef erDEBUG
- size_t nBuckets = maQueryMap.bucket_count();
-#endif
QueryKey aKey( rQueryAddress, rCriteria.getQueryOp());
QueryCriteriaAndResult aResult( rCriteria, rResultAddress);
if (!bAvailable)
aResult.maAddress.SetRow(-1);
bool bInserted = maQueryMap.insert( ::std::pair< const QueryKey,
QueryCriteriaAndResult>( aKey, aResult)).second;
-#ifdef erDEBUG
- if (nBuckets != maQueryMap.bucket_count())
- {
- fprintf( stderr, "\nbuck ScLookupCache: %d, %d, %d, %d, %d, %d; buckets: %lu, size: %lu\n",
- (int)getRange().aStart.Col(), (int)getRange().aStart.Row(),
- (int)getRange().aStart.Tab(), (int)getRange().aEnd.Col(),
- (int)getRange().aEnd.Row(), (int)getRange().aEnd.Tab(),
- (unsigned long)maQueryMap.bucket_count(), (unsigned long)maQueryMap.size());
- }
-#endif
+
return bInserted;
}
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index b6aac9b..3085aee 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -767,105 +767,6 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo )
IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
{
-#if defined(erDEBUG) //|| 1
- static ESelection aDebugSel;
- static String aDebugStr;
- static SvFileStream* pDebugStrm = NULL;
- static ULONG nDebugStrmPos = 0;
- static ULONG nDebugCount = 0;
- static ULONG nDebugCountAll = 0;
- static const sal_Char* sDebugState[15] = {
- "RTFIMP_START", "RTFIMP_END",
- "RTFIMP_NEXTTOKEN", "RTFIMP_UNKNOWNATTR",
- "RTFIMP_SETATTR",
- "RTFIMP_INSERTTEXT",
- "RTFIMP_INSERTPARA",
- "HTMLIMP_START", "HTMLIMP_END",
- "HTMLIMP_NEXTTOKEN", "HTMLIMP_UNKNOWNATTR",
- "HTMLIMP_SETATTR",
- "HTMLIMP_INSERTTEXT",
- "HTMLIMP_INSERTPARA", "HTMLIMP_INSERTFIELD"
- };
-
- nDebugCountAll++;
- if ( pInfo->eState != HTMLIMP_NEXTTOKEN // not too much
- || pInfo->nToken == HTML_TABLE_ON
- || pInfo->nToken == HTML_TABLE_OFF
- || pInfo->nToken == HTML_TABLEROW_ON
- || pInfo->nToken == HTML_TABLEROW_OFF
- || pInfo->nToken == HTML_TABLEHEADER_ON
- || pInfo->nToken == HTML_TABLEHEADER_OFF
- || pInfo->nToken == HTML_TABLEDATA_ON
- || pInfo->nToken == HTML_TABLEDATA_OFF
- || !aDebugSel.IsEqual( pInfo->aSelection )
- || pInfo->aText.Len() || aDebugStr != pInfo->aText
- )
- {
- aDebugSel = pInfo->aSelection;
- aDebugStr = pInfo->aText;
- nDebugCount++;
- if ( !pDebugStrm )
- {
- pDebugStrm = new SvFileStream( "d:\\erdbghtm.log",
- STREAM_WRITE | STREAM_TRUNC );
- }
- else
- {
- pDebugStrm->ReOpen();
- pDebugStrm->Seek( nDebugStrmPos );
- }
- SvFileStream& rS = *pDebugStrm;
- rS.WriteNumber( nDebugCountAll ); rS << ".: ";
- rS.WriteNumber( nDebugCount ); rS << ". State: ";
- rS.WriteNumber( (USHORT) pInfo->eState );
- rS << ' ' << sDebugState[pInfo->eState] << endl;
- rS << "SPar,SPos EPar,EPos: ";
- rS.WriteNumber( aDebugSel.nStartPara ); rS << ',';
- rS.WriteNumber( aDebugSel.nStartPos ); rS << ' ';
- rS.WriteNumber( aDebugSel.nEndPara ); rS << ',';
- rS.WriteNumber( aDebugSel.nEndPos ); rS << endl;
- if ( aDebugStr.Len() )
- {
- rS << "Text: \"" << aDebugStr << '\"' << endl;
- }
- else
- {
- rS << "Text:" << endl;
- }
- rS << "Token: "; rS.WriteNumber( pInfo->nToken );
- switch ( pInfo->nToken )
- {
- case HTML_TABLE_ON:
- rS << " HTML_TABLE_ON";
- break;
- case HTML_TABLE_OFF:
- rS << " HTML_TABLE_OFF";
- break;
- case HTML_TABLEROW_ON:
- rS << " HTML_TABLEROW_ON";
- break;
- case HTML_TABLEROW_OFF:
- rS << " HTML_TABLEROW_OFF";
- break;
- case HTML_TABLEHEADER_ON:
- rS << " HTML_TABLEHEADER_ON";
- break;
- case HTML_TABLEHEADER_OFF:
- rS << " HTML_TABLEHEADER_OFF";
- break;
- case HTML_TABLEDATA_ON:
- rS << " HTML_TABLEDATA_ON";
- break;
- case HTML_TABLEDATA_OFF:
- rS << " HTML_TABLEDATA_OFF";
- break;
- }
- rS << " Value: "; rS.WriteNumber( pInfo->nTokenValue );
- rS << endl << endl;
- nDebugStrmPos = pDebugStrm->Tell();
- pDebugStrm->Close();
- }
-#endif
switch ( pInfo->eState )
{
case HTMLIMP_NEXTTOKEN:
commit 1f7140b7d72ce511c3c3d5029d6ddfef3bb81d5c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 12:02:43 2011 +0100
Remove erBEEPER().
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 1cca198..51ba8fd 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -33,13 +33,6 @@
#include <vcl/svapp.hxx>
-#if defined( WNT ) && defined( erBEEP )
-#include <svwin.h>
-#define erBEEPER() Beep( 666, 66 )
-#else
-#define erBEEPER()
-#endif
-
#include "document.hxx"
#include "brdcst.hxx"
#include "bcaslot.hxx"
@@ -453,7 +446,6 @@ void ScDocument::TrackFormulas( ULONG nHintId )
if ( pFormulaTrack )
{
- erBEEPER();
// outside the loop, check if any sheet has a "calculate" event script
bool bCalcEvent = HasAnySheetEventScript( SC_SHEETEVENT_CALCULATE, true );
SvtBroadcaster* pBC;
commit b0fda66a77eb268ded77c7bf37466e877adfb575
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 24 11:58:36 2011 +0100
Remove NOTYET directive.
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index d71fea3..e0d6ad0 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -114,66 +114,6 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
else
rPoints[0].realloc(0);
}
-#ifdef NOTYET
-void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget
- , ::std::vector< ::std::vector< TickInfo > >& /* rRadiusTickInfos */
- , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList )
-{
- Reference< drawing::XShapes > xMainTarget(
- this->createGroupShape( xLogicTarget, m_aCID ) );
-
- const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0];
- Reference< XScaling > xInverseScaling( NULL );
- if( rAngleScale.Scaling.is() )
- xInverseScaling = rAngleScale.Scaling->getInverseScaling();
-
- double fLogicInnerRadius = m_pPosHelper->getInnerLogicRadius();
- double fLogicOuterRadius = m_pPosHelper->getOuterLogicRadius();
- double fLogicZ = -0.5;//as defined
-
- sal_Int32 nLinePropertiesCount = rLinePropertiesList.size();
- ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rAngleTickInfos.begin();
- sal_Int32 nDepth=0;
- /*
- //no subgrids so far for polar angle grid (need different radii)
- const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rAngleTickInfos.end();
- for( ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount
- ; aDepthIter++, nDepth++ )
- */
- if(nLinePropertiesCount)
- {
- //create axis main lines
- drawing::PointSequenceSequence aAllPoints;
- ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin();
- const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
- for( ; aTickIter != aTickEnd; aTickIter++ )
- {
- TickInfo& rTickInfo = *aTickIter;
- if( !rTickInfo.bPaintIt )
- continue;
-
- rTickInfo.updateUnscaledValue( xInverseScaling );
- double fLogicAngle = rTickInfo.fUnscaledTickValue;
-
- drawing::PointSequenceSequence aPoints(1);
- aPoints[0].realloc(2);
- drawing::Position3D aScenePositionStart( m_pPosHelper->transformAngleRadiusToScene( fLogicAngle, fLogicInnerRadius, fLogicZ ) );
- drawing::Position3D aScenePositionEnd( m_pPosHelper->transformAngleRadiusToScene( fLogicAngle, fLogicOuterRadius, fLogicZ ) );
- aPoints[0][0].X = static_cast<sal_Int32>(aScenePositionStart.PositionX);
- aPoints[0][0].Y = static_cast<sal_Int32>(aScenePositionStart.PositionY);
- aPoints[0][1].X = static_cast<sal_Int32>(aScenePositionEnd.PositionX);
- aPoints[0][1].Y = static_cast<sal_Int32>(aScenePositionEnd.PositionY);
- appendPointSequence( aAllPoints, aPoints );
- }
-
- Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D(
- xMainTarget, aAllPoints, &rLinePropertiesList[nDepth] );
- //because of this name this line will be used for marking
- m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") );
- }
-}
-#endif
void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget
, ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 0723aed..521d83c 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -83,12 +83,6 @@ private: //member
, ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
, ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
, const ::std::vector<VLineProperties>& rLinePropertiesList );
-#if NOTYET
- void create2DAngleGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget
- , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
- , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList );
-#endif
};
//.............................................................................
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index ee08824..9ac31af 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -187,9 +187,6 @@ public:
using PlottingPositionHelper::transformScaledLogicToScene;
-#ifdef NOTYET
- double getInnerLogicRadius() const;
-#endif
double getOuterLogicRadius() const;
inline bool isMathematicalOrientationAngle() const;
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index 3f2d748..d2252b6 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -611,17 +611,6 @@ drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( do
return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ, bDoScaling );
}
-#ifdef NOTYET
-double PolarPlottingPositionHelper::getInnerLogicRadius() const
-{
- const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[0] : m_aScales[1];
- if( AxisOrientation_MATHEMATICAL==rScale.Orientation )
- return rScale.Minimum;
- else
- return rScale.Maximum;
-}
-#endif
-
double PolarPlottingPositionHelper::getOuterLogicRadius() const
{
const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[0] : m_aScales[1];
commit e6ea6a8385f3ad8d251676c5041bb950ce03a0bc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jan 22 18:55:06 2011 +0100
Replace suitable equalsAscii calls with equalsAsciiL.
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 70ec0cf..c737f57 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -93,9 +93,9 @@ OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI)
{
- if (rURI.equalsAscii(URI_SHA1))
+ if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_SHA1)))
return PASSHASH_SHA1;
- else if (rURI.equalsAscii(URI_XLS_LEGACY))
+ else if (rURI.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URI_XLS_LEGACY)))
return PASSHASH_XL;
return PASSHASH_UNSPECIFIED;
}
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index c4a4e5b..233a028 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -796,7 +796,7 @@ bool ScOptSolverDlg::FindTimeout( sal_Int32& rTimeout )
for (sal_Int32 nProp=0; nProp<nPropCount && !bFound; ++nProp)
{
const beans::PropertyValue& rValue = maProperties[nProp];
- if ( rValue.Name.equalsAscii( SC_UNONAME_TIMEOUT ) )
+ if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_TIMEOUT ) ) )
bFound = ( rValue.Value >>= rTimeout );
}
return bFound;
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index b9cb787..5c3ad2c 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1695,7 +1695,7 @@ BOOL lcl_GetFieldDataByName( ScDPObject* pDPObj, const OUString& rFieldName, ScF
// The name "Data" always refers to the data layout field.
rFieldId.maFieldName = rFieldName;
rFieldId.mnFieldIdx = 0;
- rFieldId.mbDataLayout = rFieldName.equalsAscii( SC_DATALAYOUT_NAME );
+ rFieldId.mbDataLayout = rFieldName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_DATALAYOUT_NAME ) );
pDPObj->GetSource(); // IsDimNameInUse doesn't update source data
@@ -3425,11 +3425,11 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyNam
if (pMember)
{
bool bGetNewIndex = false;
- if ( aPropertyName.equalsAscii( SC_UNONAME_SHOWDETAIL ) )
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SHOWDETAIL ) ) )
pMember->SetShowDetails(cppu::any2bool(aValue));
- else if ( aPropertyName.equalsAscii( SC_UNONAME_ISHIDDEN ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISHIDDEN ) ) )
pMember->SetIsVisible(!cppu::any2bool(aValue));
- else if ( aPropertyName.equalsAscii( SC_UNONAME_POS ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_POS ) ) )
{
sal_Int32 nNewPos = 0;
if ( ( aValue >>= nNewPos ) && nNewPos >= 0 && nNewPos < nCount )
@@ -3475,7 +3475,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
Reference< XNamed > xMember( xMembersIndex->getByIndex( mnIndex ), UNO_QUERY );
String sName( xMember->getName() );
ScDPSaveMember* pMember = pDim->GetExistingMemberByName( sName );
- if( aPropertyName.equalsAscii( SC_UNONAME_SHOWDETAIL ) )
+ if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SHOWDETAIL ) ) )
{
if (pMember && pMember->HasShowDetails())
{
@@ -3490,7 +3490,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
aRet <<= true;
}
}
- else if ( aPropertyName.equalsAscii( SC_UNONAME_ISHIDDEN ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISHIDDEN ) ) )
{
if (pMember && pMember->HasIsVisible())
{
@@ -3505,7 +3505,7 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
aRet <<= false;
}
}
- else if ( aPropertyName.equalsAscii( SC_UNONAME_POS ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_POS ) ) )
{
aRet <<= mnIndex;
}
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index c484dc5..135f864 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -268,13 +268,13 @@ void SAL_CALL ScTableConditionalFormat::addNew(
{
const beans::PropertyValue& rProp = pPropArray[i];
- if ( rProp.Name.equalsAscii( SC_UNONAME_OPERATOR ) )
+ if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_OPERATOR ) ) )
{
sheet::ConditionOperator eOper = (sheet::ConditionOperator)
ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
aEntry.meMode = lcl_ConditionOperatorToMode( eOper );
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULA1 ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULA1 ) ) )
{
rtl::OUString aStrVal;
uno::Sequence<sheet::FormulaToken> aTokens;
@@ -286,7 +286,7 @@ void SAL_CALL ScTableConditionalFormat::addNew(
aEntry.maTokens1 = aTokens;
}
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULA2 ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULA2 ) ) )
{
rtl::OUString aStrVal;
uno::Sequence<sheet::FormulaToken> aTokens;
@@ -298,44 +298,44 @@ void SAL_CALL ScTableConditionalFormat::addNew(
aEntry.maTokens2 = aTokens;
}
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_SOURCEPOS ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SOURCEPOS ) ) )
{
table::CellAddress aAddress;
if ( rProp.Value >>= aAddress )
aEntry.maPos = ScAddress( (SCCOL)aAddress.Column, (SCROW)aAddress.Row, aAddress.Sheet );
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_SOURCESTR ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_SOURCESTR ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maPosStr = String( aStrVal );
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_STYLENAME ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_STYLENAME ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName(
aStrVal, SFX_STYLE_FAMILY_PARA );
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULANMSP1 ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULANMSP1 ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maExprNmsp1 = aStrVal;
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_FORMULANMSP2 ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_FORMULANMSP2 ) ) )
{
rtl::OUString aStrVal;
if ( rProp.Value >>= aStrVal )
aEntry.maExprNmsp2 = aStrVal;
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_GRAMMAR1 ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_GRAMMAR1 ) ) )
{
sal_Int32 nVal = 0;
if ( rProp.Value >>= nVal )
aEntry.meGrammar1 = static_cast< FormulaGrammar::Grammar >( nVal );
}
- else if ( rProp.Name.equalsAscii( SC_UNONAME_GRAMMAR2 ) )
+ else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_GRAMMAR2 ) ) )
{
sal_Int32 nVal = 0;
if ( rProp.Value >>= nVal )
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 99d189a..cce0555 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -382,7 +382,7 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue(
uno::RuntimeException)
{
SolarMutexGuard aGuard;
- if ( rPropertyName.equalsAscii( SC_UNONAME_ISSHAREDFMLA ) )
+ if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISSHAREDFMLA ) ) )
{
bool bIsShared = false;
if( aValue >>= bIsShared )
@@ -399,21 +399,21 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope
{
SolarMutexGuard aGuard;
uno::Any aRet;
- if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPBIT ) )
+ if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNO_LINKDISPBIT ) ) )
{
// no target bitmaps for individual entries (would be all equal)
// ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_RANGENAME );
}
- else if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPNAME ) )
+ else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNO_LINKDISPNAME ) ) )
aRet <<= rtl::OUString( aName );
- else if ( rPropertyName.equalsAscii( SC_UNONAME_TOKENINDEX ) )
+ else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_TOKENINDEX ) ) )
{
// get index for use in formula tokens (read-only)
ScRangeData* pData = GetRangeData_Impl();
if (pData)
aRet <<= static_cast<sal_Int32>(pData->GetIndex());
}
- else if ( rPropertyName.equalsAscii( SC_UNONAME_ISSHAREDFMLA ) )
+ else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISSHAREDFMLA ) ) )
{
if( ScRangeData* pData = GetRangeData_Impl() )
aRet <<= static_cast< bool >( pData->HasType( RT_SHARED ) );
@@ -433,8 +433,8 @@ rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::Runti
sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName )
throw(uno::RuntimeException)
{
- return rServiceName.equalsAscii( SCNAMEDRANGEOBJ_SERVICE ) ||
- rServiceName.equalsAscii( SCLINKTARGET_SERVICE );
+ return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCNAMEDRANGEOBJ_SERVICE ) ) ||
+ rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SCLINKTARGET_SERVICE ) );
}
uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames()
@@ -730,7 +730,7 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue(
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
- if (rPropertyName.equalsAscii(SC_UNO_MODIFY_BROADCAST))
+ if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
{
aValue >>= mbModifyAndBroadcast;
}
@@ -741,7 +741,7 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyN
uno::RuntimeException)
{
Any aRet;
- if (rPropertyName.equalsAscii(SC_UNO_MODIFY_BROADCAST))
+ if (rPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SC_UNO_MODIFY_BROADCAST)))
{
aRet <<= mbModifyAndBroadcast;
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 6d22117..1d2091e 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1972,7 +1972,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
SolarMutexGuard aGuard;
uno::Any aAny;
- if ( aPropertyName.equalsAscii( SC_UNONAME_DISPNAME ) ) // read-only
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_DISPNAME ) ) ) // read-only
{
// core always has the display name
SfxStyleSheetBase* pStyle = GetStyle_Impl();
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index e3ca928..d552cc8 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -428,8 +428,8 @@ OUString SAL_CALL ScaDateAddIn::getImplementationName() throw( uno::RuntimeExcep
sal_Bool SAL_CALL ScaDateAddIn::supportsService( const OUString& aServiceName ) throw( uno::RuntimeException )
{
- return aServiceName.equalsAscii( ADDIN_SERVICE ) ||
- aServiceName.equalsAscii( MY_SERVICE );
+ return aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ADDIN_SERVICE ) ) ||
+ aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MY_SERVICE ) );
}
uno::Sequence< OUString > SAL_CALL ScaDateAddIn::getSupportedServiceNames() throw( uno::RuntimeException )
More information about the Libreoffice-commits
mailing list