1 files changed, 12 insertions, 18 deletions

diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index b0db17a7da3c..339b4da73042 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -81,26 +81,26 @@ void SwHTMLParser::NewScript()
     if( aScriptURL.Len() )
     {
         // Den Inhalt des Script-Tags ignorieren
-        bIgnoreRawData = TRUE;
+        bIgnoreRawData = sal_True;
     }
 }
 
 void SwHTMLParser::EndScript()
 {
-    BOOL bInsIntoBasic = FALSE,
-         bInsSrcIntoFld = FALSE;
+    sal_Bool bInsIntoBasic = sal_False,
+         bInsSrcIntoFld = sal_False;
 
     switch( eScriptLang )
     {
     case HTML_SL_STARBASIC:
-        bInsIntoBasic = TRUE;
+        bInsIntoBasic = sal_True;
         break;
     default:
-        bInsSrcIntoFld = TRUE;
+        bInsSrcIntoFld = sal_True;
         break;
     }
 
-    bIgnoreRawData = FALSE;
+    bIgnoreRawData = sal_False;
     aScriptSource.ConvertLineEnd();
 
     // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
@@ -122,7 +122,7 @@ void SwHTMLParser::EndScript()
     {
     // Fuer JavaScript und StarBasic noch ein Basic-Modul anlegen
         // Das Basic entfernt natuerlich weiterhin keine SGML-Kommentare
-        RemoveSGMLComment( aScriptSource, TRUE );
+        RemoveSGMLComment( aScriptSource, sal_True );
 
         // get library name
         ::rtl::OUString aLibName;
@@ -154,7 +154,7 @@ void SwHTMLParser::EndScript()
                 if( !aBasicModule.Len() )
                 {
                     // create module name
-                    BOOL bFound = TRUE;
+                    sal_Bool bFound = sal_True;
                     while( bFound )
                     {
                         aBasicModule.AssignAscii( "Modul" );
@@ -268,8 +268,7 @@ void SwHTMLParser::InsertBasicDocEvent( rtl::OUString aEvent, const String& rNam
 
     rtl::OUString aEventName;
 
-    SfxEventConfiguration* pECfg = SFX_APP()->GetEventConfig();
-    pECfg->ConfigureEvent( aEvent, SvxMacro( sEvent, sScriptType, eScrType ),
+    SfxEventConfiguration::ConfigureEvent( aEvent, SvxMacro( sEvent, sScriptType, eScrType ),
                            pDocSh );
 }
 
@@ -278,26 +277,23 @@ void SwHTMLWriter::OutBasic()
     if( !bCfgStarBasic )
         return;
 
-    SFX_APP()->EnterBasicCall();
-
     BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager();
     OSL_ENSURE( pBasicMan, "Wo ist der Basic-Manager?" );
     // nur das DocumentBasic schreiben
     if( !pBasicMan || pBasicMan == SFX_APP()->GetBasicManager() )
     {
-        SFX_APP()->LeaveBasicCall();
         return;
     }
 
     // und jetzt alle StarBasic-Module und alle unbenutzen JavaSrript-Module
     // ausgeben
-    for( USHORT i=0; i<pBasicMan->GetLibCount(); i++ )
+    for( sal_uInt16 i=0; i<pBasicMan->GetLibCount(); i++ )
     {
         StarBASIC *pBasic = pBasicMan->GetLib( i  );
         const String& rLibName = pBasic->GetName();
 
         SbxArray *pModules = pBasic->GetModules();
-        for( USHORT j=0; j<pModules->Count(); j++ )
+        for( sal_uInt16 j=0; j<pModules->Count(); j++ )
         {
             const SbModule *pModule = PTR_CAST( SbModule, pModules->Get(j) );
             OSL_ENSURE( pModule, "Wo ist das Modul?" );
@@ -332,8 +328,6 @@ void SwHTMLWriter::OutBasic()
                                      eDestEnc, &aNonConvertableCharacters );
         }
     }
-
-    SFX_APP()->LeaveBasicCall();
 }
 
 static const char* aEventNames[] =
@@ -353,7 +347,7 @@ void SwHTMLWriter::OutBasicBodyEvents()
     uno::Reference < container::XNameReplace > xEvents = xSup->getEvents();
     for ( sal_Int32 i=0; i<4; i++ )
     {
-        SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( ::rtl::OUString::createFromAscii(aEventNames[i]) ), pDocSh, TRUE );
+        SvxMacro* pMacro = SfxEventConfiguration::ConvertToMacro( xEvents->getByName( ::rtl::OUString::createFromAscii(aEventNames[i]) ), pDocSh, sal_True );
         if ( pMacro )
             pDocTable->Insert( aBodyEventTable[i].nEvent, pMacro );
     }