[Libreoffice-commits] .: sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Tue Jun 7 13:38:45 PDT 2011
sc/source/ui/inc/viewdata.hxx | 42 +++++++++++++++++++----------------------
sc/source/ui/view/viewdata.cxx | 22 ++++++++++-----------
2 files changed, 31 insertions(+), 33 deletions(-)
New commits:
commit e305b905c1cf175195ef8bbdcc38e710812a61f2
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Tue Jun 7 16:38:21 2011 -0400
sal_Bool to bool etc.
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index a39e5d6..736191e 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -148,8 +148,7 @@ private:
SCROW nPosY[2];
bool bShowGrid; // per-sheet show grid-lines option.
-
- sal_Bool bOldCurValid; // "virtuelle" Cursorpos. bei zusammengefassten
+ bool mbOldCursorValid; // "virtuelle" Cursorpos. bei zusammengefassten
ScViewDataTable();
~ScViewDataTable();
@@ -220,14 +219,13 @@ private:
ScPasteFlags nPasteFlags;
ScSplitPos eEditActivePart; // the part that was active when edit mode was started
- sal_Bool bEditActive[4]; // aktiv?
- sal_Bool bActive; // aktives Fenster ?
- sal_Bool bIsRefMode; // Referenzeingabe
- sal_Bool bDelMarkValid; // nur gueltig bei SC_REFTYPE_FILL
- sal_uInt8 nFillMode; // Modus
- sal_Bool bPagebreak; // Seitenumbruch-Vorschaumodus
-
- sal_Bool bSelCtrlMouseClick; // special selection handling for ctrl-mouse-click
+ sal_uInt8 nFillMode; // Modus
+ bool bEditActive[4]; // aktiv?
+ bool bActive:1; // aktives Fenster ?
+ bool bIsRefMode:1; // Referenzeingabe
+ bool bDelMarkValid:1; // nur gueltig bei SC_REFTYPE_FILL
+ bool bPagebreak:1; // Seitenumbruch-Vorschaumodus
+ bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click
SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, EditStatus*);
SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*);
@@ -273,8 +271,8 @@ public:
ScDocument* GetDocument() const;
- sal_Bool IsActive() const { return bActive; }
- void Activate(sal_Bool bActivate) { bActive = bActivate; }
+ bool IsActive() const { return bActive; }
+ void Activate(bool bActivate) { bActive = bActivate; }
void InsertTab( SCTAB nTab );
void InsertTabs( SCTAB nTab, SCTAB nNewSheets );
@@ -292,7 +290,7 @@ public:
SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; }
SCCOL GetCurX() const { return pThisTab->nCurX; }
SCROW GetCurY() const { return pThisTab->nCurY; }
- sal_Bool HasOldCursor() const { return pThisTab->bOldCurValid; }
+ bool HasOldCursor() const { return pThisTab->mbOldCursorValid; }
SCCOL GetOldCurX() const;
SCROW GetOldCurY() const;
ScSplitMode GetHSplitMode() const { return pThisTab->eHSplitMode; }
@@ -301,7 +299,7 @@ public:
long GetVSplitPos() const { return pThisTab->nVSplitPos; }
SCCOL GetFixPosX() const { return pThisTab->nFixPosX; }
SCROW GetFixPosY() const { return pThisTab->nFixPosY; }
- sal_Bool IsPagebreakMode() const { return bPagebreak; }
+ bool IsPagebreakMode() const { return bPagebreak; }
bool IsPasteMode() const { return nPasteFlags & SC_PASTE_MODE; }
bool ShowPasteSource() const { return nPasteFlags & SC_PASTE_BORDER; }
@@ -317,7 +315,7 @@ public:
void SetVSplitPos( long nPos ) { pThisTab->nVSplitPos = nPos; }
void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; }
void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; }
- void SetPagebreakMode( sal_Bool bSet );
+ void SetPagebreakMode( bool bSet );
void SetPasteMode ( ScPasteFlags nFlags ) { nPasteFlags = nFlags; }
void SetZoomType( SvxZoomType eNew, sal_Bool bAll );
@@ -326,7 +324,7 @@ public:
void SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll );
void RefreshZoom();
- void SetSelCtrlMouseClick( sal_Bool bTmp ) { bSelCtrlMouseClick = bTmp; }
+ void SetSelCtrlMouseClick( bool bTmp ) { bSelCtrlMouseClick = bTmp; }
SvxZoomType GetZoomType() const { return pThisTab->eZoomType; }
const Fraction& GetZoomX() const { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; }
@@ -375,7 +373,7 @@ public:
void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich,
SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop );
- sal_Bool IsRefMode() const { return bIsRefMode; }
+ bool IsRefMode() const { return bIsRefMode; }
ScRefType GetRefType() const { return eRefType; }
SCCOL GetRefStartX() const { return nRefStartX; }
SCROW GetRefStartY() const { return nRefStartY; }
@@ -384,7 +382,7 @@ public:
SCROW GetRefEndY() const { return nRefEndY; }
SCTAB GetRefEndZ() const { return nRefEndZ; }
- void SetRefMode( sal_Bool bNewMode, ScRefType eNewType )
+ void SetRefMode( bool bNewMode, ScRefType eNewType )
{ bIsRefMode = bNewMode; eRefType = eNewType; }
void SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
@@ -394,9 +392,9 @@ public:
void ResetDelMark() { bDelMarkValid = false; }
void SetDelMark( const ScRange& rRange )
- { aDelRange = rRange; bDelMarkValid = sal_True; }
+ { aDelRange = rRange; bDelMarkValid = true; }
- sal_Bool GetDelMark( ScRange& rRange ) const
+ bool GetDelMark( ScRange& rRange ) const
{ rRange = aDelRange; return bDelMarkValid; }
inline void GetMoveCursor( SCCOL& rCurX, SCROW& rCurY );
@@ -425,7 +423,7 @@ public:
ScEditEngineDefaulter* pNewEngine,
Window* pWin, SCCOL nNewX, SCROW nNewY );
void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow );
- sal_Bool HasEditView( ScSplitPos eWhich ) const
+ bool HasEditView( ScSplitPos eWhich ) const
{ return pEditView[eWhich] && bEditActive[eWhich]; }
EditView* GetEditView( ScSplitPos eWhich ) const
{ return pEditView[eWhich]; }
@@ -491,7 +489,7 @@ public:
const Size& GetScenButSize() const { return aScenButSize; }
void SetScenButSize(const Size& rNew) { aScenButSize = rNew; }
- sal_Bool IsSelCtrlMouseClick() { return bSelCtrlMouseClick; }
+ bool IsSelCtrlMouseClick() { return bSelCtrlMouseClick; }
static inline long ToPixel( sal_uInt16 nTwips, double nFactor );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 9e44d1a..fe60ab8 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -96,7 +96,7 @@ ScViewDataTable::ScViewDataTable() :
nCurX( 0 ),
nCurY( 0 ),
bShowGrid( true ),
- bOldCurValid( false )
+ mbOldCursorValid( false )
{
nPosX[0]=nPosX[1]=0;
nPosY[0]=nPosY[1]=0;
@@ -313,10 +313,10 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
nRefTabNo ( 0 ),
nPasteFlags ( SC_PASTE_NONE ),
eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
- bActive ( sal_True ), //! wie initialisieren?
+ nFillMode ( SC_FILL_NONE ),
+ bActive ( true ), //! wie initialisieren?
bIsRefMode ( false ),
bDelMarkValid( false ),
- nFillMode ( SC_FILL_NONE ),
bPagebreak ( false ),
bSelCtrlMouseClick( false )
{
@@ -382,10 +382,10 @@ ScViewData::ScViewData( const ScViewData& rViewData ) :
nTabNo ( rViewData.nTabNo ),
nRefTabNo ( rViewData.nTabNo ), // kein RefMode
eEditActivePart( rViewData.eEditActivePart ),
- bActive ( sal_True ), //! wie initialisieren?
+ nFillMode ( SC_FILL_NONE ),
+ bActive ( true ), //! wie initialisieren?
bIsRefMode ( false ),
bDelMarkValid( false ),
- nFillMode ( SC_FILL_NONE ),
bPagebreak ( rViewData.bPagebreak ),
bSelCtrlMouseClick( rViewData.bSelCtrlMouseClick )
{
@@ -704,7 +704,7 @@ void ScViewData::RefreshZoom()
aLogicMode.SetScaleY( GetZoomY() );
}
-void ScViewData::SetPagebreakMode( sal_Bool bSet )
+void ScViewData::SetPagebreakMode( bool bSet )
{
bPagebreak = bSet;
@@ -866,7 +866,7 @@ void ScViewData::GetFillData( SCCOL& rStartCol, SCROW& rStartRow,
SCCOL ScViewData::GetOldCurX() const
{
- if (pThisTab->bOldCurValid)
+ if (pThisTab->mbOldCursorValid)
return pThisTab->nOldCurX;
else
return pThisTab->nCurX;
@@ -874,7 +874,7 @@ SCCOL ScViewData::GetOldCurX() const
SCROW ScViewData::GetOldCurY() const
{
- if (pThisTab->bOldCurValid)
+ if (pThisTab->mbOldCursorValid)
return pThisTab->nOldCurY;
else
return pThisTab->nCurY;
@@ -884,12 +884,12 @@ void ScViewData::SetOldCursor( SCCOL nNewX, SCROW nNewY )
{
pThisTab->nOldCurX = nNewX;
pThisTab->nOldCurY = nNewY;
- pThisTab->bOldCurValid = sal_True;
+ pThisTab->mbOldCursorValid = true;
}
void ScViewData::ResetOldCursor()
{
- pThisTab->bOldCurValid = false;
+ pThisTab->mbOldCursorValid = false;
}
Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY,
@@ -937,7 +937,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
sal_uLong nVC = pEditView[eWhich]->GetControlWord();
pEditView[eWhich]->SetControlWord(nVC & ~EV_CNTRL_AUTOSCROLL);
- bEditActive[eWhich] = sal_True;
+ bEditActive[eWhich] = true;
const ScPatternAttr* pPattern = pDoc->GetPattern( nNewX, nNewY, nTabNo );
SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
More information about the Libreoffice-commits
mailing list