diff options
-rw-r--r-- | svtools/inc/svtools/accessibletableprovider.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/brwbox.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/svtools/svtabbx.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/svtools/textview.hxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/brwbox3.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/svimpicn.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 2 | ||||
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 2 | ||||
-rw-r--r-- | toolkit/inc/toolkit/awt/vclxmenu.hxx | 2 | ||||
-rw-r--r-- | toolkit/inc/toolkit/helper/unowrapper.hxx | 2 | ||||
-rw-r--r-- | toolkit/source/helper/unowrapper.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/unohelp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 24 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/inc/saldisp.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/app/keysymnames.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 2 |
19 files changed, 31 insertions, 31 deletions
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx index d14aecce9f58..3905ff3f9898 100644 --- a/svtools/inc/svtools/accessibletableprovider.hxx +++ b/svtools/inc/svtools/accessibletableprovider.hxx @@ -87,7 +87,7 @@ public: virtual sal_Bool HasRowHeader() const = 0; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ virtual sal_Bool IsCellFocusable() const = 0; - virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; + virtual BOOL GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual void SetNoSelection() = 0; virtual void SelectAll() = 0; diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx index 42fb4b4d36ac..e19d27c18226 100644 --- a/svtools/inc/svtools/brwbox.hxx +++ b/svtools/inc/svtools/brwbox.hxx @@ -369,7 +369,7 @@ protected: @param nRow nRow starts at 0 */ - virtual BOOL SeekRow( long nRow ) = 0; + virtual sal_Bool SeekRow( long nRow ) = 0; virtual void DrawCursor(); virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); virtual void PaintData( Window& rWin, const Rectangle& rRect ); @@ -470,7 +470,7 @@ public: virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); - virtual BOOL IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const; + virtual sal_Bool IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const; virtual void CursorMoved(); virtual void ColumnMoved( USHORT nColId ); virtual void ColumnResized( USHORT nColId ); diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index 89fd92a4fc09..c5aae3f47479 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -202,7 +202,7 @@ public: virtual sal_Bool HasRowHeader() const; //GetColumnId /** @return <TRUE/>, if the object can focus a cell. */ virtual sal_Bool IsCellFocusable() const; - virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); + virtual BOOL GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); virtual void SetNoSelection(); using SvListView::SelectAll; diff --git a/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx index c17084a1d693..50a87110dcbe 100644 --- a/svtools/inc/svtools/textview.hxx +++ b/svtools/inc/svtools/textview.hxx @@ -76,7 +76,7 @@ protected: void ImpShowHideSelection( BOOL bShow, const TextSelection* pRange = NULL ); TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent ); - TextPaM ImpDelete( BOOL bForward, BYTE nMode ); + TextPaM ImpDelete( BYTE nMode, BYTE nDelMode ); void ImpSetSelection( const TextSelection& rNewSel, BOOL bUI ); BOOL IsInSelection( const TextPaM& rPaM ); diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 3a29c4ae63fa..3ca6e5ce77d5 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -2594,7 +2594,7 @@ void BrowseBox::VisibleRowsChanged( long, USHORT ) //------------------------------------------------------------------- -BOOL BrowseBox::IsCursorMoveAllowed( long, USHORT ) const +sal_Bool BrowseBox::IsCursorMoveAllowed( long, USHORT ) const /* [Beschreibung] diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 102af1b6e1a1..9668f3221bd9 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -459,7 +459,7 @@ sal_Bool BrowseBox::IsCellFocusable() const return sal_True; } // ----------------------------------------------------------------------------- -sal_Bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) +BOOL BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) { return GoToRowColumnId( _nRow, GetColumnId( _nColumn ) ); } diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 2394ae619936..52dcbcd855b9 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -3636,7 +3636,7 @@ void SvxIconChoiceCtrl_Impl::DrawFocusRect ( OutputDevice* pOut ) pOut->DrawPolyLine ( aPolygon, aLineInfo ); } -sal_Bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const +BOOL SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const { sal_Bool bRet = sal_False; const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index 2d4c9cf2df0e..3fabff4c8f25 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -3562,7 +3562,7 @@ void ImpIcnCursor::ExpandGrid() if( pGridMap ) { long nNewGridRows = nGridRows + 20; - unsigned char* pTempMap = new unsigned char[ nNewGridRows * nGridCols ]; + BOOL* pTempMap = new BOOL[ nNewGridRows * nGridCols ]; memcpy( pTempMap, pGridMap, nGridRows * nGridCols ); delete pGridMap; pGridMap = pTempMap; diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 53fbded59f11..080371e4d9c6 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -841,7 +841,7 @@ sal_Bool SvHeaderTabListBox::IsCellFocusable() const return IsCellFocusEnabled(); } // ----------------------------------------------------------------------- -sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) +BOOL SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) { sal_Bool bRet = ( IsCellFocusEnabled() == TRUE ); if ( bRet ) diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index fafbb1f86445..d11ee4208e80 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -181,7 +181,7 @@ INT32 HTMLOption::GetSNumber() const return aTmp.ToInt32(); } -void HTMLOption::GetNumbers( SvULongs &rLongs, BOOL bSpaceDelim ) const +void HTMLOption::GetNumbers( SvULongs &rLongs, sal_Bool bSpaceDelim ) const { if( rLongs.Count() ) rLongs.Remove( 0, rLongs.Count() ); diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx index c675ad1d4bd9..26d93196bd9f 100644 --- a/toolkit/inc/toolkit/awt/vclxmenu.hxx +++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx @@ -70,7 +70,7 @@ protected: DECL_LINK( MenuEventListener, VclSimpleEvent* ); - void ImplCreateMenu( BOOL bPopup ); + void ImplCreateMenu( sal_Bool bPopup ); public: VCLXMenu(); diff --git a/toolkit/inc/toolkit/helper/unowrapper.hxx b/toolkit/inc/toolkit/helper/unowrapper.hxx index 31cc259b7fd0..a0aa53345a40 100644 --- a/toolkit/inc/toolkit/helper/unowrapper.hxx +++ b/toolkit/inc/toolkit/helper/unowrapper.hxx @@ -60,7 +60,7 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ); // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, BOOL bCreate ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ); virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ); void WindowDestroyed( Window* pWindow ); diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index c36ae29d4531..ffcd7a1930f6 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -162,7 +162,7 @@ UnoWrapper::~UnoWrapper() return mxToolkit.get(); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, BOOL bCreate ) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, sal_Bool bCreate ) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer(); if ( !xPeer.is() && bCreate ) diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 237156a5f9f7..711f9fb06ae1 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -190,7 +190,7 @@ uno::Reference < i18n::XCollator > vcl::unohelper::CreateCollator() return xB; } -::rtl::OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, BOOL bSUPD ) +::rtl::OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ) { // create variable library name suffixes OUString aDLLSuffix = OUString::createFromAscii( STRING(DLLPOSTFIX) ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a51a525a5f70..5277da0567b6 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -641,7 +641,7 @@ void Window::ImplInitWindowData( WindowType nType ) mpWindowImpl->mbMenuFloatingWindow= FALSE; // TRUE: MenuFloatingWindow is the base class mpWindowImpl->mbToolbarFloatingWindow= FALSE; // TRUE: ImplPopupFloatWin is the base class, used for subtoolbars mpWindowImpl->mbSplitter = FALSE; // TRUE: Splitter is the base class - mpWindowImpl->mbVisible = FALSE; // TRUE: Show( TRUE ) called + mpWindowImpl->mbVisible = FALSE; // TRUE: Show( true ) called mpWindowImpl->mbOverlapVisible = FALSE; // TRUE: Hide called for visible window from ImplHideAllOverlapWindow() mpWindowImpl->mbDisabled = FALSE; // TRUE: Enable( FALSE ) called mpWindowImpl->mbInputDisabled = FALSE; // TRUE: EnableInput( FALSE ) called @@ -1763,7 +1763,7 @@ BOOL Window::ImplSysObjClip( const Region* pOldRegion ) if ( mpWindowImpl->mpSysObj ) { - BOOL bVisibleState = mpWindowImpl->mbReallyVisible; + bool bVisibleState = mpWindowImpl->mbReallyVisible; if ( bVisibleState ) { @@ -3109,7 +3109,7 @@ void Window::ImplUpdateWindowPtr() void Window::ImplUpdateOverlapWindowPtr( BOOL bNewFrame ) { BOOL bVisible = IsVisible(); - Show( FALSE ); + Show( false ); ImplRemoveWindow( bNewFrame ); Window* pRealParent = mpWindowImpl->mpRealParent; ImplInsertWindow( ImplGetParent() ); @@ -3130,7 +3130,7 @@ void Window::ImplUpdateOverlapWindowPtr( BOOL bNewFrame ) } if ( bVisible ) - Show( TRUE ); + Show( true ); } // ----------------------------------------------------------------------- @@ -3757,7 +3757,7 @@ void Window::ImplShowAllOverlaps() { if ( pOverlapWindow->mpWindowImpl->mbOverlapVisible ) { - pOverlapWindow->Show( TRUE, SHOW_NOACTIVATE ); + pOverlapWindow->Show( true, SHOW_NOACTIVATE ); pOverlapWindow->mpWindowImpl->mbOverlapVisible = FALSE; } @@ -3775,7 +3775,7 @@ void Window::ImplHideAllOverlaps() if ( pOverlapWindow->IsVisible() ) { pOverlapWindow->mpWindowImpl->mbOverlapVisible = TRUE; - pOverlapWindow->Show( FALSE ); + pOverlapWindow->Show( false ); } pOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; @@ -4785,7 +4785,7 @@ void Window::doLazyDelete() DockingWindow* pDockWin = dynamic_cast<DockingWindow*>(this); if( pSysWin || ( pDockWin && pDockWin->IsFloatingMode() ) ) { - Show( FALSE ); + Show( false ); SetParent( ImplGetDefaultWindow() ); } vcl::LazyDeletor<Window>::Delete( this ); @@ -6304,7 +6304,7 @@ void Window::SetParent( Window* pNewParent ) mpWindowImpl->mpFrame->SetParent( pNewParent->mpWindowImpl->mpFrame ); BOOL bVisible = IsVisible(); - Show( FALSE, SHOW_NOFOCUSCHANGE ); + Show( false, SHOW_NOFOCUSCHANGE ); // Testen, ob sich das Overlap-Window aendert Window* pOldOverlapWindow; @@ -6420,7 +6420,7 @@ void Window::SetParent( Window* pNewParent ) ImplGetOwnerDrawList().push_back( this ); if ( bVisible ) - Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } // ----------------------------------------------------------------------- @@ -6445,10 +6445,10 @@ void Window::Show( BOOL bVisible, USHORT nFlags ) if ( mpWindowImpl->mpBorderWindow ) { - BOOL bOldUpdate = mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate; + bool bOldUpdate = mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate; if ( mpWindowImpl->mbNoParentUpdate ) mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate = TRUE; - mpWindowImpl->mpBorderWindow->Show( FALSE, nFlags ); + mpWindowImpl->mpBorderWindow->Show( false, nFlags ); mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate = bOldUpdate; } else if ( mpWindowImpl->mbFrame ) @@ -6586,7 +6586,7 @@ void Window::Show( BOOL bVisible, USHORT nFlags ) } if ( mpWindowImpl->mpBorderWindow ) - mpWindowImpl->mpBorderWindow->Show( TRUE, nFlags ); + mpWindowImpl->mpBorderWindow->Show( true, nFlags ); else if ( mpWindowImpl->mbFrame ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 46c4b8e5f7c7..8ccb6a08b34f 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -114,7 +114,7 @@ GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event, void signalKeysChanged( GdkKeymap*, gpointer data ) { GtkSalDisplay* pDisp = (GtkSalDisplay*)data; - pDisp->GetKeyboardName(TRUE); + pDisp->GetKeyboardName(true); } void signalScreenSizeChanged( GdkScreen* pScreen, gpointer data ) diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index 2558f899c558..d359ff4022ac 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -512,7 +512,7 @@ public: { mpInputMethod = pInputMethod; } void SetKbdExtension(SalI18N_KeyboardExtension *pKbdExtension) { mpKbdExtension = pKbdExtension; } - const char* GetKeyboardName( BOOL bRefresh = FALSE ); + const char* GetKeyboardName( bool bRefresh = false ); ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; } DtIntegrator* getDtIntegrator() const { return m_pDtIntegrator; } bool IsXinerama() const { return m_bXinerama; } diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx index c9515f016433..9f605be3a7a3 100644 --- a/vcl/unx/source/app/keysymnames.cxx +++ b/vcl/unx/source/app/keysymnames.cxx @@ -597,7 +597,7 @@ static const keyboard_layout type6_layout[] = #include <stdio.h> #endif -const char* SalDisplay::GetKeyboardName( BOOL bRefresh ) +const char* SalDisplay::GetKeyboardName( bool bRefresh ) { if( bRefresh || ! m_aKeyboardName.Len() ) { diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index ca1f0052d8f0..4e706e656d93 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -2419,7 +2419,7 @@ long SalX11Display::Dispatch( XEvent *pEvent ) if( MappingModifier == pEvent->xmapping.request ) ModifierMapping(); if( MappingKeyboard == pEvent->xmapping.request ) // refresh mapping - GetKeyboardName( TRUE ); + GetKeyboardName( true ); } break; case ButtonPress: |