summaryrefslogtreecommitdiff
path: root/cui/source/options/optfltr.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/options/optfltr.cxx')
-rw-r--r--cui/source/options/optfltr.cxx50
1 files changed, 25 insertions, 25 deletions
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 811a421223e9..a41a4b82bf57 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -84,11 +84,11 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
return new OfaMSFilterTabPage( pParent, rAttrSet );
}
-BOOL OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
+sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
{
SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- BOOL bFlag;
+ sal_Bool bFlag;
if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked()))
pOpt->SetLoadWordBasicCode( bFlag );
if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked()))
@@ -106,7 +106,7 @@ BOOL OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
if( aPBasicStgCB.GetSavedValue() != (bFlag = aPBasicStgCB.IsChecked()))
pOpt->SetLoadPPointBasicStorage( bFlag );
- return FALSE;
+ return sal_False;
}
/*-----------------02.09.96 13.47-------------------
@@ -179,15 +179,15 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
return new OfaMSFilterTabPage2( pParent, rAttrSet );
}
-BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
+sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
{
- BOOL bModified = FALSE;
+ sal_Bool bModified = sal_False;
SvtFilterOptions* pOpt = SvtFilterOptions::Get();
static struct ChkCBoxEntries{
MSFltrPg2_CheckBoxEntries eType;
- BOOL (SvtFilterOptions:: *FnIs)() const;
- void (SvtFilterOptions:: *FnSet)( BOOL bFlag );
+ sal_Bool (SvtFilterOptions:: *FnIs)() const;
+ void (SvtFilterOptions:: *FnSet)( sal_Bool bFlag );
} aChkArr[] = {
{ Math, &SvtFilterOptions::IsMathType2Math,
&SvtFilterOptions::SetMathType2Math },
@@ -208,38 +208,38 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
{ InvalidCBEntry, 0, 0 }
};
- BOOL bCheck, bFirst = TRUE;
+ sal_Bool bCheck, bFirst = sal_True;
for( const ChkCBoxEntries* pArr = aChkArr;
InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst )
{
- USHORT nCol = bFirst ? 1 : 2;
+ sal_uInt16 nCol = bFirst ? 1 : 2;
SvLBoxEntry* pEntry = GetEntry4Type( pArr->eType );
if( pEntry )
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol ));
if( pItem && ((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON )
{
- USHORT nButtonFlags = pItem->GetButtonFlags();
+ sal_uInt16 nButtonFlags = pItem->GetButtonFlags();
bCheck = SV_BUTTON_CHECKED ==
pCheckButtonData->ConvertToButtonState( nButtonFlags );
if( bCheck != (pOpt->*pArr->FnIs)() )
{
- bModified = TRUE;
+ bModified = sal_True;
(pOpt->*pArr->FnSet)( bCheck );
}
}
}
}
- return TRUE;
+ return sal_True;
}
void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
{
SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- aCheckLB.SetUpdateMode(FALSE);
+ aCheckLB.SetUpdateMode(sal_False);
aCheckLB.Clear();
SvtModuleOptions aModuleOpt;
@@ -256,7 +256,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
static struct ChkCBoxEntries{
MSFltrPg2_CheckBoxEntries eType;
- BOOL (SvtFilterOptions:: *FnIs)() const;
+ sal_Bool (SvtFilterOptions:: *FnIs)() const;
} aChkArr[] = {
{ Math, &SvtFilterOptions::IsMathType2Math },
{ Math, &SvtFilterOptions::IsMath2MathType },
@@ -269,11 +269,11 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
{ InvalidCBEntry, NULL }
};
- BOOL bFirst = TRUE;
+ sal_Bool bFirst = sal_True;
for( const ChkCBoxEntries* pArr = aChkArr;
InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst )
{
- USHORT nCol = bFirst ? 1 : 2;
+ sal_uInt16 nCol = bFirst ? 1 : 2;
SvLBoxEntry* pEntry = GetEntry4Type( static_cast< sal_IntPtr >( pArr->eType ) );
if( pEntry )
{
@@ -288,7 +288,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
}
}
}
- aCheckLB.SetUpdateMode( TRUE );
+ aCheckLB.SetUpdateMode( sal_True );
}
void OfaMSFilterTabPage2::InsertEntry( const String& _rTxt, sal_IntPtr _nType )
@@ -324,7 +324,7 @@ SvLBoxEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs()
{
SvxSimpleTable::SetTabs();
- USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE;
+ sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE;
if( aTabs.Count() > 1 )
{
@@ -348,7 +348,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick()
---------------------------------------------------------------------------*/
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
- SvLBoxEntry* pEntry, USHORT nCol, SvButtonState eState)
+ SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState)
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -376,7 +376,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
---------------------------------------------------------------------------*/
SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
- SvLBoxEntry* pEntry, USHORT nCol ) const
+ SvLBoxEntry* pEntry, sal_uInt16 nCol ) const
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -384,7 +384,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON)
{
- USHORT nButtonFlags = pItem->GetButtonFlags();
+ sal_uInt16 nButtonFlags = pItem->GetButtonFlags();
eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
}
@@ -393,7 +393,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
/* -----------------------------2002/06/20 11:57------------------------------
---------------------------------------------------------------------------*/
-void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked)
+void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked)
{
if ( nPos < GetEntryCount() )
SetCheckButtonState(
@@ -410,8 +410,8 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt )
if(!rKEvt.GetKeyCode().GetModifier() &&
KEY_SPACE == rKEvt.GetKeyCode().GetCode())
{
- ULONG nSelPos = GetModel()->GetAbsPos(GetCurEntry());
- USHORT nCol = GetCurrentTabPos() - 1;
+ sal_uLong nSelPos = GetModel()->GetAbsPos(GetCurEntry());
+ sal_uInt16 nCol = GetCurrentTabPos() - 1;
if ( nCol < 2 )
{
SvLBoxEntry* pEntry = GetEntry( nSelPos );
@@ -421,7 +421,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt )
}
else
{
- USHORT nCheck = GetCheckButtonState( GetEntry(nSelPos), 1 ) == SV_BUTTON_CHECKED ? 1 : 0;
+ sal_uInt16 nCheck = GetCheckButtonState( GetEntry(nSelPos), 1 ) == SV_BUTTON_CHECKED ? 1 : 0;
if(GetCheckButtonState( GetEntry(nSelPos), 0 ))
nCheck += 2;
nCheck--;
generated by cgit (git 2.34.1) at 2024-08-05 23:53:42 +0000