summaryrefslogtreecommitdiff
path: root/extensions/source/update/ui/updatecheckui.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/update/ui/updatecheckui.cxx')
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 3456b58c778e..b0b5f684bcc0 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -123,7 +123,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Paint( const Rectangle& rRect );
void Resize();
- void Show( BOOL bVisible = TRUE, USHORT nFlags = SHOW_NOACTIVATE );
+ void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE );
void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; }
void SetTitleAndText( const XubString& rTitle, const XubString& rText,
const Image& rImage );
@@ -151,10 +151,10 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3
bool mbShowBubble;
bool mbShowMenuIcon;
bool mbBubbleChanged;
- USHORT mnIconID;
+ sal_uInt16 mnIconID;
private:
- DECL_LINK( ClickHdl, USHORT* );
+ DECL_LINK( ClickHdl, sal_uInt16* );
DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* );
DECL_LINK( WaitTimeOutHdl, Timer* );
DECL_LINK( TimeOutHdl, Timer* );
@@ -416,7 +416,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
mpBubbleWin = GetBubbleWindow();
if ( mpBubbleWin )
{
- mpBubbleWin->Show( TRUE );
+ mpBubbleWin->Show( sal_True );
maTimeoutTimer.Start();
}
mbShowBubble = false;
@@ -485,7 +485,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
if ( mbShowBubble )
Application::PostUserEvent( LINK( this, UpdateCheckUI, UserEventHdl ) );
else if ( mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
}
else if( rPropertyName.compareToAscii( PROPERTY_CLICK_HDL ) == 0 ) {
uno::Reference< task::XJob > aJob;
@@ -511,7 +511,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
throw beans::UnknownPropertyException();
if ( mbBubbleChanged && mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
}
//------------------------------------------------------------------------------
@@ -642,13 +642,13 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon )
}
// -----------------------------------------------------------------------
-IMPL_LINK( UpdateCheckUI, ClickHdl, USHORT*, EMPTYARG )
+IMPL_LINK( UpdateCheckUI, ClickHdl, sal_uInt16*, EMPTYARG )
{
vos::OGuard aGuard( Application::GetSolarMutex() );
maWaitTimer.Stop();
if ( mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
if ( mrJob.is() )
{
@@ -734,7 +734,7 @@ IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG )
// -----------------------------------------------------------------------
IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent )
{
- ULONG nEventID = pEvent->GetId();
+ sal_uLong nEventID = pEvent->GetId();
if ( VCLEVENT_OBJECT_DYING == nEventID )
{
@@ -927,11 +927,11 @@ void BubbleWindow::Paint( const Rectangle& )
//------------------------------------------------------------------------------
void BubbleWindow::MouseButtonDown( const MouseEvent& )
{
- Show( FALSE );
+ Show( sal_False );
}
//------------------------------------------------------------------------------
-void BubbleWindow::Show( BOOL bVisible, USHORT nFlags )
+void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
{
vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -983,7 +983,7 @@ void BubbleWindow::Show( BOOL bVisible, USHORT nFlags )
void BubbleWindow::RecalcTextRects()
{
Size aTotalSize;
- BOOL bFinished = FALSE;
+ sal_Bool bFinished = sal_False;
Font aOldFont = GetFont();
Font aBoldFont = aOldFont;
@@ -1015,7 +1015,7 @@ void BubbleWindow::RecalcTextRects()
maMaxTextSize.Height() = maMaxTextSize.Height() * 3 / 2;
}
else
- bFinished = TRUE;
+ bFinished = sal_True;
}
maTitleRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT );
maTextRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT + maTitleRect.GetHeight() + aBoldFont.GetHeight() * 3 / 4 );