[Libreoffice-commits] core.git: vcl/source
Takeshi Abe
tabe at fixedpoint.jp
Fri Jun 21 05:45:35 PDT 2013
vcl/source/window/menu.cxx | 108 ++++++++++++++++++++---------------------
vcl/source/window/mnemonic.cxx | 8 +--
vcl/source/window/splitwin.cxx | 80 +++++++++++++++---------------
3 files changed, 98 insertions(+), 98 deletions(-)
New commits:
commit f47b777a0b06fcc56569ac8aeff1a845d634ba1a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Jun 21 21:40:18 2013 +0900
sal_Bool to bool
Change-Id: I0673e9ec1d3e69a338313c568c462ab1e820d2b0
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index b896a7d..7bf3c16 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -126,7 +126,7 @@ struct MenuItemData
sal_Bool bChecked; // Checked
sal_Bool bEnabled; // Enabled
sal_Bool bVisible; // Visible (note: this flag will not override MENU_FLAG_HIDEDISABLEDENTRIES when true)
- sal_Bool bIsTemporary; // Temporary inserted ('No selection possible')
+ bool bIsTemporary; // Temporary inserted ('No selection possible')
sal_Bool bMirrorMode;
long nItemImageAngle;
Size aSz; // only temporarily valid
@@ -247,7 +247,7 @@ MenuItemData* MenuItemList::Insert(
pData->bChecked = sal_False;
pData->bEnabled = sal_True;
pData->bVisible = sal_True;
- pData->bIsTemporary = sal_False;
+ pData->bIsTemporary = false;
pData->bMirrorMode = sal_False;
pData->nItemImageAngle = 0;
@@ -283,7 +283,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
pData->bChecked = sal_False;
pData->bEnabled = sal_True;
pData->bVisible = sal_True;
- pData->bIsTemporary = sal_False;
+ pData->bIsTemporary = false;
pData->bMirrorMode = sal_False;
pData->nItemImageAngle = 0;
@@ -477,13 +477,13 @@ private:
sal_uInt16 nFirstEntry;
sal_uInt16 nBorder;
sal_uInt16 nPosInParent;
- sal_Bool bInExecute;
+ bool bInExecute;
sal_Bool bScrollMenu;
sal_Bool bScrollUp;
sal_Bool bScrollDown;
- sal_Bool bIgnoreFirstMove;
- sal_Bool bKeyInput;
+ bool bIgnoreFirstMove;
+ bool bKeyInput;
DECL_LINK(PopupEnd, void *);
DECL_LINK( HighlightChanged, Timer* );
@@ -682,8 +682,8 @@ private:
sal_uInt16 nRolloveredItem;
sal_uLong nSaveFocusId;
sal_Bool mbAutoPopup;
- sal_Bool bIgnoreFirstMove;
- sal_Bool bStayActive;
+ bool bIgnoreFirstMove;
+ bool bStayActive;
DecoToolBox aCloser;
PushButton aFloatBtn;
@@ -786,12 +786,12 @@ static sal_uLong ImplChangeTipTimeout( sal_uLong nTimeout, Window *pWindow )
return nRet;
}
-static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem, const HelpEvent& rHEvt, const Rectangle &rHighlightRect )
+static bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem, const HelpEvent& rHEvt, const Rectangle &rHighlightRect )
{
if( ! pMenu )
- return sal_False;
+ return false;
- sal_Bool bDone = sal_False;
+ bool bDone = false;
sal_uInt16 nId = 0;
if ( nHighlightedItem != ITEMPOS_INVALID )
@@ -820,7 +820,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1
Help::ShowQuickHelp( pMenuWindow, aRect, pMenu->GetTipHelpText( nId ) );
ImplChangeTipTimeout( oldTimeout, pMenuWindow );
}
- bDone = sal_True;
+ bDone = true;
}
else if ( ( rHEvt.GetMode() & HELPMODE_QUICK ) && pMenuWindow )
{
@@ -831,7 +831,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1
// call always, even when strlen==0 to correctly remove tip
Help::ShowQuickHelp( pMenuWindow, aRect, pMenu->GetTipHelpText( nId ) );
ImplChangeTipTimeout( oldTimeout, pMenuWindow );
- bDone = sal_True;
+ bDone = true;
}
else if ( rHEvt.GetMode() & (HELPMODE_CONTEXT | HELPMODE_EXTENDED) )
{
@@ -851,7 +851,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1
else
pHelp->Start( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), NULL );
}
- bDone = sal_True;
+ bDone = true;
}
return bDone;
}
@@ -1377,7 +1377,7 @@ void Menu::InsertSeparator(const OString &rIdent, sal_uInt16 nPos)
void Menu::RemoveItem( sal_uInt16 nPos )
{
- sal_Bool bRemove = sal_False;
+ bool bRemove = false;
if ( nPos < GetItemCount() )
{
@@ -1386,7 +1386,7 @@ void Menu::RemoveItem( sal_uInt16 nPos )
ImplGetSalMenu()->RemoveItem( nPos );
pItemList->Remove( nPos );
- bRemove = sal_True;
+ bRemove = true;
}
Window* pWin = ImplGetWindow();
@@ -3043,12 +3043,12 @@ void Menu::RemoveDisabledEntries( sal_Bool bCheckPopups, sal_Bool bRemoveEmptyPo
{
for ( sal_uInt16 n = 0; n < GetItemCount(); n++ )
{
- sal_Bool bRemove = sal_False;
+ bool bRemove = false;
MenuItemData* pItem = pItemList->GetDataFromPos( n );
if ( pItem->eType == MENUITEM_SEPARATOR )
{
if ( !n || ( GetItemType( n-1 ) == MENUITEM_SEPARATOR ) )
- bRemove = sal_True;
+ bRemove = true;
}
else
bRemove = !pItem->bEnabled;
@@ -3057,7 +3057,7 @@ void Menu::RemoveDisabledEntries( sal_Bool bCheckPopups, sal_Bool bRemoveEmptyPo
{
pItem->pSubMenu->RemoveDisabledEntries( sal_True );
if ( bRemoveEmptyPopups && !pItem->pSubMenu->GetItemCount() )
- bRemove = sal_True;
+ bRemove = true;
}
if ( bRemove )
@@ -3617,12 +3617,12 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
bCanceled = sal_False;
sal_uLong nFocusId = 0;
- sal_Bool bRealExecute = sal_False;
+ bool bRealExecute = false;
if ( !pStartedFrom )
{
pSVData->maWinData.mbNoDeactivate = sal_True;
nFocusId = Window::SaveFocus();
- bRealExecute = sal_True;
+ bRealExecute = true;
}
else
{
@@ -3686,7 +3686,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
MenuItemData* pData = pItemList->Insert(
0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF, OString() );
- pData->bIsTemporary = sal_True;
+ pData->bIsTemporary = true;
}
}
else if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( nMenuFlags & MENU_FLAG_NOAUTOMNEMONICS ) )
@@ -3886,7 +3886,7 @@ long PopupMenu::ImplCalcHeight( sal_uInt16 nEntries ) const
}
-static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar )
+static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar )
{
const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings();
@@ -3943,7 +3943,7 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nSt
pMenu = pMen;
pActivePopup = 0;
nSaveFocusId = 0;
- bInExecute = sal_False;
+ bInExecute = false;
bScrollMenu = sal_False;
nHighlightedItem = ITEMPOS_INVALID;
nMBDownPos = ITEMPOS_INVALID;
@@ -3953,11 +3953,11 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nSt
nFirstEntry = 0;
bScrollUp = sal_False;
bScrollDown = sal_False;
- bIgnoreFirstMove = sal_True;
- bKeyInput = sal_False;
+ bIgnoreFirstMove = true;
+ bKeyInput = false;
EnableSaveBackground();
- ImplInitMenuWindow( this, sal_True, sal_False );
+ ImplInitMenuWindow( this, true, false );
SetPopupModeEndHdl( LINK( this, MenuFloatingWindow, PopupEnd ) );
@@ -4076,7 +4076,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM
Size aOutSz = GetOutputSizePixel();
if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() - nY ) ) )
{
- sal_Bool bHighlighted = sal_False;
+ bool bHighlighted = false;
size_t nCount = pMenu->pItemList->size();
nY += ImplGetStartY(); // ggf. gescrollt.
for ( size_t n = 0; !bHighlighted && ( n < nCount ); n++ )
@@ -4130,7 +4130,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM
HighlightChanged( NULL );
}
}
- bHighlighted = sal_True;
+ bHighlighted = true;
}
}
}
@@ -4156,7 +4156,7 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd)
KillActivePopup(); // should be ok to just remove it
//pActivePopup->bCanceled = sal_True;
}
- bInExecute = sal_False;
+ bInExecute = false;
pMenu->bInCallback = sal_True;
pMenu->Deactivate();
pMenu->bInCallback = sal_False;
@@ -4299,7 +4299,7 @@ void MenuFloatingWindow::Execute()
pSVData->maAppData.mpActivePopupMenu = (PopupMenu*)pMenu;
- bInExecute = sal_True;
+ bInExecute = true;
// bCallingSelect = sal_False;
while ( bInExecute )
@@ -4325,7 +4325,7 @@ void MenuFloatingWindow::StopExecute( sal_uLong nFocusId )
ImplEndPopupMode( 0, nFocusId );
aHighlightChangedTimer.Stop();
- bInExecute = sal_False;
+ bInExecute = false;
if ( pActivePopup )
{
KillActivePopup();
@@ -4481,7 +4481,7 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt )
{
aSubmenuCloseTimer.Stop();
if( bIgnoreFirstMove )
- bIgnoreFirstMove = sal_False;
+ bIgnoreFirstMove = false;
else
ImplHighlightItem( rMEvt, sal_False );
}
@@ -4673,7 +4673,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
DBG_ASSERT( pMenu->ImplIsVisible( n ), "Highlight: Item not visible!" );
if ( pData->eType != MENUITEM_SEPARATOR )
{
- sal_Bool bRestoreLineColor = sal_False;
+ bool bRestoreLineColor = false;
Color oldLineColor;
bool bDrawItemRect = true;
@@ -4724,7 +4724,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
SetFillColor();
oldLineColor = GetLineColor();
SetLineColor( GetSettings().GetStyleSettings().GetMenuHighlightColor() );
- bRestoreLineColor = sal_True;
+ bRestoreLineColor = true;
}
}
else
@@ -4871,7 +4871,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
ImplAddDel( &aDelData );
sal_uInt16 nCode = rKEvent.GetKeyCode().GetCode();
- bKeyInput = sal_True;
+ bKeyInput = true;
switch ( nCode )
{
case KEY_UP:
@@ -4939,14 +4939,14 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
{
if( pMenu )
{
- sal_Bool bDone = sal_False;
+ bool bDone = false;
if ( nHighlightedItem != ITEMPOS_INVALID )
{
MenuItemData* pData = pMenu->GetItemList()->GetDataFromPos( nHighlightedItem );
if ( pData && pData->pSubMenu )
{
HighlightChanged( 0 );
- bDone = sal_True;
+ bDone = true;
}
}
if ( !bDone )
@@ -5018,7 +5018,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
if ( !aDelData.IsDead() )
{
ImplRemoveDel( &aDelData );
- bKeyInput = sal_False;
+ bKeyInput = false;
}
}
@@ -5102,7 +5102,7 @@ void MenuFloatingWindow::StateChanged( StateChangedType nType )
if ( ( nType == STATE_CHANGE_CONTROLFOREGROUND ) || ( nType == STATE_CHANGE_CONTROLBACKGROUND ) )
{
- ImplInitMenuWindow( this, sal_False, sal_False );
+ ImplInitMenuWindow( this, false, false );
Invalidate();
}
}
@@ -5116,7 +5116,7 @@ void MenuFloatingWindow::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE)) )
{
- ImplInitMenuWindow( this, sal_False, sal_False );
+ ImplInitMenuWindow( this, false, false );
Invalidate();
}
}
@@ -5159,8 +5159,8 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
nRolloveredItem = ITEMPOS_INVALID;
mbAutoPopup = sal_True;
nSaveFocusId = 0;
- bIgnoreFirstMove = sal_True;
- bStayActive = sal_False;
+ bIgnoreFirstMove = true;
+ bStayActive = false;
ResMgr* pResMgr = ImplGetResMgr();
@@ -5204,7 +5204,7 @@ void MenuBarWindow::SetMenu( MenuBar* pMen )
pMenu = pMen;
KillActivePopup();
nHighlightedItem = ITEMPOS_INVALID;
- ImplInitMenuWindow( this, sal_True, sal_True );
+ ImplInitMenuWindow( this, true, true );
if ( pMen )
{
aCloser.ShowItem( IID_DOCUMENTCLOSE, pMen->HasCloser() );
@@ -5316,7 +5316,7 @@ void MenuBarWindow::ImplCreatePopup( sal_Bool bPreSelectFirst )
MenuItemData* pItemData = pMenu ? pMenu->GetItemList()->GetDataFromPos( nHighlightedItem ) : NULL;
if ( pItemData )
{
- bIgnoreFirstMove = sal_True;
+ bIgnoreFirstMove = true;
if ( pActivePopup && ( pActivePopup != pItemData->pSubMenu ) )
{
KillActivePopup();
@@ -5447,7 +5447,7 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt )
if( bIgnoreFirstMove )
{
- bIgnoreFirstMove = sal_False;
+ bIgnoreFirstMove = false;
return;
}
@@ -5467,14 +5467,14 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa
KillActivePopup(); // pActivePopup when applicable without pWin, if Rescheduled in Activate()
// activate menubar only ones per cycle...
- sal_Bool bJustActivated = sal_False;
+ bool bJustActivated = false;
if ( ( nHighlightedItem == ITEMPOS_INVALID ) && ( n != ITEMPOS_INVALID ) )
{
ImplGetSVData()->maWinData.mbNoDeactivate = sal_True;
if( !bStayActive )
{
// #105406# avoid saving the focus when we already have the focus
- sal_Bool bNoSaveFocus = (this == ImplGetSVData()->maWinData.mpFocusWin );
+ bool bNoSaveFocus = (this == ImplGetSVData()->maWinData.mpFocusWin );
if( nSaveFocusId )
{
@@ -5497,11 +5497,11 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa
}
}
else
- bStayActive = sal_False;
+ bStayActive = false;
pMenu->bInCallback = sal_True; // set here if Activate overloaded
pMenu->Activate();
pMenu->bInCallback = sal_False;
- bJustActivated = sal_True;
+ bJustActivated = true;
}
else if ( ( nHighlightedItem != ITEMPOS_INVALID ) && ( n == ITEMPOS_INVALID ) )
{
@@ -5799,9 +5799,9 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF
mbAutoPopup = sal_False;
sal_uInt16 n = nHighlightedItem;
nHighlightedItem = ITEMPOS_INVALID;
- bStayActive = sal_True;
+ bStayActive = true;
ChangeHighlightItem( n, sal_False );
- bStayActive = sal_False;
+ bStayActive = false;
KillActivePopup();
GrabFocus();
}
@@ -5958,7 +5958,7 @@ void MenuBarWindow::StateChanged( StateChangedType nType )
if ( ( nType == STATE_CHANGE_CONTROLFOREGROUND ) ||
( nType == STATE_CHANGE_CONTROLBACKGROUND ) )
{
- ImplInitMenuWindow( this, sal_False, sal_True );
+ ImplInitMenuWindow( this, false, true );
Invalidate();
}
else if( pMenu )
@@ -5970,7 +5970,7 @@ void MenuBarWindow::ImplLayoutChanged()
{
if( pMenu )
{
- ImplInitMenuWindow( this, sal_True, sal_True );
+ ImplInitMenuWindow( this, true, true );
// if the font was changed.
long nHeight = pMenu->ImplCalcSize( this ).Height();
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 78afb46..676bd56 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -149,8 +149,8 @@ sal_Bool MnemonicGenerator::CreateMnemonic( XubString& rKey )
// #110720#, avoid CJK-style mnemonics for latin-only strings that do not contain useful mnemonic chars
if( bCJK )
{
- sal_Bool bLatinOnly = sal_True;
- sal_Bool bMnemonicIndexFound = sal_False;
+ bool bLatinOnly = true;
+ bool bMnemonicIndexFound = false;
sal_Unicode c;
xub_StrLen nIndex;
@@ -160,11 +160,11 @@ sal_Bool MnemonicGenerator::CreateMnemonic( XubString& rKey )
if ( ((c >= 0x3000) && (c <= 0xD7FF)) || // cjk
((c >= 0xFF61) && (c <= 0xFFDC)) ) // halfwidth forms
{
- bLatinOnly = sal_False;
+ bLatinOnly = false;
break;
}
if( ImplGetMnemonicIndex( c ) != MNEMONIC_INDEX_NOTFOUND )
- bMnemonicIndexFound = sal_True;
+ bMnemonicIndexFound = true;
}
if( bLatinOnly && !bMnemonicIndexFound )
return sal_False;
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index c411b51..e92df5a 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -60,8 +60,8 @@ struct ImplSplitItem
Window* mpOrgParent;
sal_uInt16 mnId;
SplitWindowItemBits mnBits;
- sal_Bool mbFixed;
- sal_Bool mbSubSize;
+ bool mbFixed;
+ bool mbSubSize;
/// Minimal width or height of the item. -1 means no restriction.
long mnMinSize;
/// Maximal width or height of the item. -1 means no restriction.
@@ -77,7 +77,7 @@ struct ImplSplitSet
long mnSplitSize;
sal_uInt16 mnItems;
sal_uInt16 mnId;
- sal_Bool mbCalcPix;
+ bool mbCalcPix;
};
@@ -453,7 +453,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
long nMaxPos;
long* pSize;
ImplSplitItem* pItems = pSet->mpItems;
- sal_Bool bEmpty;
+ bool bEmpty;
// Anzahl sichtbarer Items ermitteln
nVisItems = 0;
@@ -533,7 +533,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
nCurSize += pItems[i].mnPixSize;
}
- pSet->mbCalcPix = sal_False;
+ pSet->mbCalcPix = false;
pSet->mnLastSize = nCalcSize;
// Fenster einpassen
@@ -584,10 +584,10 @@ static void ImplCalcSet( ImplSplitSet* pSet,
{
for ( i = 0; i < nItems; i++ )
{
- pItems[i].mbSubSize = sal_False;
+ pItems[i].mbSubSize = false;
if ( j >= 2 )
- pItems[i].mbSubSize = sal_True;
+ pItems[i].mbSubSize = true;
else
{
if ( !(pItems[i].mnBits & SWIB_INVISIBLE) )
@@ -595,11 +595,11 @@ static void ImplCalcSet( ImplSplitSet* pSet,
if ( (nSizeDelta > 0) || pItems[i].mnPixSize )
{
if ( j >= 1 )
- pItems[i].mbSubSize = sal_True;
+ pItems[i].mbSubSize = true;
else
{
if ( (j == 0) && (pItems[i].mnBits & (SWIB_RELATIVESIZE | SWIB_PERCENTSIZE)) )
- pItems[i].mbSubSize = sal_True;
+ pItems[i].mbSubSize = true;
}
}
}
@@ -696,20 +696,20 @@ static void ImplCalcSet( ImplSplitSet* pSet,
pItems[i].mnOldHeight = pItems[i].mnHeight;
if ( pItems[i].mnBits & SWIB_INVISIBLE )
- bEmpty = sal_True;
+ bEmpty = true;
else
{
- bEmpty = sal_False;
+ bEmpty = false;
if ( bDown )
{
if ( nPos+pItems[i].mnPixSize > nMaxPos )
- bEmpty = sal_True;
+ bEmpty = true;
}
else
{
nPos -= pItems[i].mnPixSize;
if ( nPos < nMaxPos )
- bEmpty = sal_True;
+ bEmpty = true;
}
}
@@ -780,9 +780,9 @@ static void ImplCalcSet( ImplSplitSet* pSet,
// Fixed setzen
for ( i = 0; i < nItems; i++ )
{
- pItems[i].mbFixed = sal_False;
+ pItems[i].mbFixed = false;
if ( pItems[i].mnBits & SWIB_FIXED )
- pItems[i].mbFixed = sal_True;
+ pItems[i].mbFixed = true;
else
{
// Wenn Child-Set vorhanden, ist dieses Item auch Fixed, wenn
@@ -793,7 +793,7 @@ static void ImplCalcSet( ImplSplitSet* pSet,
{
if ( pItems[i].mpSet->mpItems[j].mbFixed )
{
- pItems[i].mbFixed = sal_True;
+ pItems[i].mbFixed = true;
break;
}
}
@@ -1031,7 +1031,7 @@ static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet,
ImplSplitItem* pItems = pSet->mpItems;
const StyleSettings& rStyleSettings = pWindow->GetSettings().GetStyleSettings();
- sal_Bool bFlat = (pWindow->GetStyle() & WB_FLATSPLITDRAW) == WB_FLATSPLITDRAW;
+ bool bFlat = (pWindow->GetStyle() & WB_FLATSPLITDRAW) == WB_FLATSPLITDRAW;
for ( i = 0; i < nItems-1; i++ )
{
@@ -1305,7 +1305,7 @@ void SplitWindow::ImplInit( Window* pParent, WinBits nStyle )
pNewSet->mnItems = 0;
pNewSet->mnId = 0;
pNewSet->mnSplitSize = SPLITWIN_SPLITSIZE;
- pNewSet->mbCalcPix = sal_True;
+ pNewSet->mbCalcPix = true;
mpMainSet = pNewSet;
mpBaseSet = pNewSet;
@@ -2089,14 +2089,14 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
ImplSplitItem* pSplitItem;
long nCurMaxSize;
sal_uInt16 nTemp;
- sal_Bool bDown;
- sal_Bool bPropSmaller;
+ bool bDown;
+ bool bPropSmaller;
mnMouseModifier = rMEvt.GetModifier();
if ( !(mnMouseModifier & KEY_SHIFT) || (mnSplitPos+1 >= mpSplitSet->mnItems) )
- bPropSmaller = sal_False;
+ bPropSmaller = false;
else
- bPropSmaller = sal_True;
+ bPropSmaller = true;
// Hier kann noch die maximale Groesse gesetzt werden
StartSplit();
@@ -2114,9 +2114,9 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
if ( mpSplitSet->mpItems )
{
- bDown = sal_True;
+ bDown = true;
if ( (mpSplitSet == mpMainSet) && mbBottomRight )
- bDown = sal_False;
+ bDown = false;
pSplitItem = &(mpSplitSet->mpItems[mnSplitPos]);
maDragRect.Left() = pSplitItem->mnLeft;
@@ -2504,7 +2504,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
else
{
ImplSplitMousePos( aMousePosPixel );
- sal_Bool bSplit = sal_True;
+ bool bSplit = true;
if ( mbDragFull )
{
if ( rTEvt.IsTrackingEnded() )
@@ -2521,7 +2521,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
ImplUpdate();
Split();
}
- bSplit = sal_False;
+ bSplit = false;
}
}
else
@@ -2534,7 +2534,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
else
{
ImplDrawSplitTracking( this, aMousePosPixel );
- bSplit = sal_False;
+ bSplit = false;
}
}
@@ -2781,7 +2781,7 @@ void SplitWindow::InsertItem( sal_uInt16 nId, Window* pWindow, long nSize,
delete[] pSet->mpItems;
pSet->mpItems = pNewItems;
pSet->mnItems++;
- pSet->mbCalcPix = sal_True;
+ pSet->mbCalcPix = true;
// Create and initialize item.
pItem = &(pSet->mpItems[nPos]);
@@ -2811,7 +2811,7 @@ void SplitWindow::InsertItem( sal_uInt16 nId, Window* pWindow, long nSize,
pNewSet->mnItems = 0;
pNewSet->mnId = nId;
pNewSet->mnSplitSize = pSet->mnSplitSize;
- pNewSet->mbCalcPix = sal_True;
+ pNewSet->mbCalcPix = true;
pItem->mpSet = pNewSet;
}
@@ -2850,7 +2850,7 @@ void SplitWindow::RemoveItem( sal_uInt16 nId, sal_Bool bHide )
// Item entfernen
pSet->mnItems--;
- pSet->mbCalcPix = sal_True;
+ pSet->mbCalcPix = true;
if ( pSet->mnItems )
{
memmove( pSet->mpItems+nPos, pSet->mpItems+nPos+1,
@@ -2892,7 +2892,7 @@ void SplitWindow::Clear()
mpMainSet->mnItems = 0;
mpMainSet->mnId = 0;
mpMainSet->mnSplitSize = SPLITWIN_SPLITSIZE;
- mpMainSet->mbCalcPix = sal_True;
+ mpMainSet->mbCalcPix = true;
if ( mnWinStyle & WB_NOSPLITDRAW )
mpMainSet->mnSplitSize -= 2;
mpBaseSet = mpMainSet;
@@ -2952,8 +2952,8 @@ void SplitWindow::SplitItem( sal_uInt16 nId, long nNewSize,
}
// Wenn das Fenster sizeable ist, wird das TopSet anders behandelt
- sal_Bool bSmall = sal_True;
- sal_Bool bGreat = sal_True;
+ bool bSmall = true;
+ bool bGreat = true;
if ( (pSet == mpMainSet) && (mnWinStyle & WB_SIZEABLE) )
{
if ( nPos < pSet->mnItems-1 )
@@ -2963,23 +2963,23 @@ void SplitWindow::SplitItem( sal_uInt16 nId, long nNewSize,
((nDelta < 0) && bPropGreat)) )
{
if ( nDelta < 0 )
- bGreat = sal_False;
+ bGreat = false;
else
- bSmall = sal_False;
+ bSmall = false;
}
}
else
{
if ( nDelta < 0 )
- bGreat = sal_False;
+ bGreat = false;
else
- bSmall = sal_False;
+ bSmall = false;
}
}
else if ( nPos >= nMax )
{
- bSmall = sal_False;
- bGreat = sal_False;
+ bSmall = false;
+ bGreat = false;
}
else if ( nPos && (nPos >= pSet->mnItems-1) )
{
@@ -3153,7 +3153,7 @@ void SplitWindow::SetItemSize( sal_uInt16 nId, long nNewSize )
{
// Neue Groesse setzen und neu durchrechnen
pItem->mnSize = nNewSize;
- pSet->mbCalcPix = sal_True;
+ pSet->mbCalcPix = true;
ImplUpdate();
}
}
More information about the Libreoffice-commits
mailing list