diff options
Diffstat (limited to 'sw/source/ui/dialog/macassgn.cxx')
-rw-r--r-- | sw/source/ui/dialog/macassgn.cxx | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 2d2b7c357720..4ae83ef60d77 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -61,16 +61,14 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::frame::XFrame; -// SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage*, const String& ); - SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) { // const SfxItemSet& rSet = rPg.GetItemSet(); SfxEventNamesItem aItem(SID_EVENTCONFIG); - BOOL bHtmlMode = FALSE; - USHORT nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); - bHtmlMode = nHtmlMode & HTMLMODE_ON ? TRUE : FALSE; + sal_Bool bHtmlMode = sal_False; + sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); + bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; switch( eType ) { @@ -133,10 +131,10 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) } -BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, +sal_Bool SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 ); SvxMacroItem aItem( RES_FRMMACRO ); if( !rpINetItem ) @@ -155,42 +153,11 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, { const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pOutSet->GetItemState( RES_FRMMACRO, FALSE, &pItem )) + if( SFX_ITEM_SET == pOutSet->GetItemState( RES_FRMMACRO, sal_False, &pItem )) { rpINetItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() ); - bRet = TRUE; + bRet = sal_True; } } return bRet; } - -/* -SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage* , const String& rLanguage ) -{ - SvStringsDtor* pNew = new SvStringsDtor; - - SfxApplication* pSfxApp = SFX_APP(); - if ( !rLanguage.EqualsAscii(SVX_MACRO_LANGUAGE_JAVASCRIPT) ) - { - pSfxApp->EnterBasicCall(); - - String* pNewEntry = new String( pSfxApp->GetName() ); - pNew->Insert( pNewEntry, pNew->Count() ); - - TypeId aType( TYPE( SwDocShell )); - SfxObjectShell* pDoc = SfxObjectShell::GetFirst( &aType ); - while( pDoc ) - { - pNewEntry = new String( pDoc->GetTitle() ); - pNew->Insert( pNewEntry, pNew->Count() ); - pDoc = SfxObjectShell::GetNext( *pDoc, &aType ); - } - pSfxApp->LeaveBasicCall(); - } - - return pNew; -} -*/ - - - |