diff options
Diffstat (limited to 'sw/source/ui/app/docsh2.cxx')
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 305 |
1 files changed, 167 insertions, 138 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 5501b0227f..49bdd982ff 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -84,6 +84,7 @@ #include <redlndlg.hxx> #include <docstyle.hxx> #include <doc.hxx> +#include <IDocumentUndoRedo.hxx> #include <pagedesc.hxx> #include <shellio.hxx> #include <pview.hxx> @@ -129,7 +130,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using ::rtl::OUString; using namespace ::sfx2; -extern BOOL FindPhyStyle( SwDoc& , const String& , SfxStyleFamily ); +extern sal_Bool FindPhyStyle( SwDoc& , const String& , SfxStyleFamily ); /*-------------------------------------------------------------------- Description: create DocInfo (virtual) @@ -165,7 +166,7 @@ void SwDocShell::DoFlushDocInfo() bool bUnlockView(true); if ( pWrtShell ) { bUnlockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); // lock visible section + pWrtShell->LockView( sal_True ); // lock visible section pWrtShell->StartAllAction(); } @@ -174,7 +175,7 @@ void SwDocShell::DoFlushDocInfo() if ( pWrtShell ) { pWrtShell->EndAllAction(); if ( bUnlockView ) { - pWrtShell->LockView( FALSE ); + pWrtShell->LockView( sal_False ); } } } @@ -185,7 +186,7 @@ void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventP if ( rHint.ISA( SfxEventHint ) ) { uno::Sequence< uno::Any > aArgs; - ULONG nEventId = ((SfxEventHint&)rHint).GetEventId(); + sal_uLong nEventId = ((SfxEventHint&)rHint).GetEventId(); switch( nEventId ) { case SFX_EVENT_CREATEDOC: @@ -213,7 +214,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( xVbaEvents.is() ) lcl_processCompatibleSfxHint( xVbaEvents, rHint ); - USHORT nAction = 0; + sal_uInt16 nAction = 0; if( rHint.ISA(SfxSimpleHint) ) { // switch for more actions @@ -234,11 +235,11 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( nAction ) { - BOOL bUnlockView = sal_True; //initializing prevents warning + sal_Bool bUnlockView = sal_True; //initializing prevents warning if( pWrtShell ) { bUnlockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); //lock visible section + pWrtShell->LockView( sal_True ); //lock visible section pWrtShell->StartAllAction(); } switch( nAction ) @@ -255,7 +256,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const bool bResetModified = IsEnableSetModified(); if ( bResetModified ) - EnableSetModified( FALSE ); + EnableSetModified( sal_False ); // #i41679# const bool bIsDocModified = pDoc->IsModified(); @@ -265,7 +266,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( !bIsDocModified ) pDoc->ResetModified(); if ( bResetModified ) - EnableSetModified( TRUE ); + EnableSetModified( sal_True ); } break; } @@ -274,7 +275,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { pWrtShell->EndAllAction(); if( bUnlockView ) - pWrtShell->LockView( FALSE ); + pWrtShell->LockView( sal_False ); } } } @@ -283,11 +284,11 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) Description: Notification Close Doc --------------------------------------------------------------------*/ -USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) +sal_uInt16 SwDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing ) { - USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing ); + sal_uInt16 nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing ); - if( TRUE == nRet ) //has to be queried against TRUE! (RET_NEWTASK) + if( sal_True == nRet ) //has to be queried against TRUE! (RET_NEWTASK) EndListening( *this ); if( pDoc && IsInPrepareClose() ) @@ -301,28 +302,27 @@ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) } } return nRet; -} +} /*-------------------------------------------------------------------- Description: Organizer --------------------------------------------------------------------*/ -BOOL SwDocShell::Insert( SfxObjectShell &rSource, - USHORT nSourceIdx1, // SourcePool: uppermost content level (templates/macros) - USHORT nSourceIdx2, // Index in the content - USHORT nSourceIdx3, // Index in the content level - USHORT &rIdx1, // and the same for the DestinationPool - USHORT &rIdx2, // "" - USHORT &rIdx3, // "" - USHORT &rRemovedIdx ) // if doubles are being deleted, Pos back +sal_Bool SwDocShell::Insert( SfxObjectShell &rSource, + sal_uInt16 nSourceIdx1, // SourcePool: uppermost content level (templates/macros) + sal_uInt16 nSourceIdx2, // Index in the content + sal_uInt16 nSourceIdx3, // Index in the content level + sal_uInt16 &rIdx1, // and the same for the DestinationPool + sal_uInt16 &rIdx2, // "" + sal_uInt16 &rIdx3, // "" + sal_uInt16 &rRemovedIdx ) // if doubles are being deleted, Pos back { // #i48949# - actions aren't undoable. Thus, allow no undo // actions // Note: The undo action stack is cleared at the end of this method. - bool bDoesUndo( GetDoc()->DoesUndo() ); - GetDoc()->DoUndo( sal_False ); + ::sw::UndoGuard const undoGuard(GetDoc()->GetIDocumentUndoRedo()); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if (INDEX_IGNORE == rIdx1 && CONTENT_STYLE == nSourceIdx1) rIdx1 = CONTENT_STYLE; @@ -335,7 +335,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, // we can't move back and forth within ourselves if( pHisPool == pMyPool ) - return FALSE; + return sal_False; if( INDEX_IGNORE == rIdx2 ) rIdx2 = pMyPool->Count(); @@ -355,10 +355,10 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, ( SFX_STYLE_FAMILY_CHAR == eOldFamily && rOldName == *SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ] )) - return FALSE; + return sal_False; SfxStyleFamily eMyOldFamily( pMyPool->GetSearchFamily() ); - USHORT nMySrchMask = pMyPool->GetSearchMask(); + sal_uInt16 nMySrchMask = pMyPool->GetSearchMask(); SfxStyleSheetBase* pExist; if( ::FindPhyStyle( *pDoc, rOldName, eOldFamily ) ) @@ -367,7 +367,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, if( ERRCODE_BUTTON_OK != ErrorHandler::HandleError( *new MessageInfo( ERRCODE_SFXMSG_STYLEREPLACE, rOldName )) ) { - return FALSE; + return sal_False; } // Because Replace needs the aStyleSheet-Member itself, the result @@ -381,7 +381,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, GetDoc()->SetModified(); - return TRUE; + return sal_True; } pMyPool->SetSearchMask( eOldFamily, nMySrchMask ); @@ -413,7 +413,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, // Used and User-defined templates are being showed. That's why // the Index of the template in the pool has to be found out. pExist = pMyPool->First(); - USHORT nIdx = 0; + sal_uInt16 nIdx = 0; while( pExist ) { if( pExist->GetName() == rOldName && @@ -435,7 +435,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, // who gets the new one as parent? who uses the new one as Follow? // (always using the instanciated!!!) pMyPool->SetSearchMask( eOldFamily, nMySrchMask ); - pMyPool->SetOrganizerMode( TRUE ); + pMyPool->SetOrganizerMode( sal_True ); SfxStyleSheetBase* pTestSheet = pMyPool->First(); while (pTestSheet) { @@ -496,7 +496,7 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, OSL_ENSURE(pDoc, "Doc missing"); GetDoc()->SetModified(); - bRet = TRUE; + bRet = sal_True; } else bRet = SfxObjectShell::Insert( rSource, @@ -510,11 +510,10 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, // #i48949# - actions aren't undoable and could have change // the document node array. Thus, clear the undo action stack. - if ( bDoesUndo ) + if (undoGuard.UndoWasEnabled()) { - GetDoc()->DelAllUndoObj(); + GetDoc()->GetIDocumentUndoRedo().DelAllUndoObj(); } - GetDoc()->DoUndo( bDoesUndo ); return bRet; } @@ -523,11 +522,11 @@ BOOL SwDocShell::Insert( SfxObjectShell &rSource, Description: template Remove --------------------------------------------------------------------*/ -BOOL SwDocShell::Remove(USHORT nIdx1, // see Insert - USHORT nIdx2, - USHORT nIdx3) +sal_Bool SwDocShell::Remove(sal_uInt16 nIdx1, // see Insert + sal_uInt16 nIdx2, + sal_uInt16 nIdx3) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if (CONTENT_STYLE == nIdx1) { @@ -546,13 +545,13 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // see Insert ( SFX_STYLE_FAMILY_CHAR == eFamily && aName == *SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD - RES_POOLCOLL_TEXT_BEGIN ] )) - return FALSE; + return sal_False; // so delete pMyPool->Remove( pMySheet ); // now correct the Parents/Follows of all instanciated - pMyPool->SetOrganizerMode( TRUE ); + pMyPool->SetOrganizerMode( sal_True ); SfxStyleSheetBase* pTestSheet = pMyPool->First(); while (pTestSheet) { @@ -574,7 +573,7 @@ BOOL SwDocShell::Remove(USHORT nIdx1, // see Insert } pMyPool->SetOrganizerMode( SFX_CREATE_MODE_ORGANIZER == GetCreateMode() ); - bRet = TRUE; + bRet = sal_True; } else bRet = SfxObjectShell::Remove( nIdx1, @@ -593,8 +592,8 @@ void SwDocShell::Execute(SfxRequest& rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - USHORT nWhich = rReq.GetSlot(); - BOOL bDone = FALSE; + sal_uInt16 nWhich = rReq.GetSlot(); + sal_Bool bDone = sal_False; switch ( nWhich ) { case SID_AUTO_CORRECT_DLG: @@ -613,7 +612,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxApplication* pApp = SFX_APP(); SfxRequest aAppReq(SID_AUTO_CORRECT_DLG, SFX_CALLMODE_SYNCHRON, pApp->GetPool()); - SfxBoolItem aSwOptions( SID_AUTO_CORRECT_DLG, TRUE ); + SfxBoolItem aSwOptions( SID_AUTO_CORRECT_DLG, sal_True ); aAppReq.AppendItem(aSwOptions); // SMARTTAGS @@ -623,7 +622,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aSet.Put( aSwOptions ); const SfxPoolItem* pOpenSmartTagOptionsItem = 0; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_OPEN_SMARTTAGOPTIONS, FALSE, &pOpenSmartTagOptionsItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_OPEN_SMARTTAGOPTIONS, sal_False, &pOpenSmartTagOptionsItem ) ) aSet.Put( *static_cast<const SfxBoolItem*>(pOpenSmartTagOptionsItem) ); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -643,7 +642,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pAFlags->pAutoCmpltList = 0; } // remove all pointer we never delete the strings - aTmpLst.Remove( (USHORT)0, aTmpLst.Count() ); + aTmpLst.Remove( (sal_uInt16)0, aTmpLst.Count() ); if( !bOldAutoCmpltCollectWords && bOldAutoCmpltCollectWords != pAFlags->bAutoCmpltCollectWords ) @@ -665,20 +664,20 @@ void SwDocShell::Execute(SfxRequest& rReq) case SID_PRINTPREVIEW: { - BOOL bSet = FALSE, bFound = FALSE, bOnly = TRUE; + sal_Bool bSet = sal_False, bFound = sal_False, bOnly = sal_True; SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this); SfxViewShell* pViewShell = SfxViewShell::Current(); SwView* pCurrView = dynamic_cast< SwView *> ( pViewShell ); - BOOL bCurrent = IS_TYPE( SwPagePreView, pViewShell ); + sal_Bool bCurrent = IS_TYPE( SwPagePreView, pViewShell ); while( pTmpFrm ) // search PreView { if( IS_TYPE( SwView, pTmpFrm->GetViewShell()) ) - bOnly = FALSE; + bOnly = sal_False; else if( IS_TYPE( SwPagePreView, pTmpFrm->GetViewShell())) { pTmpFrm->GetFrame().Appear(); - bFound = TRUE; + bFound = sal_True; } if( bFound && !bOnly ) break; @@ -686,12 +685,12 @@ void SwDocShell::Execute(SfxRequest& rReq) } if( pArgs && SFX_ITEM_SET == - pArgs->GetItemState( SID_PRINTPREVIEW, FALSE, &pItem )) + pArgs->GetItemState( SID_PRINTPREVIEW, sal_False, &pItem )) bSet = ((SfxBoolItem*)pItem)->GetValue(); else bSet = !bCurrent; - USHORT nSlotId = 0; + sal_uInt16 nSlotId = 0; if( bSet && !bFound ) // Nothing found, so create new Preview { // Don't create new one for BrowseView! @@ -722,14 +721,14 @@ void SwDocShell::Execute(SfxRequest& rReq) case SID_TEMPLATE_LOAD: { String aFileName; - static BOOL bText = TRUE; - static BOOL bFrame = FALSE; - static BOOL bPage = FALSE; - static BOOL bNum = FALSE; - static BOOL bMerge = FALSE; - USHORT nRet = USHRT_MAX; - - USHORT nFlags = bFrame ? SFX_LOAD_FRAME_STYLES : 0; + static sal_Bool bText = sal_True; + static sal_Bool bFrame = sal_False; + static sal_Bool bPage = sal_False; + static sal_Bool bNum = sal_False; + static sal_Bool bMerge = sal_False; + sal_uInt16 nRet = USHRT_MAX; + + sal_uInt16 nFlags = bFrame ? SFX_LOAD_FRAME_STYLES : 0; if(bPage) nFlags|= SFX_LOAD_PAGE_STYLES; if(bNum) @@ -741,13 +740,13 @@ void SwDocShell::Execute(SfxRequest& rReq) if ( pArgs ) { - SFX_REQUEST_ARG( rReq, pTemplateItem, SfxStringItem, SID_TEMPLATE_NAME, FALSE ); + SFX_REQUEST_ARG( rReq, pTemplateItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False ); if ( pTemplateItem ) { aFileName = pTemplateItem->GetValue(); - SFX_REQUEST_ARG( rReq, pFlagsItem, SfxInt32Item, SID_TEMPLATE_LOAD, FALSE ); + SFX_REQUEST_ARG( rReq, pFlagsItem, SfxInt32Item, SID_TEMPLATE_LOAD, sal_False ); if ( pFlagsItem ) - nFlags = (USHORT) pFlagsItem->GetValue(); + nFlags = (sal_uInt16) pFlagsItem->GetValue(); } } @@ -780,7 +779,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } pFlt = aIter.Next(); } - BOOL bWeb = 0 != dynamic_cast< SwWebDocShell *>( this ); + sal_Bool bWeb = 0 != dynamic_cast< SwWebDocShell *>( this ); const SfxFilter *pOwnFlt = SwDocShell::Factory().GetFilterContainer()-> GetFilter4FilterName(String::CreateFromAscii("writer8")); @@ -830,7 +829,7 @@ void SwDocShell::Execute(SfxRequest& rReq) bMerge = 0 != (nFlags&SFX_MERGE_STYLES); aOpt.SetMerge( !bMerge ); - SetError( LoadStylesFromFile( aFileName, aOpt, FALSE ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); + SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) )); if ( !GetError() ) rReq.Done(); } @@ -853,7 +852,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SwIoSystem::GetFilterOfFormat( String::CreateFromAscii("HTML"), SwWebDocShell::Factory().GetFilterContainer() ); - BOOL bLocalHasName = HasName(); + sal_Bool bLocalHasName = HasName(); if(bLocalHasName) { //check for filter type @@ -862,7 +861,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { QueryBox aQuery(&pViewFrm->GetWindow(), SW_RES(MSG_SAVEAS_HTML_QUERY)); if(RET_YES == aQuery.Execute()) - bLocalHasName = FALSE; + bLocalHasName = sal_False; else break; } @@ -888,13 +887,13 @@ void SwDocShell::Execute(SfxRequest& rReq) } #if OSL_DEBUG_LEVEL > 1 { - BOOL bWeb = 0 != dynamic_cast<SwWebDocShell*>(this); + sal_Bool bWeb = 0 != dynamic_cast<SwWebDocShell*>(this); OSL_ENSURE(bWeb == TRUE, "SourceView only in WebDocShell"); } #endif // the SourceView is not the 1 for SwWebDocShell - USHORT nSlot = SID_VIEWSHELL1; - BOOL bSetModified = FALSE; + sal_uInt16 nSlot = SID_VIEWSHELL1; + sal_Bool bSetModified = sal_False; SfxPrinter* pSavePrinter = 0; if( 0 != pSrcView) { @@ -907,13 +906,12 @@ void SwDocShell::Execute(SfxRequest& rReq) utl::TempFile aTempFile; aTempFile.EnableKillingFile(); pSrcView->SaveContent(aTempFile.GetURL()); - bDone = TRUE; - SfxEventConfiguration* pEvent = SFX_APP()->GetEventConfig(); + bDone = sal_True; SvxMacro aMac(aEmptyStr, aEmptyStr, STARBASIC); - pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC ), aMac, this); - pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC ), aMac, this); - pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ), aMac, this); - pEvent->ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_DEACTIVATEDOC ), aMac, this); + SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC ), aMac, this); + SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC ), aMac, this); + SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ), aMac, this); + SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_DEACTIVATEDOC ), aMac, this); ReloadFromHtml(aTempFile.GetURL(), pSrcView); nSlot = 0; } @@ -953,13 +951,13 @@ void SwDocShell::Execute(SfxRequest& rReq) OSL_ENSURE(pDlg, "Dialogdiet fail!"); if(RET_OK == pDlg->Execute()) { - BYTE nLevel = pDlg->GetLevel(); - BYTE nPara = pDlg->GetPara(); + sal_uInt8 nLevel = pDlg->GetLevel(); + sal_uInt8 nPara = pDlg->GetPara(); SwDoc* pSmryDoc = new SwDoc(); - SfxObjectShellRef xDocSh( new SwDocShell( pSmryDoc, SFX_CREATE_MODE_STANDARD)); + SfxObjectShellLock xDocSh( new SwDocShell( pSmryDoc, SFX_CREATE_MODE_STANDARD)); xDocSh->DoInitNew( 0 ); - BOOL bImpress = FN_ABSTRACT_STARIMPRESS == nWhich; + sal_Bool bImpress = FN_ABSTRACT_STARIMPRESS == nWhich; pDoc->Summary( pSmryDoc, nLevel, nPara, bImpress ); if( bImpress ) { @@ -987,12 +985,12 @@ void SwDocShell::Execute(SfxRequest& rReq) pStrm->Seek( STREAM_SEEK_TO_BEGIN ); // Transfer ownership of stream to a lockbytes object - SvLockBytes aLockBytes( pStrm, TRUE ); + SvLockBytes aLockBytes( pStrm, sal_True ); SvLockBytesStat aStat; if ( aLockBytes.Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE ) { sal_uInt32 nLen = aStat.nSize; - ULONG nRead = 0; + sal_uLong nRead = 0; uno::Sequence< sal_Int8 > aSeq( nLen ); aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); @@ -1058,12 +1056,12 @@ void SwDocShell::Execute(SfxRequest& rReq) pStrm->Seek( STREAM_SEEK_TO_BEGIN ); // Transfer ownership of stream to a lockbytes object - SvLockBytes aLockBytes( pStrm, TRUE ); + SvLockBytes aLockBytes( pStrm, sal_True ); SvLockBytesStat aStat; if ( aLockBytes.Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE ) { sal_uInt32 nLen = aStat.nSize; - ULONG nRead = 0; + sal_uLong nRead = 0; uno::Sequence< sal_Int8 > aSeq( nLen ); aLockBytes.ReadAt( 0, aSeq.getArray(), nLen, &nRead ); @@ -1094,17 +1092,17 @@ void SwDocShell::Execute(SfxRequest& rReq) } break; case SID_SPELLCHECKER_CHANGED: - //! FALSE, TRUE, TRUE is on the save side but a probably overdone - SW_MOD()->CheckSpellChanges(FALSE, TRUE, TRUE, FALSE ); + //! sal_False, sal_True, sal_True is on the save side but a probably overdone + SW_MOD()->CheckSpellChanges(sal_False, sal_True, sal_True, sal_False ); break; case SID_BROWSER_MODE: case FN_PRINT_LAYOUT: // for Web, inverse to BrowserMode { int eState = STATE_TOGGLE; - BOOL bSet = sal_True; + sal_Bool bSet = sal_True; const SfxPoolItem* pAttr=NULL; - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , FALSE, &pAttr )) + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , sal_False, &pAttr )) { bSet = ((SfxBoolItem*)pAttr)->GetValue(); if ( nWhich == FN_PRINT_LAYOUT ) @@ -1118,7 +1116,7 @@ void SwDocShell::Execute(SfxRequest& rReq) ToggleBrowserMode(bSet, 0); // OS: mind the numerical order! - static USHORT const aInva[] = + static sal_uInt16 const aInva[] = { SID_NEWWINDOW,/*5620*/ SID_BROWSER_MODE, /*6313*/ @@ -1152,7 +1150,19 @@ void SwDocShell::Execute(SfxRequest& rReq) } break; - case SID_MAIL_EXPORT_FINISHED: + case SID_MAIL_PREPAREEXPORT: + { + //pWrtShell is not set in page preview + if(pWrtShell) + pWrtShell->StartAllAction(); + pDoc->UpdateFlds( NULL, false ); + pDoc->EmbedAllLinks(); + pDoc->RemoveInvisibleContent(); + if(pWrtShell) + pWrtShell->EndAllAction(); + } + break; + case SID_MAIL_EXPORT_FINISHED: { if(pWrtShell) pWrtShell->StartAllAction(); @@ -1165,14 +1175,14 @@ void SwDocShell::Execute(SfxRequest& rReq) case FN_NEW_HTML_DOC: case FN_NEW_GLOBAL_DOC: { - bDone = FALSE; - BOOL bCreateHtml = FN_NEW_HTML_DOC == nWhich; + bDone = sal_False; + sal_Bool bCreateHtml = FN_NEW_HTML_DOC == nWhich; - BOOL bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei + sal_Bool bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei sal_Int32 nTemplateOutlineLevel = 0 ; //#outline level,add by zhaojianwei String aFileName, aTemplateName; - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, FALSE, &pItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, sal_False, &pItem ) ) { aFileName = ((const SfxStringItem*)pItem)->GetValue(); SFX_ITEMSET_ARG( pArgs, pTemplItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False ); @@ -1183,7 +1193,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if ( !aFileName.Len() ) { FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE, 0 ); - //set HelpIds + const sal_Int16 nControlIds[] = { CommonFilePickerElementIds::PUSHBUTTON_OK, CommonFilePickerElementIds::PUSHBUTTON_CANCEL, @@ -1194,20 +1204,37 @@ void SwDocShell::Execute(SfxRequest& rReq) ExtendedFilePickerElementIds::LISTBOX_TEMPLATE, 0 }; - sal_Int32 nHelpIds[8]; - sal_Int32 nStartHelpId = - bCreateHtml ? - HID_SEND_HTML_CTRL_PUSHBUTTON_OK : HID_SEND_MASTER_CTRL_PUSHBUTTON_OK ; - for(int nHelp = 0; nHelp < 7; nHelp++) - nHelpIds[nHelp] = nStartHelpId++; - nHelpIds[7] = 0; - aDlgHelper.SetControlHelpIds( nControlIds, nHelpIds ); + const char* aHTMLHelpIds[] = + { + HID_SEND_HTML_CTRL_PUSHBUTTON_OK, + HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL, + HID_SEND_HTML_CTRL_LISTBOX_FILTER, + HID_SEND_HTML_CTRL_CONTROL_FILEVIEW, + HID_SEND_HTML_CTRL_EDIT_FILEURL, + HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION, + HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE, + "" + }; + + const char* aMasterHelpIds[] = + { + HID_SEND_MASTER_CTRL_PUSHBUTTON_OK, + HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL, + HID_SEND_MASTER_CTRL_LISTBOX_FILTER, + HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW, + HID_SEND_MASTER_CTRL_EDIT_FILEURL, + HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION, + HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE, + "" + }; + const char** pHelpIds = bCreateHtml ? aHTMLHelpIds : aMasterHelpIds; + aDlgHelper.SetControlHelpIds( nControlIds, pHelpIds ); uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); const SfxFilter* pFlt; - USHORT nStrId; + sal_uInt16 nStrId; if( bCreateHtml ) { @@ -1248,7 +1275,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( rOutlNds.Count() ) { int nLevel; - for(USHORT n = 0; n < rOutlNds.Count(); ++n ) + for(sal_uInt16 n = 0; n < rOutlNds.Count(); ++n ) if( ( nLevel = rOutlNds[n]->GetTxtNode()->GetAttrOutlineLevel()) > 0 && ! bOutline[nLevel-1] ) { @@ -1256,20 +1283,20 @@ void SwDocShell::Execute(SfxRequest& rReq) } } - const USHORT nStyleCount = pDoc->GetTxtFmtColls()->Count(); + const sal_uInt16 nStyleCount = pDoc->GetTxtFmtColls()->Count(); Sequence<OUString> aListBoxEntries( MAXLEVEL + nStyleCount); OUString* pEntries = aListBoxEntries.getArray(); sal_Int32 nIdx = 0 ; OUString sOutline( SW_RESSTR(STR_FDLG_OUTLINE_LEVEL) ); - for( USHORT i = 0; i < MAXLEVEL; ++i ) + for( sal_uInt16 i = 0; i < MAXLEVEL; ++i ) { if( bOutline[i] ) pEntries[nIdx++] = sOutline + String::CreateFromInt32( i+1 ); } OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) ); - for(USHORT i = 0; i < nStyleCount; ++i) + for(sal_uInt16 i = 0; i < nStyleCount; ++i) { SwTxtFmtColl &rTxtColl = *pDoc->GetTxtFmtColls()->GetObject( i ); @@ -1335,9 +1362,9 @@ void SwDocShell::Execute(SfxRequest& rReq) if( aFileName.Len() ) { - if( PrepareClose( FALSE ) ) + if( PrepareClose( sal_False ) ) { - SwWait aWait( *this, TRUE ); + SwWait aWait( *this, sal_True ); if ( bCreateByOutlineLevel ) { @@ -1395,10 +1422,10 @@ void SwDocShell::Execute(SfxRequest& rReq) break; case SID_ATTR_YEAR2000: - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , FALSE, &pItem )) + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , sal_False, &pItem )) { OSL_ENSURE(pItem->ISA(SfxUInt16Item), "wrong Item"); - USHORT nYear2K = ((SfxUInt16Item*)pItem)->GetValue(); + sal_uInt16 nYear2K = ((SfxUInt16Item*)pItem)->GetValue(); // iterate over Views and put the State to FormShells SfxViewFrame* pVFrame = SfxViewFrame::GetFirst( this ); @@ -1413,7 +1440,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pViewShell = pVFrame ? pVFrame->GetViewShell() : 0; pCurrView = dynamic_cast<SwView*>( pViewShell ); } - pDoc->GetNumberFormatter(TRUE)->SetYear2000(nYear2K); + pDoc->GetNumberFormatter(sal_True)->SetYear2000(nYear2K); } break; @@ -1428,7 +1455,7 @@ void lcl_processCompatibleSfxHint( const uno::Reference< document::XVbaEventsHel if ( rHint.ISA( SfxEventHint ) ) { uno::Sequence< uno::Any > aArgs; - ULONG nEventId = ((SfxEventHint&)rHint).GetEventId(); + sal_uLong nEventId = ((SfxEventHint&)rHint).GetEventId(); switch( nEventId ) { case SFX_EVENT_CREATEDOC: @@ -1505,25 +1532,27 @@ void SwDocShell::FillClass( SvGlobalName * pClassName, *pUserName = SW_RESSTR(STR_HUMAN_SWDOC_NAME); } -void SwDocShell::SetModified( BOOL bSet ) +void SwDocShell::SetModified( sal_Bool bSet ) { SfxObjectShell::SetModified( bSet ); if( IsEnableSetModified()) { if (!pDoc->IsInCallModified() ) { - EnableSetModified( FALSE ); + EnableSetModified( sal_False ); if( bSet ) { - BOOL bOld = pDoc->IsModified(); + sal_Bool bOld = pDoc->IsModified(); pDoc->SetModified(); if( !bOld ) - pDoc->SetUndoNoResetModified(); + { + pDoc->GetIDocumentUndoRedo().SetUndoNoResetModified(); + } } else pDoc->ResetModified(); - EnableSetModified( TRUE ); + EnableSetModified( sal_True ); } UpdateChildWindows(); @@ -1564,7 +1593,7 @@ class SwReloadFromHtmlReader : public SwReader void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView ) { - BOOL bModified = IsModified(); + sal_Bool bModified = IsModified(); // The HTTP-Header fields have to be removed, otherwise // there are some from Meta-Tags dublicated or triplicated afterwards. @@ -1583,7 +1612,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView BasicManager *pBasicMan = GetBasicManager(); if( pBasicMan && (pBasicMan != SFX_APP()->GetBasicManager()) ) { - USHORT nLibCount = pBasicMan->GetLibCount(); + sal_uInt16 nLibCount = pBasicMan->GetLibCount(); while( nLibCount ) { StarBASIC *pBasic = pBasicMan->GetLib( --nLibCount ); @@ -1600,7 +1629,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView // Only the modules are deleted from the standard-lib if( nLibCount ) - pBasicMan->RemoveLib( nLibCount, TRUE ); + pBasicMan->RemoveLib( nLibCount, sal_True ); else pBasic->Clear(); } @@ -1637,7 +1666,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView SubInitNew(); - SfxMedium aMed( rStreamName, STREAM_READ, FALSE ); + SfxMedium aMed( rStreamName, STREAM_READ, sal_False ); // #i48748# - use class <SwReloadFromHtmlReader>, because // the base URL has to be set to the filename of the document <rMedname> // and not to the base URL of the temporary file <aMed> in order to get @@ -1653,7 +1682,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView { SwWrtShell& rWrtSh = pCurrView->GetWrtShell(); if( rWrtSh.GetLayout()) - rWrtSh.CheckBrowseView( TRUE ); + rWrtSh.CheckBrowseView( sal_True ); } @@ -1668,7 +1697,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView pDoc->ResetModified(); } -void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView ) +void SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView ) { GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet ); UpdateFontList(); @@ -1692,15 +1721,15 @@ void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView ) // Currently there can be only one view (layout) if the document is viewed in Web layout // So if there are more views we are in print layout and for toggling to Web layout all other views must be closed - SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, FALSE); + SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, sal_False); do { if( pTmpFrm != pTempView->GetViewFrame() ) { pTmpFrm->DoClose(); - pTmpFrm = SfxViewFrame::GetFirst(this, FALSE); + pTmpFrm = SfxViewFrame::GetFirst(this, sal_False); } else - pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, FALSE); + pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, sal_False); } while ( pTmpFrm ); @@ -1709,7 +1738,7 @@ void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView ) // set view columns before toggling: if ( bSet ) { - const USHORT nColumns = rViewOptions.GetViewLayoutColumns(); + const sal_uInt16 nColumns = rViewOptions.GetViewLayoutColumns(); const bool bBookMode = rViewOptions.IsViewLayoutBookMode(); if ( 1 != nColumns || bBookMode ) { @@ -1718,7 +1747,7 @@ void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView ) } // Triggeres a formatting: - pTempView->GetWrtShell().CheckBrowseView( TRUE ); + pTempView->GetWrtShell().CheckBrowseView( sal_True ); pTempView->CheckVisArea(); if( GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE) ) @@ -1735,10 +1764,10 @@ void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView ) } } -ULONG SwDocShell::LoadStylesFromFile( const String& rURL, - SwgReaderOption& rOpt, BOOL bUnoCall ) +sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, + SwgReaderOption& rOpt, sal_Bool bUnoCall ) { - ULONG nErr = 0; + sal_uLong nErr = 0; // Create a URL from filename INetURLObject aURLObj( rURL ); @@ -1753,14 +1782,14 @@ ULONG SwDocShell::LoadStylesFromFile( const String& rURL, SfxFilterMatcher aMatcher( sFactory ); // search for filter in WebDocShell, too - SfxMedium aMed( rURL, STREAM_STD_READ, FALSE ); + SfxMedium aMed( rURL, STREAM_STD_READ, sal_False ); const SfxFilter* pFlt = 0; - aMatcher.DetectFilter( aMed, &pFlt, FALSE, FALSE ); + aMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False ); if(!pFlt) { String sWebFactory(String::CreateFromAscii(SwWebDocShell::Factory().GetShortName())); SfxFilterMatcher aWebMatcher( sWebFactory ); - aWebMatcher.DetectFilter( aMed, &pFlt, FALSE, FALSE ); + aWebMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False ); } if( aMed.IsStorage() ) { |