summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/layctrl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/tbxctrls/layctrl.cxx')
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/layctrl.cxx68
1 files changed, 33 insertions, 35 deletions
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 56366e9ddc60..c2171261a3ce 100644..100755
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -39,7 +39,7 @@
#include <sfx2/app.hxx>
#include <svx/dialogs.hrc>
-#include "layctrl.hxx"
+#include "svx/layctrl.hxx"
#include <svx/dialmgr.hxx>
#include <comphelper/processfactory.hxx>
#include <svtools/colorcfg.hxx>
@@ -77,8 +77,8 @@ private:
::Color aBackgroundColor;
long nCol;
long nLine;
- BOOL bInitialKeyInput;
- BOOL m_bMod1;
+ sal_Bool bInitialKeyInput;
+ sal_Bool m_bMod1;
ToolBox& rTbx;
Reference< XFrame > mxFrame;
rtl::OUString maCommand;
@@ -86,7 +86,7 @@ private:
DECL_LINK( SelectHdl, void * );
public:
- TableWindow( USHORT nSlotId,
+ TableWindow( sal_uInt16 nSlotId,
const rtl::OUString& rCmd,
const String& rText,
ToolBox& rParentTbx,
@@ -116,13 +116,11 @@ IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG )
// -----------------------------------------------------------------------
-TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ),
aTableButton( this ),
nCol( 0 ),
nLine( 0 ),
- bInitialKeyInput(TRUE),
- m_bMod1(FALSE),
rTbx(rParentTbx),
mxFrame( rFrame ),
maCommand( rCmd )
@@ -139,7 +137,7 @@ TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, const Strin
Font aFont = GetFont();
aFont.SetColor( ::Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ) );
aFont.SetFillColor( aBackgroundColor );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
SetFont( aFont );
SetText( rText );
@@ -185,8 +183,8 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt )
void TableWindow::KeyInput( const KeyEvent& rKEvt )
{
bool bHandled = false;
- USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
- USHORT nKey = rKEvt.GetKeyCode().GetCode();
+ sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+ sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
if ( !nModifier )
{
bHandled = true;
@@ -235,7 +233,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
//make sure that a table can initially be created
if(bInitialKeyInput)
{
- bInitialKeyInput = FALSE;
+ bInitialKeyInput = sal_False;
if(!nNewLine)
nNewLine = 1;
if(!nNewCol)
@@ -246,7 +244,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
}
else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
{
- m_bMod1 = TRUE;
+ m_bMod1 = sal_True;
EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL );
}
@@ -373,7 +371,7 @@ void TableWindow::Update( long nNewCol, long nNewLine )
void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
{
Window* pParent = rTbx.GetParent();
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY );
@@ -417,15 +415,15 @@ private:
long nWidth;
long nMX;
long nTextHeight;
- BOOL bInitialKeyInput;
- BOOL m_bMod1;
+ sal_Bool bInitialKeyInput;
+ sal_Bool m_bMod1;
ToolBox& rTbx;
Reference< XFrame > mxFrame;
::rtl::OUString maCommand;
void UpdateSize_Impl( long nNewCol );
public:
- ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
+ ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
void KeyInput( const KeyEvent& rKEvt );
virtual void MouseMove( const MouseEvent& rMEvt );
@@ -435,15 +433,15 @@ public:
virtual void PopupModeEnd();
virtual SfxPopupWindow* Clone() const;
- USHORT GetColCount() const { return (USHORT)nCol; }
+ sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; }
};
// -----------------------------------------------------------------------
-ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
SfxPopupWindow( nId, rFrame, WB_STDPOPUP ),
- bInitialKeyInput(TRUE),
- m_bMod1(FALSE),
+ bInitialKeyInput(sal_True),
+ m_bMod1(sal_False),
rTbx(rParentTbx),
mxFrame(rFrame),
maCommand( rCmd )
@@ -461,7 +459,7 @@ ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const Str
Font aFont( GetFont() );
aFont.SetColor( aLineColor );
aFont.SetFillColor( aFaceColor );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
SetFont( aFont );
nCol = 0;
@@ -572,16 +570,16 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt )
void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
{
- BOOL bHandled = FALSE;
- USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
- USHORT nKey = rKEvt.GetKeyCode().GetCode();
+ sal_Bool bHandled = sal_False;
+ sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+ sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
if(!nModifier)
{
if( KEY_LEFT == nKey || KEY_RIGHT == nKey ||
KEY_RETURN == nKey ||KEY_ESCAPE == nKey ||
KEY_UP == nKey)
{
- bHandled = TRUE;
+ bHandled = sal_True;
long nNewCol = nCol;
switch(nKey)
{
@@ -605,7 +603,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
//make sure that a table can initially be created
if(bInitialKeyInput)
{
- bInitialKeyInput = FALSE;
+ bInitialKeyInput = sal_False;
if(!nNewCol)
nNewCol = 1;
}
@@ -614,7 +612,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
}
else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
{
- m_bMod1 = TRUE;
+ m_bMod1 = sal_True;
if(IsMouseCaptured())
ReleaseMouse();
EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL );
@@ -696,7 +694,7 @@ void ColumnsWindow::PopupModeEnd()
{
if ( !IsPopupModeCanceled() && nCol )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
Window* pParent = rTbx.GetParent();
pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
@@ -717,9 +715,9 @@ void ColumnsWindow::PopupModeEnd()
// class SvxTableToolBoxControl ------------------------------------------
-SvxTableToolBoxControl::SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
- bEnabled( TRUE )
+ bEnabled( sal_True )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
rTbx.Invalidate();
@@ -764,17 +762,17 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading()
// -----------------------------------------------------------------------
-void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
if ( pState && pState->ISA(SfxUInt16Item) )
{
- INT16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
+ sal_Int16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
bEnabled = ( nValue != 0 );
}
else
bEnabled = SFX_ITEM_DISABLED != eState;
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -784,7 +782,7 @@ void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const Sf
// class SvxColumnsToolBoxControl ------------------------------------------
-SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -831,7 +829,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading()
return pWin;
}
-void SvxColumnsToolBoxControl::StateChanged( USHORT nSID,
+void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState )
{
generated by cgit (git 2.34.1) at 2024-07-12 20:11:10 +0000