INTEGRATION: CWS aquavcl04 (1.75.4); FILE MERGED

2007/11/21 10:11:18 gh 1.75.4.3: Testtool is called VCLTestTool
2007/11/09 11:08:05 pl 1.75.4.2: #i83007# replace %PRODUCTNAME
2007/11/07 15:32:42 gh 1.75.4.1: #i83007#about and settings dialog for MacOS

1 files changed, 50 insertions, 2 deletions

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 1a7069b862a1..65f790b4f0a4 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: app.cxx,v $
  *
- *  $Revision: 1.76 $
+ *  $Revision: 1.77 $
  *
- *  last change: $Author: obo $ $Date: 2008-01-07 09:49:09 $
+ *  last change: $Author: ihi $ $Date: 2008-01-14 15:49:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -310,6 +310,23 @@ uno::Reference< XContentProviderManager > InitializeUCB( void )
     return xUcb;
 }
 
+static void ReplaceStringHookProc( UniString& rStr )
+{
+    static String aTestToolName( RTL_CONSTASCII_USTRINGPARAM( "VCLTestTool" ) ); // HACK, should be read from ressources
+
+    if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+    {
+        rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", aTestToolName );
+        /*
+        rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
+        rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
+        rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
+        rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName );
+        rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion );
+        */
+    }
+}
+
 void BasicApp::Main( )
 {
 #ifdef DBG_UTIL
@@ -322,6 +339,8 @@ void BasicApp::Main( )
         DBG_ERROR("osl_setDebugMessageFunc returns non NULL pointer");
 #endif
 
+    ResMgr::SetReadStringHook( ReplaceStringHookProc );
+
     try
     {
 #ifdef _USE_UNO
@@ -759,6 +778,35 @@ BasicFrame::~BasicFrame()
     pBasic.Clear();     // Da jetzt REF
 }
 
+void BasicFrame::Command( const CommandEvent& rCEvt )
+{
+    switch( rCEvt.GetCommand() ) {
+        case COMMAND_SHOWDIALOG:
+            {
+                const CommandDialogData* pData = rCEvt.GetDialogData();
+                if ( pData)
+                {
+                    const int nCommand = pData->GetDialogId();
+
+                    switch (nCommand)
+                    {
+                        case SHOWDIALOG_ID_PREFERENCES :
+                                Command( RID_OPTIONS );
+                                break;
+
+                        case SHOWDIALOG_ID_ABOUT :
+                                Command( RID_HELPABOUT );
+                                break;
+
+                        default :
+                                ;
+                    }
+                }
+            }
+            break;
+    }
+}
+
 void BasicFrame::UpdateTitle()
 {
     String aTitle;