summaryrefslogtreecommitdiff
path: root/sc/source/ui/formdlg/dwfunctr.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/formdlg/dwfunctr.cxx')
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx70
1 files changed, 35 insertions, 35 deletions
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 4b6bfee38d46..e923f66b31d0 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -73,7 +73,7 @@ SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX )
#************************************************************************/
ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
SfxChildWindow( pParentP, nId )
@@ -122,13 +122,13 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
eSfxNewAlignment=GetAlignment();
eSfxOldAlignment=eSfxNewAlignment;
- aFiFuncDesc.SetUpdateMode(TRUE);
+ aFiFuncDesc.SetUpdateMode(sal_True);
pAllFuncList=&aFuncList;
aDDFuncList.Disable();
aDDFuncList.Hide();
nArgs=0;
nDockMode=0;
- bSizeFlag=FALSE;
+ bSizeFlag=false;
aCatBox.SetDropDownLineCount(9);
Font aFont=aFiFuncDesc.GetFont();
aFont.SetColor(Color(COL_BLACK));
@@ -147,7 +147,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
Link a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl);
aPrivatSplit.SetCtrModifiedHdl(a3Link);
- StartListening( *pBindingsP, TRUE );
+ StartListening( *pBindingsP, sal_True );
Point aTopLeft=aCatBox.GetPosPixel();
String aString=String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww"));
@@ -161,7 +161,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
GetOutputSizePixel().Height()-2*aTxtSize.Height());
aPrivatSplit.SetYRange(aYRange);
SelHdl(&aCatBox);
- bInit=TRUE;
+ bInit=sal_True;
}
/*************************************************************************
@@ -204,7 +204,7 @@ void ScFunctionDockWin::InitLRUList()
pFuncMgr->fillLastRecentlyUsedFunctions(aLRUList);
- USHORT nSelPos = aCatBox.GetSelectEntryPos();
+ sal_uInt16 nSelPos = aCatBox.GetSelectEntryPos();
if(nSelPos == 0)
UpdateFunctionList();
@@ -250,7 +250,7 @@ void ScFunctionDockWin::UpdateLRUList()
void ScFunctionDockWin::SetSize()
{
- USHORT nSelEntry=0;
+ sal_uInt16 nSelEntry=0;
SfxChildAlignment aChildAlign=eSfxOldAlignment;//GetAlignment();
short nNewDockMode;
switch(aChildAlign)
@@ -328,9 +328,9 @@ void ScFunctionDockWin::SetSize()
void ScFunctionDockWin::SetLeftRightSize()
{
- if(bSizeFlag==FALSE)
+ if(bSizeFlag==false)
{
- bSizeFlag=TRUE;
+ bSizeFlag=sal_True;
Size aDiffSize=GetSizePixel();
Size aNewSize=GetOutputSizePixel();
@@ -355,7 +355,7 @@ void ScFunctionDockWin::SetLeftRightSize()
aOldSize=aNewSize;
aNewSize.Width()+=aDiffSize.Width();
aNewSize.Height()+=aDiffSize.Height();
- bSizeFlag=FALSE;
+ bSizeFlag=false;
}
}
@@ -376,9 +376,9 @@ void ScFunctionDockWin::SetLeftRightSize()
void ScFunctionDockWin::SetTopBottonSize()
{
- if(bSizeFlag==FALSE)
+ if(bSizeFlag==false)
{
- bSizeFlag=TRUE;
+ bSizeFlag=sal_True;
Size aDiffSize=GetSizePixel();
Size aNewSize=GetOutputSizePixel();
aDiffSize.Width()-=aNewSize.Width();
@@ -389,7 +389,7 @@ void ScFunctionDockWin::SetTopBottonSize()
aNewSize.Width()+=aDiffSize.Width();
aNewSize.Height()+=aDiffSize.Height();
- bSizeFlag=FALSE;
+ bSizeFlag=false;
}
}
@@ -410,7 +410,7 @@ void ScFunctionDockWin::SetTopBottonSize()
void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
{
- if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
+ if((sal_uLong)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
Size aCDSize=aCatBox.GetSizePixel();
Size aFLSize=aFuncList.GetSizePixel();
@@ -448,7 +448,7 @@ void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
void ScFunctionDockWin::SetMyHeightLeRi(Size &aNewSize)
{
- if((ULONG)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
+ if((sal_uLong)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
Size aFLSize=aFuncList.GetSizePixel();
Size aSplitterSize=aPrivatSplit.GetSizePixel();
@@ -497,7 +497,7 @@ void ScFunctionDockWin::SetMyHeightLeRi(Size &aNewSize)
void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize)
{
- if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
+ if((sal_uLong)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
Size aCDSize=aCatBox.GetSizePixel();
Size aDdFLSize=aDDFuncList.GetSizePixel();
@@ -538,7 +538,7 @@ void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize)
void ScFunctionDockWin::SetMyHeightToBo(Size &aNewSize)
{
- if((ULONG)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
+ if((sal_uLong)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
Size aFDSize=aFiFuncDesc.GetSizePixel();
@@ -621,8 +621,8 @@ void ScFunctionDockWin::SetDescription()
void ScFunctionDockWin::Resizing( Size& rNewSize )
{
- if((ULONG)rNewSize.Width()<nMinWidth) rNewSize.Width()=nMinWidth;
- if((ULONG)rNewSize.Height()<nMinHeight) rNewSize.Height()=nMinHeight;
+ if((sal_uLong)rNewSize.Width()<nMinWidth) rNewSize.Width()=nMinWidth;
+ if((sal_uLong)rNewSize.Height()<nMinHeight) rNewSize.Height()=nMinHeight;
}
@@ -640,9 +640,9 @@ void ScFunctionDockWin::Resizing( Size& rNewSize )
#*
#************************************************************************/
-BOOL ScFunctionDockWin::Close()
+sal_Bool ScFunctionDockWin::Close()
{
- SfxBoolItem aItem( FID_FUNCTION_BOX, FALSE );
+ SfxBoolItem aItem( FID_FUNCTION_BOX, false );
GetBindings().GetDispatcher()->Execute( FID_FUNCTION_BOX,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
@@ -650,7 +650,7 @@ BOOL ScFunctionDockWin::Close()
SfxDockingWindow::Close();
- return( TRUE );
+ return( sal_True );
}
@@ -680,7 +680,7 @@ SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */
}
else
{
- bInit=FALSE;
+ bInit=false;
eSfxOldAlignment=aChildAlign;
eSfxNewAlignment=aChildAlign;
}
@@ -779,12 +779,12 @@ void ScFunctionDockWin::Resize()
void ScFunctionDockWin::UpdateFunctionList()
{
- USHORT nSelPos = aCatBox.GetSelectEntryPos();
- USHORT nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
+ sal_uInt16 nSelPos = aCatBox.GetSelectEntryPos();
+ sal_uInt16 nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
? (nSelPos-1) : 0;
pAllFuncList->Clear();
- pAllFuncList->SetUpdateMode( FALSE );
+ pAllFuncList->SetUpdateMode( false );
if ( nSelPos > 0 )
{
@@ -812,7 +812,7 @@ void ScFunctionDockWin::UpdateFunctionList()
//------------------------------------------------------
- pAllFuncList->SetUpdateMode( TRUE );
+ pAllFuncList->SetUpdateMode( sal_True );
if ( pAllFuncList->GetEntryCount() > 0 )
{
@@ -841,7 +841,7 @@ void ScFunctionDockWin::UpdateFunctionList()
#*
#************************************************************************/
-void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
+void ScFunctionDockWin::DoEnter(sal_Bool /* bOk */) //@@ ???
{
String aFirstArgStr;
String aParaStr;
@@ -883,8 +883,8 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
if ( nArgs != VAR_ARGS )
{ // no VarArgs or Fix plus VarArgs, but not VarArgs only
String aArgSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "; " ));
- USHORT nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 );
- for ( USHORT nArg = 1;
+ sal_uInt16 nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 );
+ for ( sal_uInt16 nArg = 1;
nArg < nFix && !pDesc->pDefArgFlags[nArg].bOptional; nArg++ )
{
if (!pDesc->pDefArgFlags[nArg].bSuppress)
@@ -912,7 +912,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
if(nArgs>0)
{
pHdl->InsertFunction(aString);
- pEdView->InsertText(aArgStr,TRUE);
+ pEdView->InsertText(aArgStr,sal_True);
ESelection aESel=pEdView->GetSelection();
aESel.nEndPos=aESel.nStartPos+aFirstArgStr.Len();
pEdView->SetSelection(aESel);
@@ -921,7 +921,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
else
{
aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "()" ));
- pEdView->InsertText(aString,FALSE);
+ pEdView->InsertText(aString,false);
pHdl->DataChanged();
}
}
@@ -994,7 +994,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl )
if ((ImageButton *)pCtrl == &aInsertButton ||
(ListBox *)pCtrl == &aFuncList)
{
- DoEnter(TRUE); // Uebernimmt die Eingabe
+ DoEnter(sal_True); // Uebernimmt die Eingabe
}
//...
@@ -1091,10 +1091,10 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo)
if ( aStr.Len())
{
aSplitterInitPos=aPrivatSplit.GetPosPixel();
- aSplitterInitPos.Y()=(USHORT) aStr.ToInt32();
+ aSplitterInitPos.Y()=(sal_uInt16) aStr.ToInt32();
xub_StrLen n1 = aStr.Search(';');
aStr.Erase(0, n1+1);
- USHORT nSelPos=sal::static_int_cast<USHORT>( aStr.ToInt32() );
+ sal_uInt16 nSelPos=sal::static_int_cast<sal_uInt16>( aStr.ToInt32() );
aCatBox.SelectEntryPos(nSelPos);
SelHdl(&aCatBox);