summaryrefslogtreecommitdiff
path: root/sc/source/ui/optdlg
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/optdlg')
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx28
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx18
-rw-r--r--sc/source/ui/optdlg/tpcompatibility.cxx2
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx2
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx16
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx68
-rw-r--r--sc/source/ui/optdlg/tpview.cxx98
7 files changed, 116 insertions, 116 deletions
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 05e6fc3d855c..7648ec79cb4e 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -90,12 +90,12 @@ SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet&
return new ScRedlineOptionsTabPage( pParent, rSet );
}
-BOOL ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
+sal_Bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
{
ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
- ULONG nNew=0;
- USHORT nPos=0;
+ sal_uLong nNew=0;
+ sal_uInt16 nPos=0;
nPos = aContentColorLB.GetSelectEntryPos();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -154,7 +154,7 @@ BOOL ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
if (pDocSh)
pDocSh->PostPaintGridAll();
- return FALSE;
+ return false;
}
void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
@@ -166,12 +166,12 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
aInsertColorLB.InsertEntry(aAuthorStr);
aRemoveColorLB.InsertEntry(aAuthorStr);
- aContentColorLB.SetUpdateMode( FALSE);
- aMoveColorLB.SetUpdateMode( FALSE);
- aInsertColorLB.SetUpdateMode( FALSE);
- aRemoveColorLB.SetUpdateMode( FALSE);
+ aContentColorLB.SetUpdateMode( false);
+ aMoveColorLB.SetUpdateMode( false);
+ aInsertColorLB.SetUpdateMode( false);
+ aRemoveColorLB.SetUpdateMode( false);
- for( USHORT i = 0; i < pColorTbl->Count(); ++i )
+ for( sal_uInt16 i = 0; i < pColorTbl->Count(); ++i )
{
XColorEntry* pEntry = pColorTbl->GetColor( i );
Color aColor = pEntry->GetColor();
@@ -182,15 +182,15 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
aInsertColorLB.InsertEntry( aColor, sName );
aRemoveColorLB.InsertEntry( aColor, sName );
}
- aContentColorLB.SetUpdateMode( TRUE );
- aMoveColorLB.SetUpdateMode( TRUE );
- aInsertColorLB.SetUpdateMode( TRUE );
- aRemoveColorLB.SetUpdateMode( TRUE );
+ aContentColorLB.SetUpdateMode( sal_True );
+ aMoveColorLB.SetUpdateMode( sal_True );
+ aInsertColorLB.SetUpdateMode( sal_True );
+ aRemoveColorLB.SetUpdateMode( sal_True );
ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
- ULONG nColor = aAppOptions.GetTrackContentColor();
+ sal_uLong nColor = aAppOptions.GetTrackContentColor();
if (nColor == COL_TRANSPARENT)
aContentColorLB.SelectEntryPos(0);
else
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 143cb41d4ea2..a969b311ddf7 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -56,7 +56,7 @@
// STATIC DATA -----------------------------------------------------------
-static USHORT pCalcOptRanges[] =
+static sal_uInt16 pCalcOptRanges[] =
{
SID_SCDOCOPTIONS,
SID_SCDOCOPTIONS,
@@ -125,7 +125,7 @@ void ScTpCalcOptions::Init()
//-----------------------------------------------------------------------
-USHORT* ScTpCalcOptions::GetRanges()
+sal_uInt16* ScTpCalcOptions::GetRanges()
{
return pCalcOptRanges;
}
@@ -141,7 +141,7 @@ SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet
void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
{
- USHORT d,m,y;
+ sal_uInt16 d,m,y;
*pLocalOptions = *pOldOptions;
@@ -190,10 +190,10 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
//-----------------------------------------------------------------------
-BOOL ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
{
// alle weiteren Optionen werden in den Handlern aktualisiert
- pLocalOptions->SetIterCount( (USHORT)aEdSteps.GetValue() );
+ pLocalOptions->SetIterCount( (sal_uInt16)aEdSteps.GetValue() );
pLocalOptions->SetIgnoreCase( !aBtnCase.IsChecked() );
pLocalOptions->SetCalcAsShown( aBtnCalc.IsChecked() );
pLocalOptions->SetMatchWholeCell( aBtnMatch.IsChecked() );
@@ -209,10 +209,10 @@ BOOL ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
if ( *pLocalOptions != *pOldOptions )
{
rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) );
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return false;
}
//------------------------------------------------------------------------
@@ -285,13 +285,13 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn )
{
if ( pBtn->IsChecked() )
{
- pLocalOptions->SetIter( TRUE );
+ pLocalOptions->SetIter( sal_True );
aFtSteps.Enable(); aEdSteps.Enable();
aFtEps .Enable(); aEdEps .Enable();
}
else
{
- pLocalOptions->SetIter( FALSE );
+ pLocalOptions->SetIter( false );
aFtSteps.Disable(); aEdSteps.Disable();
aFtEps .Disable(); aEdEps .Disable();
}
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 26ab3f88361e..367180b5153a 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -59,7 +59,7 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAt
return new ScTpCompatOptions(pParent, rCoreAttrs);
}
-BOOL ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs)
+sal_Bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs)
{
ScOptionsUtil::KeyBindingType eKeyB = ScOptionsUtil::KEY_DEFAULT;
switch (maLbKeyBindings.GetSelectEntryPos())
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 38ca8a34aeae..c87183e6bb33 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -215,7 +215,7 @@ SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreS
return new ScTpFormulaOptions(pParent, rCoreSet);
}
-BOOL ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
+sal_Bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
{
::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
switch (maLbFormulaSyntax.GetSelectEntryPos())
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index 31f913e23061..29fd59c5309b 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -42,7 +42,7 @@
// -----------------------------------------------------------------------
-static USHORT pPrintOptRanges[] =
+static sal_uInt16 pPrintOptRanges[] =
{
SID_SCPRINTOPTIONS,
SID_SCPRINTOPTIONS,
@@ -68,7 +68,7 @@ ScTpPrintOptions::~ScTpPrintOptions()
{
}
-USHORT* ScTpPrintOptions::GetRanges()
+sal_uInt16* ScTpPrintOptions::GetRanges()
{
return pPrintOptRanges;
}
@@ -93,7 +93,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
ScPrintOptions aOptions;
const SfxPoolItem* pItem;
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, FALSE , &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, false , &pItem))
aOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
else
{
@@ -101,9 +101,9 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
aOptions = SC_MOD()->GetPrintOptions();
}
- if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, FALSE , &pItem ) )
+ if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) )
{
- BOOL bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
+ sal_Bool bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
aSelectedSheetsCB.Check( bChecked );
}
else
@@ -118,7 +118,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
// -----------------------------------------------------------------------
-BOOL ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
{
rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET );
@@ -135,11 +135,11 @@ BOOL ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
{
rCoreAttrs.Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, aSelectedSheetsCB.IsChecked() ) );
}
- return TRUE;
+ return sal_True;
}
else
{
- return FALSE;
+ return false;
}
}
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index af0cb875409c..6761f313e38c 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -56,7 +56,7 @@
#define CR (sal_Unicode)13
#define LF (sal_Unicode)10
-static USHORT pUserListsRanges[] =
+static sal_uInt16 pUserListsRanges[] =
{
SID_SCUSERLISTS,
SID_SCUSERLISTS,
@@ -99,9 +99,9 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
pDoc ( NULL ),
pViewData ( NULL ),
pRangeUtil ( new ScRangeUtil ),
- bModifyMode ( FALSE ),
- bCancelMode ( FALSE ),
- bCopyDone ( FALSE ),
+ bModifyMode ( false ),
+ bCancelMode ( false ),
+ bCopyDone ( false ),
nCancelPos ( 0 )
{
SetExchangeSupport();
@@ -167,7 +167,7 @@ void ScTpUserLists::Init()
// -----------------------------------------------------------------------
-USHORT* ScTpUserLists::GetRanges()
+sal_uInt16* ScTpUserLists::GetRanges()
{
return pUserListsRanges;
}
@@ -230,7 +230,7 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
// -----------------------------------------------------------------------
-BOOL ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
{
// Modifikationen noch nicht uebernommen?
// -> Click auf Add-Button simulieren
@@ -242,18 +242,18 @@ BOOL ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
GetItemSet().Get( nWhichUserLists );
ScUserList* pCoreList = rUserListItem.GetUserList();
- BOOL bDataModified = FALSE;
+ sal_Bool bDataModified = false;
if ( (pUserLists == NULL) && (pCoreList == NULL) )
{
- bDataModified = FALSE;
+ bDataModified = false;
}
else if ( pUserLists != NULL )
{
if ( pCoreList != NULL )
bDataModified = (*pUserLists != *pCoreList);
else
- bDataModified = TRUE;
+ bDataModified = sal_True;
}
if ( bDataModified )
@@ -281,7 +281,7 @@ int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP )
// -----------------------------------------------------------------------
-USHORT ScTpUserLists::UpdateUserListBox()
+sal_uInt16 ScTpUserLists::UpdateUserListBox()
{
aLbLists.Clear();
@@ -289,12 +289,12 @@ USHORT ScTpUserLists::UpdateUserListBox()
//----------------------------------------------------------
- USHORT nCount = pUserLists->GetCount();
+ sal_uInt16 nCount = pUserLists->GetCount();
String aEntry;
if ( nCount > 0 )
{
- for ( USHORT i=0; i<nCount; i++ )
+ for ( sal_uInt16 i=0; i<nCount; i++ )
{
aEntry = (*pUserLists)[i]->GetString();
DBG_ASSERT( aEntry.Len() > 0, "Empty UserList-entry :-/" );
@@ -307,7 +307,7 @@ USHORT ScTpUserLists::UpdateUserListBox()
// -----------------------------------------------------------------------
-void ScTpUserLists::UpdateEntries( USHORT nList )
+void ScTpUserLists::UpdateEntries( sal_uInt16 nList )
{
if ( !pUserLists ) return;
@@ -316,10 +316,10 @@ void ScTpUserLists::UpdateEntries( USHORT nList )
if ( nList < pUserLists->GetCount() )
{
ScUserListData* pList = (*pUserLists)[nList];
- USHORT nSubCount = pList->GetSubCount();
+ sal_uInt16 nSubCount = pList->GetSubCount();
String aEntryListStr;
- for ( USHORT i=0; i<nSubCount; i++ )
+ for ( sal_uInt16 i=0; i<nSubCount; i++ )
{
if ( i!=0 )
aEntryListStr += CR;
@@ -413,8 +413,8 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
SCROW nStartRow = rStartPos.Row();
SCCOL nEndCol = rEndPos.Col();
SCROW nEndRow = rEndPos.Row();
- USHORT nCellDir = SCRET_COLS;
- BOOL bValueIgnored = FALSE;
+ sal_uInt16 nCellDir = SCRET_COLS;
+ sal_Bool bValueIgnored = false;
if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) )
{
@@ -447,7 +447,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
}
}
else
- bValueIgnored = TRUE;
+ bValueIgnored = sal_True;
}
if ( aStrList.Len() > 0 )
AddNewList( aStrList );
@@ -471,7 +471,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
}
}
else
- bValueIgnored = TRUE;
+ bValueIgnored = sal_True;
}
if ( aStrList.Len() > 0 )
AddNewList( aStrList );
@@ -487,13 +487,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
//----------------------------------------------------------
- bCopyDone = TRUE;
+ bCopyDone = sal_True;
}
// -----------------------------------------------------------------------
-void ScTpUserLists::ModifyList( USHORT nSelList,
+void ScTpUserLists::ModifyList( sal_uInt16 nSelList,
const String& rEntriesStr )
{
if ( !pUserLists ) return;
@@ -509,7 +509,7 @@ void ScTpUserLists::ModifyList( USHORT nSelList,
// -----------------------------------------------------------------------
-void ScTpUserLists::RemoveList( USHORT nList )
+void ScTpUserLists::RemoveList( sal_uInt16 nList )
{
if ( pUserLists ) pUserLists->AtFree( nList );
}
@@ -522,7 +522,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
{
if ( pLb == &aLbLists )
{
- USHORT nSelPos = aLbLists.GetSelectEntryPos();
+ sal_uInt16 nSelPos = aLbLists.GetSelectEntryPos();
if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
{
if ( !aFtEntries.IsEnabled() ) aFtEntries.Enable();
@@ -565,7 +565,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
aEdCopyFrom.Disable();
}
aBtnNew.SetText( aStrCancel );
- bCancelMode = TRUE;
+ bCancelMode = sal_True;
}
else // if ( bCancelMode )
{
@@ -592,8 +592,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
aEdCopyFrom.Enable();
}
aBtnNew.SetText( aStrNew );
- bCancelMode = FALSE;
- bModifyMode = FALSE;
+ bCancelMode = false;
+ bModifyMode = false;
}
}
else if ( pBtn == &aBtnAdd )
@@ -625,11 +625,11 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
aBtnAdd.Disable();
aBtnRemove.Enable();
aBtnNew.SetText( aStrNew );
- bCancelMode = FALSE;
+ bCancelMode = false;
}
else // if ( bModifyMode )
{
- USHORT nSelList = aLbLists.GetSelectEntryPos();
+ sal_uInt16 nSelList = aLbLists.GetSelectEntryPos();
DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" );
@@ -645,8 +645,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
LbSelectHdl( &aLbLists );
}
- aBtnNew.SetText( aStrNew ); bCancelMode = FALSE;
- aBtnAdd.SetText( aStrAdd ); bModifyMode = FALSE;
+ aBtnNew.SetText( aStrNew ); bCancelMode = false;
+ aBtnAdd.SetText( aStrAdd ); bModifyMode = false;
aBtnAdd.Disable();
aBtnRemove.Enable();
aFtLists.Enable();
@@ -664,7 +664,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
{
if ( aLbLists.GetEntryCount() > 0 )
{
- USHORT nRemovePos = aLbLists.GetSelectEntryPos();
+ sal_uInt16 nRemovePos = aLbLists.GetSelectEntryPos();
String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) );
aMsg += aLbLists.GetEntry( nRemovePos );
@@ -716,7 +716,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
ScRefAddress theStartPos;
ScRefAddress theEndPos;
String theAreaStr( aEdCopyFrom.GetText() );
- BOOL bAreaOk = FALSE;
+ sal_Bool bAreaOk = false;
if ( theAreaStr.Len() > 0 )
{
@@ -783,8 +783,8 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd )
{
if ( !bCancelMode && !bModifyMode )
{
- aBtnNew.SetText( aStrCancel ); bCancelMode = TRUE;
- aBtnAdd.SetText( aStrModify ); bModifyMode = TRUE;
+ aBtnNew.SetText( aStrCancel ); bCancelMode = sal_True;
+ aBtnAdd.SetText( aStrModify ); bModifyMode = sal_True;
aBtnAdd.Enable();
aBtnRemove.Disable();
aFtLists.Disable();
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 005824580fd4..79ec3116762f 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -141,9 +141,9 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent,
return new ScTpContentOptions(pParent, rCoreSet);
}
-BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = false;
if( aFormulaCB .GetSavedValue() != aFormulaCB .IsChecked() ||
aNilCB .GetSavedValue() != aNilCB .IsChecked() ||
aAnnotCB .GetSavedValue() != aAnnotCB .IsChecked() ||
@@ -168,17 +168,17 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
aColorLB.GetSelectEntry() );
rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aRangeFindCB.GetSavedValue() != aRangeFindCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, aRangeFindCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aSyncZoomCB.GetSavedValue() != aSyncZoomCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, aSyncZoomCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
@@ -188,7 +188,7 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
{
const SfxPoolItem* pItem;
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
pLocalOptions = new ScViewOptions(
((const ScTpViewItem*)pItem)->GetViewOptions() );
else
@@ -200,9 +200,9 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aAnchorCB .Check(pLocalOptions->GetOption(VOPT_ANCHOR));
aClipMarkCB .Check(pLocalOptions->GetOption(VOPT_CLIPMARKS));
- aObjGrfLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
- aDiagramLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
- aDrawLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
+ aObjGrfLB .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
+ aDiagramLB .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
+ aDrawLB .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
aRowColHeaderCB.Check( pLocalOptions->GetOption(VOPT_HEADER) );
aHScrollCB .Check( pLocalOptions->GetOption(VOPT_HSCROLL) );
@@ -217,9 +217,9 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) ); // inverted
aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
aRangeFindCB.Check(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem))
aSyncZoomCB.Check(((const SfxBoolItem*)pItem)->GetValue());
aRangeFindCB.SaveValue();
@@ -250,7 +250,7 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
{
const SfxPoolItem* pItem;
- if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
*pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions();
}
@@ -263,7 +263,7 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
{
- USHORT nSelPos = pLb->GetSelectEntryPos();
+ sal_uInt16 nSelPos = pLb->GetSelectEntryPos();
ScVObjMode eMode = ScVObjMode(nSelPos);
ScVObjType eType = VOBJ_TYPE_OLE;
@@ -280,7 +280,7 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
{
ScViewOption eOption = VOPT_FORMULAS;
- BOOL bChecked = pBtn->IsChecked();
+ sal_Bool bChecked = pBtn->IsChecked();
if ( &aFormulaCB == pBtn ) eOption = VOPT_FORMULAS;
else if ( &aNilCB == pBtn ) eOption = VOPT_NULLVALS;
@@ -310,7 +310,7 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
void ScTpContentOptions::InitGridOpt()
{
- BOOL bGrid = pLocalOptions->GetOption( VOPT_GRID );
+ sal_Bool bGrid = pLocalOptions->GetOption( VOPT_GRID );
aGridCB.Check( bGrid );
@@ -342,7 +342,7 @@ void ScTpContentOptions::InitGridOpt()
//------------------------------------------------------
- aColorLB.SetUpdateMode( FALSE );
+ aColorLB.SetUpdateMode( false );
// Eintraege aus der Colortable
@@ -360,7 +360,7 @@ void ScTpContentOptions::InitGridOpt()
aColorLB.GetEntryPos( aStdCol ) )
aColorLB.InsertEntry( aStdCol, ScGlobal::GetRscString( STR_GRIDCOLOR ) );
- aColorLB.SetUpdateMode( TRUE );
+ aColorLB.SetUpdateMode( sal_True );
Invalidate();
}
@@ -369,7 +369,7 @@ void ScTpContentOptions::InitGridOpt()
String aName;
Color aCol = pLocalOptions->GetGridColor( &aName );
- USHORT nSelPos = aColorLB.GetEntryPos( aCol );
+ sal_uInt16 nSelPos = aColorLB.GetEntryPos( aCol );
if ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
aColorLB.SelectEntryPos( nSelPos );
@@ -379,7 +379,7 @@ void ScTpContentOptions::InitGridOpt()
IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
{
- BOOL bChecked = pBox->IsChecked();
+ sal_Bool bChecked = pBox->IsChecked();
aColorFT.Enable(bChecked);
aColorLB.Enable(bChecked);
pLocalOptions->SetOption( VOPT_GRID, bChecked );
@@ -422,7 +422,7 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
aAlignCB.SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl));
- for ( USHORT i = 0; i < aUnitArr.Count(); ++i )
+ for ( sal_uInt16 i = 0; i < aUnitArr.Count(); ++i )
{
String sMetric = aUnitArr.GetStringByPos( i );
FieldUnit eFUnit = (FieldUnit)aUnitArr.GetValue( i );
@@ -436,7 +436,7 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
case FUNIT_INCH:
{
// nur diese Metriken benutzen
- USHORT nPos = aUnitLB.InsertEntry( sMetric );
+ sal_uInt16 nPos = aUnitLB.InsertEntry( sMetric );
aUnitLB.SetEntryData( nPos, (void*)(long)eFUnit );
}
break;
@@ -464,23 +464,23 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
return pNew;
}
-BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
{
- BOOL bRet = TRUE;
- const USHORT nMPos = aUnitLB.GetSelectEntryPos();
+ sal_Bool bRet = sal_True;
+ const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
if ( nMPos != aUnitLB.GetSavedValue() )
{
- USHORT nFieldUnit = (USHORT)(long)aUnitLB.GetEntryData( nMPos );
+ sal_uInt16 nFieldUnit = (sal_uInt16)(long)aUnitLB.GetEntryData( nMPos );
rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC,
- (UINT16)nFieldUnit ) );
- bRet = TRUE;
+ (sal_uInt16)nFieldUnit ) );
+ bRet = sal_True;
}
if(aTabMF.GetText() != aTabMF.GetSavedValue())
{
rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
- sal::static_int_cast<UINT16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
- bRet = TRUE;
+ sal::static_int_cast<sal_uInt16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
+ bRet = sal_True;
}
ScLkUpdMode nSet=LM_ALWAYS;
@@ -502,55 +502,55 @@ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
aAppOptions.SetLinkMode(nSet );
SC_MOD()->SetAppOptions(aAppOptions);
- bRet = TRUE;
+ bRet = sal_True;
}
if(aAlignCB.GetSavedValue() != aAlignCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, aAlignCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aAlignLB.GetSavedValue() != aAlignLB.GetSelectEntryPos())
{
rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, aAlignLB.GetSelectEntryPos()));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aEditModeCB.GetSavedValue() != aEditModeCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, aEditModeCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aFormatCB.GetSavedValue() != aFormatCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, aFormatCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aExpRefCB.GetSavedValue() != aExpRefCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, aExpRefCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aMarkHdrCB.GetSavedValue() != aMarkHdrCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, aMarkHdrCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
if(aTextFmtCB.GetSavedValue() != aTextFmtCB.IsChecked())
{
rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, aTextFmtCB.IsChecked()));
- bRet = TRUE;
+ bRet = sal_True;
}
if( aReplWarnCB.GetSavedValue() != aReplWarnCB.IsChecked() )
{
rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, aReplWarnCB.IsChecked() ) );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -564,7 +564,7 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet.Get( SID_ATTR_METRIC );
FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
- for ( USHORT i = 0; i < aUnitLB.GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < aUnitLB.GetEntryCount(); ++i )
{
if ( (FieldUnit)(long)aUnitLB.GetEntryData( i ) == eFieldUnit )
{
@@ -577,7 +577,7 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
aUnitLB.SaveValue();
const SfxPoolItem* pItem;
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem))
aTabMF.SetValue(aTabMF.Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP);
aTabMF.SaveValue();
@@ -607,29 +607,29 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
// added to avoid warnings
}
}
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, false, &pItem))
aAlignCB.Check(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem))
aAlignLB.SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue());
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem))
aEditModeCB.Check(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem))
aFormatCB.Check(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem))
aExpRefCB.Check(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem))
aMarkHdrCB.Check(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, FALSE, &pItem))
+ if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem))
aTextFmtCB.Check(((const SfxBoolItem*)pItem)->GetValue());
- if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) )
aReplWarnCB.Check( ( (const SfxBoolItem*)pItem)->GetValue() );
aAlignCB .SaveValue();
@@ -661,7 +661,7 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
{
- const USHORT nMPos = aUnitLB.GetSelectEntryPos();
+ const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
if(nMPos != USHRT_MAX)
{
FieldUnit eFieldUnit = (FieldUnit)(long)aUnitLB.GetEntryData( nMPos );
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 20:47:37 +0000