diff options
author | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
---|---|---|
committer | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
commit | f42f3b496a1d956f72fad8aaf37da790e89ed803 (patch) | |
tree | b6f9cea18fda9b1c8a0af9642958a9671de6f713 /automation/source/miniapp/testapp.cxx | |
parent | de539c71865e6eec7b1db38031f661d7d8ad0714 (diff) | |
parent | 16680c16eb84b5315dbbeeb61b3693c4d567640a (diff) |
accfixes: merged to m100
Diffstat (limited to 'automation/source/miniapp/testapp.cxx')
-rw-r--r-- | automation/source/miniapp/testapp.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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 */ |