diff options
Diffstat (limited to 'sc/source/ui/view/tabvwshe.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwshe.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index c0af39226c3f..0784d3143202 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -56,7 +56,7 @@ //================================================================== -String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) +String __EXPORT ScTabViewShell::GetSelectionText( sal_Bool bWholeWord ) { String aStrSelection; @@ -97,7 +97,9 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) SCROW nRow1, nRow2; SCTAB nTab1, nTab2; aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2); - if (pDoc->ShrinkToUsedDataArea( nTab1, nCol1, nRow1, nCol2, nRow2, false)) + bool bShrunk; + pDoc->ShrinkToUsedDataArea( bShrunk, nTab1, nCol1, nRow1, nCol2, nRow2, false); + if (bShrunk) { aRange.aStart.SetCol( nCol1 ); aRange.aStart.SetRow( nRow1 ); @@ -138,10 +140,10 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) //------------------------------------------------------------------------ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const String& rTarget, - USHORT nMode ) + sal_uInt16 nMode ) { SvxLinkInsertMode eMode = (SvxLinkInsertMode) nMode; - BOOL bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text + sal_Bool bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text if ( bAsText ) { @@ -156,11 +158,11 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S { // #91216# if the view is not active, InsertURLField doesn't work // -> use InsertBookmark to directly manipulate cell content - // bTryReplace=TRUE -> if cell contains only one URL, replace it + // bTryReplace=sal_True -> if cell contains only one URL, replace it SCCOL nPosX = GetViewData()->GetCurX(); SCROW nPosY = GetViewData()->GetCurY(); - InsertBookmark( rName, rURL, nPosX, nPosY, &rTarget, TRUE ); + InsertBookmark( rName, rURL, nPosX, nPosY, &rTarget, sal_True ); } } else @@ -196,7 +198,7 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co ScModule* pScMod = SC_MOD(); ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); - BOOL bSelectFirst = FALSE; + sal_Bool bSelectFirst = sal_False; if ( !pScMod->IsEditMode() ) { if ( !SelectionEditable() ) @@ -242,7 +244,7 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co void ScTabViewShell::ExecSearch( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); const SfxPoolItem* pItem; switch ( nSlot ) @@ -250,13 +252,13 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) case FID_SEARCH_NOW: { if ( pReqArgs && - SFX_ITEM_SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem) ) + SFX_ITEM_SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, sal_False, &pItem) ) { DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" ); const SvxSearchItem* pSearchItem = (const SvxSearchItem*) pItem; ScGlobal::SetSearchItem( *pSearchItem ); - SearchAndReplace( pSearchItem, TRUE, rReq.IsAPI() ); + SearchAndReplace( pSearchItem, sal_True, rReq.IsAPI() ); rReq.Done(); } } @@ -264,7 +266,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) case SID_SEARCH_ITEM: if (pReqArgs && SFX_ITEM_SET == - pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem)) + pReqArgs->GetItemState(SID_SEARCH_ITEM, sal_False, &pItem)) { // Search-Item merken DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" ); @@ -280,7 +282,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) case FID_REPLACE_ALL: case FID_SEARCH_ALL: { - if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, FALSE, &pItem)) + if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, sal_False, &pItem)) { // SearchItem holen @@ -289,7 +291,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) // SearchItem fuellen aSearchItem.SetSearchString(((SfxStringItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, FALSE, &pItem)) + if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, sal_False, &pItem)) aSearchItem.SetReplaceString(((SfxStringItem*)pItem)->GetValue()); if (nSlot == FID_SEARCH) |