diff options
Diffstat (limited to 'sw/source/core/doc/docglos.cxx')
| -rw-r--r-- | sw/source/core/doc/docglos.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx index 8395c358c495..610a8fb170b8 100644 --- a/sw/source/core/doc/docglos.cxx +++ b/sw/source/core/doc/docglos.cxx @@ -28,8 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/document/XDocumentProperties.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <doc.hxx> +#include <IDocumentUndoRedo.hxx> #include <shellio.hxx> #include <pam.hxx> #include <swundo.hxx> @@ -38,11 +43,6 @@ #include <crsrsh.hxx> #include <docsh.hxx> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/document/XDocumentProperties.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> - using namespace ::com::sun::star; @@ -108,16 +108,16 @@ static void lcl_copyDocumentProperties( /* -----------------22.07.99 11:47------------------- Description: inserts an AutoText block --------------------------------------------------*/ -BOOL SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry, +sal_Bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry, SwPaM& rPaM, SwCrsrShell* pShell ) { - BOOL bRet = FALSE; - USHORT nIdx = rBlock.GetIndex( rEntry ); - if( (USHORT) -1 != nIdx ) + sal_Bool bRet = sal_False; + sal_uInt16 nIdx = rBlock.GetIndex( rEntry ); + if( (sal_uInt16) -1 != nIdx ) { // Bug #70238# ask the TextOnly-Flag before BeginGetDoc, because // the method closed the Storage! - BOOL bSav_IsInsGlossary = mbInsOnlyTxtGlssry; + sal_Bool bSav_IsInsGlossary = mbInsOnlyTxtGlssry; mbInsOnlyTxtGlssry = rBlock.IsOnlyTextBlock( nIdx ); if( rBlock.BeginGetDoc( nIdx ) ) @@ -160,7 +160,7 @@ BOOL SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry, pCntntNd = aCpyPam.GetCntntNode(); aCpyPam.GetPoint()->nContent.Assign( pCntntNd, pCntntNd->Len() ); - StartUndo( UNDO_INSGLOSSARY, NULL ); + GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL ); SwPaM *_pStartCrsr = &rPaM, *__pStartCrsr = _pStartCrsr; do { @@ -187,12 +187,12 @@ BOOL SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry, pShell->SaveTblBoxCntnt( &rInsPos ); } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != __pStartCrsr ); - EndUndo( UNDO_INSGLOSSARY, NULL ); + GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, NULL ); UnlockExpFlds(); if( !IsExpFldsLocked() ) UpdateExpFlds(NULL, true); - bRet = TRUE; + bRet = sal_True; } mbInsOnlyTxtGlssry = bSav_IsInsGlossary; } |