summaryrefslogtreecommitdiff
path: root/automation/source/miniapp
diff options
context:
space:
mode:
Diffstat (limited to 'automation/source/miniapp')
-rw-r--r--automation/source/miniapp/editwin.cxx10
-rw-r--r--automation/source/miniapp/editwin.hxx6
-rw-r--r--automation/source/miniapp/servres.cxx4
-rw-r--r--automation/source/miniapp/servres.hrc6
-rw-r--r--automation/source/miniapp/servres.hxx4
-rw-r--r--automation/source/miniapp/servres.src2
-rw-r--r--automation/source/miniapp/servuid.hxx22
-rw-r--r--automation/source/miniapp/testapp.cxx13
-rw-r--r--automation/source/miniapp/testapp.hxx8
9 files changed, 38 insertions, 37 deletions
diff --git a/automation/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx
index 5568b5152320..395c9deb350a 100644
--- a/automation/source/miniapp/editwin.cxx
+++ b/automation/source/miniapp/editwin.cxx
@@ -34,13 +34,13 @@
#include <vcl/msgbox.hxx>
-BOOL GHEditWindow::Close()
+sal_Bool GHEditWindow::Close()
{
if (aInhalt.IsModified())
{
}
delete(this);
- return TRUE;
+ return sal_True;
}
void GHEditWindow::Resize()
@@ -64,7 +64,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();
@@ -110,11 +110,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 bf7cbfa3ca34..ed10acec2646 100644
--- a/automation/source/miniapp/editwin.hxx
+++ b/automation/source/miniapp/editwin.hxx
@@ -39,7 +39,7 @@ protected:
MultiLineEdit aInhalt;
- virtual BOOL Close(); // derived
+ virtual sal_Bool Close(); // derived
void Resize();
public:
@@ -48,7 +48,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);
};
@@ -57,7 +57,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 3cbb4bf3c80c..1bd795fd4041 100644
--- a/automation/source/miniapp/servres.cxx
+++ b/automation/source/miniapp/servres.cxx
@@ -35,7 +35,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() ) ),
@@ -53,7 +53,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.hrc b/automation/source/miniapp/servres.hrc
index 2f95a34a60b6..6efd2ce57460 100644
--- a/automation/source/miniapp/servres.hrc
+++ b/automation/source/miniapp/servres.hrc
@@ -29,9 +29,9 @@
#define IDM_FILE 1
#define IDM_FILE_OPEN_TEST 2
#define IDM_FILE_EXIT 3
-#define IDM_FILE_EXIT_HELP 4
-#define IDM_FILE_OPEN_TEST_HELP 1
-#define IDM_FILE_HELP 3
+#define IDM_FILE_EXIT_HELP "AUTOMATION_IDM_FILE_EXIT_HELP"
+#define IDM_FILE_OPEN_TEST_HELP "AUTOMATION_IDM_FILE_OPEN_TEST_HELP"
+#define IDM_FILE_HELP "AUTOMATION_IDM_FILE_HELP"
#define GROSSER_TEST_DLG 256
#define IDM_TEST 5
#define IDM_TEST_GROSS 6
diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx
index c93c758ec229..72584163c7cd 100644
--- a/automation/source/miniapp/servres.hxx
+++ b/automation/source/miniapp/servres.hxx
@@ -52,14 +52,14 @@ 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 );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/servres.src b/automation/source/miniapp/servres.src
index 426be8b81532..c1af1caa775a 100644
--- a/automation/source/miniapp/servres.src
+++ b/automation/source/miniapp/servres.src
@@ -54,7 +54,7 @@ ModalDialog GROSSER_TEST_DLG
};
OKButton 1
{
- HelpID = 1 ;
+ HelpID = "hid1" ;
Pos = MAP_APPFONT ( 132 , 92 ) ;
Size = MAP_APPFONT ( 64 , 12 ) ;
TabStop = TRUE ;
diff --git a/automation/source/miniapp/servuid.hxx b/automation/source/miniapp/servuid.hxx
index 7460c097606a..019479cc65a3 100644
--- a/automation/source/miniapp/servuid.hxx
+++ b/automation/source/miniapp/servuid.hxx
@@ -25,16 +25,16 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define UID_GROSSER_TEST_DLG 101
-#define UID_CheckBox 202
-#define UID_TriStateBox 303
-#define UID_OKButton 404
-#define UID_TimeField 505
-#define UID_MultiLineEdit 606
-#define UID_RadioButton1 707
-#define UID_RadioButton2 708
-#define UID_MultiListBox 809
-#define UID_ComboBox 910
-#define UID_DateBox 1011
+#define UID_GROSSER_TEST_DLG "AUTOMATION_UID_GROSSER_TEST_DLG"
+#define UID_CheckBox "AUTOMATION_UID_CheckBox"
+#define UID_TriStateBox "AUTOMATION_UID_TriStateBox"
+#define UID_OKButton "AUTOMATION_UID_OKButton"
+#define UID_TimeField "AUTOMATION_UID_TimeField"
+#define UID_MultiLineEdit "AUTOMATION_UID_MultiLineEdit"
+#define UID_RadioButton1 "AUTOMATION_UID_RadioButton1"
+#define UID_RadioButton2 "AUTOMATION_UID_RadioButton2"
+#define UID_MultiListBox "AUTOMATION_UID_MultiListBox"
+#define UID_ComboBox "AUTOMATION_UID_ComboBox"
+#define UID_DateBox "AUTOMATION_UID_DateBox"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 2c359e057434..914b59a6739c 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()
@@ -110,7 +110,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);
@@ -119,9 +119,10 @@ void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent)
aText.SearchAndReplaceAllAscii("\n",CUniString("\\n"));
aEditWin->AddText(String(sIndent).AppendAscii("Text: ").Append(aText).AppendAscii("\n"));
- aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String::CreateFromInt64(pBase->GetHelpId())).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n"));
+ // 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);
@@ -193,7 +194,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 498ee04af136..65bfe777d0d1 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -58,12 +58,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*);
@@ -77,8 +77,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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 10:49:52 +0000