diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/drawfunc | |
| parent | Typo. (diff) | |
| parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
| download | core-12343c15568dcc2c9209d8ca41fda2263122448f.tar.gz core-12343c15568dcc2c9209d8ca41fda2263122448f.zip | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/drawfunc')
27 files changed, 560 insertions, 1366 deletions
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 4e6ac3ad6b8b..cd2ad601a465 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -90,7 +90,7 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) void ScDrawShell::StateDisableItems( SfxItemSet &rSet ) { SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { @@ -111,13 +111,13 @@ void lcl_setModified( SfxObjectShell* pShell ) void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) { - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); Window* pWin = pViewData->GetActiveWin(); ScDrawView* pView = pViewData->GetScDrawView(); SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); SdrObject* pSingleSelectedObj = NULL; if ( nMarkCount > 0 ) pSingleSelectedObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); @@ -134,7 +134,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) case SID_TEXT_STANDARD: // Harte Textattributierung loeschen { SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END); - pView->SetAttributes(aEmptyAttr, TRUE); + pView->SetAttributes(aEmptyAttr, sal_True); } break; @@ -186,9 +186,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } if( pView->AreObjectsMarked() ) - pView->SetAttrToMarked( *rReq.GetArgs(), FALSE ); + pView->SetAttrToMarked( *rReq.GetArgs(), false ); else - pView->SetDefaultAttr( *rReq.GetArgs(), FALSE); + pView->SetDefaultAttr( *rReq.GetArgs(), false); pView->InvalidateAttribs(); } break; @@ -257,7 +257,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) { SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView ); - const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); + const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); aCombSet.Put( aNewAttr ); aCombSet.Put( aNewGeoAttr ); @@ -307,7 +307,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) { SvxMacroItem aItem ( SFX_APP()->GetPool().GetWhich( SID_ATTR_MACROITEM ) ); - ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE ); + ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True ); if ( pInfo->GetMacro().getLength() > 0 ) { SvxMacroTableDtor aTab; @@ -334,7 +334,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) { const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, FALSE, &pItem )) + if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem )) { rtl::OUString sMacro; SvxMacro* pMacro = ((SvxMacroItem*)pItem)->GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT ); @@ -344,10 +344,10 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) if ( pObj->IsGroupObject() ) { SdrObjList* pOL = pObj->GetSubList(); - ULONG nObj = pOL->GetObjCount(); - for ( ULONG index=0; index<nObj; ++index ) + sal_uLong nObj = pOL->GetObjCount(); + for ( sal_uLong index=0; index<nObj; ++index ) { - pInfo = ScDrawLayer::GetMacroInfo( pOL->GetObj(index), TRUE ); + pInfo = ScDrawLayer::GetMacroInfo( pOL->GetObj(index), sal_True ); pInfo->SetMacro( sMacro ); } } @@ -361,10 +361,10 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) delete pItemSet; } -void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) +void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage ) { ScDrawView* pView = pViewData->GetScDrawView(); - BOOL bHasMarked = pView->AreObjectsMarked(); + sal_Bool bHasMarked = pView->AreObjectsMarked(); const SdrObject* pObj = NULL; const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); @@ -373,7 +373,7 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) SfxItemSet aNewAttr( pView->GetDefaultAttr() ); if( bHasMarked ) - pView->MergeAttrFromMarked( aNewAttr, FALSE ); + pView->MergeAttrFromMarked( aNewAttr, false ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet Factory fail!"); @@ -389,9 +389,9 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) if ( pDlg->Execute() == RET_OK ) { if( bHasMarked ) - pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), FALSE ); + pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), false ); else - pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), FALSE ); + pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), false ); pView->InvalidateAttribs(); rReq.Done(); @@ -400,14 +400,14 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) delete pDlg; } -void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) +void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage ) { ScDrawView* pView = pViewData->GetScDrawView(); - BOOL bHasMarked = pView->AreObjectsMarked(); + sal_Bool bHasMarked = pView->AreObjectsMarked(); SfxItemSet aNewAttr( pView->GetDefaultAttr() ); if( bHasMarked ) - pView->MergeAttrFromMarked( aNewAttr, FALSE ); + pView->MergeAttrFromMarked( aNewAttr, false ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -431,9 +431,9 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) if ( pDlg->Execute() == RET_OK ) { if( bHasMarked ) - pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), FALSE ); + pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), false ); else - pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), FALSE ); + pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), false ); pView->InvalidateAttribs(); rReq.Done(); @@ -442,26 +442,26 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) delete pDlg; } -void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ ) +void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 /* nTabPage */ ) { ScDrawView* pView = pViewData->GetScDrawView(); - BOOL bHasMarked = pView->AreObjectsMarked(); + sal_Bool bHasMarked = pView->AreObjectsMarked(); SfxItemSet aNewAttr ( pView->GetDefaultAttr() ); if( bHasMarked ) - pView->MergeAttrFromMarked( aNewAttr, FALSE ); + pView->MergeAttrFromMarked( aNewAttr, false ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, pView ); - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); if ( RET_OK == nResult ) { if ( bHasMarked ) pView->SetAttributes( *pDlg->GetOutputItemSet() ); else - pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), FALSE ); + pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), false ); pView->InvalidateAttribs(); rReq.Done(); @@ -473,7 +473,7 @@ void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk { if ( pObj ) { - ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE ); + ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True ); pInfo->SetHlink( rHlnk ); lcl_setModified( GetObjectShell() ); } diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 033b93fcdd4e..4e1539fc38ff 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -58,7 +58,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdocapt.hxx> -USHORT ScGetFontWorkId(); // in drtxtob +sal_uInt16 ScGetFontWorkId(); // in drtxtob using namespace com::sun::star; @@ -69,7 +69,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) : pViewData( pData ) { SetPool( &pViewData->GetScDrawView()->GetModel()->GetItemPool() ); - SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); + ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); SetUndoManager( pMgr ); if ( !pViewData->GetDocument()->IsUndoEnabled() ) { @@ -92,14 +92,14 @@ void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles rSet.Put( SfxBoolItem( SID_OBJECT_MIRROR, eMode == SDRDRAG_MIRROR ) ); rSet.Put( SfxBoolItem( SID_BEZIER_EDIT, !pView->IsFrameDragSingles() ) ); - USHORT nFWId = ScGetFontWorkId(); + sal_uInt16 nFWId = ScGetFontWorkId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); rSet.Put(SfxBoolItem(SID_FONTWORK, pViewFrm->HasChildWindow(nFWId))); // Notes always default to Page anchor. bool bDisableAnchor = false; const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); @@ -116,18 +116,18 @@ void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles switch( pView->GetAnchorType() ) { case SCA_PAGE: - rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, TRUE ) ); - rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, FALSE ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, false ) ); break; case SCA_CELL: - rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, TRUE ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, false ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, sal_True ) ); break; default: - rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, FALSE ) ); - rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, FALSE ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, false ) ); + rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, false ) ); break; } } @@ -139,14 +139,14 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl // call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked) // is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method. - if (!pView->IsMirrorAllowed(TRUE,TRUE)) + if (!pView->IsMirrorAllowed(sal_True,sal_True)) { rSet.DisableItem( SID_MIRROR_HORIZONTAL ); rSet.DisableItem( SID_MIRROR_VERTICAL ); } const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount <= 1 || !pView->IsGroupPossible() ) rSet.DisableItem( SID_GROUP ); @@ -195,7 +195,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl } } - BOOL bCanRename = FALSE; + sal_Bool bCanRename = false; if ( nMarkCount > 1 ) { // no hypelink options for a selected group @@ -214,10 +214,10 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl } SdrLayerID nLayerID = pObj->GetLayer(); if ( nLayerID != SC_LAYER_INTERN ) - bCanRename = TRUE; // #i51351# anything except internal objects can be renamed + bCanRename = sal_True; // #i51351# anything except internal objects can be renamed // #91929#; don't show original size entry if not possible - UINT16 nObjType = pObj->GetObjIdentifier(); + sal_uInt16 nObjType = pObj->GetObjIdentifier(); if ( nObjType == OBJ_OLE2 ) { SdrOle2Obj* pOleObj = static_cast<SdrOle2Obj*>(rMarkList.GetMark( 0 )->GetMarkedSdrObj()); @@ -270,7 +270,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl pView->GetAttributes( aAttrs ); if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE ) { - BOOL bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); + sal_Bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) ); } } @@ -289,17 +289,17 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) Window* pWindow = pViewData->GetActiveWin(); ScDrawView* pDrView = pViewData->GetScDrawView(); Point aPos = pWindow->PixelToLogic(aMousePos); - BOOL bHasMarked = pDrView->AreObjectsMarked(); + sal_Bool bHasMarked = pDrView->AreObjectsMarked(); if( bHasMarked ) { - rSet.Put( pDrView->GetAttrFromMarked(FALSE) ); + rSet.Put( pDrView->GetAttrFromMarked(false) ); // Wenn die View selektierte Objekte besitzt, muessen entspr. Items // von SFX_ITEM_DEFAULT (_ON) auf SFX_ITEM_DISABLED geaendert werden SfxWhichIter aIter( rSet, XATTR_LINE_FIRST, XATTR_FILL_LAST ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while( nWhich ) { if( SFX_ITEM_DEFAULT == rSet.GetItemState( nWhich ) ) @@ -322,7 +322,7 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) // #i34458# The SvxSizeItem in SID_TABLE_CELL is no longer needed by // SvxPosSizeStatusBarControl, it's enough to have it in SID_ATTR_SIZE. - BOOL bActionItem = FALSE; + sal_Bool bActionItem = false; if ( pDrView->IsAction() ) // action rectangle { Rectangle aRect; @@ -333,7 +333,7 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) rSet.Put( SfxPointItem( SID_ATTR_POSITION, aRect.TopLeft() ) ); Size aSize( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() ); rSet.Put( SvxSizeItem( SID_ATTR_SIZE, aSize ) ); - bActionItem = TRUE; + bActionItem = sal_True; } } if ( !bActionItem ) @@ -362,7 +362,7 @@ void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet) // Dialoge fuer Draw-Attribute disablen, wenn noetig ScDrawView* pDrView = pViewData->GetScDrawView(); - SfxItemSet aViewSet = pDrView->GetAttrFromMarked(FALSE); + SfxItemSet aViewSet = pDrView->GetAttrFromMarked(false); if ( aViewSet.GetItemState( XATTR_LINESTYLE ) == SFX_ITEM_DEFAULT ) { @@ -374,18 +374,18 @@ void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet) rSet.DisableItem( SID_ATTRIBUTES_AREA ); } -BOOL ScDrawShell::AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark) +sal_Bool ScDrawShell::AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark) { - BOOL bResult=TRUE; - ULONG nCount = rMark.GetMarkCount(); - for (ULONG i=0; i<nCount; i++) + sal_Bool bResult=sal_True; + sal_uLong nCount = rMark.GetMarkCount(); + for (sal_uLong i=0; i<nCount; i++) { SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj(); if ( !pObj->ISA(SdrUnoObj) ) { if(nLayerNo!=pObj->GetLayer()) { - bResult=FALSE; + bResult=false; break; } } diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index 49c8ed0652a6..75b1747dc3be 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -56,7 +56,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) SvxFontWorkDialog* pDlg = NULL; ScDrawView* pDrView = pViewData->GetScDrawView(); const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( pViewFrm->HasChildWindow(nId) ) @@ -69,7 +69,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) !((SdrTextObj*) pObj)->HasText() ) { if ( pDlg ) - pDlg->SetActive(FALSE); + pDlg->SetActive(false); rSet.DisableItem(XATTR_FORMTXTSTYLE); rSet.DisableItem(XATTR_FORMTXTADJUST); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index c471aad6f85e..ea0830b65d7e 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -82,7 +82,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink { ScDrawView* pView = pViewData->GetScDrawView(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); // Hyperlink @@ -160,14 +160,14 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); switch ( nSlot ) { case SID_HYPERLINK_SETLINK: if( pReqArgs ) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; const String& rName = pHyper->GetName(); @@ -175,7 +175,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) const String& rTarget = pHyper->GetTargetFrame(); SvxLinkInsertMode eMode = pHyper->GetInsertMode(); - BOOL bDone = FALSE; + sal_Bool bDone = false; if ( eMode == HLINK_FIELD || eMode == HLINK_BUTTON ) { ScDrawView* pView = pViewData->GetScDrawView(); @@ -232,20 +232,20 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) //! Undo ??? pViewData->GetDocShell()->SetDocumentModified(); - bDone = TRUE; + bDone = sal_True; } } else { SetHlinkForObject( pObj, rURL ); - bDone = TRUE; + bDone = sal_True; } } } if (!bDone) pViewData->GetViewShell()-> - InsertURL( rName, rURL, rTarget, (USHORT) eMode ); + InsertURL( rName, rURL, rTarget, (sal_uInt16) eMode ); // InsertURL an der ViewShell schaltet bei "Text" die DrawShell ab !!! } @@ -256,7 +256,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) } } -USHORT ScGetFontWorkId(); // wegen CLOOKs - in drtxtob2 +sal_uInt16 ScGetFontWorkId(); // wegen CLOOKs - in drtxtob2 //------------------------------------------------------------------ @@ -270,7 +270,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) ScTabView* pTabView = pViewData->GetView(); ScDrawView* pView = pTabView->GetScDrawView(); const SfxItemSet *pArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); + sal_uInt16 nSlotId = rReq.GetSlot(); //!!! // wer weiss, wie lange das funktioniert? (->vom Abreisscontrol funktioniert es) @@ -291,7 +291,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) rBindings.Invalidate(SID_OBJECT_HELL); // leave draw shell if nothing selected (layer may be locked) if ( pView->GetMarkedObjectList().GetMarkCount() == 0 ) - pViewData->GetViewShell()->SetDrawShell( FALSE ); + pViewData->GetViewShell()->SetDrawShell( false ); break; case SID_FRAME_TO_TOP: @@ -362,13 +362,13 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) case SID_DELETE_CONTENTS: pView->DeleteMarked(); if (!pTabView->IsDrawSelMode()) - pViewData->GetViewShell()->SetDrawShell( FALSE ); + pViewData->GetViewShell()->SetDrawShell( false ); break; case SID_CUT: pView->DoCut(); if (!pTabView->IsDrawSelMode()) - pViewData->GetViewShell()->SetDrawShell( FALSE ); + pViewData->GetViewShell()->SetDrawShell( false ); break; case SID_COPY: @@ -423,7 +423,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) rBindings.Invalidate( SID_OBJECT_MIRROR ); if (eMode == SDRDRAG_ROTATE && !pView->IsFrameDragSingles()) { - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); rBindings.Invalidate( SID_BEZIER_EDIT ); } } @@ -440,14 +440,14 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) rBindings.Invalidate( SID_OBJECT_MIRROR ); if (eMode == SDRDRAG_MIRROR && !pView->IsFrameDragSingles()) { - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); rBindings.Invalidate( SID_BEZIER_EDIT ); } } break; case SID_BEZIER_EDIT: { - BOOL bOld = pView->IsFrameDragSingles(); + sal_Bool bOld = pView->IsFrameDragSingles(); pView->SetFrameDragSingles( !bOld ); rBindings.Invalidate( SID_BEZIER_EDIT ); if (bOld && pView->GetDragMode() != SDRDRAG_MOVE) @@ -461,7 +461,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) case SID_FONTWORK: { - USHORT nId = ScGetFontWorkId(); + sal_uInt16 nId = ScGetFontWorkId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( rReq.GetArgs() ) @@ -483,11 +483,11 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) case SID_ENABLE_HYPHENATION: { - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, FALSE); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, false); if( pItem ) { SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - BOOL bValue = ( (const SfxBoolItem*) pItem)->GetValue(); + sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); pView->SetAttributes( aSet ); } @@ -555,7 +555,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) } // ChartListenerCollectionNeedsUpdate is needed for Navigator update - pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( TRUE ); + pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True ); pDocSh->SetDrawModified(); } @@ -594,7 +594,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) pSelected->SetDescription(aDescription); // ChartListenerCollectionNeedsUpdate is needed for Navigator update - pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( TRUE ); + pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True ); pDocSh->SetDrawModified(); } @@ -680,12 +680,12 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq) pDrView->ScEndTextEdit(); if ( SFX_ITEM_SET == - rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem) + rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) && XFTFORM_NONE != ((const XFormTextStdFormItem*) pItem)->GetValue() ) { - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*) (pViewFrm-> @@ -713,7 +713,7 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq ) } else { - BOOL bLock = FALSE; + sal_Bool bLock = false; const SfxItemSet *pArgs = rReq.GetArgs(); if( pArgs && pArgs->Count() >= 1 ) bLock = static_cast<const SfxBoolItem&>(pArgs->Get(SID_FORMATPAINTBRUSH)).GetValue(); @@ -721,7 +721,7 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq ) ScDrawView* pDrawView = pViewData->GetScDrawView(); if ( pDrawView && pDrawView->AreObjectsMarked() ) { - BOOL bOnlyHardAttr = TRUE; + sal_Bool bOnlyHardAttr = sal_True; SfxItemSet* pItemSet = new SfxItemSet( pDrawView->GetAttrFromMarked(bOnlyHardAttr) ); pView->SetDrawBrushSet( pItemSet, bLock ); } @@ -731,8 +731,8 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq ) void ScDrawShell::StateFormatPaintbrush( SfxItemSet& rSet ) { ScDrawView* pDrawView = pViewData->GetScDrawView(); - BOOL bSelection = pDrawView && pDrawView->AreObjectsMarked(); - BOOL bHasPaintBrush = pViewData->GetView()->HasPaintBrush(); + sal_Bool bSelection = pDrawView && pDrawView->AreObjectsMarked(); + sal_Bool bHasPaintBrush = pViewData->GetView()->HasPaintBrush(); if ( !bHasPaintBrush && !bSelection ) rSet.DisableItem( SID_FORMATPAINTBRUSH ); diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index a69aadb2d43c..638d9a5676ad 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -35,19 +35,19 @@ ToolBoxItem\ {\ Identifier = SID_FRAME_TO_TOP ; \ - HelpID = SID_FRAME_TO_TOP ; \ + HelpID = CMD_SID_FRAME_TO_TOP ; \ };\ ToolBoxItem\ {\ Identifier = SID_FRAME_TO_BOTTOM ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ + HelpID = CMD_SID_FRAME_TO_BOTTOM ; \ }; #define MN_RENAME_OBJECT \ MenuItem\ {\ Identifier = SID_RENAME_OBJECT ; \ - HelpId = SID_RENAME_OBJECT ; \ + HelpId = CMD_SID_RENAME_OBJECT ; \ Text [ en-US ] = "Name...";\ }; @@ -56,7 +56,7 @@ MenuItem\ {\ Identifier = SID_TITLE_DESCRIPTION_OBJECT; \ - HelpId = SID_TITLE_DESCRIPTION_OBJECT; \ + HelpId = CMD_SID_TITLE_DESCRIPTION_OBJECT; \ Text [ en-US ] = "Description...";\ }; @@ -117,14 +117,14 @@ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ };\ };\ @@ -135,7 +135,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ - HelpId = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ; \ SubMenu = Menu\ {\ diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 3325cdcbbde5..9237d0e1f66a 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -110,7 +110,7 @@ TYPEINIT1( ScDrawTextObjectBar, SfxShell ); void ScDrawTextObjectBar::StateDisableItems( SfxItemSet &rSet ) { SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { @@ -123,12 +123,12 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) : SfxShell(pData->GetViewShell()), pViewData(pData), pClipEvtLstnr(NULL), - bPastePossible(FALSE) + bPastePossible(false) { SetPool( pViewData->GetScDrawView()->GetDefaultAttr().GetPool() ); // UndoManager wird beim Umschalten in den Edit-Modus umgesetzt... - SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); + ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); SetUndoManager( pMgr ); if ( !pViewData->GetDocument()->IsUndoEnabled() ) { @@ -143,7 +143,7 @@ ScDrawTextObjectBar::~ScDrawTextObjectBar() { if ( pClipEvtLstnr ) { - pClipEvtLstnr->AddRemoveListener( pViewData->GetActiveWin(), FALSE ); + pClipEvtLstnr->AddRemoveListener( pViewData->GetActiveWin(), false ); // The listener may just now be waiting for the SolarMutex and call the link // afterwards, in spite of RemoveListener. So the link has to be reset, too. @@ -172,7 +172,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) } const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); switch ( nSlot ) { case SID_COPY: @@ -189,10 +189,10 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) case SID_CLIPBOARD_FORMAT_ITEMS: { - ULONG nFormat = 0; + sal_uLong nFormat = 0; const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET && + pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET && pItem->ISA(SfxUInt32Item) ) { nFormat = ((const SfxUInt32Item*)pItem)->GetValue(); @@ -214,8 +214,8 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) case SID_SELECTALL: { - ULONG nCount = pOutliner->GetParagraphCount(); - ESelection aSel( 0,0,(USHORT)nCount,0 ); + sal_uLong nCount = pOutliner->GetParagraphCount(); + ESelection aSel( 0,0,(sal_uInt16)nCount,0 ); pOutView->SetSelection( aSel ); } break; @@ -231,13 +231,13 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; if( pArgs ) - pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem); + pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem); if ( pItem ) { aString = ((const SfxStringItem*)pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; - pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem); + pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem); const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); if ( pFontItem ) { @@ -270,7 +270,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) if( pReqArgs ) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; const String& rName = pHyper->GetName(); @@ -278,7 +278,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) const String& rTarget = pHyper->GetTargetFrame(); SvxLinkInsertMode eMode = pHyper->GetInsertMode(); - BOOL bDone = FALSE; + sal_Bool bDone = false; if ( pOutView && ( eMode == HLINK_DEFAULT || eMode == HLINK_FIELD ) ) { const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection(); @@ -315,7 +315,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) pOutView->SetSelection( aSel ); } - bDone = TRUE; + bDone = sal_True; } if (!bDone) @@ -356,7 +356,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) case SID_THES: { String aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (aReplaceText.Len() > 0) @@ -376,13 +376,13 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) { SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); - BOOL bHasFontWork = pViewFrm->HasChildWindow(SID_FONTWORK); - BOOL bDisableFontWork = FALSE; + sal_Bool bHasFontWork = pViewFrm->HasChildWindow(SID_FONTWORK); + sal_Bool bDisableFontWork = false; if (IsNoteEdit()) { // #i21255# notes now support rich text formatting (#i74140# but not fontwork) - bDisableFontWork = TRUE; + bDisableFontWork = sal_True; } if ( bDisableFontWork ) @@ -397,7 +397,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) OutlinerView* pOutView = pView->GetTextEditOutlinerView(); if ( pOutView ) { - BOOL bField = FALSE; + sal_Bool bField = false; const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection(); if (pFieldItem) { @@ -408,7 +408,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) aHLinkItem.SetName( pURLField->GetRepresentation() ); aHLinkItem.SetURL( pURLField->GetURL() ); aHLinkItem.SetTargetFrame( pURLField->GetTargetFrame() ); - bField = TRUE; + bField = sal_True; } } if (!bField) @@ -457,7 +457,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) pView->GetAttributes( aAttrs ); if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE ) { - BOOL bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); + sal_Bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) ); } } @@ -479,7 +479,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) rSet.Put( SfxStringItem( SID_THES, aStatusVal ) ); // disable thesaurus main menu and context menu entry if there is nothing to look up - BOOL bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang ); + sal_Bool bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang ); if (!bIsLookUpWord || !bCanDoThesaurus) rSet.DisableItem( SID_THES ); if (!bCanDoThesaurus) @@ -516,7 +516,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScDrawTextObjectBar, ClipboardChanged ) ); pClipEvtLstnr->acquire(); Window* pWin = pViewData->GetActiveWin(); - pClipEvtLstnr->AddRemoveListener( pWin, TRUE ); + pClipEvtLstnr->AddRemoveListener( pWin, sal_True ); // get initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) ); @@ -524,7 +524,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) } SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { switch (nWhich) @@ -568,7 +568,7 @@ void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) SdrView* pView = pViewData->GetScDrawView(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); SfxItemSet aSet( pView->GetDefaultAttr() ); @@ -615,41 +615,41 @@ void lcl_RemoveFields( OutlinerView& rOutView ) aSel.Adjust(); xub_StrLen nNewEnd = aSel.nEndPos; - BOOL bUpdate = pOutliner->GetUpdateMode(); - BOOL bChanged = FALSE; + sal_Bool bUpdate = pOutliner->GetUpdateMode(); + sal_Bool bChanged = false; //! GetPortions and GetAttribs should be const! EditEngine& rEditEng = (EditEngine&)pOutliner->GetEditEngine(); - ULONG nParCount = pOutliner->GetParagraphCount(); - for (ULONG nPar=0; nPar<nParCount; nPar++) + sal_uLong nParCount = pOutliner->GetParagraphCount(); + for (sal_uLong nPar=0; nPar<nParCount; nPar++) if ( nPar >= aSel.nStartPara && nPar <= aSel.nEndPara ) { SvUShorts aPortions; - rEditEng.GetPortions( (USHORT)nPar, aPortions ); + rEditEng.GetPortions( (sal_uInt16)nPar, aPortions ); //! GetPortions should use xub_StrLen instead of USHORT - for ( USHORT nPos = aPortions.Count(); nPos; ) + for ( sal_uInt16 nPos = aPortions.Count(); nPos; ) { --nPos; - USHORT nEnd = aPortions.GetObject( nPos ); - USHORT nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0; + sal_uInt16 nEnd = aPortions.GetObject( nPos ); + sal_uInt16 nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0; // fields are single characters if ( nEnd == nStart+1 && ( nPar > aSel.nStartPara || nStart >= aSel.nStartPos ) && ( nPar < aSel.nEndPara || nEnd <= aSel.nEndPos ) ) { - ESelection aFieldSel( (USHORT)nPar, nStart, (USHORT)nPar, nEnd ); + ESelection aFieldSel( (sal_uInt16)nPar, nStart, (sal_uInt16)nPar, nEnd ); SfxItemSet aSet = rEditEng.GetAttribs( aFieldSel ); if ( aSet.GetItemState( EE_FEATURE_FIELD ) == SFX_ITEM_ON ) { if (!bChanged) { if (bUpdate) - pOutliner->SetUpdateMode( FALSE ); + pOutliner->SetUpdateMode( false ); String aName = ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); pOutliner->GetUndoManager().EnterListAction( aName, aName ); - bChanged = TRUE; + bChanged = sal_True; } String aFieldText = rEditEng.GetText( aFieldSel ); @@ -667,7 +667,7 @@ void lcl_RemoveFields( OutlinerView& rOutView ) if (bUpdate && bChanged) { pOutliner->GetUndoManager().LeaveListAction(); - pOutliner->SetUpdateMode( TRUE ); + pOutliner->SetUpdateMode( sal_True ); } if ( aOldSel.IsEqual( aSel ) ) // aSel is adjusted @@ -681,15 +681,15 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) { SdrView* pView = pViewData->GetScDrawView(); const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); - BOOL bArgsInReq = ( pArgs != NULL ); + sal_Bool bArgsInReq = ( pArgs != NULL ); if ( !bArgsInReq ) { SfxItemSet aEditAttr(pView->GetModel()->GetItemPool()); pView->GetAttributes(aEditAttr); SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() ); - BOOL bDone = TRUE; + sal_Bool bDone = sal_True; switch ( nSlot ) { @@ -701,7 +701,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) pOutView->Paint( Rectangle() ); SfxItemSet aEmptyAttr( *aEditAttr.GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - pView->SetAttributes( aEmptyAttr, TRUE ); + pView->SetAttributes( aEmptyAttr, sal_True ); if ( pOutView ) { @@ -711,7 +711,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) rReq.Done( aEmptyAttr ); pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); - bDone = FALSE; // bereits hier passiert + bDone = false; // bereits hier passiert } break; @@ -855,13 +855,13 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) // font items from toolbox controller have to be applied for the right script type // #i78017 establish the same behaviour as in Writer - USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + sal_uInt16 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; if (nSlot == SID_ATTR_CHAR_FONT) nScript = pView->GetScriptType(); SfxItemPool& rPool = GetPool(); SvxScriptSetItem aSetItem( nSlot, rPool ); - USHORT nWhich = rPool.GetWhich( nSlot ); + sal_uInt16 nWhich = rPool.GetWhich( nSlot ); aSetItem.PutItemForScriptType( nScript, pArgs->Get( nWhich ) ); pView->SetAttributes( aSetItem.GetItemSet() ); @@ -884,8 +884,8 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) } SvtLanguageOptions aLangOpt; - BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); - BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); + sal_Bool bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); + sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); SdrView* pView = pViewData->GetScDrawView(); SfxItemSet aAttrSet(pView->GetModel()->GetItemPool()); @@ -897,10 +897,10 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) // choose font info according to selection script type - USHORT nScript = pView->GetScriptType(); + sal_uInt16 nScript = pView->GetScriptType(); // #i55929# input-language-dependent script type (depends on input language if nothing selected) - USHORT nInputScript = nScript; + sal_uInt16 nInputScript = nScript; OutlinerView* pOutView = pView->GetTextEditOutlinerView(); if (pOutView && !pOutView->GetSelection().HasRange()) { @@ -925,16 +925,16 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) switch( eAdj ) { case SVX_ADJUST_LEFT: - rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, sal_True ) ); break; case SVX_ADJUST_CENTER: - rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, sal_True ) ); break; case SVX_ADJUST_RIGHT: - rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, sal_True ) ); break; case SVX_ADJUST_BLOCK: - rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, sal_True ) ); break; default: { @@ -949,19 +949,19 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) // Zeilenabstand - USHORT nLineSpace = (USHORT) + sal_uInt16 nLineSpace = (sal_uInt16) ((const SvxLineSpacingItem&)aAttrSet. Get( EE_PARA_SBL )).GetPropLineSpace(); switch( nLineSpace ) { case 100: - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, sal_True ) ); break; case 150: - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, sal_True ) ); break; case 200: - rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, sal_True ) ); break; } @@ -970,13 +970,13 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&) aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, TRUE ) ); + rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); // Unterstreichung - SfxItemState eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, TRUE ); + SfxItemState eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, sal_True ); if ( eState == SFX_ITEM_DONTCARE ) { rDestSet.InvalidateItem( SID_ULINE_VAL_NONE ); @@ -988,7 +988,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) { FontUnderline eUnderline = ((const SvxUnderlineItem&) aAttrSet.Get(EE_CHAR_UNDERLINE)).GetLineStyle(); - USHORT nId = SID_ULINE_VAL_NONE; + sal_uInt16 nId = SID_ULINE_VAL_NONE; switch (eUnderline) { case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; @@ -997,18 +997,18 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) default: break; } - rDestSet.Put( SfxBoolItem( nId, TRUE ) ); + rDestSet.Put( SfxBoolItem( nId, sal_True ) ); } // horizontal / vertical - BOOL bLeftToRight = TRUE; + sal_Bool bLeftToRight = sal_True; SdrOutliner* pOutl = pView->GetTextEditOutliner(); if( pOutl ) { if( pOutl->IsVertical() ) - bLeftToRight = FALSE; + bLeftToRight = false; } else bLeftToRight = ( (const SvxWritingModeItem&) aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index e3ab9efcd409..7dfafc870102 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -56,7 +56,7 @@ #include "scabstdlg.hxx" //------------------------------------------------------------------------ -BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, +sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -65,7 +65,7 @@ BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &rArgs, pViewData->GetSfxDocShell(),RID_SCDLG_CHAR ); DBG_ASSERT(pDlg, "Dialog create fail!"); - BOOL bRet = ( pDlg->Execute() == RET_OK ); + sal_Bool bRet = ( pDlg->Execute() == RET_OK ); if ( bRet ) { @@ -78,7 +78,7 @@ BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, return bRet; } -BOOL ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs, +sal_Bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ) { SfxItemPool* pArgPool = rArgs.GetPool(); @@ -96,7 +96,7 @@ BOOL ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs, // Muss natuerlich noch geaendert werden // aNewAttr.Put( SvxParaDlgLimitsItem( 567 * 50, 5670) ); - aNewAttr.Put( SvxHyphenZoneItem( sal_False, SID_ATTR_PARA_HYPHENZONE ) ); + aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) ); aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) ); aNewAttr.Put( SvxFmtSplitItem( sal_True, SID_ATTR_PARA_SPLIT) ); aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) ); @@ -107,7 +107,7 @@ BOOL ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs, SfxAbstractTabDialog* pDlg = pFact->CreateScParagraphDlg( pViewData->GetDialogParent(), &aNewAttr, RID_SCDLG_PARAGRAPH); DBG_ASSERT(pDlg, "Dialog create fail!"); - BOOL bRet = ( pDlg->Execute() == RET_OK ); + sal_Bool bRet = ( pDlg->Execute() == RET_OK ); if ( bRet ) { @@ -132,7 +132,7 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ ) TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) ); - ULONG nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() ); + sal_uLong nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() ); //! test if outliner view is still valid diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index fe38c247518b..d85ac90fa677 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -58,12 +58,12 @@ //------------------------------------------------------------------------ -USHORT ScGetFontWorkId() +sal_uInt16 ScGetFontWorkId() { return SvxFontWorkChildWindow::GetChildWindowId(); } -BOOL ScDrawTextObjectBar::IsNoteEdit() +sal_Bool ScDrawTextObjectBar::IsNoteEdit() { return ScDrawLayer::IsNoteCaption( pViewData->GetView()->GetSdrView()->GetTextEditObject() ); } @@ -75,7 +75,7 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) ScTabView* pTabView = pViewData->GetView(); ScDrawView* pView = pTabView->GetScDrawView(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); switch ( nSlot ) { case SID_COPY: @@ -85,7 +85,7 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) case SID_CUT: pView->DoCut(); if (!pTabView->IsDrawSelMode()) - pViewData->GetViewShell()->SetDrawShell( FALSE ); + pViewData->GetViewShell()->SetDrawShell( false ); break; case SID_PASTE: @@ -119,11 +119,11 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) case SID_ENABLE_HYPHENATION: { - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, FALSE); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, false); if( pItem ) { SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - BOOL bValue = ( (const SfxBoolItem*) pItem)->GetValue(); + sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); pView->SetAttributes( aSet ); } @@ -140,7 +140,7 @@ void ScDrawTextObjectBar::GetGlobalClipState( SfxItemSet& rSet ) //! move paste etc. to view shell? SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { rSet.DisableItem( nWhich ); @@ -153,12 +153,12 @@ void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) ScTabView* pTabView = pViewData->GetView(); ScDrawView* pView = pTabView->GetScDrawView(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); switch ( nSlot ) { case SID_FONTWORK: { - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( rReq.GetArgs() ) @@ -181,7 +181,7 @@ void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, EE_PARA_JUST, EE_PARA_JUST, 0 ); - BOOL bLeft = ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT ); + sal_Bool bLeft = ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT ); aAttr.Put( SvxFrameDirectionItem( bLeft ? FRMDIR_HORI_LEFT_TOP : FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) ); @@ -212,12 +212,12 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq) pDrView->ScEndTextEdit(); if ( SFX_ITEM_SET == - rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem) + rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) && XFTFORM_NONE != ((const XFormTextStdFormItem*) pItem)->GetValue() ) { - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*) (pViewFrm-> @@ -239,7 +239,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) SvxFontWorkDialog* pDlg = NULL; ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); - USHORT nId = SvxFontWorkChildWindow::GetChildWindowId(); + sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( pViewFrm->HasChildWindow(nId) ) @@ -252,7 +252,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) !((SdrTextObj*) pObj)->HasText() ) { if ( pDlg ) - pDlg->SetActive(FALSE); + pDlg->SetActive(false); rSet.DisableItem(XATTR_FORMTXTSTYLE); rSet.DisableItem(XATTR_FORMTXTADJUST); diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 865d1eb5196b..9906919f0f3f 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -66,19 +66,19 @@ FuConstArc::~FuConstArc() |* \************************************************************************/ -BOOL FuConstArc::MouseButtonDown( const MouseEvent& rMEvt ) +sal_Bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt ) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FuConstruct::MouseButtonDown( rMEvt ); + sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt ); if ( rMEvt.IsLeft() && !pView->IsAction() ) { Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); pWindow->CaptureMouse(); pView->BegCreateObj( aPnt ); - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -89,7 +89,7 @@ BOOL FuConstArc::MouseButtonDown( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstArc::MouseMove( const MouseEvent& rMEvt ) +sal_Bool FuConstArc::MouseMove( const MouseEvent& rMEvt ) { return FuConstruct::MouseMove(rMEvt); } @@ -100,17 +100,17 @@ BOOL FuConstArc::MouseMove( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstArc::MouseButtonUp( const MouseEvent& rMEvt ) +sal_Bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt ) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { pView->EndCreateObj( SDRCREATE_NEXTPOINT ); - bReturn = TRUE; + bReturn = sal_True; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } @@ -119,14 +119,14 @@ BOOL FuConstArc::MouseButtonUp( const MouseEvent& rMEvt ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuConstArc::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstArc::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -163,7 +163,7 @@ void FuConstArc::Activate() break; } - pView->SetCurrentObj( sal::static_int_cast<UINT16>( aObjKind ) ); + pView->SetCurrentObj( sal::static_int_cast<sal_uInt16>( aObjKind ) ); aOldPointer = pWindow->GetPointer(); pViewShell->SetActivePointer( aNewPointer ); diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 974c7f0d6ba8..c2704f8c32c6 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -76,12 +76,12 @@ FuConstCustomShape::~FuConstCustomShape() |* \************************************************************************/ -BOOL FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !pView->IsAction() ) { Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); @@ -92,14 +92,14 @@ BOOL FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt) if ( pObj ) { SetAttributes( pObj ); - sal_Bool bForceNoFillStyle = sal_False; + sal_Bool bForceNoFillStyle = false; if ( ((SdrObjCustomShape*)pObj)->UseNoFillStyle() ) bForceNoFillStyle = sal_True; if ( bForceNoFillStyle ) pObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) ); } - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -110,7 +110,7 @@ BOOL FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstCustomShape::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstCustomShape::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -121,18 +121,18 @@ BOOL FuConstCustomShape::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); pView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = TRUE; + bReturn = sal_True; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } @@ -141,14 +141,14 @@ BOOL FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuConstCustomShape::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstCustomShape::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -215,7 +215,7 @@ SdrObject* FuConstCustomShape::CreateDefaultObject(const sal_uInt16 /* nID */, c void FuConstCustomShape::SetAttributes( SdrObject* pObj ) { - sal_Bool bAttributesAppliedFromGallery = sal_False; + sal_Bool bAttributesAppliedFromGallery = false; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { @@ -271,7 +271,7 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, 0 ) ); pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); - pObj->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) ); + pObj->SetMergedItem( SdrTextAutoGrowHeightItem( false ) ); ((SdrObjCustomShape*)pObj)->MergeDefaultAttributes( &aCustomShape ); } } diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 822780dafd26..46bacf8ef245 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -74,12 +74,12 @@ FuConstPolygon::~FuConstPolygon() |* \************************************************************************/ -BOOL FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); SdrViewEvent aVEvt; (void)pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); @@ -87,15 +87,15 @@ BOOL FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt) { // Texteingabe hier nicht zulassen aVEvt.eEvent = SDREVENT_BEGDRAGOBJ; - pView->EnableExtendedMouseEventDispatcher(FALSE); + pView->EnableExtendedMouseEventDispatcher(false); } else { - pView->EnableExtendedMouseEventDispatcher(TRUE); + pView->EnableExtendedMouseEventDispatcher(sal_True); } if ( pView->MouseButtonDown(rMEvt, pWindow) ) - bReturn = TRUE; + bReturn = sal_True; return bReturn; } @@ -106,10 +106,10 @@ BOOL FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstPolygon::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstPolygon::MouseMove(const MouseEvent& rMEvt) { pView->MouseMove(rMEvt, pWindow); - BOOL bReturn = FuConstruct::MouseMove(rMEvt); + sal_Bool bReturn = FuConstruct::MouseMove(rMEvt); return bReturn; } @@ -119,13 +119,13 @@ BOOL FuConstPolygon::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; - BOOL bSimple = FALSE; + sal_Bool bReturn = false; + sal_Bool bSimple = false; SdrViewEvent aVEvt; (void)pView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt); @@ -134,11 +134,11 @@ BOOL FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) if (aVEvt.eEvent == SDREVENT_ENDCREATE) { - bReturn = TRUE; - bSimple = TRUE; // Doppelklick nicht weiterreichen + bReturn = sal_True; + bSimple = sal_True; // Doppelklick nicht weiterreichen } - BOOL bParent; + sal_Bool bParent; if (bSimple) bParent = FuConstruct::SimpleMouseButtonUp(rMEvt); else @@ -151,14 +151,14 @@ BOOL FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuConstPolygon::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstPolygon::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -171,7 +171,7 @@ BOOL FuConstPolygon::KeyInput(const KeyEvent& rKEvt) void FuConstPolygon::Activate() { - pView->EnableExtendedMouseEventDispatcher(TRUE); + pView->EnableExtendedMouseEventDispatcher(sal_True); SdrObjKind eKind; @@ -222,7 +222,7 @@ void FuConstPolygon::Activate() break; } - pView->SetCurrentObj(sal::static_int_cast<UINT16>(eKind)); + pView->SetCurrentObj(sal::static_int_cast<sal_uInt16>(eKind)); pView->SetEditMode(SDREDITMODE_CREATE); @@ -243,7 +243,7 @@ void FuConstPolygon::Deactivate() { pView->SetEditMode(SDREDITMODE_EDIT); - pView->EnableExtendedMouseEventDispatcher(FALSE); + pView->EnableExtendedMouseEventDispatcher(false); FuConstruct::Deactivate(); diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index e9f3e7031db4..d6f623ad8367 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -74,12 +74,12 @@ FuConstRectangle::~FuConstRectangle() |* \************************************************************************/ -BOOL FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !pView->IsAction() ) { @@ -107,7 +107,7 @@ BOOL FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstRectangle::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstRectangle::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -118,12 +118,12 @@ BOOL FuConstRectangle::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { @@ -143,11 +143,11 @@ BOOL FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) ((SdrTextObj*)pObj)->ForceOutlinerParaObject(); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if( pOPO && !pOPO->IsVertical() ) - pOPO->SetVertical( TRUE ); + pOPO->SetVertical( sal_True ); } } - bReturn = TRUE; + bReturn = sal_True; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } @@ -156,14 +156,14 @@ BOOL FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuConstRectangle::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstRectangle::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -206,7 +206,7 @@ void FuConstRectangle::Activate() break; } - pView->SetCurrentObj(sal::static_int_cast<UINT16>(aObjKind)); + pView->SetCurrentObj(sal::static_int_cast<sal_uInt16>(aObjKind)); aOldPointer = pWindow->GetPointer(); pViewShell->SetActivePointer( aNewPointer ); diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 2784102537ea..f4db6ebfb742 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -70,7 +70,7 @@ FuConstruct::~FuConstruct() { } -BYTE FuConstruct::Command(const CommandEvent& rCEvt) +sal_uInt8 FuConstruct::Command(const CommandEvent& rCEvt) { // special code for non-VCL OS2/UNX removed @@ -83,18 +83,18 @@ BYTE FuConstruct::Command(const CommandEvent& rCEvt) |* \************************************************************************/ -BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); if ( pView->IsAction() ) { if ( rMEvt.IsRight() ) pView->BckAction(); - return TRUE; + return sal_True; } aDragTimer.Start(); @@ -110,16 +110,16 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) if ( pHdl != NULL || pView->IsMarkedHit(aMDPos) ) { pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, 1); - bReturn = TRUE; + bReturn = sal_True; } else if ( pView->AreObjectsMarked() ) { pView->UnmarkAll(); - bReturn = TRUE; + bReturn = sal_True; } } - bIsInDragMode = FALSE; + bIsInDragMode = false; return bReturn; } @@ -130,7 +130,7 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt) { FuDraw::MouseMove(rMEvt); @@ -168,7 +168,7 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) pViewShell->SetActivePointer( aNewPointer ); } } - return TRUE; + return sal_True; } /************************************************************************* @@ -177,16 +177,16 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = SimpleMouseButtonUp( rMEvt ); + sal_Bool bReturn = SimpleMouseButtonUp( rMEvt ); // Doppelklick auf Textobjekt? (->fusel) - USHORT nClicks = rMEvt.GetClicks(); + sal_uInt16 nClicks = rMEvt.GetClicks(); if ( nClicks == 2 && rMEvt.IsLeft() ) { if ( pView->AreObjectsMarked() ) @@ -201,8 +201,8 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - BOOL bVertical = ( pOPO && pOPO->IsVertical() ); - USHORT nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; + sal_Bool bVertical = ( pOPO && pOPO->IsVertical() ); + sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; pViewShell->GetViewData()->GetDispatcher(). Execute(nTextSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); @@ -215,7 +215,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) Point aMousePixel = rMEvt.GetPosPixel(); pText->SetInEditMode( pObj, &aMousePixel ); } - bReturn = TRUE; + bReturn = sal_True; } } } @@ -228,9 +228,9 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) // SimpleMouseButtonUp - ohne Test auf Doppelklick -BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = TRUE; + sal_Bool bReturn = sal_True; if (aDragTimer.IsActive() ) { @@ -245,7 +245,7 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) else if ( pView->IsMarkObj() ) pView->EndMarkObj(); - else bReturn = FALSE; + else bReturn = false; if ( !pView->IsAction() ) { @@ -253,7 +253,7 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) if ( !pView->AreObjectsMarked() && rMEvt.GetClicks() < 2 ) { - pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1()); + pView->MarkObj(aPnt, -2, false, rMEvt.IsMod1()); SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher(); if ( pView->AreObjectsMarked() ) @@ -270,14 +270,14 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuConstruct::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; switch ( rKEvt.GetKeyCode().GetCode() ) { @@ -286,7 +286,7 @@ BOOL FuConstruct::KeyInput(const KeyEvent& rKEvt) { pView->BrkAction(); pWindow->ReleaseMouse(); - bReturn = TRUE; + bReturn = sal_True; } else // Zeichenmodus beenden { @@ -297,7 +297,7 @@ BOOL FuConstruct::KeyInput(const KeyEvent& rKEvt) case KEY_DELETE: pView->DeleteMarked(); - bReturn = TRUE; + bReturn = sal_True; break; } diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index aa7a0b730eed..3bd7175a5bdd 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -44,8 +44,8 @@ FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDr SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) { - SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, FALSE ); - SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, FALSE ); + SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, false ); + SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, false ); if( pInventorItem ) nInventor = pInventorItem->GetValue(); if( pIdentifierItem ) @@ -68,19 +68,19 @@ FuConstUnoControl::~FuConstUnoControl() |* \************************************************************************/ -BOOL FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !pView->IsAction() ) { Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); pWindow->CaptureMouse(); pView->BegCreateObj(aPnt); - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -91,7 +91,7 @@ BOOL FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -102,18 +102,18 @@ BOOL FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if ( pView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); pView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = TRUE; + bReturn = sal_True; } return (FuConstruct::MouseButtonUp(rMEvt) || bReturn); } @@ -122,14 +122,14 @@ BOOL FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuConstUnoControl::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstUnoControl::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 456a3bde9432..df8725cbded0 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -91,12 +91,12 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt) // Control = Snap (Toggle) // Alt = zentrisch - BOOL bShift = rMEvt.IsShift(); - BOOL bAlt = rMEvt.IsMod2(); + sal_Bool bShift = rMEvt.IsShift(); + sal_Bool bAlt = rMEvt.IsMod2(); bool bOrtho = bShift; - BOOL bAngleSnap = bShift; - BOOL bCenter = bAlt; + sal_Bool bAngleSnap = bShift; + sal_Bool bCenter = bAlt; // #i33136# if(doConstructOrthogonal()) @@ -121,12 +121,12 @@ void FuDraw::ResetModifiers() ScViewData* pViewData = pViewShell->GetViewData(); const ScViewOptions& rOpt = pViewData->GetOptions(); const ScGridOptions& rGrid = rOpt.GetGridOptions(); - BOOL bGridOpt = rGrid.GetUseGridSnap(); + sal_Bool bGridOpt = rGrid.GetUseGridSnap(); if (pView->IsOrtho()) - pView->SetOrtho(FALSE); + pView->SetOrtho(false); if (pView->IsAngleSnapEnabled()) - pView->SetAngleSnapEnabled(FALSE); + pView->SetAngleSnapEnabled(false); if (pView->IsGridSnap() != bGridOpt) pView->SetGridSnap(bGridOpt); @@ -134,9 +134,9 @@ void FuDraw::ResetModifiers() pView->SetSnapEnabled(bGridOpt); if (pView->IsCreate1stPointAsCenter()) - pView->SetCreate1stPointAsCenter(FALSE); + pView->SetCreate1stPointAsCenter(false); if (pView->IsResizeAtCenter()) - pView->SetResizeAtCenter(FALSE); + pView->SetResizeAtCenter(false); } /************************************************************************* @@ -145,13 +145,13 @@ void FuDraw::ResetModifiers() |* \************************************************************************/ -BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); DoModifiers( rMEvt ); - return FALSE; + return false; } /************************************************************************* @@ -160,14 +160,14 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) { // evaluate modifiers only if in a drawing layer action // (don't interfere with keyboard shortcut handling) if (pView->IsAction()) DoModifiers( rMEvt ); - return FALSE; + return false; } /************************************************************************* @@ -176,35 +176,35 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); ResetModifiers(); - return FALSE; + return false; } /************************************************************************* |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey ) +sal_Bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey ) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if ( pObj && pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) { // start text edit - like FuSelection::MouseButtonUp, // but with bCursorToEnd instead of mouse position OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - BOOL bVertical = ( pOPO && pOPO->IsVertical() ); - USHORT nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; + sal_Bool bVertical = ( pOPO && pOPO->IsVertical() ); + sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; // don't switch shells if text shell is already active FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr(); @@ -219,17 +219,17 @@ BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEven if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI { FuText* pText = (FuText*)pPoor; - pText->SetInEditMode( pObj, NULL, TRUE, pInitialKey ); + pText->SetInEditMode( pObj, NULL, sal_True, pInitialKey ); //! set cursor to end of text } - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } -BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; ScViewData& rViewData = *pViewShell->GetViewData(); switch ( rKEvt.GetKeyCode().GetCode() ) @@ -239,13 +239,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { // in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); - bReturn = TRUE; + bReturn = sal_True; } else if ( pViewShell->IsDrawSelMode() ) { pView->UnmarkAll(); rViewData.GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); - bReturn = TRUE; + bReturn = sal_True; } else if ( pView->AreObjectsMarked() ) { @@ -258,15 +258,15 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) // Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert if (!pView->AreObjectsMarked()) - pViewShell->SetDrawShell( FALSE ); + pViewShell->SetDrawShell( false ); - bReturn = TRUE; + bReturn = sal_True; } break; case KEY_DELETE: //! ueber Accelerator pView->DeleteMarked(); - bReturn = TRUE; + bReturn = sal_True; break; case KEY_RETURN: @@ -278,17 +278,17 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() ) { - BOOL bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); + sal_Bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( pObj && pObj->ISA( SdrOle2Obj ) && !bOle ) { pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 ); // consumed - bReturn = TRUE; + bReturn = sal_True; } else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object - bReturn = TRUE; + bReturn = sal_True; } } } @@ -305,7 +305,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object - bReturn = TRUE; + bReturn = sal_True; } } } @@ -335,7 +335,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) if(pView->AreObjectsMarked()) pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow); - bReturn = TRUE; + bReturn = sal_True; } // handle Mod1 and Mod2 to get travelling running on different systems @@ -358,7 +358,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = TRUE; + bReturn = sal_True; } } } @@ -377,13 +377,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { // mark last object pView->UnmarkAllObj(); - pView->MarkNextObj(FALSE); + pView->MarkNextObj(false); // II if(pView->AreObjectsMarked()) pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -402,13 +402,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { // mark first object pView->UnmarkAllObj(); - pView->MarkNextObj(TRUE); + pView->MarkNextObj(sal_True); // II if(pView->AreObjectsMarked()) pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -437,7 +437,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) long nX = 0; long nY = 0; - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); if (nCode == KEY_UP) { @@ -464,7 +464,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) nY = 0; } - BOOL bReadOnly = rViewData.GetDocShell()->IsReadOnly(); + sal_Bool bReadOnly = rViewData.GetDocShell()->IsReadOnly(); if(!rKEvt.GetKeyCode().IsMod1() && !bReadOnly) { @@ -532,7 +532,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) // II pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow); - bReturn = TRUE; + bReturn = sal_True; } } else @@ -551,13 +551,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) if(pView->IsDragObj()) { bool bWasNoSnap = rDragStat.IsNoSnap(); - BOOL bWasSnapEnabled = pView->IsSnapEnabled(); + sal_Bool bWasSnapEnabled = pView->IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(TRUE); + ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); if(bWasSnapEnabled) - pView->SetSnapEnabled(FALSE); + pView->SetSnapEnabled(false); pView->MovAction(aEndPoint); pView->EndDragObj(); @@ -573,7 +573,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) Rectangle aVisRect(aEndPoint - Point(100, 100), Size(200, 200)); pView->MakeVisible(aVisRect, *pWindow); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -640,7 +640,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) } } - bReturn = TRUE; + bReturn = sal_True; } } } @@ -664,7 +664,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) // start text edit for suitable object, pass key event to OutlinerView if ( lcl_KeyEditMode( pObj, pViewShell, &rKEvt ) ) - bReturn = TRUE; + bReturn = sal_True; } } @@ -728,7 +728,7 @@ void FuDraw::Deactivate() |* \************************************************************************/ -BOOL lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow ) +sal_Bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow ) { SdrViewEvent aVEvt; MouseEvent aMEvt( rPosPixel, 1, 0, MOUSE_LEFT ); @@ -738,13 +738,13 @@ BOOL lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow ) { if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) && ScDrawLayer::GetHitIMapObject( aVEvt.pObj, pWindow->PixelToLogic(rPosPixel), *pWindow ) ) - return TRUE; + return sal_True; if ( aVEvt.eEvent == SDREVENT_EXECUTEURL ) - return TRUE; + return sal_True; } - return FALSE; + return false; } void FuDraw::ForcePointer(const MouseEvent* pMEvt) @@ -752,7 +752,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ( !pView->IsAction() ) { Point aPosPixel = pWindow->GetPointerPosPixel(); - BOOL bAlt = pMEvt && pMEvt->IsMod2(); + sal_Bool bAlt = pMEvt && pMEvt->IsMod2(); Point aPnt = pWindow->PixelToLogic( aPosPixel ); SdrHdl* pHdl = pView->PickHandle(aPnt); SdrObject* pObj; @@ -804,9 +804,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) } } -BOOL FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const +sal_Bool FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const { - BOOL bIsSizingOrMoving = FALSE; + sal_Bool bIsSizingOrMoving = false; if ( rMEvt.IsLeft() ) { const SdrMarkList& rNoteMarkList = pView->GetMarkedObjectList(); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 2ae18fd3d7e8..33eb9f8882ad 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -61,7 +61,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r return; Size aPageSize = rPage; - BOOL bNegative = aPageSize.Width() < 0; + sal_Bool bNegative = aPageSize.Width() < 0; if ( bNegative ) { // make everything positive temporarily @@ -103,7 +103,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r //------------------------------------------------------------------------ void lcl_InsertGraphic( const Graphic& rGraphic, - const String& rFileName, const String& rFilterName, BOOL bAsLink, BOOL bApi, + const String& rFileName, const String& rFilterName, sal_Bool bAsLink, sal_Bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) { // set the size so the graphic has its original pixel size @@ -148,7 +148,7 @@ void lcl_InsertGraphic( const Graphic& rGraphic, pObj->SetName(aName); // don't select if from (dispatch) API, to allow subsequent cell operations - ULONG nInsOptions = bApi ? SDRINSERT_DONTMARK : 0; + sal_uLong nInsOptions = bApi ? SDRINSERT_DONTMARK : 0; pView->InsertObjectAtView( pObj, *pPV, nInsOptions ); // SetGraphicLink has to be used after inserting the object, @@ -211,23 +211,23 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, const SfxItemSet* pReqArgs = rReq.GetArgs(); const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState( SID_INSERT_GRAPHIC, TRUE, &pItem ) == SFX_ITEM_SET ) + pReqArgs->GetItemState( SID_INSERT_GRAPHIC, sal_True, &pItem ) == SFX_ITEM_SET ) { String aFileName = ((const SfxStringItem*)pItem)->GetValue(); String aFilterName; - if ( pReqArgs->GetItemState( FN_PARAM_FILTER, TRUE, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_FILTER, sal_True, &pItem ) == SFX_ITEM_SET ) aFilterName = ((const SfxStringItem*)pItem)->GetValue(); - BOOL bAsLink = FALSE; - if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET ) + sal_Bool bAsLink = false; + if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET ) bAsLink = ((const SfxBoolItem*)pItem)->GetValue(); Graphic aGraphic; int nError = GraphicFilter::LoadGraphic( aFileName, aFilterName, aGraphic, GraphicFilter::GetGraphicFilter() ); if ( nError == GRFILTER_OK ) { - lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, TRUE, pViewSh, pWindow, pView ); + lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, sal_True, pViewSh, pWindow, pView ); } } else @@ -242,17 +242,17 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, { String aFileName = aDlg.GetPath(); String aFilterName = aDlg.GetCurrentFilter(); - BOOL bAsLink = aDlg.IsAsLink(); + sal_Bool bAsLink = aDlg.IsAsLink(); // really store as link only? if( bAsLink && SvtMiscOptions().ShowLinkWarningDialog() ) { SvxLinkWarningDialog aWarnDlg(pWin,aFileName); if( aWarnDlg.Execute() != RET_OK ) - bAsLink = sal_False; // don't store as link + bAsLink = false; // don't store as link } - lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, FALSE, pViewSh, pWindow, pView ); + lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, false, pViewSh, pWindow, pView ); // append items for recording rReq.AppendItem( SfxStringItem( SID_INSERT_GRAPHIC, aFileName ) ); diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 0efb433c071c..3efae6b07752 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -55,7 +55,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> - +#include <sfx2/msgpool.hxx> +#include <scmod.hxx> // BM/IHA -- #include <cppuhelper/component_context.hxx> @@ -98,7 +99,7 @@ extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht //------------------------------------------------------------------------ #define IS_AVAILABLE(WhichId,ppItem) \ - (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET) + (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET) void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScViewData* pViewData, const rtl::OUString& rRangeParam ) @@ -118,7 +119,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie ScMarkData& rMark = pViewData->GetMarkData(); if ( !rMark.IsMarked() ) - pViewData->GetView()->MarkDataArea( TRUE ); + pViewData->GetView()->MarkDataArea( sal_True ); if ( pViewData->GetSimpleArea( nCol1,nRow1,nTab1, nCol2,nRow2,nTab2 ) == SC_MARK_SIMPLE ) { @@ -228,7 +229,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); - BOOL bIsFromFile = FALSE; + sal_Bool bIsFromFile = false; ::rtl::OUString aName; sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; @@ -236,8 +237,8 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference< io::XInputStream > xIconMetaFile; - USHORT nSlot = rReq.GetSlot(); - SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + sal_uInt16 nSlot = rReq.GetSlot(); + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, false ); if ( nSlot == SID_INSERT_OBJECT && pNameItem ) { SvGlobalName aClassName = pNameItem->GetValue(); @@ -262,12 +263,11 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie aServerLst.Remove( ScDocShell::Factory().GetClassId() ); // Starcalc nicht anzeigen //TODO/LATER: currently no inserting of ClassId into SfxRequest! case SID_INSERT_PLUGIN : - case SID_INSERT_APPLET : case SID_INSERT_FLOATINGFRAME : { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( pViewShell->GetWindow(), nSlot, + pFact->CreateInsertObjectDialog( pViewShell->GetWindow(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommandString(), xStorage, &aServerLst ); if ( pDlg ) { @@ -428,7 +428,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie if (bIsFromFile) { // Objekt ist selektiert, also Draw-Shell aktivieren - pViewShell->SetDrawShell( TRUE ); + pViewShell->SetDrawShell( true ); } else { @@ -517,7 +517,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* bool bAutomaticMark = false; if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) { - pViewSh->GetViewData()->GetView()->MarkDataArea( TRUE ); + pViewSh->GetViewData()->GetView()->MarkDataArea( sal_True ); bAutomaticMark = true; } @@ -525,7 +525,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* aMultiMark.MarkToMulti(); ScRangeList aRanges; - aMultiMark.FillRangeListWithMarks( &aRanges, FALSE ); + aMultiMark.FillRangeListWithMarks( &aRanges, false ); String aStr; ScDocument* pDocument = pViewSh->GetViewData()->GetDocument(); aRanges.Format( aStr, SCR_ABS_3D, pDocument, pDocument->GetAddressConvention() ); @@ -568,7 +568,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* ScRangeListRef aDummy; Rectangle aMarkDest; SCTAB nMarkTab; - BOOL bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab ); + sal_Bool bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab ); // Objekt-Groesse awt::Size aSz = xObj->getVisualAreaSize( nAspect ); @@ -576,17 +576,17 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) ); - BOOL bSizeCh = FALSE; + sal_Bool bSizeCh = false; if (bDrawRect && !aMarkDest.IsEmpty()) { aSize = aMarkDest.GetSize(); - bSizeCh = TRUE; + bSizeCh = sal_True; } if (aSize.Height() <= 0 || aSize.Width() <= 0) { aSize.Width() = 5000; aSize.Height() = 5000; - bSizeCh = TRUE; + bSizeCh = sal_True; } if (bSizeCh) { @@ -599,12 +599,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* ScViewData* pData = pViewSh->GetViewData(); ScDocShell* pScDocSh = pData->GetDocShell(); ScDocument* pScDoc = pScDocSh->GetDocument(); - BOOL bUndo (pScDoc->IsUndoEnabled()); + sal_Bool bUndo (pScDoc->IsUndoEnabled()); if( pReqArgs ) { const SfxPoolItem* pItem; - UINT16 nToTable = 0; + sal_uInt16 nToTable = 0; if( IS_AVAILABLE( FN_PARAM_4, &pItem ) ) { @@ -616,15 +616,15 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* // -> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle if ( ((const SfxBoolItem*)pItem)->GetValue() ) - nToTable = static_cast<UINT16>(pScDoc->GetTableCount()); + nToTable = static_cast<sal_uInt16>(pScDoc->GetTableCount()); else - nToTable = static_cast<UINT16>(pData->GetTabNo()); + nToTable = static_cast<sal_uInt16>(pData->GetTabNo()); } } else { if (bDrawRect) - nToTable = static_cast<UINT16>(nMarkTab); + nToTable = static_cast<sal_uInt16>(nMarkTab); rReq.AppendItem( SfxUInt16Item( FN_PARAM_4, nToTable ) ); } @@ -639,7 +639,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* if ( pScDoc->InsertTab( nNewTab, aTabName ) ) { - BOOL bAppend = TRUE; + sal_Bool bAppend = sal_True; if (bUndo) { @@ -649,7 +649,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } pScDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nNewTab ) ); - pViewSh->SetTabNo( nNewTab, TRUE ); + pViewSh->SetTabNo( nNewTab, sal_True ); pScDocSh->PostPaintExtras(); //! erst hinterher ??? } else @@ -659,7 +659,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } else if ( nToTable != pData->GetTabNo() ) { - pViewSh->SetTabNo( nToTable, TRUE ); + pViewSh->SetTabNo( nToTable, sal_True ); } } @@ -790,7 +790,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* bAddUndo = false; // don't create the undo action for inserting // leave the draw shell - pViewShell->SetDrawShell( FALSE ); + pViewShell->SetDrawShell( false ); } else { diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index 199331bd6e48..b46e43d93125 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -52,8 +52,8 @@ FuMarkRect::FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq), - bVisible(FALSE), - bStartDrag(FALSE) + bVisible(false), + bStartDrag(false) { } @@ -73,18 +73,18 @@ FuMarkRect::~FuMarkRect() |* \************************************************************************/ -BOOL FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); pWindow->CaptureMouse(); pView->UnmarkAll(); // der Einheitlichkeit halber und wegen #50558# - bStartDrag = TRUE; + bStartDrag = sal_True; aBeginPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() ); aZoomRect = Rectangle( aBeginPos, Size() ); - return TRUE; + return sal_True; } /************************************************************************* @@ -93,7 +93,7 @@ BOOL FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuMarkRect::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuMarkRect::MouseMove(const MouseEvent& rMEvt) { if ( bStartDrag ) { @@ -107,7 +107,7 @@ BOOL FuMarkRect::MouseMove(const MouseEvent& rMEvt) aZoomRect = aRect; aZoomRect.Justify(); pViewShell->DrawMarkRect(aZoomRect); - bVisible = TRUE; + bVisible = sal_True; } ForcePointer(&rMEvt); @@ -121,7 +121,7 @@ BOOL FuMarkRect::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -130,12 +130,12 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) { // Hide ZoomRect pViewShell->DrawMarkRect(aZoomRect); - bVisible = FALSE; + bVisible = false; } Size aZoomSizePixel = pWindow->LogicToPixel(aZoomRect).GetSize(); - USHORT nMinMove = pView->GetMinMoveDistancePixel(); + sal_uInt16 nMinMove = pView->GetMinMoveDistancePixel(); if ( aZoomSizePixel.Width() < nMinMove || aZoomSizePixel.Height() < nMinMove ) { // Klick auf der Stelle @@ -143,7 +143,7 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) aZoomRect.SetSize(Size()); // dann ganz leer } - bStartDrag = FALSE; + bStartDrag = false; pWindow->ReleaseMouse(); pViewShell->GetViewData()->GetDispatcher(). @@ -155,11 +155,11 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) // Chart-Dialog starten: -// USHORT nId = ScChartDlgWrapper::GetChildWindowId(); +// sal_uInt16 nId = ScChartDlgWrapper::GetChildWindowId(); // SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId ); -// SC_MOD()->SetRefDialog( nId, pWnd ? FALSE : TRUE ); +// SC_MOD()->SetRefDialog( nId, pWnd ? sal_False : sal_True ); - return TRUE; + return sal_True; } /************************************************************************* @@ -168,7 +168,7 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt) |* \************************************************************************/ -BYTE FuMarkRect::Command(const CommandEvent& rCEvt) +sal_uInt8 FuMarkRect::Command(const CommandEvent& rCEvt) { if ( COMMAND_STARTDRAG == rCEvt.GetCommand() ) { @@ -184,14 +184,14 @@ BYTE FuMarkRect::Command(const CommandEvent& rCEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuMarkRect::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuMarkRect::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; switch ( rKEvt.GetKeyCode().GetCode() ) { @@ -199,7 +199,7 @@ BOOL FuMarkRect::KeyInput(const KeyEvent& rKEvt) // beenden pViewShell->GetViewData()->GetDispatcher(). Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); - bReturn = TRUE; + bReturn = sal_True; break; } @@ -247,7 +247,7 @@ void FuMarkRect::Activate() ScMarkData& rMark = pViewData->GetMarkData(); if ( !rMark.IsMultiMarked() && !rMark.IsMarked() ) - pViewShell->MarkDataArea( TRUE ); + pViewShell->MarkDataArea( sal_True ); pViewData->GetMultiArea( aSourceRange ); // Mehrfachselektion erlaubt @@ -270,8 +270,8 @@ void FuMarkRect::Deactivate() { // Hide ZoomRect pViewShell->DrawMarkRect(aZoomRect); - bVisible = FALSE; - bStartDrag = FALSE; + bVisible = false; + bStartDrag = false; } } diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 232a619589e2..014a10e19405 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -56,7 +56,7 @@ FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, pDrDoc(pDoc), aSfxRequest(rReq), pDialog(NULL), - bIsInDragMode(FALSE), + bIsInDragMode(false), // remember MouseButton state mnCode(0) { @@ -179,21 +179,21 @@ IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) // moved from inline to *.cxx -BOOL FuPoor::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return false; } // moved from inline to *.cxx -BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return false; } /************************************************************************* @@ -208,25 +208,25 @@ BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuPoor::KeyInput(const KeyEvent& /* rKEvt */) +sal_Bool FuPoor::KeyInput(const KeyEvent& /* rKEvt */) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; return(bReturn); } -BYTE FuPoor::Command(const CommandEvent& rCEvt) +sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt) { if ( COMMAND_STARTDRAG == rCEvt.GetCommand() ) { //!!! sollte Joe eigentlich machen: // nur, wenn im Outliner was selektiert ist, darf - // Command TRUE zurueckliefern: + // Command sal_True zurueckliefern: OutlinerView* pOutView = pView->GetTextEditOutlinerView(); @@ -307,7 +307,7 @@ IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG ) if ( pHdl==NULL && pView->IsMarkedHit(aMDPos) ) { pWindow->ReleaseMouse(); - bIsInDragMode = TRUE; + bIsInDragMode = sal_True; // pView->BeginDrag(pWindow, aMDPos); pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos); @@ -317,24 +317,24 @@ IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG ) // Detektiv-Linie -BOOL FuPoor::IsDetectiveHit( const Point& rLogicPos ) +sal_Bool FuPoor::IsDetectiveHit( const Point& rLogicPos ) { SdrPageView* pPV = pView->GetSdrPageView(); if (!pPV) - return FALSE; + return false; - BOOL bFound = FALSE; + sal_Bool bFound = false; SdrObjListIter aIter( *pPV->GetObjList(), IM_FLAT ); SdrObject* pObject = aIter.Next(); while (pObject && !bFound) { if (ScDetectiveFunc::IsNonAlienArrow( pObject )) { - USHORT nHitLog = (USHORT) pWindow->PixelToLogic( + sal_uInt16 nHitLog = (sal_uInt16) pWindow->PixelToLogic( Size(pView->GetHitTolerancePixel(),0)).Width(); if(SdrObjectPrimitiveHit(*pObject, rLogicPos, nHitLog, *pPV, 0, false)) { - bFound = TRUE; + bFound = sal_True; } } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index d7e95b311fd6..ceca9c45bd9d 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -57,6 +57,9 @@ #include "drwlayer.hxx" #include "userdat.hxx" #include "scmod.hxx" +#include "charthelper.hxx" +#include "docuno.hxx" +#include "docsh.hxx" // ----------------------------------------------------------------------- @@ -81,7 +84,7 @@ using namespace com::sun::star; FuSelection::FuSelection(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuDraw(pViewSh, pWin, pViewP, pDoc, rReq), - bVCAction(FALSE) + bVCAction(false) { } @@ -95,7 +98,7 @@ FuSelection::~FuSelection() { } -BYTE FuSelection::Command(const CommandEvent& rCEvt) +sal_uInt8 FuSelection::Command(const CommandEvent& rCEvt) { // special code for non-VCL OS2/UNX removed @@ -108,7 +111,7 @@ BYTE FuSelection::Command(const CommandEvent& rCEvt) |* \************************************************************************/ -BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -117,13 +120,13 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { if ( bSelectionOnly ) pView->BckAction(); - return TRUE; + return sal_True; } - bVCAction = FALSE; - bIsInDragMode = FALSE; // irgendwo muss es ja zurueckgesetzt werden (#50033#) + bVCAction = false; + bIsInDragMode = false; // irgendwo muss es ja zurueckgesetzt werden (#50033#) - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); aMDPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -163,16 +166,16 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { aDragTimer.Start(); pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl); - bReturn = TRUE; + bReturn = sal_True; } } else { - BOOL bAlt = rMEvt.IsMod2(); + sal_Bool bAlt = rMEvt.IsMod2(); if ( !bAlt && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) ) { pView->BegMacroObj(aMDPos, pObj, pPV, pWindow); - bReturn = TRUE; + bReturn = sal_True; } else { @@ -202,7 +205,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pObj = pHit; } - ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE ); + ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, true ); // For interoperability favour links over macros if both are defined if ( pInfo->GetHlink().getLength() > 0 ) { @@ -232,7 +235,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pObjSh->CallXScript( pInfo->GetMacro(), *pInArgs, aRet, aOutArgsIndex, aOutArgs, true, &aCaller ); pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() ); - return TRUE; // kein CaptureMouse etc. + return sal_True; // kein CaptureMouse etc. } } } @@ -266,13 +269,13 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { ScGlobal::OpenURL( sURL, sTarget ); pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() ); - return TRUE; // kein CaptureMouse etc. + return sal_True; // kein CaptureMouse etc. } // Is another object being edited in this view? // (Editing is ended in MarkListHasChanged - test before UnmarkAll) SfxInPlaceClient* pClient = pViewShell->GetIPClient(); - BOOL bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() ); + sal_Bool bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() ); // Markieren @@ -287,7 +290,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pView->UnlockInternalLayer(); // try to select the clicked object - if ( pView->MarkObj( aMDPos, -2, FALSE, rMEvt.IsMod1() ) ) + if ( pView->MarkObj( aMDPos, -2, false, rMEvt.IsMod1() ) ) { //********************************************************* //Objekt verschieben @@ -303,11 +306,11 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) pHdl=pView->PickHandle(aMDPos); pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl); - bReturn = TRUE; + bReturn = sal_True; } else // Objekt am Rand getroffen if (pViewShell->IsDrawSelMode()) - bReturn = TRUE; + bReturn = sal_True; } else { @@ -319,7 +322,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) //Objekt selektieren //******************************************************** pView->BegMarkObj(aMDPos); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -343,9 +346,9 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FuDraw::MouseMove(rMEvt); + sal_Bool bReturn = FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive() ) { @@ -363,14 +366,14 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) ForceScroll(aPix); pView->MovAction(aPnt); - bReturn = TRUE; + bReturn = sal_True; } // Ein VCControl ist aktiv // Event an den Manager weiterleiten if( bVCAction ) { - bReturn = TRUE; + bReturn = true; } ForcePointer(&rMEvt); @@ -384,13 +387,13 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FuDraw::MouseButtonUp(rMEvt); - BOOL bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); + sal_Bool bReturn = FuDraw::MouseButtonUp(rMEvt); + sal_Bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); if (aDragTimer.IsActive() ) { @@ -399,6 +402,14 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); + bool bCopy = false; + ScViewData* pViewData = ( pViewShell ? pViewShell->GetViewData() : NULL ); + ScDocument* pDocument = ( pViewData ? pViewData->GetDocument() : NULL ); + SdrPageView* pPageView = ( pView ? pView->GetSdrPageView() : NULL ); + SdrPage* pPage = ( pPageView ? pPageView->GetPage() : NULL ); + ::std::vector< ::rtl::OUString > aExcludedChartNames; + ScRangeListVector aProtectedChartRangesVector; + if ( rMEvt.IsLeft() ) { if ( pView->IsDragObj() ) @@ -406,6 +417,29 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) /****************************************************************** * Objekt wurde verschoben ******************************************************************/ + if ( rMEvt.IsMod1() ) + { + if ( pPage ) + { + ScChartHelper::GetChartNames( aExcludedChartNames, pPage ); + } + if ( pView && pDocument ) + { + const SdrMarkList& rSdrMarkList = pView->GetMarkedObjectList(); + sal_uLong nMarkCount = rSdrMarkList.GetMarkCount(); + for ( sal_uLong i = 0; i < nMarkCount; ++i ) + { + SdrMark* pMark = rSdrMarkList.GetMark( i ); + SdrObject* pObj = ( pMark ? pMark->GetMarkedSdrObj() : NULL ); + if ( pObj ) + { + ScChartHelper::AddRangesIfProtectedChart( aProtectedChartRangesVector, pDocument, pObj ); + } + } + } + bCopy = true; + } + pView->EndDragObj( rMEvt.IsMod1() ); pView->ForceMarkedToAnotherPage(); @@ -418,7 +452,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) FuText* pText = static_cast<FuText*>(pPoor); pText->StopDragMode(pObj ); } - bReturn = TRUE; + bReturn = sal_True; } else if (pView->IsAction() ) { @@ -427,16 +461,16 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pView->EndAction(); if ( pView->AreObjectsMarked() ) { - bReturn = TRUE; + bReturn = sal_True; /* if multi-selection contains a note caption object, remove all other objects from selection. */ const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); + sal_uLong nCount = rMarkList.GetMarkCount(); if( nCount > 1 ) { bool bFound = false; - for( ULONG nIdx = 0; !bFound && (nIdx < nCount); ++nIdx ) + for( sal_uLong nIdx = 0; !bFound && (nIdx < nCount); ++nIdx ) { SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj(); bFound = ScDrawLayer::IsNoteCaption( pObj ); @@ -465,7 +499,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pIPClient->DeactivateObject(); } - USHORT nClicks = rMEvt.GetClicks(); + sal_uInt16 nClicks = rMEvt.GetClicks(); if ( nClicks == 2 && rMEvt.IsLeft() ) { if ( pView->AreObjectsMarked() ) @@ -483,7 +517,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) SdrHitKind eHit = pView->PickAnything( rMEvt, SDRMOUSEBUTTONDOWN, aVEvt ); if ( eHit != SDRHIT_NONE && aVEvt.pObj == pObj ) { - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); // // OLE: aktivieren @@ -508,8 +542,8 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) else if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) && !pObj->ISA(SdrMediaObj) ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - BOOL bVertical = ( pOPO && pOPO->IsVertical() ); - USHORT nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; + sal_Bool bVertical = ( pOPO && pOPO->IsVertical() ); + sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT; pViewShell->GetViewData()->GetDispatcher(). Execute(nTextSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD); @@ -522,21 +556,21 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) Point aMousePixel = rMEvt.GetPosPixel(); pText->SetInEditMode( pObj, &aMousePixel ); } - bReturn = TRUE; + bReturn = sal_True; } } } } else if ( TestDetective( pView->GetSdrPageView(), aPnt ) ) - bReturn = TRUE; + bReturn = sal_True; } // Ein VCControl ist aktiv // Event an den Manager weiterleiten if( bVCAction ) { - bVCAction = FALSE; - bReturn = TRUE; + bVCAction = false; + bReturn = true; } ForcePointer(&rMEvt); @@ -550,6 +584,18 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pViewShell->GetViewData()->GetDispatcher(). Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); + if ( bCopy && pViewData && pDocument && pPage ) + { + ScDocShell* pDocShell = pViewData->GetDocShell(); + ScModelObj* pModelObj = ( pDocShell ? ScModelObj::getImplementation( pDocShell->GetModel() ) : NULL ); + if ( pModelObj ) + { + SCTAB nTab = pViewData->GetTabNo(); + ScChartHelper::CreateProtectedChartListenersAndNotify( pDocument, pPage, pModelObj, nTab, + aProtectedChartRangesVector, aExcludedChartNames ); + } + } + return (bReturn); } @@ -557,14 +603,14 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuSelection::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if (!bReturn) { diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 8e884ee45a61..4978b3c7c709 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -64,19 +64,19 @@ inline long Diff( const Point& rP1, const Point& rP2 ) return nX+nY; } -BOOL FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos ) +sal_Bool FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos ) { if (!pPV) - return FALSE; + return false; - BOOL bFound = FALSE; + sal_Bool bFound = false; SdrObjListIter aIter( *pPV->GetObjList(), IM_FLAT ); SdrObject* pObject = aIter.Next(); while (pObject && !bFound) { if (ScDetectiveFunc::IsNonAlienArrow( pObject )) { - USHORT nHitLog = (USHORT) pWindow->PixelToLogic( + sal_uInt16 nHitLog = (sal_uInt16) pWindow->PixelToLogic( Size(pView->GetHitTolerancePixel(),0)).Width(); if (SdrObjectPrimitiveHit(*pObject, rPos, nHitLog, *pPV, 0, false)) { @@ -94,11 +94,11 @@ BOOL FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos ) pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), ePos, nEndCol, nEndRow ); SCsCOL nCurX = (SCsCOL) pViewData->GetCurX(); SCsROW nCurY = (SCsROW) pViewData->GetCurY(); - BOOL bStart = ( Diff( rPos,aLineStart ) > Diff( rPos,aLineEnd ) ); + sal_Bool bStart = ( Diff( rPos,aLineStart ) > Diff( rPos,aLineEnd ) ); if ( nCurX == nStartCol && nCurY == nStartRow ) - bStart = FALSE; + bStart = false; else if ( nCurX == nEndCol && nCurY == nEndRow ) - bStart = TRUE; + bStart = sal_True; SCsCOL nDifX; SCsROW nDifY; @@ -112,9 +112,9 @@ BOOL FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos ) nDifX = nEndCol - nCurX; nDifY = nEndRow - nCurY; } - pViewShell->MoveCursorRel( nDifX, nDifY, SC_FOLLOW_JUMP, FALSE ); + pViewShell->MoveCursorRel( nDifX, nDifY, SC_FOLLOW_JUMP, false ); - bFound = TRUE; + bFound = sal_True; } } @@ -149,7 +149,7 @@ bool FuSelection::IsNoteCaptionClicked( const Point& rPos ) const bool bProtectDoc = rDoc.IsTabProtected( nTab ) || (pDocSh && pDocSh->IsReadOnly()); // search the last object (on top) in the object list - SdrObjListIter aIter( *pPageView->GetObjList(), IM_DEEPNOGROUPS, TRUE ); + SdrObjListIter aIter( *pPageView->GetObjList(), IM_DEEPNOGROUPS, sal_True ); for( SdrObject* pObj = aIter.Next(); pObj; pObj = aIter.Next() ) { if( pObj->GetLogicRect().IsInside( rPos ) ) diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 5d5f9befd329..7e926e0b1ae4 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -132,13 +132,13 @@ FuText::~FuText() |* \************************************************************************/ -BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); if ( pView->MouseButtonDown(rMEvt, pWindow) ) - return (TRUE); // Event von der SdrView ausgewertet + return (sal_True); // Event von der SdrView ausgewertet if ( pView->IsTextEdit() ) { @@ -153,13 +153,13 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) { SdrHdl* pHdl = pView->PickHandle(aMDPos); - ULONG nHdlNum = pView->GetHdlNum(pHdl); + sal_uLong nHdlNum = pView->GetHdlNum(pHdl); if (pHdl != NULL) { if (pView->HasMarkablePoints() && pView->IsPointMarkable(*pHdl)) { - BOOL bPointMarked=pView->IsPointMarked(*pHdl); + sal_Bool bPointMarked=pView->IsPointMarked(*pHdl); if ( rMEvt.IsShift() ) { @@ -199,8 +199,8 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) // vertical flag: // deduced from slot ids only if text object has no content - USHORT nSlotID = aSfxRequest.GetSlot(); - BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); + sal_uInt16 nSlotID = aSfxRequest.GetSlot(); + sal_Bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if ( pOPO ) bVertical = pOPO->IsVertical(); // content wins @@ -214,7 +214,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) OutlinerView* pOLV = pView->GetTextEditOutlinerView(); if ( pOLV->MouseButtonDown(rMEvt) ) - return (TRUE); // Event an den Outliner + return (sal_True); // Event an den Outliner } } else @@ -245,7 +245,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) } else { - BOOL bMacro = FALSE; + sal_Bool bMacro = false; // if (bMacro && pView->TakeMacroObject(aMDPos,pObj,pPV)) if (bMacro && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) ) @@ -257,7 +257,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) { if (pView->IsEditMode()) { - BOOL bPointMode=pView->HasMarkablePoints(); + sal_Bool bPointMode=pView->HasMarkablePoints(); if (!rMEvt.IsShift()) { @@ -277,7 +277,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) pHdl=pView->GetHdl(nHdlNum); } - if ( pView->MarkObj(aMDPos, -2, FALSE, rMEvt.IsMod1()) ) + if ( pView->MarkObj(aMDPos, -2, false, rMEvt.IsMod1()) ) { aDragTimer.Start(); @@ -334,7 +334,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow )); // return (bReturn); - return TRUE; + return sal_True; } /************************************************************************* @@ -343,9 +343,9 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuText::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuText::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; // pViewShell->SetActivePointer(aNewPointer); @@ -362,7 +362,7 @@ BOOL FuText::MouseMove(const MouseEvent& rMEvt) } if ( pView->MouseMove(rMEvt, pWindow) ) - return (TRUE); // Event von der SdrView ausgewertet + return (sal_True); // Event von der SdrView ausgewertet if ( pView->IsAction() ) { @@ -382,12 +382,12 @@ BOOL FuText::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if (aDragTimer.IsActive() ) { @@ -399,7 +399,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); if ( pView->MouseButtonUp(rMEvt, pWindow) ) - return (TRUE); // Event von der SdrView ausgewertet + return (sal_True); // Event von der SdrView ausgewertet if ( pView->IsDragObj() ) { @@ -433,20 +433,20 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) SfxItemSet aItemSet( pDrDoc->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST); - aItemSet.Put( SdrTextAutoGrowWidthItem( FALSE ) ); - aItemSet.Put( SdrTextAutoGrowHeightItem( FALSE ) ); + aItemSet.Put( SdrTextAutoGrowWidthItem( false ) ); + aItemSet.Put( SdrTextAutoGrowHeightItem( false ) ); aItemSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) ); aItemSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) ); aItemSet.Put( SdrTextAniCountItem( 1 ) ); aItemSet.Put( SdrTextAniAmountItem( - (INT16)pWindow->PixelToLogic(Size(2,1)).Width()) ); + (sal_Int16)pWindow->PixelToLogic(Size(2,1)).Width()) ); pObj->SetMergedItemSetAndBroadcast(aItemSet); } } // init object different when vertical writing sal_uInt16 nSlotID(aSfxRequest.GetSlot()); - BOOL bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotID); + sal_Bool bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotID); if(bVertical) { const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); @@ -458,10 +458,10 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) SdrTextObj* pText = (SdrTextObj*)pObj; SfxItemSet aSet(pDrDoc->GetItemPool()); - pText->SetVerticalWriting(TRUE); + pText->SetVerticalWriting(sal_True); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(false)); aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); @@ -477,7 +477,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) if ( !pView->AreObjectsMarked() ) { - pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1()); + pView->MarkObj(aPnt, -2, false, rMEvt.IsMod1()); SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher(); if ( pView->AreObjectsMarked() ) @@ -497,7 +497,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) if ( !pView->AreObjectsMarked() && rMEvt.GetClicks() < 2 ) { - pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1()); + pView->MarkObj(aPnt, -2, false, rMEvt.IsMod1()); SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher(); if ( pView->AreObjectsMarked() ) @@ -527,18 +527,18 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls |* FALSE. |* \************************************************************************/ -BOOL FuText::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = false; if ( pView->KeyInput(rKEvt, pWindow) ) { - bReturn = TRUE; + bReturn = sal_True; lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() ); } else @@ -572,7 +572,7 @@ void FuText::Activate() /********************************************************************** * Kein Textobjekt im EditMode, daher CreateMode setzen **********************************************************************/ - USHORT nObj = OBJ_TEXT; + sal_uInt16 nObj = OBJ_TEXT; pView->SetCurrentObj(nObj); @@ -626,7 +626,7 @@ void FuText::SelectionHasChanged() SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nSdrObjKind == OBJ_TEXT || nSdrObjKind == OBJ_TITLETEXT || @@ -643,9 +643,9 @@ void FuText::SelectionHasChanged() /********************************************************************** * Kein Textobjekt im EditMode, daher CreateMode setzen **********************************************************************/ - USHORT nObj = OBJ_TEXT; - UINT16 nIdent; - UINT32 nInvent; + sal_uInt16 nObj = OBJ_TEXT; + sal_uInt16 nIdent; + sal_uInt32 nInvent; pView->TakeCurrentObj(nIdent, nInvent); pView->SetCurrentObj(nObj); @@ -661,7 +661,7 @@ void FuText::SelectionHasChanged() \************************************************************************/ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, - BOOL bCursorToEnd, const KeyEvent* pInitialKey) + sal_Bool bCursorToEnd, const KeyEvent* pInitialKey) { /* It is possible to pass a special (unselected) object in pObj, e.g. the caption object of a cell note. If pObj is 0, then the selected object @@ -683,7 +683,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, if ( pObj ) { - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nSdrObjKind == OBJ_TEXT || nSdrObjKind == OBJ_TITLETEXT || @@ -700,8 +700,8 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, // vertical flag: // deduced from slot ids only if text object has no content - USHORT nSlotID = aSfxRequest.GetSlot(); - BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); + sal_uInt16 nSlotID = aSfxRequest.GetSlot(); + sal_Bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL ); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if ( pOPO ) bVertical = pOPO->IsVertical(); // content wins @@ -777,8 +777,8 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR { SfxItemSet aSet(pDrDoc->GetItemPool()); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(false)); aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); @@ -789,12 +789,12 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR { SfxItemSet aSet(pDrDoc->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST); - aSet.Put( SdrTextAutoGrowWidthItem( FALSE ) ); - aSet.Put( SdrTextAutoGrowHeightItem( FALSE ) ); + aSet.Put( SdrTextAutoGrowWidthItem( false ) ); + aSet.Put( SdrTextAutoGrowHeightItem( false ) ); aSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) ); aSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) ); aSet.Put( SdrTextAniCountItem( 1 ) ); - aSet.Put( SdrTextAniAmountItem( (INT16)pWindow->PixelToLogic(Size(2,1)).Width()) ); + aSet.Put( SdrTextAniAmountItem( (sal_Int16)pWindow->PixelToLogic(Size(2,1)).Width()) ); pObj->SetMergedItemSetAndBroadcast(aSet); } diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index c1a4e2ce6f22..e43c1ce44344 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -60,10 +60,6 @@ #define _COLDLG_HXX #define _SOUND_HXX -#if defined WIN -#define _MENUBTN_HXX -#endif - //svtools #define _SCRWIN_HXX #define _RULER_HXX diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 09a4240c0678..096a7b602744 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -59,10 +59,10 @@ // Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden, // damit die Aenderungen ins Dokument uebernommen werden! // (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte) -// bTextDirection=TRUE means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx). +// bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx). // ------------------------------------------------------------------------------------ -void FuText::StopEditMode(BOOL /*bTextDirection*/) +void FuText::StopEditMode(sal_Bool /*bTextDirection*/) { SdrObject* pObject = pView->GetTextEditObject(); if( !pObject ) return; @@ -86,7 +86,7 @@ void FuText::StopEditMode(BOOL /*bTextDirection*/) } ScDocShell* pDocShell = rViewData.GetDocShell(); - SfxUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : 0; + ::svl::IUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : 0; bool bNewNote = false; if( pNote && pUndoMgr ) { @@ -188,7 +188,7 @@ void FuText::StopEditMode(BOOL /*bTextDirection*/) // invalidate stream positions only for the affected sheet rDoc.LockStreamValid(false); if (rDoc.IsStreamValid(aNotePos.Tab())) - rDoc.SetStreamValid(aNotePos.Tab(), FALSE); + rDoc.SetStreamValid(aNotePos.Tab(), false); } } diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 101ce8578f05..4d950a69c783 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -96,14 +96,14 @@ void ScGraphicShell::GetFilterState( SfxItemSet& rSet ) { ScDrawView* pView = GetViewData()->GetScDrawView(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - BOOL bEnable = FALSE; + sal_Bool bEnable = false; if( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( pObj && pObj->ISA( SdrGrafObj ) && ( ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) ) - bEnable = TRUE; + bEnable = sal_True; } if( !bEnable ) diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 542573e39fa9..6fcdedf3b7fd 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -75,7 +75,7 @@ void ScMediaShell::GetMediaState( SfxItemSet& rSet ) if( pView ) { SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while( nWhich ) { @@ -118,7 +118,7 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) + if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, false, &pItem ) ) ) pItem = NULL; if( pItem ) diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index c7749d7adf27..586aaf822e92 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -35,7 +35,7 @@ MenuItem\ {\ Identifier = SID_TEXT_STANDARD ; \ - HelpID = SID_TEXT_STANDARD ; \ + HelpID = CMD_SID_TEXT_STANDARD ; \ Text [ en-US ] = "~Default" ; \ Text [ x-comment ] = " ";\ }; @@ -46,7 +46,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_STYLE ; \ - HelpID = RID_MN_FORMAT_STYLE ; \ + HelpID = HID_MN_FORMAT_STYLE ; \ Text [ en-US ] = "~Style" ; \ SubMenu = Menu\ {\ @@ -87,14 +87,14 @@ MenuItem\ {\ Identifier = SID_SET_SUPER_SCRIPT ; \ - HelpID = SID_SET_SUPER_SCRIPT ; \ + HelpID = CMD_SID_SET_SUPER_SCRIPT ; \ Text [ en-US ] = "~Superscript" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_SET_SUB_SCRIPT ; \ - HelpID = SID_SET_SUB_SCRIPT ; \ + HelpID = CMD_SID_SET_SUB_SCRIPT ; \ Text [ en-US ] = "S~ubscript" ; \ Text [ x-comment ] = " ";\ };\ @@ -105,7 +105,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_ALGN ; \ - HelpID = RID_MN_FORMAT_ALGN ; \ + HelpID = HID_MN_FORMAT_ALGN ; \ Text [ en-US ] = "~Alignment" ; \ RadioCheck = TRUE ; \ SubMenu = Menu\ @@ -115,7 +115,7 @@ MenuItem\ {\ Identifier = SID_ALIGNLEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Left" ;\ Text [ x-comment ] = " "; \ @@ -123,21 +123,21 @@ MenuItem\ {\ Identifier = SID_ALIGNRIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Right" ;\ };\ MenuItem\ {\ Identifier = SID_ALIGNCENTERHOR ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Centered" ;\ };\ MenuItem\ {\ Identifier = SID_ALIGNBLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Justified" ; \ Text [ x-comment ] = " ";\ @@ -149,7 +149,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_LINESPACE ; \ - HelpID = RID_MN_FORMAT_LINESPACE ; \ + HelpID = HID_MN_FORMAT_LINESPACE ; \ Text [ en-US ] = "~Line Spacing" ; \ _MenuItemFlags = MIB_RADIOCHECK ; \ SubMenu = Menu\ @@ -190,7 +190,7 @@ MenuItem\ {\ Identifier = SID_DRAW_HLINK_EDIT ; \ - HelpID = SID_DRAW_HLINK_EDIT ; \ + HelpID = CMD_SID_DRAW_HLINK_EDIT ; \ Text [ en-US ] = "~Hyperlink..." ; \ }; @@ -198,7 +198,7 @@ MenuItem\ {\ Identifier = SID_DRAW_HLINK_DELETE ; \ - HelpID = SID_DRAW_HLINK_DELETE ; \ + HelpID = CMD_SID_DRAW_HLINK_DELETE ; \ Text [ en-US ] = "~Remove Hyperlink" ; \ }; @@ -206,7 +206,7 @@ MenuItem\ {\ Identifier = SID_DRAWTEXT_ATTR_DLG ; \ - HelpID = SID_DRAWTEXT_ATTR_DLG ; \ + HelpID = CMD_SID_DRAWTEXT_ATTR_DLG ; \ Text [ en-US ] = "Te~xt..." ; \ Text [ x-comment ] = " ";\ }; @@ -215,7 +215,7 @@ MenuItem\ {\ Identifier = SID_ASSIGNMACRO ; \ - HelpID = SID_ASSIGNMACRO ; \ + HelpID = CMD_SID_ASSIGNMACRO ; \ Text [ en-US ] = "Assig~n Macro..." ; \ Text [ x-comment ] = " ";\ }; @@ -233,7 +233,7 @@ MenuItem\ {\ Identifier = SID_RENAME_OBJECT ; \ - HelpId = SID_RENAME_OBJECT ; \ + HelpId = CMD_SID_RENAME_OBJECT ; \ Text [ en-US ] = "Name...";\ }; @@ -242,7 +242,7 @@ MenuItem\ {\ Identifier = SID_TITLE_DESCRIPTION_OBJECT; \ - HelpId = SID_TITLE_DESCRIPTION_OBJECT; \ + HelpId = CMD_SID_TITLE_DESCRIPTION_OBJECT; \ Text [ en-US ] = "Description...";\ }; @@ -259,14 +259,14 @@ MenuItem\ {\ Identifier = SID_MIRROR_VERTICAL ; \ - HelpId = SID_MIRROR_VERTICAL ; \ + HelpId = CMD_SID_MIRROR_VERTICAL ; \ Text [ en-US ] = "~Vertically" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_MIRROR_HORIZONTAL ; \ - HelpId = SID_MIRROR_HORIZONTAL ; \ + HelpId = CMD_SID_MIRROR_HORIZONTAL ; \ Text [ en-US ] = "~Horizontal" ; \ Text [ x-comment ] = " ";\ };\ @@ -335,7 +335,7 @@ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ Text [ x-comment ] = " ";\ };\ @@ -343,7 +343,7 @@ {\ RadioCheck = TRUE ; \ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ Text [ x-comment ] = " ";\ };\ @@ -356,7 +356,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ - HelpId = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ; \ SubMenu = Menu\ {\ @@ -406,150 +406,6 @@ String RID_DRAW_OBJECTBAR Text [ en-US ] = "Drawing Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_DRAW_OBJECTBAR -{ - HelpId = HID_SC_TOOLBOX_DRAW ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_BEZIER_EDIT ; - HelpID = SID_BEZIER_EDIT ; - - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - // Linien - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE ; - HelpId = SID_ATTRIBUTES_LINE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINEEND_STYLE ; - HelpID = SID_ATTR_LINEEND_STYLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_LINE_STYLE ; - HelpId = SID_ATTR_LINE_STYLE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINE_WIDTH ; - HelpId = SID_ATTR_LINE_WIDTH ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINE_COLOR ; - HelpId = SID_ATTR_LINE_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA ; - HelpId = SID_ATTRIBUTES_AREA ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_FILL_STYLE ; - HelpId = SID_ATTR_FILL_STYLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - // Rest - ToolBoxItem - { - Identifier = SID_OBJECT_ROTATE ; - HelpId = SID_OBJECT_ROTATE ; - }; - ToolBoxItem - { - Identifier = SID_ANCHOR_TOGGLE ; - HelpId = SID_ANCHOR_TOGGLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_FRAME_TO_TOP ; - HelpId = SID_FRAME_TO_TOP ; - }; - ToolBoxItem - { - Identifier = SID_FRAME_TO_BOTTOM ; - HelpId = SID_FRAME_TO_BOTTOM ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HEAVEN ; - HelpID = SID_OBJECT_HEAVEN ; - - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HELL ; - HelpID = SID_OBJECT_HELL ; - - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - - ToolBoxItem - { - Identifier = SID_GRID_VISIBLE; - HelpID = SID_GRID_VISIBLE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_GRID_USE; - HelpID = SID_GRID_USE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_HELPLINES_MOVE; - HelpID = SID_HELPLINES_MOVE; - Hide = TRUE; - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN ; - HelpId = SID_OBJECT_ALIGN ; - }; - }; - Scroll = TRUE ; -}; // // Text-Toolbox // @@ -558,504 +414,6 @@ String RID_TEXT_TOOLBOX Text [ en-US ] = "Text Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_TEXT_TOOLBOX -{ - HelpId = HID_SC_TOOLBOX_DRTEXT ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; - ItemList[ ar ] = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; - ItemList[ he ] = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; -}; // // Graphics toolbox // @@ -1063,182 +421,6 @@ String RID_GRAPHIC_OBJECTBAR { Text [ en-US ] = "Graphics Object Bar"; }; -ToolBox RID_GRAPHIC_OBJECTBAR -{ - HelpId = HID_SC_TOOLBOX_GRAPHIC ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GRFFILTER; - HelpID = SID_GRFFILTER; - DropDown = TRUE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_MODE; - HelpID = SID_ATTR_GRAF_MODE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_RED; - HelpID = SID_ATTR_GRAF_RED; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GREEN; - HelpID = SID_ATTR_GRAF_GREEN; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_BLUE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_LUMINANCE; - HelpID = SID_ATTR_GRAF_LUMINANCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CONTRAST; - HelpID = SID_ATTR_GRAF_CONTRAST; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GAMMA; - HelpID = SID_ATTR_GRAF_GAMMA; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_TRANSPARENCE; - HelpID = SID_ATTR_GRAF_TRANSPARENCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - // #i25616# - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE; - HelpID = SID_ATTRIBUTES_LINE; - }; - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA; - HelpID = SID_ATTRIBUTES_AREA; - }; - ToolBoxItem - { - Identifier = SID_ATTR_FILL_SHADOW; - HelpID = SID_ATTR_FILL_SHADOW; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CROP; - HelpID = SID_ATTR_GRAF_CROP; - }; - - // copied from the "normal" drawing toolbar: - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ANCHOR_TOGGLE ; - HelpId = SID_ANCHOR_TOGGLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_FRAME_TO_TOP ; - HelpId = SID_FRAME_TO_TOP ; - }; - ToolBoxItem - { - Identifier = SID_FRAME_TO_BOTTOM ; - HelpId = SID_FRAME_TO_BOTTOM ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HEAVEN ; - HelpID = SID_OBJECT_HEAVEN ; - - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HELL ; - HelpID = SID_OBJECT_HELL ; - - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - - ToolBoxItem - { - Identifier = SID_GRID_VISIBLE; - HelpID = SID_GRID_VISIBLE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_GRID_USE; - HelpID = SID_GRID_USE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_HELPLINES_MOVE; - HelpID = SID_HELPLINES_MOVE; - Hide = TRUE; - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN ; - HelpId = SID_OBJECT_ALIGN ; - }; - }; -}; // // Popup-Menues --------------------------------------------------------------------- // @@ -1404,36 +586,6 @@ Menu RID_POPUP_MEDIA }; }; -ToolBox RID_MEDIA_OBJECTBAR -{ - //HelpId = HID_SC_TOOLBOX_MEDIA ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_AVMEDIA_TOOLBOX; - HelpID = SID_AVMEDIA_TOOLBOX; - DropDown = FALSE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - }; -}; - // // Ole-Objekt // |