6 files changed, 21 insertions, 21 deletions
diff --git a/automation/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx
index f00917e6d2e5..67476c09bf6a 100644
--- a/automation/source/miniapp/editwin.cxx
+++ b/automation/source/miniapp/editwin.cxx
@@ -35,13 +35,13 @@
 #endif
 
 
-BOOL GHEditWindow::Close()
+sal_Bool GHEditWindow::Close()
 {
     if (aInhalt.IsModified())
     {
     }
     delete(this);
-    return TRUE;
+    return sal_True;
 }
 
 void GHEditWindow::Resize()
@@ -65,7 +65,7 @@ void GHEditWindow::Clear()
     aInhalt.SetText(String());
 }
 
-void GHEditWindow::AddText( String aNew, BOOL bMoveToEnd)
+void GHEditWindow::AddText( String aNew, sal_Bool bMoveToEnd)
 {
     String aOld = aInhalt.GetText();
 
@@ -111,11 +111,11 @@ void EditFileWindow::LoadFile()
 
     All.ConvertLineEnd();
 
-    AddText(All,FALSE);
+    AddText(All,sal_False);
 
 }
 
-BOOL EditFileWindow::Close()
+sal_Bool EditFileWindow::Close()
 {
 
     if (aInhalt.IsModified() && QueryBox(this,WB_DEF_YES | WB_YES_NO_CANCEL, String(aFileName).AppendAscii("\nhas been changed.\n\nSave file?")).Execute())
diff --git a/automation/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx
index 8fbf04227382..9547695fcc9d 100644
--- a/automation/source/miniapp/editwin.hxx
+++ b/automation/source/miniapp/editwin.hxx
@@ -40,7 +40,7 @@ protected:
 
     MultiLineEdit   aInhalt;
 
-    virtual BOOL Close(); // derived
+    virtual sal_Bool Close(); // derived
     void Resize();
 
 public:
@@ -49,7 +49,7 @@ public:
     GHEditWindow(Window * pParent, String aName = CUniString("Neues Fenster"), WinBits iWstyle = WB_STDWORK);
 
     void Clear();
-    void AddText( String aNew, BOOL bMoveToEnd = TRUE);
+    void AddText( String aNew, sal_Bool bMoveToEnd = sal_True);
 };
 
 
@@ -58,7 +58,7 @@ class EditFileWindow : public GHEditWindow
 {
 
     String  aFileName;
-    virtual BOOL Close(); // derived
+    virtual sal_Bool Close(); // derived
     void LoadFile();
 
 public:
diff --git a/automation/source/miniapp/servres.cxx b/automation/source/miniapp/servres.cxx
index a708e026a2a6..f01d5d8c79b1 100644
--- a/automation/source/miniapp/servres.cxx
+++ b/automation/source/miniapp/servres.cxx
@@ -34,7 +34,7 @@
 #include "servres.hxx"
 
 
-ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, BOOL bFreeRes )
+ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, sal_Bool bFreeRes )
     : ModalDialog( pParent, rResId ),
     aCheckBox1( this, ResId( 1, *rResId.GetResMgr() ) ),
     aTriStateBox1( this, ResId( 1, *rResId.GetResMgr() ) ),
@@ -52,7 +52,7 @@ ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, cons
     if( bFreeRes ) FreeResource();
 }
 
-MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, BOOL )
+MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, sal_Bool )
     : MenuBar( rResId )
 {
     // No subresources, automatic free resource
diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx
index 848779a39fa7..9262b50d946a 100644
--- a/automation/source/miniapp/servres.hxx
+++ b/automation/source/miniapp/servres.hxx
@@ -69,13 +69,13 @@ protected:
     DateBox aDateBox1;
     FixedText aFixedText1;
 public:
-    ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, BOOL bFreeRes = TRUE );
+    ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, sal_Bool bFreeRes = sal_True );
 };
 
 class MenuMENU_CLIENT : public MenuBar
 {
 protected:
 public:
-    MenuMENU_CLIENT( const ResId & rResId, BOOL bFreeRes = TRUE );
+    MenuMENU_CLIENT( const ResId & rResId, sal_Bool bFreeRes = sal_True );
 };
 
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index eec1d8ac837b..6711ffe8b333 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -97,11 +97,11 @@ void MainWindow::TestGross()
 }
 
 
-BOOL MainWindow::Close()
+sal_Bool MainWindow::Close()
 {
     WorkWindow::Close();
     FileExit();
-    return TRUE;
+    return sal_True;
 }
 
 void MainWindow::FileExit()
@@ -113,7 +113,7 @@ void MainWindow::FileExit()
 }
 
 
-void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent)
+void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, sal_uInt16 Indent)
 {
     String sIndent,aText;
     sIndent.Expand(5*Indent);
@@ -125,7 +125,7 @@ void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent)
     // FIXME: HELPID
     aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String(rtl::OStringToOUString(pBase->GetHelpId(), RTL_TEXTENCODING_UTF8))).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n"));
 
-    USHORT i;
+    sal_uInt16 i;
     for (i = 0 ; i < pBase->GetChildCount() ; i++)
     {
         Tree(aEditWin,pBase->GetChild(i),Indent+1);
@@ -240,7 +240,7 @@ void MyApp::Property( ApplicationProperty& rProp )
 }
 
 
-USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT nMode)
+sal_uInt16 MyDispatcher::ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs, sal_uInt16 nMode)
 {
     (void) ppArgs; /* avoid warning about unused parameter */
     (void) nMode; /* avoid warning about unused parameter */
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index 31a480a0173e..a3c33ed359d3 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -75,12 +75,12 @@ class MainWindow : public WorkWindow
 
 public:
     MainWindow(MyApp *pAppl);
-    virtual BOOL Close(); // derived
+    virtual sal_Bool Close(); // derived
 
     void FileExit();
     void FileOpen();
     void TestGross();
-    void Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent);
+    void Tree(GHEditWindow *aEditWin, Window *pBase, sal_uInt16 Indent);
     void WinTree();
     void SysDlg();
     DECL_LINK(MenuSelectHdl,MenuBar*);
@@ -94,8 +94,8 @@ class MyDispatcher
 public:
     MyDispatcher(MainWindow  *MainWin) : pMainWin(MainWin) {};
     virtual ~MyDispatcher() {};
-    virtual USHORT ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs = 0, USHORT nMode = 0);
-    virtual void SetExecuteMode( USHORT nMode )
+    virtual sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs = 0, sal_uInt16 nMode = 0);
+    virtual void SetExecuteMode( sal_uInt16 nMode )
     {
         (void) nMode; /* avoid warning about unused parameter */
     };  // Ist hier sowieso egal