summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/tabvwsh3.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view/tabvwsh3.cxx')
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx166
1 files changed, 83 insertions, 83 deletions
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index b1db9c4714bd..f6e7dccb45a1 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -44,7 +44,7 @@
#include <svl/ptitem.hxx>
#include <svl/stritem.hxx>
#include <tools/urlobj.hxx>
-
+#include <sfx2/objface.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/vclenum.hxx>
@@ -87,7 +87,7 @@ using ::std::auto_ptr;
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
#define IS_AVAILABLE(WhichId,ppItem) \
- (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+ (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
#define GET_STRING(nid) ((const SfxStringItem&)pReqArgs->Get(nid)).GetValue()
#define GET_UINT16(nid) ((const SfxUInt16Item&)pReqArgs->Get(nid)).GetValue()
#define GET_BOOL(nid) ((const SfxBoolItem&)pReqArgs->Get(nid)).GetValue()
@@ -97,9 +97,9 @@ using ::std::auto_ptr;
/** Try to parse the given range using Calc-style syntax first, then
Excel-style if that fails. */
-USHORT lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDoc, USHORT /* nSlot */)
+sal_uInt16 lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */)
{
- USHORT nResult = rScRange.Parse(aAddress, pDoc);
+ sal_uInt16 nResult = rScRange.Parse(aAddress, pDoc);
if ( (nResult & SCA_VALID) )
return nResult;
@@ -108,9 +108,9 @@ USHORT lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDo
/** Try to parse the given address using Calc-style syntax first, then
Excel-style if that fails. */
-USHORT lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocument* pDoc, USHORT /* nSlot */)
+sal_uInt16 lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */)
{
- USHORT nResult = rScAddress.Parse(aAddress, pDoc);
+ sal_uInt16 nResult = rScAddress.Parse(aAddress, pDoc);
if ( (nResult & SCA_VALID) )
return nResult;
@@ -123,7 +123,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SfxBindings& rBindings = pThisFrame->GetBindings();
ScModule* pScMod = SC_MOD();
const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp
HideListBox(); // Autofilter-DropDown-Listbox
@@ -134,22 +134,22 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
const SfxPoolItem* pItem;
if ( pReqArgs &&
- pReqArgs->GetItemState(FID_INSERT_FILE,TRUE,&pItem) == SFX_ITEM_SET )
+ pReqArgs->GetItemState(FID_INSERT_FILE,sal_True,&pItem) == SFX_ITEM_SET )
{
String aFileName = ((const SfxStringItem*)pItem)->GetValue();
// Einfuege-Position
Point aInsertPos;
- if ( pReqArgs->GetItemState(FN_PARAM_1,TRUE,&pItem) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState(FN_PARAM_1,sal_True,&pItem) == SFX_ITEM_SET )
aInsertPos = ((const SfxPointItem*)pItem)->GetValue();
else
aInsertPos = GetInsertPos();
// als Link?
- BOOL bAsLink = FALSE;
- if ( pReqArgs->GetItemState(FN_PARAM_2,TRUE,&pItem) == SFX_ITEM_SET )
+ sal_Bool bAsLink = false;
+ if ( pReqArgs->GetItemState(FN_PARAM_2,sal_True,&pItem) == SFX_ITEM_SET )
bAsLink = ((const SfxBoolItem*)pItem)->GetValue();
// ausfuehren
@@ -161,10 +161,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_OPENDLG_EDIT_PRINTAREA:
{
- USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId();
+ sal_uInt16 nId = ScPrintAreasDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
- pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+ pScMod->SetRefDialog( nId, pWnd ? false : sal_True );
}
break;
@@ -175,18 +175,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
String aPrintStr;
String aRowStr;
String aColStr;
- BOOL bEntire = FALSE;
+ sal_Bool bEntire = false;
const SfxPoolItem* pItem;
- if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, TRUE, &pItem ) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, sal_True, &pItem ) == SFX_ITEM_SET )
aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
- if ( pReqArgs->GetItemState( FN_PARAM_2, TRUE, &pItem ) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState( FN_PARAM_2, sal_True, &pItem ) == SFX_ITEM_SET )
aRowStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
- if ( pReqArgs->GetItemState( FN_PARAM_3, TRUE, &pItem ) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState( FN_PARAM_3, sal_True, &pItem ) == SFX_ITEM_SET )
aColStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
- if ( pReqArgs->GetItemState( FN_PARAM_4, TRUE, &pItem ) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState( FN_PARAM_4, sal_True, &pItem ) == SFX_ITEM_SET )
bEntire = static_cast<const SfxBoolItem*>(pItem)->GetValue();
- SetPrintRanges( bEntire, &aPrintStr, &aColStr, &aRowStr, FALSE );
+ SetPrintRanges( bEntire, &aPrintStr, &aColStr, &aRowStr, false );
rReq.Done();
}
@@ -196,18 +196,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_ADD_PRINTAREA:
case SID_DEFINE_PRINTAREA: // Menue oder Basic
{
- BOOL bAdd = ( nSlot == SID_ADD_PRINTAREA );
+ sal_Bool bAdd = ( nSlot == SID_ADD_PRINTAREA );
if ( pReqArgs )
{
String aPrintStr;
const SfxPoolItem* pItem;
- if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, TRUE, &pItem ) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, sal_True, &pItem ) == SFX_ITEM_SET )
aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
- SetPrintRanges( FALSE, &aPrintStr, NULL, NULL, bAdd );
+ SetPrintRanges( false, &aPrintStr, NULL, NULL, bAdd );
}
else
{
- SetPrintRanges( FALSE, NULL, NULL, NULL, bAdd ); // aus Selektion
+ SetPrintRanges( false, NULL, NULL, NULL, bAdd ); // aus Selektion
rReq.Done();
}
}
@@ -216,7 +216,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_DELETE_PRINTAREA:
{
String aEmpty;
- SetPrintRanges( FALSE, &aEmpty, NULL, NULL, FALSE ); // Druckbereich loeschen
+ SetPrintRanges( false, &aEmpty, NULL, NULL, false ); // Druckbereich loeschen
rReq.Done();
}
break;
@@ -249,18 +249,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
String aAddress;
const SfxPoolItem* pItem;
- if ( pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
aAddress = ((const SfxStringItem*)pItem)->GetValue();
else if ( nSlot == SID_JUMPTOMARK && pReqArgs->GetItemState(
- SID_JUMPTOMARK, TRUE, &pItem ) == SFX_ITEM_SET )
+ SID_JUMPTOMARK, sal_True, &pItem ) == SFX_ITEM_SET )
aAddress = ((const SfxStringItem*)pItem)->GetValue();
// #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1
// isn't set (for recorded macros, because IsAPI is no longer available).
// ScGridWindow::MouseButtonUp no longer executes the slot for a single
// cell if there is a multi selection.
- BOOL bUnmark = ( nSlot == SID_CURRENTCELL );
- if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
+ sal_Bool bUnmark = ( nSlot == SID_CURRENTCELL );
+ if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET )
bUnmark = ((const SfxBoolItem*)pItem)->GetValue();
bool bAlignToCursor = true;
@@ -275,15 +275,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
RTL_TEXTENCODING_UTF8 );
}
- BOOL bFound = FALSE;
+ sal_Bool bFound = false;
ScViewData* pViewData = GetViewData();
ScDocument* pDoc = pViewData->GetDocument();
ScMarkData& rMark = pViewData->GetMarkData();
ScRange aScRange;
ScAddress aScAddress;
- USHORT nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot);
+ sal_uInt16 nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot);
SCTAB nTab = pViewData->GetTabNo();
- BOOL bMark = TRUE;
+ sal_Bool bMark = sal_True;
// Is this a range ?
if( nResult & SCA_VALID )
@@ -312,7 +312,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
aScRange = ScRange( aScAddress, aScAddress );
// Zellen sollen nicht markiert werden
- bMark = FALSE;
+ bMark = false;
}
// Ist es benahmster Bereich (erst Namen dann DBBereiche) ?
else
@@ -340,7 +340,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
aScAddress.SetCol( pViewData->GetCurX() );
aScAddress.SetTab( nTab );
aScRange = ScRange( aScAddress, aScAddress );
- bMark = FALSE;
+ bMark = false;
nResult = SCA_VALID;
}
}
@@ -351,10 +351,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
// wir haben was gefunden
if( nResult & SCA_VALID )
{
- bFound = TRUE;
+ bFound = sal_True;
SCCOL nCol = aScRange.aStart.Col();
SCROW nRow = aScRange.aStart.Row();
- BOOL bNothing = ( pViewData->GetCurX()==nCol && pViewData->GetCurY()==nRow );
+ sal_Bool bNothing = ( pViewData->GetCurX()==nCol && pViewData->GetCurY()==nRow );
// markieren
if( bMark )
@@ -369,18 +369,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
bNothing = ( aCurrent == aOldMark );
}
else
- bNothing = FALSE;
+ bNothing = false;
if (!bNothing)
- MarkRange( aScRange, FALSE ); // Cursor kommt hinterher...
+ MarkRange( aScRange, false ); // Cursor kommt hinterher...
}
else
{
- // remove old selection, unless bUnmark argument is FALSE (from navigator)
+ // remove old selection, unless bUnmark argument is sal_False (from navigator)
if( bUnmark )
{
MoveCursorAbs( nCol, nRow,
- SC_FOLLOW_NONE, FALSE, FALSE );
+ SC_FOLLOW_NONE, false, false );
}
}
@@ -426,7 +426,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SCTAB nNameTab;
if ( pDoc->GetTable( aAddress, nNameTab ) )
{
- bFound = TRUE;
+ bFound = sal_True;
if ( nNameTab != nTab )
SetTabNo( nNameTab );
}
@@ -478,7 +478,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SfxViewFrame* pViewFrame = NULL;
ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst();
- BOOL bFound = FALSE;
+ sal_Bool bFound = false;
// zu aktivierenden ViewFrame suchen
@@ -543,13 +543,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_NORMALVIEWMODE:
case FID_PAGEBREAKMODE:
{
- BOOL bWantPageBreak = nSlot == FID_PAGEBREAKMODE;
+ sal_Bool bWantPageBreak = nSlot == FID_PAGEBREAKMODE;
// check whether there is an explicit argument, use it
const SfxPoolItem* pItem;
- if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+ if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
{
- BOOL bItemValue = ((const SfxBoolItem*)pItem)->GetValue();
+ sal_Bool bItemValue = ((const SfxBoolItem*)pItem)->GetValue();
bWantPageBreak = (nSlot == FID_PAGEBREAKMODE) == bItemValue;
}
@@ -557,12 +557,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
SetPagebreakMode( bWantPageBreak );
UpdatePageBreakData();
- SetCurSubShell( GetCurObjectSelectionType(), TRUE );
+ SetCurSubShell( GetCurObjectSelectionType(), sal_True );
PaintGrid();
PaintTop();
PaintLeft();
rBindings.Invalidate( nSlot );
- rReq.AppendItem( SfxBoolItem( nSlot, TRUE ) );
+ rReq.AppendItem( SfxBoolItem( nSlot, sal_True ) );
rReq.Done();
}
}
@@ -570,7 +570,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_FUNCTION_BOX:
{
- USHORT nChildId = ScFunctionChildWindow::GetChildWindowId();
+ sal_uInt16 nChildId = ScFunctionChildWindow::GetChildWindowId();
if ( rReq.GetArgs() )
pThisFrame->SetChildWindow( nChildId, ((const SfxBoolItem&) (rReq.GetArgs()->Get(FID_FUNCTION_BOX))).GetValue());
else
@@ -587,9 +587,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_TOGGLESYNTAX:
{
- BOOL bSet = !GetViewData()->IsSyntaxMode();
+ sal_Bool bSet = !GetViewData()->IsSyntaxMode();
const SfxPoolItem* pItem;
- if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+ if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
bSet = ((const SfxBoolItem*)pItem)->GetValue();
GetViewData()->SetSyntaxMode( bSet );
PaintGrid();
@@ -600,9 +600,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case FID_TOGGLEHEADERS:
{
- BOOL bSet = !GetViewData()->IsHeaderMode();
+ sal_Bool bSet = !GetViewData()->IsHeaderMode();
const SfxPoolItem* pItem;
- if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+ if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
bSet = ((const SfxBoolItem*)pItem)->GetValue();
GetViewData()->SetHeaderMode( bSet );
RepeatResize();
@@ -616,9 +616,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
ScViewData* pViewData = GetViewData();
const ScViewOptions& rOpts = pViewData->GetOptions();
- BOOL bFormulaMode = !rOpts.GetOption( VOPT_FORMULAS );
+ sal_Bool bFormulaMode = !rOpts.GetOption( VOPT_FORMULAS );
const SfxPoolItem *pItem;
- if( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+ if( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
bFormulaMode = ((const SfxBoolItem *)pItem)->GetValue();
ScViewOptions rSetOpts = ScViewOptions( rOpts );
@@ -635,11 +635,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_TOGGLEINPUTLINE:
{
- USHORT nId = ScInputWindowWrapper::GetChildWindowId();
+ sal_uInt16 nId = ScInputWindowWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
- BOOL bSet = ( pWnd == NULL );
+ sal_Bool bSet = ( pWnd == NULL );
const SfxPoolItem* pItem;
- if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+ if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
bSet = ((const SfxBoolItem*)pItem)->GetValue();
pThisFrame->SetChildWindow( nId, bSet );
@@ -652,14 +652,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_ATTR_ZOOM: // Statuszeile
case FID_SCALE:
{
- BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+ sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
SvxZoomType eOldZoomType = GetZoomType();
SvxZoomType eNewZoomType = eOldZoomType;
const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt
- USHORT nOldZoom = (USHORT)(( rOldY.GetNumerator() * 100 )
+ sal_uInt16 nOldZoom = (sal_uInt16)(( rOldY.GetNumerator() * 100 )
/ rOldY.GetDenominator());
- USHORT nZoom = nOldZoom;
- BOOL bCancel = FALSE;
+ sal_uInt16 nZoom = nOldZoom;
+ sal_Bool bCancel = false;
if ( pReqArgs )
{
@@ -675,7 +675,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
AbstractSvxZoomDialog* pDlg = NULL;
ScMarkData& rMark = GetViewData()->GetMarkData();
- USHORT nBtnFlags = SVX_ZOOM_ENABLE_50
+ sal_uInt16 nBtnFlags = SVX_ZOOM_ENABLE_50
| SVX_ZOOM_ENABLE_75
| SVX_ZOOM_ENABLE_100
| SVX_ZOOM_ENABLE_150
@@ -764,10 +764,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_ATTR_ZOOMSLIDER:
{
const SfxPoolItem* pItem = NULL;
- BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
- if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, TRUE, &pItem) == SFX_ITEM_SET )
+ sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+ if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem) == SFX_ITEM_SET )
{
- const USHORT nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
+ const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
if( nCurrentZoom )
{
SetZoomType( SVX_ZOOM_PERCENT, bSyncZoom );
@@ -811,7 +811,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SCTAB nTab;
SvULongs aIndexList( 4, 4 );
- SFX_REQUEST_ARG( rReq, pItem, SfxIntegerListItem, SID_SELECT_TABLES, sal_False );
+ SFX_REQUEST_ARG( rReq, pItem, SfxIntegerListItem, SID_SELECT_TABLES, false );
if ( pItem )
pItem->GetList( aIndexList );
else
@@ -824,7 +824,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
pDlg->SetDescription(
String( ScResId( STR_DLG_SELECTTABLES_TITLE ) ),
String( ScResId( STR_DLG_SELECTTABLES_LBNAME ) ),
- SID_SELECT_TABLES, HID_SELECTTABLES );
+ GetStaticInterface()->GetSlot(SID_SELECT_TABLES)->GetCommand(), HID_SELECTTABLES );
// fill all table names with selection state
String aTabName;
@@ -854,7 +854,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SCTAB nFirstVisTab = 0;
// special case: only hidden tables selected -> do nothing
- sal_Bool bVisSelected = sal_False;
+ sal_Bool bVisSelected = false;
for( nSelIx = 0; !bVisSelected && (nSelIx < nSelCount); ++nSelIx )
bVisSelected = rDoc.IsVisible( nFirstVisTab = static_cast<SCTAB>(aIndexList[nSelIx]) );
if( !bVisSelected )
@@ -864,7 +864,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if( nSelCount )
{
for( nTab = 0; nTab < nTabCount; ++nTab )
- rMark.SelectTable( nTab, sal_False );
+ rMark.SelectTable( nTab, false );
for( nSelIx = 0; nSelIx < nSelCount; ++nSelIx )
rMark.SelectTable( static_cast<SCTAB>(aIndexList[nSelIx]), sal_True );
@@ -906,7 +906,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben
RemoveSplit();
else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal
- FreezeSplitters( FALSE );
+ FreezeSplitters( false );
else // erzeugen
SplitAtCursor();
rReq.Done();
@@ -922,7 +922,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben
RemoveSplit();
else
- FreezeSplitters( TRUE ); // erzeugen oder fixieren
+ FreezeSplitters( sal_True ); // erzeugen oder fixieren
rReq.Done();
InvalidateSplit();
@@ -933,10 +933,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_CHG_SHOW:
{
- USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId();
+ sal_uInt16 nId = ScHighlightChgDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
- pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+ pScMod->SetRefDialog( nId, pWnd ? false : sal_True );
}
break;
@@ -947,10 +947,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.Done ();
/*
- USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId();
+ sal_uInt16 nId = ScAcceptChgDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
- pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+ pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
*/
}
break;
@@ -966,7 +966,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
const SfxPoolItem* pItem;
if ( pReqArgs &&
- pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET &&
+ pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET &&
pItem->ISA( SfxStringItem ) )
{
String aComment = ((const SfxStringItem*)pItem)->GetValue();
@@ -988,7 +988,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if (!GetScDrawView())
{
GetViewData()->GetDocShell()->MakeDrawLayer();
- rBindings.InvalidateAll(FALSE);
+ rBindings.InvalidateAll(false);
}
break;
@@ -1011,7 +1011,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
ScDocProtection* pProtect = pDoc->GetDocProtection();
if (pProtect && pProtect->isProtected())
{
- BOOL bCancel = FALSE;
+ sal_Bool bCancel = false;
String aPassword;
if (pProtect->isProtectedWithPass())
@@ -1021,19 +1021,19 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) );
pDlg->SetMinLen( 0 );
- pDlg->SetHelpId( FID_PROTECT_DOC );
+ pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() );
pDlg->SetEditHelpId( HID_PASSWD_DOC );
if (pDlg->Execute() == RET_OK)
aPassword = pDlg->GetPassword();
else
- bCancel = TRUE;
+ bCancel = sal_True;
delete pDlg;
}
if (!bCancel)
{
Unprotect( TABLEID_DOC, aPassword );
- rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, FALSE ) );
+ rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, false ) );
rReq.Done();
}
}
@@ -1044,7 +1044,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
pDlg->SetText( ScResId(SCSTR_PROTECTDOC) );
pDlg->SetMinLen( 0 );
- pDlg->SetHelpId( FID_PROTECT_DOC );
+ pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() );
pDlg->SetEditHelpId( HID_PASSWD_DOC );
pDlg->ShowExtras( SHOWEXTRAS_CONFIRM );
@@ -1052,7 +1052,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
String aPassword = pDlg->GetPassword();
Protect( TABLEID_DOC, aPassword );
- rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, TRUE ) );
+ rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, sal_True ) );
rReq.Done();
}
@@ -1093,7 +1093,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
auto_ptr<SfxPasswordDialog> pDlg(new SfxPasswordDialog(GetDialogParent(), &aText));
pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) );
pDlg->SetMinLen( 0 );
- pDlg->SetHelpId( FID_PROTECT_TABLE );
+ pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() );
pDlg->SetEditHelpId( HID_PASSWD_TABLE );
if (pDlg->Execute() == RET_OK)
generated by cgit (git 2.34.1) at 2024-08-16 17:10:43 +0000