1 files changed, 6 insertions, 52 deletions

diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 539f4851b8e3..fec900c8578e 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -105,10 +105,7 @@ BOOL MainWindow::Close()
 
 void MainWindow::FileExit()
 {
-/*  WriteSTBProfile();*/
-
-//  if (pApp->CloseAll())
-        pApp->Quit();
+    pApp->Quit();
 }
 
 
@@ -151,26 +148,6 @@ void MainWindow::SysDlg()
               break;
       }
 
-/*
-
-#define WB_OK                   ((WinBits)0x0010)
-#define WB_OK_CANCEL            ((WinBits)0x0020)
-#define WB_YES_NO               ((WinBits)0x0040)
-#define WB_YES_NO_CANCEL        ((WinBits)0x0080)
-#define WB_RETRY_CANCEL         ((WinBits)0x0100)
-
-#define WB_DEF_OK               ((WinBits)0x0200)
-#define WB_DEF_CANCEL           ((WinBits)0x0400)
-#define WB_DEF_RETRY            ((WinBits)0x0800)
-#define WB_DEF_YES              ((WinBits)0x1000)
-#define WB_DEF_NO               ((WinBits)0x2000)
-
-#define RET_OK               TRUE
-#define RET_CANCEL           FALSE
-#define RET_YES              2
-#define RET_NO               3
-#define RET_RETRY            4
-*/
 }
 
 MyApp aApp;
@@ -188,19 +165,6 @@ void MyApp::Property( ApplicationProperty& rProp )
         pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION;
         switch ( pTTProperties->nActualPR )
         {
-/*          case TT_PR_SLOTS:
-            {
-                pTTProperties->nSidOpenUrl = SID_OPENURL;
-                pTTProperties->nSidFileName = SID_FILE_NAME;
-                pTTProperties->nSidNewDocDirect = SID_NEWDOCDIRECT;
-                pTTProperties->nSidCopy = SID_COPY;
-                pTTProperties->nSidPaste = SID_PASTE;
-                pTTProperties->nSidSourceView = SID_SOURCEVIEW;
-                pTTProperties->nSidSelectAll = SID_SELECTALL;
-                pTTProperties->nSidReferer = SID_REFERER;
-                pTTProperties->nActualPR = 0;
-            }
-            break;*/
             case TT_PR_DISPATCHER:
             {
                 PlugInDispatcher* pDispatcher = GetDispatcher();
@@ -218,16 +182,6 @@ void MyApp::Property( ApplicationProperty& rProp )
                 }
             }
             break;
-/*          case TT_PR_IMG:
-            {
-                SvDataMemberObjectRef aDataObject = new SvDataMemberObject();
-                SvData* pDataBmp = new SvData( FORMAT_BITMAP );
-                pDataBmp->SetData( pTTProperties->mpBmp );
-                aDataObject->Append( pDataBmp );
-                aDataObject->CopyClipboard();
-                pTTProperties->nActualPR = 0;
-            }
-            break;*/
             default:
             {
                 pTTProperties->nPropertyVersion = 0;
@@ -240,8 +194,8 @@ void MyApp::Property( ApplicationProperty& rProp )
 
 USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT nMode)
 {
-    (void) ppArgs; /* avoid warning about unused parameter */
-    (void) nMode; /* avoid warning about unused parameter */
+    (void) ppArgs; // avoid warning about unused parameter
+    (void) nMode;  // avoid warning about unused parameter
 
     switch (nSID)
     {
@@ -310,8 +264,8 @@ Reference< XContentProviderManager > InitializeUCB( void )
         ucbhelper::ContentBroker::get()->getContentProviderManagerInterface();
 
     Reference< XContentProvider > xFileProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True );
+        ( xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.FileContentProvider" )) ), UNO_QUERY );
+    xUcb->registerContentProvider( xFileProvider, OUString( RTL_CONSTASCII_USTRINGPARAM( "file" )), sal_True );
 
     return xUcb;
 }
@@ -347,4 +301,4 @@ void MyApp::Main()
     Execute();
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file